Merge branch 'master' into master

2021-02-23 22:07:21 +03:00
parent 4f02f14056 05d3706836
commit f5425ecdb2
284 changed files with 19538 additions and 1384 deletions
--- a/resources/views/components/documents/form/advanced.blade.php
+++ b/resources/views/components/documents/form/advanced.blade.php
@ -26,6 +26,8 @@
                            {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $document->category_id ?? setting('default.' . $categoryType . '_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=' . $categoryType, 'remote_action' => route('categories.index'). '?search=type:' . $categoryType], $more_form_class) }}
                        @endif
                    </div>
+                    @else
+                    {{ Form::hidden('category_id', $document->category_id ?? setting('default.' . $categoryType . '_category')) }}
                    @endif
                    @stack('more_row_end')

--- a/resources/views/components/documents/form/company.blade.php
+++ b/resources/views/components/documents/form/company.blade.php
@ -15,21 +15,21 @@

                    <div class="col-sm-6 col-md-6 col-lg-6 col-xl-6">
                        @if (!$hideDocumentTitle)
-                            {{ Form::textGroup('title', trans('settings.invoice.title'), 'font', ['data-field' => 'setting'], setting($type . '.title'), 'col-md-12') }}
+                            {{ Form::textGroup('title', trans('settings.invoice.title'), 'font', ['data-field' => 'setting'], $titleSetting, 'col-md-12') }}
                        @endif

                        @if (!$hideDocumentSubheading)
-                            {{ Form::textGroup('subheading', trans('settings.invoice.subheading'), 'font', ['data-field' => 'setting'], setting($type . '.subheading'), 'col-md-12') }}
+                            {{ Form::textGroup('subheading', trans('settings.invoice.subheading'), 'font', ['data-field' => 'setting'], $subheadingSetting, 'col-md-12') }}
                        @endif

                        @if (!$hideCompanyEdit)
                            <akaunting-company-edit company-id="{{ session('company_id') }}"
-                            button-text="{{ trans('Edit your business address') }}"
+                            button-text="{{ trans('settings.company.edit_your_business_address') }}"
                            taxt-number-text="{{ trans('general.tax_number') }}"
                            :company="{{ json_encode($company) }}"
                            :company-form="{{ json_encode([
                                'show' => true,
