diff --git a/public/css/print.css b/public/css/print.css index fd51ee583..9ebb8a192 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -249,6 +249,13 @@ th, td vertical-align: top; } +.col-16 +{ + display: inline-block; + width: 16%; + vertical-align: top; +} + .col-100 { display: inline-block; @@ -493,4 +500,41 @@ th, td display: block; clear: both; content: "" +} + +.show-card { + padding: 0px 15px; + border-radius: 0px; + box-shadow: rgb(0 0 0 / 20%) 0px 4px 16px; +} + +.card-amount-badge h5 { + font-size: 20px; +} + +.card-amount-badge span { + font-size: 32px; +} + +.show-head { + display: flex; + flex-direction: column; + align-items: flex-start; +} + +.show-card-body { + padding: 1.5rem 4.5rem; +} + +.show-card-bg-success { + width: 350px; + height: 150px; + border-radius: unset; +} +.show-company-value strong { + font-weight: bold; +} + +.show-company p { + min-height: 52px; } \ No newline at end of file diff --git a/resources/lang/en-GB/bills.php b/resources/lang/en-GB/bills.php index 0963c31af..4fa6ce887 100644 --- a/resources/lang/en-GB/bills.php +++ b/resources/lang/en-GB/bills.php @@ -37,6 +37,11 @@ return [ 'create_bill' => 'Create Bill', 'receive_bill' => 'Receive Bill', 'make_payment' => 'Make Payment', + 'payment_history' => 'Payment History', + 'payment_made' => 'Payment Made', + 'overdue_payment' => 'Overdue Payment', + 'payment_date' => 'Payment Date', + 'related_bill' => 'Related Bill', 'messages' => [ 'draft' => 'This is a DRAFT bill and will be reflected to charts after it gets received.', diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php index 159e41cd1..88458ebcc 100644 --- a/resources/lang/en-GB/general.php +++ b/resources/lang/en-GB/general.php @@ -162,6 +162,9 @@ return [ 'due_on' => 'Due on', 'amount_due' => 'Amount due', 'financial_year' => 'Financial Year', + 'paid_to' => 'Paid To', + 'paid_by' => 'Paid By', + 'payment_date' => 'Payment Date', 'card' => [ 'cards' => 'Card|Cards', diff --git a/resources/lang/en-GB/invoices.php b/resources/lang/en-GB/invoices.php index c5daffdea..594918872 100644 --- a/resources/lang/en-GB/invoices.php +++ b/resources/lang/en-GB/invoices.php @@ -39,6 +39,11 @@ return [ 'send_invoice' => 'Send Invoice', 'get_paid' => 'Get Paid', 'accept_payments' => 'Accept Online Payments', + 'revenue_date' => 'Revenue Date', + 'overdue_revenue' => 'Overdue Revenue', + 'revenue_made' => 'Revenue Made', + 'revenue_history' => 'Revenue History', + 'related_revenue' => 'Related Revenue', 'messages' => [ 'email_required' => 'No email address for this customer!', diff --git a/resources/views/purchases/payments/show.blade.php b/resources/views/purchases/payments/show.blade.php index 0a75a54cc..9f992b02a 100644 --- a/resources/views/purchases/payments/show.blade.php +++ b/resources/views/purchases/payments/show.blade.php @@ -1,21 +1,180 @@ @extends('layouts.admin') -@section('title', trans_choice('general.payments', 2)) +@section('title', trans('bills.payment_made') ) @section('new_button') - @can('create-purchases-payments') - {{ trans('general.add_new') }} - {{ trans('import.import') }} - @endcan - {{ trans('general.export') }} +@can('create-sales-revenues') + +{{ trans('general.add_new') }} +@endcan @endsection @section('content') -
- +
+
+
+
+
+ {{ trans_choice('general.accounts', 1) }} + + Account name + +
+
+ {{ trans_choice('general.categories', 1) }} + + Category name + +
+
+ {{ trans_choice('general.vendors', 1) }} + + Vendor name +
+
+ {{ trans('general.amount') }} + + {{ $payment->amount }} +
+
+ {{ trans('general.date') }} + + {{ Date::parse($payment->paid_at)->toDateString() }} +
+
+
+
+
+
+
+
Company - Brkcvn
+
+
+
+

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

+ +

{{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}

+ +

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

+ +

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

+
+
+
+
+

{{ trans_choice('bills.payment_made', 1) }}

+
+
+
+
+

{{ trans('general.date') }}:

+ +

{{ trans_choice('general.accounts', 1) }}:

+ +

{{ trans_choice('general.categories', 1) }}:

+

{{ trans_choice('general.payment_methods', 1) }}:

+

{{ trans('general.reference') }}:

+

{{ trans('general.description') }}:

+
+
+

12.12.2022

+ +

Account One

+

Data Category

+

Cash

+

Lorem Ipsum

+

Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum

+
+
+
+

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

+

Name

+

Adress

+
+
+
+
+
+
+
+
{{ trans('general.amount') }}
+ ₺0,00 +
+
+
+
+
+
+ +
+
+
+
+

{{ trans('bills.related_bill') }}

+ + + + + + + + + + + + + + + + + +
{{ trans('bills.bill_number') }}{{ trans_choice('general.vendors', 1) }}{{ trans('bills.bill_date') }}{{ trans('general.amount') }}
BILL-123Vendor name12.12.2022₺6.000,00
+
+
+
+
+

{{ trans('bills.overdue_payment') }}: ₺6.000,00

+
+
+
+
+
+
+ +
+
+ + + + + + + + + + + + + +
{{ trans('general.revenue_date') }}{{ trans('general.created') }}
+ 12.12.2022 + + Created name +
+
+
+
+
+
+
+ @endsection @push('scripts_start') - -@endpush + + + +@endpush \ No newline at end of file diff --git a/resources/views/sales/revenues/show.blade.php b/resources/views/sales/revenues/show.blade.php index 19c83d3db..9ee2015b0 100644 --- a/resources/views/sales/revenues/show.blade.php +++ b/resources/views/sales/revenues/show.blade.php @@ -1,20 +1,180 @@ @extends('layouts.admin') -@section('title', trans_choice('general.revenues', 2)) +@section('title', trans('invoices.revenue_made')) @section('new_button') - @can('create-sales-revenues') - {{ trans('general.add_new') }} - {{ trans('import.import') }} - @endcan - {{ trans('general.export') }} +@can('create-sales-revenues') + +{{ trans('general.add_new') }} +@endcan @endsection @section('content') -
+
+
+
+
+
+ {{ trans_choice('general.accounts', 1) }} + + Account name + +
+
+ {{ trans_choice('general.categories', 1) }} + + Category name + +
+
+ {{ trans_choice('general.customers', 1) }} + + Customer name +
+
+ {{ trans('general.amount') }} + + +
+
+ {{ trans('general.date') }} + + +
+
+
+
+
+
+
+
Company - Brkcvn
+
+
+
+

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

+ +

{{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}

+ +

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

+ +

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

+
+
+
+
+

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

+
+
+
+
+

{{ trans('general.date') }}:

+ +

{{ trans_choice('general.accounts', 1) }}:

+ +

{{ trans_choice('general.categories', 1) }}:

+

{{ trans_choice('general.payment_methods', 1) }}:

+

{{ trans('general.reference') }}:

+

{{ trans('general.description') }}:

+
+
+

12.12.2022

+ +

Account One

+

Data Category

+

Cash

+

Lorem Ipsum

+

Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum

+
+
+
+

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

+

Name

+

Adress

+
+
+
+
+
+
+
+
{{ trans('general.amount') }}
+ ₺0,00 +
+
+
+
+
+
+ +
+
+
+
+

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

+ + + + + + + + + + + + + + + + + +
{{ trans_choice('general.numbers', 1) }} {{ trans_choice('general.customers', 1) }}{{ trans('invoices.invoice_date') }}{{ trans('general.amount') }}
BILL-123Vendor name12.12.2022₺6.000,00
+
+
+
+
+

{{ trans('invoices.overdue_revenue') }}: ₺6.000,00

+
+
+
+
+
+
+ +
+
+ + + + + + + + + + + + + +
{{ trans('general.revenue_date') }}{{ trans('general.created') }}
+ 12.12.2022 + + Created name +
+
+
+
+
+
+
+ @endsection @push('scripts_start') - -@endpush + + + +@endpush \ No newline at end of file