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

2020-05-03 10:32:57 +03:00
parent aad139d40b 70bfe8c524
commit 2f8506a2eb
59 changed files with 1131 additions and 383 deletions
--- a/resources/views/modules/item/show.blade.php
+++ b/resources/views/modules/item/show.blade.php
@ -189,10 +189,10 @@
                        @endpermission
                    @endif

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