-                                'text' => trans('Edit your business address'),
+                                'text' => trans('settings.company.edit_your_business_address'),
                                'buttons' => [
                                    'cancel' => [
                                        'text' => trans('general.cancel'),
--- a/resources/views/components/documents/form/content.blade.php
+++ b/resources/views/components/documents/form/content.blade.php
@ -29,6 +29,7 @@
                hide-document-title="{{ $hideDocumentTitle }}"
                hide-document-subheading="{{ $hideDocumentSubheading }}"
                hide-company-edit="{{ $hideCompanyEdit }}"
+                title-setting="{{ $titleSetting }}"
            />
        @endif

@ -65,12 +66,16 @@
            hide-discount="{{ $hideDiscount }}"
            hide-amount="{{ $hideAmount }}"
            text-amount="{{ $textAmount }}"
+            is-sale-price="{{ $isSalePrice }}"
+            is-purchase-price="{{ $isPurchasePrice }}"
+            notes-setting="{{ $notesSetting }}"
        />

        @if (!$hideFooter)
            <x-documents.form.footer
                type="{{ $type }}"
                :document="$document"
+                footer-setting="{{ $footerSetting }}"
            />
        @endif

--- a/resources/views/components/documents/form/footer.blade.php
+++ b/resources/views/components/documents/form/footer.blade.php
@ -6,7 +6,7 @@
            </div>

            <div id="accordion-footer-body" class="collapse hide" aria-labelledby="accordion-footer-header">
-                {{ Form::textareaGroup('footer', '', '', setting($type . '.footer'), ['rows' => '3'], 'embed-acoordion-textarea') }}
+                {{ Form::textareaGroup('footer', '', '', $footerSetting, ['rows' => '3'], 'embed-acoordion-textarea') }}
            </div>
        </div>
-    </div>
+    </div>
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@ -57,7 +57,7 @@
                                        @if (!$hideDescription)
                                            <textarea
                                                class="form-control"
-                                                placeholder="Enter item description"
+                                                placeholder="{{ trans('items.enter_item_description') }}"
                                                style="height: 46px; overflow: hidden;"
                                                :name="'items.' + index + '.description'"
                                                v-model="row.description"
--- a/resources/views/components/documents/form/main.blade.php
+++ b/resources/views/components/documents/form/main.blade.php
@ -42,6 +42,8 @@
            hide-discount="{{ $hideDiscount }}"
            hide-amount="{{ $hideAmount }}"
            text-amount="{{ $textAmount }}"
+            is-sale-price="{{ $isSalePrice }}"
+            is-purchase-price="{{ $isPurchasePrice }}"
        />

        <x-documents.form.totals
@ -52,6 +54,7 @@
        <x-documents.form.note
            type="{{ $type }}"
            :document="$document"
+            notes-setting="{{ $notesSetting }}"
        />
    </div>
 </div>
--- a/resources/views/components/documents/form/note.blade.php
+++ b/resources/views/components/documents/form/note.blade.php
@ -1,3 +1,3 @@
 <div class="row embed-card-body-footer">
-    {{ Form::textareaGroup('notes', trans_choice('general.notes', 2), '', setting($type . '.notes'), ['rows' => '3', 'class' => 'form-control embed-card-body-footer-textarea'], 'col-md-12 embed-acoordion-textarea') }}
+    {{ Form::textareaGroup('notes', trans_choice('general.notes', 2), '', $notesSetting, ['rows' => '3', 'class' => 'form-control embed-card-body-footer-textarea'], 'col-md-12 embed-acoordion-textarea') }}
 </div>
--- a/resources/views/components/documents/index/card-body.blade.php
+++ b/resources/views/components/documents/index/card-body.blade.php
@ -242,10 +242,10 @@
                                        @can($permissionDelete)
                                            @if ($checkButtonReconciled)
                                                @if (!$item->reconciled)
-                                                    {!! Form::deleteLink($item, $routeButtonDelete) !!}
+                                                    {!! Form::deleteLink($item, $routeButtonDelete, $textModalDelete, $valueModalDelete) !!}
                                                @endif
                                            @else
-                                                {!! Form::deleteLink($item, $routeButtonDelete) !!}
+                                                {!! Form::deleteLink($item, $routeButtonDelete, $textModalDelete, $valueModalDelete) !!}
                                            @endif
                                        @endcan
                                    @endif
--- a/resources/views/components/documents/index/content.blade.php
+++ b/resources/views/components/documents/index/content.blade.php
@ -51,6 +51,8 @@
            hide-button-delete="{{ $hideButtonDelete }}"
            permission-delete="{{ $permissionDelete }}"
            route-button-delete="{{ $routeButtonDelete }}"
+            text-modal-delete="{{ $textModalDelete }}"
+            value-modal-delete="{{ $valueModalDelete }}"
        />

        <x-documents.index.card-footer
@ -65,5 +67,7 @@
        text-empty-page="{{ $textEmptyPage }}"
        url-docs-path="{{ $urlDocsPath }}"
        create-route="{{ $createRoute }}"
+        check-permission-create="{{ $checkPermissionCreate }}"
+        permission-create="{{ $permissionCreate }}"
    />
@endif
--- a/resources/views/components/documents/index/empty-page.blade.php
+++ b/resources/views/components/documents/index/empty-page.blade.php
@ -10,9 +10,17 @@
                {!! trans($textEmptyPage) !!} {!! trans('general.empty.documentation', ['url' => $urlDocsPath]) !!}
            </p>

-            <a href="{{ route($createRoute) }}" class="btn btn-success float-right mt-4">
-                <span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice($textPage, 1)]) }}</span>
-            </a>
+            @if ($checkPermissionCreate)
+                @can($permissionCreate)
+                    <a href="{{ route($createRoute) }}" class="btn btn-success float-right mt-4">
+                        <span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice($textPage, 1)]) }}</span>
+                    </a>
+                @endcan
+            @else
+                <a href="{{ route($createRoute) }}" class="btn btn-success float-right mt-4">
+                    <span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice($textPage, 1)]) }}</span>
+                </a>
+            @endif
        </div>
    </div>
 </div>
--- a/resources/views/components/documents/index/top-buttons.blade.php
+++ b/resources/views/components/documents/index/top-buttons.blade.php
@ -1,17 +1,21 @@
-@if ($checkPermissionCreate) 
+@if ($checkPermissionCreate)
    @can($permissionCreate)
-@endif
+        @if (!$hideCreate)
+            <a href="{{ route($createRoute) }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
+        @endif

-    @if (!$hideCreate) 
+        @if (!$hideImport)
+            <a href="{{ route($importRoute, $importRouteParameters) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
+        @endif
+    @endcan
+@else
+    @if (!$hideCreate)
        <a href="{{ route($createRoute) }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
    @endif

    @if (!$hideImport)
        <a href="{{ route($importRoute, $importRouteParameters) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
    @endif
-
-@if ($checkPermissionCreate)
-    @endcan
@endif

