diff --git a/config/type.php b/config/type.php index 81b1b4af9..89bb4621f 100644 --- a/config/type.php +++ b/config/type.php @@ -99,7 +99,8 @@ return [ //'create' => 'create-sales-revenues', ], 'translation' => [ - 'prefix' => 'revenues', // this translation file name. + 'prefix' => 'revenues', // this translation file name. + 'related_document_amount' => 'invoices.invoice_amount', ], 'contact_type' => 'customer', ], @@ -116,7 +117,8 @@ return [ //'create' => 'create-purchases-payments', ], 'translation' => [ - 'prefix' => 'payments', // this translation file name. + 'prefix' => 'payments', // this translation file name. + 'related_document_amount' => 'bills.bill_amount', ], 'contact_type' => 'vendor', ], diff --git a/resources/lang/en-GB/bills.php b/resources/lang/en-GB/bills.php index 0963c31af..34f0494f5 100644 --- a/resources/lang/en-GB/bills.php +++ b/resources/lang/en-GB/bills.php @@ -4,6 +4,7 @@ return [ 'bill_number' => 'Bill Number', 'bill_date' => 'Bill Date', + 'bill_amount' => 'Bill Amount', 'total_price' => 'Total Price', 'due_date' => 'Due Date', 'order_number' => 'Order Number', diff --git a/resources/lang/en-GB/invoices.php b/resources/lang/en-GB/invoices.php index c5daffdea..0bb50a0f0 100644 --- a/resources/lang/en-GB/invoices.php +++ b/resources/lang/en-GB/invoices.php @@ -4,6 +4,7 @@ return [ 'invoice_number' => 'Invoice Number', 'invoice_date' => 'Invoice Date', + 'invoice_amount' => 'Invoice Amount', 'total_price' => 'Total Price', 'due_date' => 'Due Date', 'order_number' => 'Order Number', diff --git a/resources/views/components/transactions/show/histories.blade.php b/resources/views/components/transactions/show/histories.blade.php index a7fec1bb9..9aeb18eed 100644 --- a/resources/views/components/transactions/show/histories.blade.php +++ b/resources/views/components/transactions/show/histories.blade.php @@ -33,7 +33,7 @@ - {{ $history->created->name }} + {{ $history->creator->name }} @stack('row_footer_histories_body_td_end') diff --git a/resources/views/components/transactions/template/default.blade.php b/resources/views/components/transactions/template/default.blade.php index a17d1e01a..6deec82a2 100644 --- a/resources/views/components/transactions/template/default.blade.php +++ b/resources/views/components/transactions/template/default.blade.php @@ -2,52 +2,53 @@ @if (!$hideCompany) - - + @endif + + @if (!$hideCompanyDetails) + + @if (!$hideCompanyEmail) +

{{ setting('company.email') }}

+ @endif + @stack('company_details_end') + + @endif
- @stack('company_logo_start') - @if (!$hideCompanyLogo) + @if (!$hideCompanyLogo) + + @stack('company_logo_start') @if (!empty($document->contact->logo) && !empty($document->contact->logo->id)) {{ $document->contact_name }} @else {{ setting('company.name') }} @endif - @endif - @stack('company_logo_end') - - @stack('company_details_start') - @if (!$hideCompanyDetails) + @stack('company_logo_end') + + @stack('company_details_start') @if (!$hideCompanyName)

{{ setting('company.name') }}

@endif - @if (!$hideCompanyAddress) -

{!! nl2br(setting('company.address')) !!}

- @endif + @if (!$hideCompanyAddress) +

{!! nl2br(setting('company.address')) !!}

+ @endif - @if (!$hideCompanyTaxNumber) -

- @if (setting('company.tax_number')) - {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} - @endif -

- @endif + @if (!$hideCompanyTaxNumber) +

+ @if (setting('company.tax_number')) + {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} + @endif +

+ @endif - @if (!$hideCompanyPhone) -

- @if (setting('company.phone')) - {{ setting('company.phone') }} - @endif -

- @endif + @if (!$hideCompanyPhone) +

+ @if (setting('company.phone')) + {{ setting('company.phone') }} + @endif +

+ @endif - @if (!$hideCompanyEmail) -

{{ setting('company.email') }}

- @endif - @endif - @stack('company_details_end') -
@endif @@ -57,7 +58,9 @@
-

{{ trans('invoices.revenue_made') }}

+

+ {{ trans($textContentTitle) }} +

@@ -69,129 +72,169 @@ @if (!$hidePaidAt) - - + + + @endif @if (!$hideAccount) - - + + + @endif @if (!$hideCategory) - - + + + @endif @if (!$hidePaymentMethods) - - + + + @endif @if (!$hideReference) - - + + + @endif @if (!$hideDescription) - + + @endif + @if (!$hideContact) - @if ($hideContactInfo) - - - - @endif - @stack('name_input_start') - @if (!$hideContactName) - - - - @endif - @stack('name_input_end') + @if ($hideContactInfo) + + + + @endif - @stack('address_input_start') - @if (!$hideContactAddress) - - - - @endif - @stack('address_input_end') + @stack('name_input_start') + @if (!$hideContactName) + + + + @endif + @stack('name_input_end') - @stack('tax_number_input_start') - @if (!$hideContactTaxNumber) - - - - @endif - @stack('tax_number_input_end') + @stack('address_input_start') + @if (!$hideContactAddress) + + + + @endif + @stack('address_input_end') - @stack('phone_input_start') - @if (!$hideContactPhone) - - - - @endif - @stack('phone_input_end') + @stack('tax_number_input_start') + @if (!$hideContactTaxNumber) + + + + @endif + @stack('tax_number_input_end') - @stack('email_start') - @if (!$hideContactEmail) - - - - @endif - @stack('email_input_end') + @stack('phone_input_start') + @if (!$hideContactPhone) + + + + @endif + @stack('phone_input_end') + + @stack('email_start') + @if (!$hideContactEmail) + + + + @endif + @stack('email_input_end') @endif
{{ trans('general.date') }}: @date($transaction->paid_at) + {{ trans($textPaidAt) }}: + + @date($transaction->paid_at) +
{{ trans_choice('general.accounts', 1) }}:{{ $transaction->account->name }} + {{ trans_choice($textAccount, 1) }}: + + {{ $transaction->account->name }} +
{{ trans_choice('general.categories', 1) }}:{{ $transaction->category->name }} + {{ trans_choice($textCategory, 1) }}: + + {{ $transaction->category->name }} +
{{ trans_choice('general.payment_methods', 1) }}:{{ $payment_methods[$transaction->payment_method] }} + {{ trans_choice($textPaymentMethods, 1) }}: + + {{ $payment_methods[$transaction->payment_method] }} +
{{ trans('general.reference') }}:{{ $transaction->reference }} + {{ trans($textReference) }}: + + {{ $transaction->reference }} +
{{ trans('general.description') }}: + {{ trans($textDescription) }}: + -

{!! nl2br($transaction->description) !!}

+

+ {!! nl2br($transaction->description) !!} +

-

{{ trans('general.paid_by') }}

+

+ {{ trans($textDescription) }} +

- {{ trans($textContactInfo) }}
-
- {{ $transaction->contact->name }}
-
+ {{ trans($textContactInfo) }}
+
-

{!! nl2br($transaction->contact->address) !!}

-
+ {{ $transaction->contact->name }}
+
-

- @if ($transaction->contact->tax_number) - {{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }} - @endif -

-
+

+ {!! nl2br($transaction->contact->address) !!} +

+
-

- @if ($transaction->contact->phone) - {{ $transaction->contact->phone }} - @endif -

-
+

+ @if ($transaction->contact->tax_number) + {{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }} + @endif +

+
-

- {{ $transaction->contact->email }} -

-
+

+ @if ($transaction->contact->phone) + {{ $transaction->contact->phone }} + @endif +

+
+

+ {{ $transaction->contact->email }} +

+
+ @if (!$hideAmount)
-
{{ trans('general.amount') }}
+
+ {{ trans($textAmount) }} +
+

@money($transaction->amount, $transaction->currency_code, true)

@@ -203,81 +246,92 @@
- - - - -
- @if (!$hideReletad) @if ($transaction->document) + + + + +
+
-

{{ trans('invoices.related_revenue') }}

+

{{ trans($textReleatedTransansaction) }}
+ - - + + @if (!$hideReletadDocumentNumber) + + @endif - + @if (!$hideReletadContact) + + @endif - + @if (!$hideReletadDocumentDate) + + @endif - + @if (!$hideReletadDocumentAmount) + + @endif - + @if (!$hideReletadAmount) + + @endif - + @if (!$hideReletadDocumentNumber) + + @endif - + @if (!$hideReletadContact) + + @endif - + @if (!$hideReletadDocumentDate) + + @endif - + @if (!$hideReletadDocumentAmount) + + @endif - + @if (!$hideReletadAmount) + + @endif
- {{ trans_choice('general.numbers', 1) }} -
+ {{ trans_choice($textReleatedDocumentNumber, 1) }} + - {{ trans_choice('general.customers', 1) }} - + {{ trans_choice($textReleatedContact, 1) }} + - {{ trans('invoices.invoice_date') }} - + {{ trans($textReleatedDocumentDate) }} + - {{ trans('invoices.invoice_date') }} - + {{ trans($textReleatedDocumentAmount) }} + - {{ trans('general.amount') }} - + {{ trans($textReleatedAmount) }} +
- - {{ $transaction->document->document_number }} - - + + {{ $transaction->document->document_number }} + + - {{ $transaction->document->contact_name }} - + {{ $transaction->document->contact_name }} + - @date($transaction->document->due_at) - + @date($transaction->document->due_at) + - @money($transaction->document->amount, $transaction->document->currency_code, true) - + @money($transaction->document->amount, $transaction->document->currency_code, true) + - @money($transaction->amount, $transaction->currency_code, true) - + @money($transaction->amount, $transaction->currency_code, true) +
- @else - - - - -
-

- {{ trans('invoices.overdue_revenue') }}: @money($transaction->amount, $transaction->currency_code, true) -

-
@endif @endif \ No newline at end of file diff --git a/resources/views/purchases/payments/show.blade.php b/resources/views/purchases/payments/show.blade.php index 5ced823ae..3a0dcb955 100644 --- a/resources/views/purchases/payments/show.blade.php +++ b/resources/views/purchases/payments/show.blade.php @@ -1,6 +1,6 @@ @extends('layouts.admin') -@section('title', trans('invoices.payment_made')) +@section('title', trans('payments.payment_made')) @section('new_button') diff --git a/resources/views/sales/revenues/show.blade.php b/resources/views/sales/revenues/show.blade.php index a6dcdefa8..5e8e399b5 100644 --- a/resources/views/sales/revenues/show.blade.php +++ b/resources/views/sales/revenues/show.blade.php @@ -1,6 +1,6 @@ @extends('layouts.admin') -@section('title', trans('invoices.revenue_made')) +@section('title', trans('revenues.revenue_made')) @section('new_button')