Merge branch 'master' of https://github.com/brkcvn/akaunting

2022-11-03 13:39:40 +03:00
parent 4dd609d96a da854adaad
commit 6577672c63
22 changed files with 111 additions and 74 deletions
--- a/resources/views/components/documents/template/classic.blade.php
+++ b/resources/views/components/documents/template/classic.blade.php
@ -2,9 +2,11 @@
    <div class="row">
        <div class="col-100">
            <div class="text text-dark">
+                @stack('title_input_start')
                <h3>
                    {{ $textDocumentTitle }}
                </h3>
+                @stack('title_input_end')
            </div>
        </div>
    </div>
@ -12,7 +14,7 @@
    <div class="row">
        <div class="col-58">
            <div class="text">
-                @stack('company_logo_start')
+                @stack('company_logo_input_start')
                @if (! $hideCompanyLogo)
                    @if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
                        <img  class="c-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
@ -20,7 +22,7 @@
                        <img  class="c-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
                    @endif
                @endif
-                @stack('company_logo_end')
+                @stack('company_logo_input_end')
            </div>
        </div>

@ -28,9 +30,11 @@
            <div class="text right-column">
                @stack('company_details_start')
                @if ($textDocumentSubheading)
+                    @stack('subheading_input_start')
                    <p class="text-normal font-semibold">
                        {{ $textDocumentSubheading }}
                    </p>
+                    @stack('subheading_input_end')
                @endif

                @if (! $hideCompanyDetails)
@ -84,7 +88,7 @@
        <div class="col-33">
            <div class="invoice-classic-frame ml-1 mt-1" style="border: 1px solid {{ $backgroundColor }}">
                <div class="invoice-classic-inline-frame text-center" style="border: 1px solid {{ $backgroundColor }}">
-                    @stack('invoice_number_input_start')
+                    @stack('document_number_input_start')
                    @if (! $hideDocumentNumber)
                        <div class="text small-text font-semibold mt-classic">
                            <span>
@ -93,10 +97,10 @@

                            <br>

-                            <p class="classic-invoice"> {{ $document->document_number }} </p>
+                            {{ $document->document_number }}
                        </div>
                    @endif
-                    @stack('invoice_number_input_end')
+                    @stack('document_number_input_end')
                </div>
            </div>
        </div>
@ -157,7 +161,7 @@
                    @endif
                @stack('phone_input_end')

-                @stack('email_start')
+                @stack('email_input_start')
                    @if (! $hideContactEmail)
                        <p class="small-text">
                            {{ $document->contact_email }}
@ -375,6 +379,7 @@

    @if (! $hideFooter)
        @if ($document->footer)
+        @stack('footer_input_start')
            <div class="row mt-1">
                <div class="col-100">
                    <div class="text company">
@ -384,6 +389,7 @@
                    </div>
                </div>
            </div>
+        @stack('footer_input_start')
        @endif
    @endif
 </div>
--- a/resources/views/components/documents/template/default.blade.php
+++ b/resources/views/components/documents/template/default.blade.php
@ -2,9 +2,11 @@
    <div class="row">
        <div class="col-100">
            <div class="text text-dark">
+                @stack('title_input_start')
                <h3>
                    {{ $textDocumentTitle }}
                </h3>
+                @stack('title_input_end')
            </div>
        </div>
    </div>
@ -12,7 +14,7 @@
    <div class="row border-bottom-1">
        <div class="col-58">
            <div class="text">
-                @stack('company_logo_start')
+                @stack('company_logo_input_start')
                @if (! $hideCompanyLogo)
                    @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
                        <img class="d-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
@ -20,7 +22,7 @@
                        <img class="d-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
                    @endif
                @endif
-                @stack('company_logo_end')
+                @stack('company_logo_input_end')
            </div>
        </div>

@ -344,6 +346,7 @@

    @if (! $hideFooter)
        @if ($document->footer)
+        @stack('footer_input_start')
            <div class="row mt-4">
                <div class="col-100 text-left">
                    <div class="text">
@ -353,6 +356,7 @@
                    </div>
                </div>
            </div>
+        @stack('footer_input_end')
        @endif
    @endif
 </div>
