diff --git a/app/Abstracts/View/Components/TransactionShow.php b/app/Abstracts/View/Components/TransactionShow.php index 5b9adee51..efb9bf8f8 100644 --- a/app/Abstracts/View/Components/TransactionShow.php +++ b/app/Abstracts/View/Components/TransactionShow.php @@ -837,7 +837,7 @@ abstract class TransactionShow extends Base return $class; } - return 'col-md-2'; + return 'col-4 col-lg-3'; } protected function getClassHeaderContact($type, $classHeaderContact) @@ -852,7 +852,7 @@ abstract class TransactionShow extends Base return $class; } - return 'col-md-3'; + return 'col-4 col-lg-2'; } protected function getClassHeaderCategory($type, $classHeaderCategory) @@ -867,7 +867,7 @@ abstract class TransactionShow extends Base return $class; } - return 'col-md-3'; + return 'col-4 col-lg-3'; } protected function getClassHeaderAmount($type, $classHeaderAmount) @@ -882,7 +882,7 @@ abstract class TransactionShow extends Base return $class; } - return 'col-md-2'; + return 'col-4 col-lg-2'; } protected function getClassHeaderPaidAt($type, $classHeaderPaidAt) @@ -897,7 +897,7 @@ abstract class TransactionShow extends Base return $class; } - return 'col-md-2'; + return 'col-4 col-lg-2'; } protected function getTextContentTitle($type, $textContentTitle) @@ -1187,4 +1187,4 @@ abstract class TransactionShow extends Base return 'col-sm-6 col-md-6 col-lg-6 col-xl-6'; } -} +} \ No newline at end of file diff --git a/public/css/custom.css b/public/css/custom.css index 56769238c..e98c31265 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -220,6 +220,22 @@ button:focus { .mwpx-100 { max-width: 100px !important; } + +.mwpx-200 { + max-width: 200px !important; +} + +.mwpx-300 { + max-width: 300px !important; +} + +.mwpx-400 { + max-width: 400px !important; +} + +.mwpx-500 { + max-width: 500px !important; +} /*--------Max Width 100 Pixel Finish--------*/ /*--------Form Group--------*/ diff --git a/public/css/print.css b/public/css/print.css index 9ebb8a192..6a610af91 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -252,7 +252,7 @@ th, td .col-16 { display: inline-block; - width: 16%; + max-width: 16%; vertical-align: top; } @@ -516,14 +516,8 @@ th, td font-size: 32px; } -.show-head { - display: flex; - flex-direction: column; - align-items: flex-start; -} - .show-card-body { - padding: 1.5rem 4.5rem; + padding: 1.5rem 2.5rem; } .show-card-bg-success { @@ -537,4 +531,26 @@ th, td .show-company p { min-height: 52px; +} + +@media (max-width: 1200px) { + .transaction-head-text { + max-width: 100px !important; + } +} + +@media (max-width: 991px) { + .transaction-head-text { + max-width: 75px !important; + } +} + +@media (max-width: 575.98px) { + .show-card { + overflow-y: scroll; + } + + .show-card-body { + padding: 1.5rem 1.5rem; + } } \ No newline at end of file diff --git a/resources/views/components/transactions/show/header.blade.php b/resources/views/components/transactions/show/header.blade.php index 6e00241f2..bc31572be 100644 --- a/resources/views/components/transactions/show/header.blade.php +++ b/resources/views/components/transactions/show/header.blade.php @@ -6,7 +6,7 @@
- + {{ $transaction->account->name }} @@ -22,7 +22,7 @@
- + {{ $transaction->category->name }} @@ -38,7 +38,7 @@
- + {{ $transaction->contact->name }} @@ -54,7 +54,7 @@
- + @money($transaction->amount, $transaction->currency_code, true) @@ -70,7 +70,7 @@
- + @date($transaction->paid_at) @@ -78,4 +78,4 @@ @endif @stack('header_paid_at_end') - + \ 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 9b96b86cc..a17d1e01a 100644 --- a/resources/views/components/transactions/template/default.blade.php +++ b/resources/views/components/transactions/template/default.blade.php @@ -1,311 +1,283 @@ - @stack('company_start') @if (!$hideCompany) -
-
-
+ + + + + +
@stack('company_logo_start') @if (!$hideCompanyLogo) - @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id)) - {{ $transaction->contact->name }} + @if (!empty($document->contact->logo) && !empty($document->contact->logo->id)) + {{ $document->contact_name }} @else - {{ setting('company.name') }} + {{ setting('company.name') }} @endif @endif @stack('company_logo_end') - - - -
-
+
@stack('company_details_start') @if (!$hideCompanyDetails) @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 + @if (!$hideCompanyEmail) +

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

