shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

Browse Source
This commit is contained in:
denisdulici
2020-05-08 16:36:04 +03:00
parent 871604b514 0e73a2bf69
commit 534bef0ae4
23 changed files with 84 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/views/modules/item/pre_sale.blade.php
View File

@ -87,10 +87,9 @@
@endif
@endpermission
@if ($module->purchase_faq)
<br>
<div class="text-center">
<a href="#" @click="onShowFaq" id="button-purchase-faq">{{ trans('modules.tab.faq')}}</a>
@if (!empty($module->purchase_desc))
<div class="text-center mt-3">
{!! $module->purchase_desc !!}
</div>
@endif
</div>

2
resources/views/modules/item/show.blade.php
View File

@ -191,7 +191,7 @@
@if (!empty($module->purchase_desc))
<div class="text-center mt-3">
{{ $module->purchase_desc }}
{!! $module->purchase_desc !!}
</div>
@endif
</div>

2
resources/views/partials/admin/head.blade.php
View File

@ -33,7 +33,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

2
resources/views/partials/auth/head.blade.php
View File

@ -28,7 +28,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

2
resources/views/partials/modules/head.blade.php
View File

@ -31,7 +31,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_home = '{{ url("apps/categories") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

2
resources/views/partials/portal/head.blade.php
View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

2
resources/views/partials/signed/head.blade.php
View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

2
resources/views/partials/wizard/head.blade.php
View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')