--- a/resources/views/components/documents/template/modern.blade.php
+++ b/resources/views/components/documents/template/modern.blade.php
@ -2,9 +2,11 @@
    <div class="row">
        <div class="col-100">
            <div class="text text-dark">
+                @stack('title_input_start')
                <h3>
                    {{ $textDocumentTitle }}
                </h3>
+                @stack('title_input_end')
            </div>
        </div>
    </div>
@ -12,7 +14,7 @@
    <div class="row modern-head pt-2 pb-2 mt-1 bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
        <div class="col-58">
            <div class="text p-modern">
-                @stack('company_logo_start')
+                @stack('company_logo_input_start')
                @if (! $hideCompanyLogo)
                    @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
                        <img class="w-image radius-circle" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
@ -20,7 +22,7 @@
                        <img class="w-image radius-circle" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
                    @endif
                @endif
-                @stack('company_logo_end')
+                @stack('company_logo_input_end')
            </div>
        </div>

@ -157,7 +159,7 @@
                    @endif
                @stack('order_number_input_end')

-                @stack('invoice_number_input_start')
+                @stack('document_number_input_start')
                    @if (! $hideDocumentNumber)
                        <p class="mb-0">
                            <span class="font-semibold spacing">
@ -169,7 +171,7 @@
                            </span>
                        </p>
                    @endif
-                @stack('invoice_number_input_end')
+                @stack('document_number_input_end')

                @stack('issued_at_input_start')
                    @if (! $hideIssuedAt)
@ -345,6 +347,7 @@

    @if (! $hideFooter)
        @if ($document->footer)
+        @stack('footer_input_start')
            <div class="row mt-7">
                <div class="col-100 py-top p-modern" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
                    <div class="text pl-2">
@ -354,6 +357,7 @@
                    </div>
                </div>
            </div>
+        @stack('footer_input_end')
        @endif
    @endif
 </div>
--- a/resources/views/components/form/group/country.blade.php
+++ b/resources/views/components/form/group/country.blade.php
@ -2,7 +2,7 @@
    name="country"
    label="{!! trans_choice('general.countries', 1) !!}"
    :options="trans('countries')"
-    :selected="setting('company.country')"
+    :selected="$selected"
    required="{{ $required }}"
    not-required="{{ $notRequired }}"
    model="form.country"
--- a/resources/views/components/payment_method/redirect.blade.php
+++ b/resources/views/components/payment_method/redirect.blade.php
@ -1,20 +1,17 @@
-<div>
-    @if (!empty($setting['name']))
-        <h2>{{ $setting['name'] }}</h2>
-    @endif  
-    @if (!empty($setting['description']))
-        <div>{{ $setting['description'] }}</div>
-    @endif
-    <br>
-    <div class="buttons">
-        <div class="pull-right">
-            <x-form id="redirect-form" :url="$confirm_url">
-                <button @click="onRedirectConfirm" type="button" id="button-confirm" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100">
-                    <span>
-                        {{ trans('general.confirm') }}
-                    </span>
-                </button>
-            </x-form>
-        </div>
-    </div>
+{{ trans('portal.redirect_description', ['name' => $setting['name']]) }}
+
+<div class="mt-3">
+    <x-form id="redirect-form" :url="$confirm_url">
+        <x-button
+            id="button-confirm"
+            kind="primary"
+            override="class"
+            class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100"
+            @click="onRedirectConfirm"
+        >
+            <span>
+                {{ trans('general.confirm') }}
+            </span>
+        </x-button>
+    </x-form>
 </div>
--- a/resources/views/components/transactions/template/default.blade.php
+++ b/resources/views/components/transactions/template/default.blade.php
@ -5,13 +5,13 @@
            <tr>
                @if (! $hideCompanyLogo)
                <td style="width:20%; padding: 0 0 15px 0;" valign="top">
-                    @stack('company_logo_start')
+                    @stack('company_logo_input_start')
                    @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id))
                        <img src="{{ Storage::url($transaction->contact->logo->id) }}" height="70" width="70" alt="{{ $transaction->contact_name }}" />
                    @else
                        <img src="{{ $logo }}" height="70" width="70" alt="{{ setting('company.name') }}" />
                    @endif
-                    @stack('company_logo_end')
+                    @stack('company_logo_input_end')
                </td>
                @endif