@if (!$hideExport)
--- a/resources/views/components/documents/show/content.blade.php
+++ b/resources/views/components/documents/show/content.blade.php
@ -84,7 +84,7 @@
        :document="$document"
        document-template="{{ $documentTemplate }}"
        logo="{{ $logo }}"
-        back-ground-color="{{ $backGroundColor }}"
+        background-color="{{ $backgroundColor }}"
        hide-footer="{{ $hideFooter }}"
        hide-company-logo="{{ $hideCompanyLogo }}"
        hide-company-details="{{ $hideCompanyDetails }}"
--- a/resources/views/components/documents/show/document.blade.php
+++ b/resources/views/components/documents/show/document.blade.php
@ -10,7 +10,7 @@
                        :document="$document"
                        document-template="{{ $documentTemplate }}"
                        logo="{{ $logo }}"
-                        back-ground-color="{{ $backGroundColor }}"
+                        background-color="{{ $backgroundColor }}"
                        hide-footer="{{ $hideFooter }}"
                        hide-company-logo="{{ $hideCompanyLogo }}"
                        hide-company-details="{{ $hideCompanyDetails }}"
@ -53,7 +53,7 @@
                        :document="$document"
                        document-template="{{ $documentTemplate }}"
                        logo="{{ $logo }}"
-                        back-ground-color="{{ $backGroundColor }}"
+                        background-color="{{ $backgroundColor }}"
                        hide-footer="{{ $hideFooter }}"
                        hide-company-logo="{{ $hideCompanyLogo }}"
                        hide-company-details="{{ $hideCompanyDetails }}"
@ -96,7 +96,7 @@
                        :document="$document"
                        document-template="{{ $documentTemplate }}"
                        logo="{{ $logo }}"
-                        back-ground-color="{{ $backGroundColor }}"
+                        background-color="{{ $backgroundColor }}"
                        hide-footer="{{ $hideFooter }}"
                        hide-company-logo="{{ $hideCompanyLogo }}"
                        hide-company-details="{{ $hideCompanyDetails }}"
--- a/resources/views/components/documents/show/timeline.blade.php
+++ b/resources/views/components/documents/show/timeline.blade.php
@ -59,7 +59,7 @@
                                @stack('timeline_sent_head_end')

                                @stack('timeline_sent_body_start')
-                                    @if ($document->status != 'sent' && $document->status != 'partial' && $document->status != 'viewed')
+                                    @if ($document->status != 'sent' && $document->status != 'partial' && $document->status != 'viewed' && $document->status != 'received')
                                        @stack('timeline_sent_body_message_start')
                                            <small>
                                                {{ trans_choice('general.statuses', 1) . ':' }}
@ -89,9 +89,15 @@
                                            @stack('timeline_receive_body_button_received_start')
                                                @if (!$hideButtonReceived)
                                                    @can($permissionUpdate)
-                                                        <a href="{{ route($routeButtonReceived, $document->id) }}" class="btn btn-danger btn-sm btn-alone">
-                                                            {{ trans($textTimelineSentStatusReceived) }}
-                                                        </a>
+                                                        @if ($document->status == 'draft')
+                                                            <a href="{{ route($routeButtonReceived, $document->id) }}" class="btn btn-danger btn-sm btn-alone">
+                                                                {{ trans($textTimelineSentStatusReceived) }}
+                                                            </a>
+                                                        @else
+                                                            <button type="button" class="btn btn-secondary btn-sm" disabled="disabled">
+                                                                {{ trans($textTimelineSentStatusReceived) }}
+                                                            </button>
+                                                        @endif
                                                    @endcan
                                                @endif
                                            @stack('timeline_receive_body_button_received_end')
@ -99,7 +105,12 @@
                                        @stack('timeline_viewed_invoice_body_message_start')
                                            <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
                                            <small>{{ trans('invoices.messages.status.viewed') }}</small>
-                                        @stack('timeline_viewed_invoice_body_message_end')
+                                        @stack('timeline_viewed_invoice_body_message_end'))
+                                    @elseif($document->status == 'received')
+                                        @stack('timeline_receive_bill_body_message_start')
+                                            <small>{{ trans_choice('general.statuses', 1) .  ':'  }}</small>
+                                            <small>{{ trans('bills.messages.status.receive.received', ['date' => Date::parse($document->received_at)->format($date_format)]) }}</small>
+                                        @stack('timeline_receive_bill_body_message_end')
                                    @else
                                        @stack('timeline_sent_body_message_start')
                                            <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
@ -107,7 +118,7 @@
                                        @stack('timeline_sent_body_message_end')
                                    @endif