+ @endif @endif @stack('company_details_end') - - - +
@endif @stack('company_end') -
- @if (!$hideContentTitle) -

- {{ trans($textContentTitle) }} -

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

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

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

- {{ trans($textPaidAt) }}: -

- @endif + + + @if (!$hideAmount) -
-
-
-
-
-
- {{ trans($textAmount) }} -
- - - @money($transaction->amount, $transaction->currency_code, true) - -
-
-
-
-
+ @endif - - + +
+ + @if (!$hidePaidAt) + + + + + @endif - @if (!$hideAccount) -

- {{ trans_choice($textAccount, 1) }}: -

- @endif + @if (!$hideAccount) + + + + + @endif - @if (!$hideCategory) -

- {{ trans_choice($textCategory, 1) }}: -

- @endif + @if (!$hideCategory) + + + + + @endif - @if (!$hidePaymentMethods) -

- {{ trans_choice($textPaymentMethods, 1) }}: -

- @endif + @if (!$hidePaymentMethods) + + + + + @endif - @if (!$hideReference) -

- {{ trans($textReference) }}: -

- @endif + @if (!$hideReference) + + + + + @endif - @if (!$hideDescription) -

- {{ trans($textDescription) }}: -

- @endif - + @if (!$hideDescription) + + + + + @endif + @if (!$hideContact) + + + + @if ($hideContactInfo) + + + + @endif -
- @if (!$hidePaidAt) -

- @date($transaction->paid_at) -

- @endif + @stack('name_input_start') + @if (!$hideContactName) +
+ + + @endif + @stack('name_input_end') - @if (!$hideAccount) -

- {{ $transaction->account->name }} -

- @endif + @stack('address_input_start') + @if (!$hideContactAddress) + + + + @endif + @stack('address_input_end') - @if (!$hideCategory) -

- {{ $transaction->category->name }} -

- @endif - - @if (!$hidePaymentMethods) -

- {{ $payment_methods[$transaction->payment_method] }} -

- @endif - - @if (!$hideReference) -

- {{ $transaction->reference }} -

- @endif - - @if (!$hideDescription) -

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

- @endif - - - - @if (!$hideContact) -
-

{{ trans($textPaidBy) }}

- - @if ($hideContactInfo) - {{ trans($textContactInfo) }}
- @endif - - @stack('name_input_start') - @if (!$hideContactName) - {{ $transaction->contact->name }}
- @endif - @stack('name_input_end') - - @stack('address_input_start') - @if (!$hideContactAddress) -

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

- @endif - @stack('address_input_end') - - @stack('tax_number_input_start') - @if (!$hideContactTaxNumber) -

- @if ($transaction->contact->tax_number) + @stack('tax_number_input_start') + @if (!$hideContactTaxNumber) +

+ + + @endif + @stack('tax_number_input_end') - @stack('phone_input_start') - @if (!$hideContactPhone) -

- @if ($transaction->contact->phone) + @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_choice('general.accounts', 1) }}:{{ $transaction->account->name }}
{{ trans_choice('general.categories', 1) }}:{{ $transaction->category->name }}
{{ trans_choice('general.payment_methods', 1) }}:{{ $payment_methods[$transaction->payment_method] }}
{{ trans('general.reference') }}:{{ $transaction->reference }}
{{ trans('general.description') }}: +

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

+
+

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

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

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

+
+

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

- @endif - @stack('tax_number_input_end') + @endif +

+
+

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

- @endif - @stack('phone_input_end') - - @stack('email_start') - @if (!$hideContactEmail) -

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

- @endif - @stack('email_input_end') - - @endif - + @endif +

+
+

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

+
+
+ + + + +
+
{{ trans('general.amount') }}
+

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

+
+
+ + + + + +
@if (!$hideReletad) @if ($transaction->document) -
-
-
-

{{ trans($textReleatedTransansaction) }}

+ + + + +
+

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

+
+ + + + -
+ {{ trans_choice('general.numbers', 1) }} +
- - - @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($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) - -

-
+ + + + +
+

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

+
@endif @endif \ No newline at end of file