From d4981c1f85e87f3efe2dde62af0d7071ac129ca7 Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Thu, 3 Nov 2022 07:12:28 +0000 Subject: [PATCH 1/7] new crowdin translations --- resources/lang/bg-BG/modules.php | 2 +- resources/lang/da-DK/email_templates.php | 15 ++++++++++----- resources/lang/da-DK/errors.php | 2 ++ resources/lang/da-DK/footer.php | 3 +++ resources/lang/de-DE/auth.php | 1 + resources/lang/de-DE/bills.php | 2 +- resources/lang/de-DE/transactions.php | 4 +++- resources/lang/ro-RO/general.php | 4 ++-- resources/lang/ro-RO/reports.php | 2 +- resources/lang/ro-RO/widgets.php | 2 +- 10 files changed, 25 insertions(+), 12 deletions(-) diff --git a/resources/lang/bg-BG/modules.php b/resources/lang/bg-BG/modules.php index 85a423a43..d7a97439b 100644 --- a/resources/lang/bg-BG/modules.php +++ b/resources/lang/bg-BG/modules.php @@ -36,7 +36,7 @@ return [ 'install' => 'Инсталирай', 'buy_now' => 'Купете сега', 'get_api_key' => 'Натиснете тук за да получите вашия API ключ.', - 'no_apps' => 'Все още няма приложения в тази категория.', + 'no_apps' => 'Вижте най-професионалните приложения за вашия бизнес и ги вземете на най-добра цена.', 'become_developer' => 'Вие сте разработчик? Тук може да научите как да създадете приложение и да стартирате продажби днес!', 'recommended_apps' => 'Препоръчани Добавки', 'can_not_install' => 'Месечните абонаменти са налични само за Cloud service. Научете повече.', diff --git a/resources/lang/da-DK/email_templates.php b/resources/lang/da-DK/email_templates.php index 32f331482..150f9ee35 100644 --- a/resources/lang/da-DK/email_templates.php +++ b/resources/lang/da-DK/email_templates.php @@ -29,6 +29,11 @@ return [ 'body' => 'Hej,

Baseret på den tilbagevendende faktura til {customer_name} er fakturanr. {invoice_number} automatisk blevet genereret.

Du kan se fakturaoplysningerne på følgende link: {invoice_number}.

Med venlig hilsen
{company_name}', ], + 'invoice_view_admin' => [ + 'subject' => 'Faktura {invoice_number} set', + 'body' => 'Hej,

{customer_name} har set faktura {invoice_number}.

Du kan se fakturaoplysninger fra følgende link: {invoice_number}.

Venlig hilsen,
{company_name}', + ], + 'invoice_payment_customer' => [ 'subject' => 'Betaling for faktura nr. {invoice_number} er modtaget', 'body' => 'Kære {customer_name},

Tak for din betaling. Find betalingsdetaljerne herunder:

-------------------------------------------------

Antal: {transaction_total}
Dato: {transaction_paid_date}
Fakturanummer: {invoice_number}

-------------------------------------------------

Du kan altid se betalingsdetaljerne på dette link: {invoice_number}.

Har du spørgsmål, er du velkommen til at kontakte os.

Med venlig hilsen,
{company_name}', @@ -49,13 +54,13 @@ return [ 'body' => 'Hej,

Baseret på {vendor_name}\'s tilbagevendende betaling, er faktura nummer {bill_number} automatisk genereret.

Du kan se fakturadetaljerne på dette link: {bill_number}.

Med venlig hilsen,
{company_name}', ], - 'revenue_new_customer' => [ - 'subject' => '{revenue_date} betaling oprettet', - 'body' => 'Kære {customer_name},

Vi har forberedt følgende betaling.

Du kan se betalingsdetaljerne på følgende link: {revenue_date}.

Du er velkommen til at kontakte os, hvis du har spørgsmål til betalingen.

Venlig hilsen,
{company_name}', + 'payment_received_customer' => [ + 'subject' => 'Din kvittering fra {company_name}', + 'body' => 'Kære {contact_name},

Tak for betalingen.

Du kan se betalingsoplysningerne fra følgende link: {payment_date}.

Du er velkommen til at kontakte os med spørgsmål.

Med venlig hilsen,
{company_name}', ], - 'payment_new_vendor' => [ - 'subject' => '{revenue_date} betaling oprettet', + 'payment_made_vendor' => [ + 'subject' => 'Betaling foretaget af {company_name}', 'body' => 'Kære {vendor_name},

Vi har forberedt følgende betaling.

Du kan se betalingsdetaljerne på følgende link: {payment_date}.

Du er velkommen til at kontakte os, hvis du har spørgsmål.

Venlig hilsen,
{company_name} ', ], diff --git a/resources/lang/da-DK/errors.php b/resources/lang/da-DK/errors.php index 53349e54e..0d117be6b 100644 --- a/resources/lang/da-DK/errors.php +++ b/resources/lang/da-DK/errors.php @@ -19,5 +19,7 @@ return [ '404' => 'Vi kunne ikke finde siden du kikkede efter.', '500' => 'Vi vil arbejde på at fixe dette straks.', 'record' => 'Vi kunne ikke finde det, du ledte efter.', + 'amount' => 'Denne side indeholder ugyldige beløb! Kontakt venligst systemadministratoren.', ], + ]; diff --git a/resources/lang/da-DK/footer.php b/resources/lang/da-DK/footer.php index ada0a85dc..6b2e63387 100644 --- a/resources/lang/da-DK/footer.php +++ b/resources/lang/da-DK/footer.php @@ -6,5 +6,8 @@ return [ 'powered' => 'Drevet af Akaunting', 'link' => 'https://akaunting.com', 'software' => 'Gratis regnskabsprogram', + 'powered_by' => 'Drevet af', + 'tag_line' => 'Send fakturaer, spor udgifter, og automatiser regnskab med Akaunting. :get_started_url', + 'get_started' => 'Kom I Gang', ]; diff --git a/resources/lang/de-DE/auth.php b/resources/lang/de-DE/auth.php index bc1b3934a..69a107349 100644 --- a/resources/lang/de-DE/auth.php +++ b/resources/lang/de-DE/auth.php @@ -39,6 +39,7 @@ return [ 'error' => [ 'self_delete' => 'Fehler: Sie können sich nicht selbst löschen!', 'self_disable' => 'Fehler: Sie können Ihr Profil nicht selbst löschen!', + 'unassigned' => 'Fehler: Die Firma :company muss mindestens einem Benutzer zugeordnet sein.', 'no_company' => 'Fehler: Ihrem Konto wurde kein Unternehmen zugewiesen. Bitte kontaktieren Sie den Systemadministrator.', ], diff --git a/resources/lang/de-DE/bills.php b/resources/lang/de-DE/bills.php index 4aaee5ba5..b86da0e6b 100644 --- a/resources/lang/de-DE/bills.php +++ b/resources/lang/de-DE/bills.php @@ -19,7 +19,7 @@ return [ 'total' => 'Gesamt', 'item_name' => 'Artikel-Name|Artikel-Namen', - 'recurring_bills' => 'Wiederkehrende Rechnung|Wiederkehrende Rechnungen', + 'recurring_bills' => 'Wiederkehrende Rechnung(-en)', 'show_discount' => ':discount% Rabatt', 'add_discount' => 'füge Rabatt hinzu', diff --git a/resources/lang/de-DE/transactions.php b/resources/lang/de-DE/transactions.php index 1a5c853ce..7b3ff6944 100644 --- a/resources/lang/de-DE/transactions.php +++ b/resources/lang/de-DE/transactions.php @@ -6,7 +6,7 @@ return [ 'payment_made' => 'Zahlung erfolgt', 'paid_by' => 'Bezahlt von', 'paid_to' => 'Bezahlt am', - 'related_invoice' => 'Zugehörige Rechnung (Einnahme)', + 'related_invoice' => 'Zugehörige Rechnung', 'related_bill' => 'Zugehörige Rechnung (Ausgabe)', 'recurring_income' => 'Wiederkehrende Einnahmen', 'recurring_expense' => 'Wiederkehrende Ausgaben', @@ -24,6 +24,8 @@ return [ 'create_recurring' => ':user hat diese wiederkehrende Transaktion am :date erstellt', 'schedule' => 'Wiederhole alle :interval :frequency seit :date', 'children' => ':count Transaktionen wurden automatisch erstellt', + 'transfer_headline' => 'Von :from_account an :to_account', + 'transfer_desc' => 'Am :date erstellte Überweisung', ], 'share' => [ diff --git a/resources/lang/ro-RO/general.php b/resources/lang/ro-RO/general.php index a8c8ead90..36adf863c 100644 --- a/resources/lang/ro-RO/general.php +++ b/resources/lang/ro-RO/general.php @@ -151,7 +151,7 @@ return [ 'duplicate' => 'Duplicat', 'unpaid' => 'Neplatit', 'paid' => 'Platit', - 'overdue' => 'Intarziat', + 'overdue' => 'Întârziate', 'partially' => 'Partial', 'partially_paid' => 'Platit Partial', 'export' => 'Export', @@ -208,7 +208,7 @@ return [ 'client_portal' => 'Portal Client', 'issue_date' => 'Data eliberării', 'due_date' => 'Data scadentă', - 'open' => 'Deschide', + 'open' => 'Deschise', 'invite' => 'Invită', 'common' => 'Comun', 'api' => 'API', diff --git a/resources/lang/ro-RO/reports.php b/resources/lang/ro-RO/reports.php index 32cf21b15..aae73ec1c 100644 --- a/resources/lang/ro-RO/reports.php +++ b/resources/lang/ro-RO/reports.php @@ -9,7 +9,7 @@ return [ 'this_quarter' => 'Trimistrul acesta', 'previous_quarter' => 'Trimestrul anterior', 'last_12_months' => 'Ultimele 12 luni', - 'profit_loss' => 'Profit & Pierdere', + 'profit_loss' => 'Profit și Pierderi', 'income_summary' => 'Rezumat Venituri', 'expense_summary' => 'Rezumat Cheltuieli', 'income_expense_summary' => 'Venituri vs. Cheltuieli', diff --git a/resources/lang/ro-RO/widgets.php b/resources/lang/ro-RO/widgets.php index a2a77fc60..2ce53cb09 100644 --- a/resources/lang/ro-RO/widgets.php +++ b/resources/lang/ro-RO/widgets.php @@ -5,7 +5,7 @@ return [ 'receivables' => 'Creanțe', 'payables' => 'Sume datorate', 'cash_flow' => 'Fluxul de numerar', - 'profit_loss' => 'Profit & Pierderi', + 'profit_loss' => 'Profit și Pierderi', 'expenses_by_category' => 'Cheltuieli pe categorii', 'account_balance' => 'Soldul contului', 'bank_feeds' => 'Conectează conturile bancare', From daa76f2d9898f8488464624903e324b7eb84db24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 3 Nov 2022 11:06:45 +0300 Subject: [PATCH 2/7] close #2718 #2709 Fixed Country field edit selected value issue.. --- app/View/Components/Form/Group/Country.php | 8 ++++++++ resources/views/components/form/group/country.blade.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/View/Components/Form/Group/Country.php b/app/View/Components/Form/Group/Country.php index b54a86b17..76f600bda 100644 --- a/app/View/Components/Form/Group/Country.php +++ b/app/View/Components/Form/Group/Country.php @@ -15,6 +15,14 @@ class Country extends Form */ public function render() { + if (empty($this->name)) { + $this->name = 'country'; + } + + if (empty($this->selected) && empty($this->getParentData('model'))) { + $this->selected = setting('company.country'); + } + return view('components.form.group.country'); } } diff --git a/resources/views/components/form/group/country.blade.php b/resources/views/components/form/group/country.blade.php index 4b7dc4732..587be1f97 100644 --- 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" From a1ca036a9d5f5e8678bc949c91155fbd744a64d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 3 Nov 2022 11:07:06 +0300 Subject: [PATCH 3/7] typo --- app/View/Components/Form/Group/PaymentMethod.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/View/Components/Form/Group/PaymentMethod.php b/app/View/Components/Form/Group/PaymentMethod.php index 6675f145f..9fc45a1b3 100644 --- a/app/View/Components/Form/Group/PaymentMethod.php +++ b/app/View/Components/Form/Group/PaymentMethod.php @@ -18,6 +18,10 @@ class PaymentMethod extends Form */ public function render() { + if (empty($this->name)) { + $this->name = 'payment_method'; + } + $this->payment_methods = Modules::getPaymentMethods(); if (empty($this->selected) && empty($this->getParentData('model'))) { From fbef52e94a952821d45d02616f97a6e5ffa593fa Mon Sep 17 00:00:00 2001 From: EnesSacid-Buker <73346401+EnesSacid-Buker@users.noreply.github.com> Date: Thu, 3 Nov 2022 11:16:57 +0300 Subject: [PATCH 4/7] Fixed style on redirect payment page --- resources/lang/en-GB/portal.php | 1 + .../payment_method/redirect.blade.php | 35 +++++++++---------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/resources/lang/en-GB/portal.php b/resources/lang/en-GB/portal.php index a0ea4a0b1..c4c3fb6b2 100644 --- a/resources/lang/en-GB/portal.php +++ b/resources/lang/en-GB/portal.php @@ -12,6 +12,7 @@ return [ 'see_all_details' => 'See all account details', 'all_payments' => 'Login to view all payments', 'received_date' => 'Received Date', + 'redirect_description' => 'You will be redirected to the :name website to make the payment.', 'last_payment' => [ 'title' => 'Last Payment Made', diff --git a/resources/views/components/payment_method/redirect.blade.php b/resources/views/components/payment_method/redirect.blade.php index 1abd6d80c..b87001873 100644 --- a/resources/views/components/payment_method/redirect.blade.php +++ b/resources/views/components/payment_method/redirect.blade.php @@ -1,20 +1,17 @@ -
- @if (!empty($setting['name'])) -

{{ $setting['name'] }}

- @endif - @if (!empty($setting['description'])) -
{{ $setting['description'] }}
- @endif -
-
-
- - - -
-
+{{ trans('portal.redirect_description', ['name' => $setting['name']]) }} + +
+ + + + {{ trans('general.confirm') }} + + +
From 8dfacd98be200eb7111fce7115db84a6c2cf05b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 3 Nov 2022 11:40:58 +0300 Subject: [PATCH 5/7] update composer.lock file --- composer.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/composer.lock b/composer.lock index eec933fe5..db0cfd06d 100644 --- a/composer.lock +++ b/composer.lock @@ -907,16 +907,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.240.5", + "version": "3.240.8", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "7fb4c933795c5908fe5e2cb32913eed608901195" + "reference": "72a4381a59f42720b033865d265aa64c3190cc13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7fb4c933795c5908fe5e2cb32913eed608901195", - "reference": "7fb4c933795c5908fe5e2cb32913eed608901195", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/72a4381a59f42720b033865d265aa64c3190cc13", + "reference": "72a4381a59f42720b033865d265aa64c3190cc13", "shasum": "" }, "require": { @@ -995,9 +995,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.240.5" + "source": "https://github.com/aws/aws-sdk-php/tree/3.240.8" }, - "time": "2022-10-28T18:17:24+00:00" + "time": "2022-11-02T18:44:20+00:00" }, { "name": "balping/json-raw-encoder", @@ -1302,23 +1302,23 @@ }, { "name": "barryvdh/reflection-docblock", - "version": "v2.0.6", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/barryvdh/ReflectionDocBlock.git", - "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16" + "reference": "bf44b757feb8ba1734659029357646466ded673e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/6b69015d83d3daf9004a71a89f26e27d27ef6a16", - "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16", + "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/bf44b757feb8ba1734659029357646466ded673e", + "reference": "bf44b757feb8ba1734659029357646466ded673e", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.0,<4.5" + "phpunit/phpunit": "^8.5.14|^9" }, "suggest": { "dflydev/markdown": "~1.0", @@ -1348,9 +1348,9 @@ } ], "support": { - "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.0.6" + "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.1.0" }, - "time": "2018-12-13T10:34:14+00:00" + "time": "2022-10-31T15:35:43+00:00" }, { "name": "bkwld/cloner", @@ -4858,16 +4858,16 @@ }, { "name": "laravel/framework", - "version": "v9.37.0", + "version": "v9.38.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "0c9675abf6d966e834b2ebeca3319f524e07a330" + "reference": "abf198e443e06696af3f356b44de67c0fa516107" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/0c9675abf6d966e834b2ebeca3319f524e07a330", - "reference": "0c9675abf6d966e834b2ebeca3319f524e07a330", + "url": "https://api.github.com/repos/laravel/framework/zipball/abf198e443e06696af3f356b44de67c0fa516107", + "reference": "abf198e443e06696af3f356b44de67c0fa516107", "shasum": "" }, "require": { @@ -5040,7 +5040,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-10-25T15:43:46+00:00" + "time": "2022-11-01T14:05:55+00:00" }, { "name": "laravel/sanctum", @@ -13247,16 +13247,16 @@ }, { "name": "filp/whoops", - "version": "2.14.5", + "version": "2.14.6", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc" + "reference": "f7948baaa0330277c729714910336383286305da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", - "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", + "url": "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da", + "reference": "f7948baaa0330277c729714910336383286305da", "shasum": "" }, "require": { @@ -13306,7 +13306,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.14.5" + "source": "https://github.com/filp/whoops/tree/2.14.6" }, "funding": [ { @@ -13314,7 +13314,7 @@ "type": "github" } ], - "time": "2022-01-07T12:00:00+00:00" + "time": "2022-11-02T16:23:29+00:00" }, { "name": "hamcrest/hamcrest-php", From ebce41fa6e82c6722aeba4d3b8bbbd0d3ec01f15 Mon Sep 17 00:00:00 2001 From: EnesSacid-Buker <73346401+EnesSacid-Buker@users.noreply.github.com> Date: Thu, 3 Nov 2022 11:50:42 +0300 Subject: [PATCH 6/7] Fixed the names of stacks in blades (document & transaction) --- .../documents/template/classic.blade.php | 18 ++++++++++++------ .../documents/template/default.blade.php | 8 ++++++-- .../documents/template/modern.blade.php | 12 ++++++++---- .../transactions/template/default.blade.php | 4 ++-- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/resources/views/components/documents/template/classic.blade.php b/resources/views/components/documents/template/classic.blade.php index 109c50888..8db235238 100644 --- a/resources/views/components/documents/template/classic.blade.php +++ b/resources/views/components/documents/template/classic.blade.php @@ -2,9 +2,11 @@
+ @stack('title_input_start')

{{ $textDocumentTitle }}

+ @stack('title_input_end')
@@ -12,7 +14,7 @@
- @stack('company_logo_start') + @stack('company_logo_input_start') @if (! $hideCompanyLogo) @if (!empty($document->contact->logo) && !empty($document->contact->logo->id)) @@ -20,7 +22,7 @@ @endif @endif - @stack('company_logo_end') + @stack('company_logo_input_end')
@@ -28,9 +30,11 @@
@stack('company_details_start') @if ($textDocumentSubheading) + @stack('subheading_input_start')

{{ $textDocumentSubheading }}

+ @stack('subheading_input_end') @endif @if (! $hideCompanyDetails) @@ -84,7 +88,7 @@
- @stack('invoice_number_input_start') + @stack('document_number_input_start') @if (! $hideDocumentNumber)
@@ -93,10 +97,10 @@
-

{{ $document->document_number }}

+ {{ $document->document_number }}
@endif - @stack('invoice_number_input_end') + @stack('document_number_input_end')
@@ -157,7 +161,7 @@ @endif @stack('phone_input_end') - @stack('email_start') + @stack('email_input_start') @if (! $hideContactEmail)

{{ $document->contact_email }} @@ -375,6 +379,7 @@ @if (! $hideFooter) @if ($document->footer) + @stack('footer_input_start')

@@ -384,6 +389,7 @@
+ @stack('footer_input_start') @endif @endif
diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php index df97780ed..d37bb2a1d 100644 --- a/resources/views/components/documents/template/default.blade.php +++ b/resources/views/components/documents/template/default.blade.php @@ -2,9 +2,11 @@
+ @stack('title_input_start')

{{ $textDocumentTitle }}

+ @stack('title_input_end')
@@ -12,7 +14,7 @@
- @stack('company_logo_start') + @stack('company_logo_input_start') @if (! $hideCompanyLogo) @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id)) @@ -20,7 +22,7 @@ @endif @endif - @stack('company_logo_end') + @stack('company_logo_input_end')
@@ -344,6 +346,7 @@ @if (! $hideFooter) @if ($document->footer) + @stack('footer_input_start')
@@ -353,6 +356,7 @@
+ @stack('footer_input_end') @endif @endif
diff --git a/resources/views/components/documents/template/modern.blade.php b/resources/views/components/documents/template/modern.blade.php index 304a0f668..03ce54a80 100644 --- a/resources/views/components/documents/template/modern.blade.php +++ b/resources/views/components/documents/template/modern.blade.php @@ -2,9 +2,11 @@
+ @stack('title_input_start')