-                                    @if (!($document->status != 'sent' && $document->status != 'partial' && $document->status != 'viewed'))
+                                    @if (!($document->status != 'sent' && $document->status != 'partial' && $document->status != 'viewed' && $document->status != 'received'))
                                    <div class="mt-3">
                                    @endif

@ -118,8 +129,8 @@
                                                    {{ trans($textTimelineSendStatusMail) }}
                                                </a>
                                            @else
-                                                <el-tooltip content="{{ trans('invoices.messages.email_required') }}" placement="top" effect="danger">
-                                                    <button type="button" class="btn btn-danger btn-sm" disabled="disabled">
+                                                <el-tooltip content="{{ trans('invoices.messages.email_required') }}" placement="top">
+                                                    <button type="button" class="btn btn-danger btn-sm btn-tooltip disabled">
                                                        {{ trans($textTimelineSendStatusMail) }}
                                                    </button>
                                                </el-tooltip>
@ -181,7 +192,7 @@
                                    <div class="mt-3">
                                        @stack('timeline_get_paid_body_button_pay_start')
                                            @if (!$hideButtonPaid)
-                                                @can('update-sales-invoices')
+                                                @can($permissionUpdate)
                                                    <a href="{{ route($routeButtonPaid, $document->id) }}" class="btn btn-white btn-sm header-button-top">
                                                        {{ trans($textTimelineGetPaidMarkPaid) }}
                                                    </a>
--- a/resources/views/components/documents/show/top-buttons.blade.php
+++ b/resources/views/components/documents/show/top-buttons.blade.php
@ -71,8 +71,8 @@
                                {{ trans($textTimelineSendStatusMail) }}
                            </a>
                        @else
-                            <el-tooltip content="{{ trans('invoices.messages.email_required') }}" placement="right" effect="danger">
-                                <button type="button" class="dropdown-item" disabled="disabled">
+                            <el-tooltip content="{{ trans('invoices.messages.email_required') }}" placement="right">
+                                <button type="button" class="dropdown-item btn-tooltip">
                                    <span class="text-disabled">{{ trans($textTimelineSendStatusMail) }}</span>
                                </button>
                            </el-tooltip>
--- a/resources/views/components/documents/template/classic.blade.php
+++ b/resources/views/components/documents/template/classic.blade.php
@ -52,8 +52,8 @@

 <div class="row mt-2">
    <div class="col-33">
-        <hr class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backGroundColor }};">
-        <hr class="invoice-classic-line" style="background-color:{{ $backGroundColor }};">
+        <hr class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backgroundColor }};">
+        <hr class="invoice-classic-line" style="background-color:{{ $backgroundColor }};">
    </div>

    <div class="col-33">
@ -72,8 +72,8 @@
    </div>

    <div class="col-33">
-        <hr class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backGroundColor }};">
-        <hr class="invoice-classic-line" style="background-color:{{ $backGroundColor }};">
+        <hr class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backgroundColor }};">
+        <hr class="invoice-classic-line" style="background-color:{{ $backgroundColor }};">
    </div>
 </div>

--- a/resources/views/components/documents/template/default.blade.php
+++ b/resources/views/components/documents/template/default.blade.php
@ -148,7 +148,7 @@
    <div class="col-100">
        <div class="text">
            <table class="lines">
-                <thead style="background-color:{{ $backGroundColor }} !important; -webkit-print-color-adjust: exact;">
+                <thead style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
                    <tr>
                        @stack('name_th_start')
                            @if (!$hideItems || (!$hideName && !$hideDescription))
--- a/resources/views/components/documents/template/modern.blade.php
+++ b/resources/views/components/documents/template/modern.blade.php
@ -1,4 +1,4 @@
-<div class="row" style="background-color:{{ $backGroundColor }} !important; -webkit-print-color-adjust: exact;">
+<div class="row" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
    <div class="col-58">
        <div class="text company pl-2 mb-1 d-flex align-items-center">
            @stack('company_logo_start')
@ -138,7 +138,7 @@
    <div class="col-100">
        <div class="text">
            <table class="m-lines">
-                <thead style="background-color:{{ $backGroundColor }} !important; -webkit-print-color-adjust: exact;">
+                <thead style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
                    <tr>
                        @stack('name_th_start')
                            @if (!$hideItems || (!$hideName && !$hideDescription))
@ -244,7 +244,7 @@
@if (!$hideFooter)
    @if ($document->footer)
        <div class="row mt-7">
-            <div class="col-100 py-2" style="background-color:{{ $backGroundColor }} !important; -webkit-print-color-adjust: exact;">
+            <div class="col-100 py-2" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
                <div class="text pl-2">
                    <strong class="text-white">{!! nl2br($document->footer) !!}</strong>
                </div>