{{ $textDocumentTitle }}

+ @stack('title_input_end')
@@ -12,7 +14,7 @@
- @stack('company_logo_start') + @stack('company_logo_input_start') @if (! $hideCompanyLogo) @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id)) {{ $document->contact_name }} @@ -20,7 +22,7 @@ {{ setting('company.name') }} @endif @endif - @stack('company_logo_end') + @stack('company_logo_input_end')
@@ -157,7 +159,7 @@ @endif @stack('order_number_input_end') - @stack('invoice_number_input_start') + @stack('document_number_input_start') @if (! $hideDocumentNumber)

@@ -169,7 +171,7 @@

@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')
@@ -354,6 +357,7 @@
+ @stack('footer_input_end') @endif @endif
\ No newline at end of file diff --git a/resources/views/components/transactions/template/default.blade.php b/resources/views/components/transactions/template/default.blade.php index 8017c885f..0814588e7 100644 --- a/resources/views/components/transactions/template/default.blade.php +++ b/resources/views/components/transactions/template/default.blade.php @@ -5,13 +5,13 @@ @if (! $hideCompanyLogo) - @stack('company_logo_start') + @stack('company_logo_input_start') @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id)) {{ $transaction->contact_name }} @else {{ setting('company.name') }} @endif - @stack('company_logo_end') + @stack('company_logo_input_end') @endif From 6eab054ab21bf99012744ab0123a1a2f2091ac6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 3 Nov 2022 11:51:38 +0300 Subject: [PATCH 7/7] Fixed listener version number.. --- app/Listeners/Update/V30/{Version308.php => Version309.php} | 6 +++--- app/Providers/Event.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename app/Listeners/Update/V30/{Version308.php => Version309.php} (91%) diff --git a/app/Listeners/Update/V30/Version308.php b/app/Listeners/Update/V30/Version309.php similarity index 91% rename from app/Listeners/Update/V30/Version308.php rename to app/Listeners/Update/V30/Version309.php index c0c2fd9f3..07202609a 100644 --- a/app/Listeners/Update/V30/Version308.php +++ b/app/Listeners/Update/V30/Version309.php @@ -7,13 +7,13 @@ use App\Events\Install\UpdateFinished as Event; use App\Traits\Permissions; use Illuminate\Support\Facades\Log; -class Version308 extends Listener +class Version309 extends Listener { use Permissions; const ALIAS = 'core'; - const VERSION = '3.0.8'; + const VERSION = '3.0.9'; /** * Handle the event. @@ -27,7 +27,7 @@ class Version308 extends Listener return; } - Log::channel('stdout')->info('Updating to 3.0.8 version...'); + Log::channel('stdout')->info('Updating to 3.0.9 version...'); $this->updatePermissions(); diff --git a/app/Providers/Event.php b/app/Providers/Event.php index 3942b3e8f..5b4a64535 100644 --- a/app/Providers/Event.php +++ b/app/Providers/Event.php @@ -20,7 +20,7 @@ class Event extends Provider 'App\Listeners\Update\V30\Version304', 'App\Listeners\Update\V30\Version305', 'App\Listeners\Update\V30\Version307', - 'App\Listeners\Update\V30\Version308', + 'App\Listeners\Update\V30\Version309', ], 'Illuminate\Auth\Events\Login' => [ 'App\Listeners\Auth\Login',