From f400f2caead0763a552b7c913e0b2458194cacca Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Fri, 3 Jun 2022 16:20:46 +0300 Subject: [PATCH 1/3] Roles styling for users index --- resources/views/auth/users/index.blade.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php index ac6768ded..8eb001753 100644 --- a/resources/views/auth/users/index.blade.php +++ b/resources/views/auth/users/index.blade.php @@ -83,9 +83,13 @@ {{ $item->email }} - + @foreach($item->roles as $role) - + {{ $role->display_name }} @endforeach From 1dd4fca8f2ffe219f815598178883852304e8889 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 6 Jun 2022 10:33:03 +0300 Subject: [PATCH 2/3] ui feedback & bugs fixed --- public/css/app.css | 31 ++++++++++--------- public/css/print.css | 8 ++--- resources/assets/js/views/common/documents.js | 4 +-- .../documents/template/classic.blade.php | 10 +++--- .../documents/template/default.blade.php | 10 +++--- .../documents/template/line-item.blade.php | 12 +++---- .../documents/template/modern.blade.php | 10 +++--- .../views/components/index/default.blade.php | 2 +- .../views/components/index/disable.blade.php | 2 +- .../transactions/template/default.blade.php | 10 +++--- 10 files changed, 50 insertions(+), 49 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 8c506bd68..27630571e 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -6977,9 +6977,6 @@ input[type="date"]::-webkit-inner-spin-button, .-mb-2{ margin-bottom: -0.5rem; } -.-ml-3{ - margin-left: -0.75rem; -} .box-border{ -webkit-box-sizing: border-box; box-sizing: border-box; @@ -36434,10 +36431,6 @@ body{ margin-right: 1rem; } -[dir="ltr"] .ltr\:ml-3{ - margin-left: 0.75rem; -} - [dir="ltr"] .ltr\:ml-2{ margin-left: 0.5rem; } @@ -36446,6 +36439,10 @@ body{ margin-right: 0.5rem; } +[dir="ltr"] .ltr\:ml-3{ + margin-left: 0.75rem; +} + [dir="ltr"] .ltr\:mr-3{ margin-right: 0.75rem; } @@ -36482,6 +36479,10 @@ body{ padding-right: 1.5rem; } +[dir="ltr"] .ltr\:pl-0{ + padding-left: 0px; +} + [dir="ltr"] .ltr\:pl-6{ padding-left: 1.5rem; } @@ -36598,10 +36599,6 @@ body{ margin-left: 1rem; } -[dir="rtl"] .rtl\:mr-3{ - margin-right: 0.75rem; -} - [dir="rtl"] .rtl\:mr-2{ margin-right: 0.5rem; } @@ -36610,6 +36607,10 @@ body{ margin-left: 0.5rem; } +[dir="rtl"] .rtl\:mr-3{ + margin-right: 0.75rem; +} + [dir="rtl"] .rtl\:ml-3{ margin-left: 0.75rem; } @@ -36656,6 +36657,10 @@ body{ padding-left: 1.5rem; } +[dir="rtl"] .rtl\:pr-0{ + padding-right: 0px; +} + [dir="rtl"] .rtl\:pr-6{ padding-right: 1.5rem; } @@ -36664,10 +36669,6 @@ body{ padding-left: 0px; } -[dir="rtl"] .rtl\:pr-0{ - padding-right: 0px; -} - [dir="rtl"] .rtl\:pr-3{ padding-right: 0.75rem; } diff --git a/public/css/print.css b/public/css/print.css index 4777487e3..c3409705e 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -276,19 +276,19 @@ html[dir='rtl'] .border-radius-last { } html[dir='ltr'] .text-alignment-left { - text-align: left; + text-align: left !important; } html[dir='rtl'] .text-alignment-left { - text-align: right; + text-align: right !important; } html[dir='lte'] .text-alignment-right { - text-align: right; + text-align: right !important; } html[dir='rtl'] .text-alignment-right { - text-align: left; + text-align: left !important; } .text-right diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index 6ae3605f3..4f32bba7c 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -585,7 +585,7 @@ const app = new Vue({ this.component = Vue.component('add-new-component', (resolve, reject) => { resolve({ - template: '
', + template: '
', mixins: [ Global @@ -819,7 +819,7 @@ const app = new Vue({ this.component = Vue.component('add-new-component', (resolve, reject) => { resolve({ - template: '
', + template: '
', mixins: [ Global diff --git a/resources/views/components/documents/template/classic.blade.php b/resources/views/components/documents/template/classic.blade.php index 39c810aa5..004f07041 100644 --- a/resources/views/components/documents/template/classic.blade.php +++ b/resources/views/components/documents/template/classic.blade.php @@ -204,33 +204,33 @@ @stack('name_th_start') @if (!$hideItems || (!$hideName && !$hideDescription)) - {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} + {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} @endif @stack('name_th_end') @stack('quantity_th_start') @if (!$hideQuantity) - {{ trans($textQuantity) }} + {{ trans($textQuantity) }} @endif @stack('quantity_th_end') @stack('price_th_start') @if (!$hidePrice) - {{ trans($textPrice) }} + {{ trans($textPrice) }} @endif @stack('price_th_end') @if (!$hideDiscount) @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) @stack('discount_td_start') - {{ trans('invoices.discount') }} + {{ trans('invoices.discount') }} @stack('discount_td_end') @endif @endif @stack('total_th_start') @if (!$hideAmount) - {{ trans($textAmount) }} + {{ trans($textAmount) }} @endif @stack('total_th_end') diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php index 1b85ae7d0..25e11b115 100644 --- a/resources/views/components/documents/template/default.blade.php +++ b/resources/views/components/documents/template/default.blade.php @@ -189,33 +189,33 @@ @stack('name_th_start') @if (!$hideItems || (!$hideName && !$hideDescription)) - {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} + {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} @endif @stack('name_th_end') @stack('quantity_th_start') @if (!$hideQuantity) - {{ trans($textQuantity) }} + {{ trans($textQuantity) }} @endif @stack('quantity_th_end') @stack('price_th_start') @if (!$hidePrice) - {{ trans($textPrice) }} + {{ trans($textPrice) }} @endif @stack('price_th_end') @if (!$hideDiscount) @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) @stack('discount_td_start') - {{ trans('invoices.discount') }} + {{ trans('invoices.discount') }} @stack('discount_td_end') @endif @endif @stack('total_th_start') @if (!$hideAmount) - {{ trans($textAmount) }} + {{ trans($textAmount) }} @endif @stack('total_th_end') diff --git a/resources/views/components/documents/template/line-item.blade.php b/resources/views/components/documents/template/line-item.blade.php index 541af42f6..bd8e48f7b 100644 --- a/resources/views/components/documents/template/line-item.blade.php +++ b/resources/views/components/documents/template/line-item.blade.php @@ -1,7 +1,7 @@ @stack('name_td_start') @if (! $hideItems || (! $hideName && ! $hideDescription)) - + @if (! $hideName) {{ $item->name }}
@endif @@ -22,13 +22,13 @@ @stack('quantity_td_start') @if (! $hideQuantity) - {{ $item->quantity }} + {{ $item->quantity }} @endif @stack('quantity_td_end') @stack('price_td_start') @if (! $hidePrice) - @money($item->price, $document->currency_code, true) + @money($item->price, $document->currency_code, true) @endif @stack('price_td_end') @@ -36,9 +36,9 @@ @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) @stack('discount_td_start') @if ($item->discount_type === 'percentage') - {{ $item->discount }} + {{ $item->discount }} @else - @money($item->discount, $document->currency_code, true) + @money($item->discount, $document->currency_code, true) @endif @stack('discount_td_end') @endif @@ -46,7 +46,7 @@ @stack('total_td_start') @if (! $hideAmount) - @money($item->total, $document->currency_code, true) + @money($item->total, $document->currency_code, true) @endif @stack('total_td_end') diff --git a/resources/views/components/documents/template/modern.blade.php b/resources/views/components/documents/template/modern.blade.php index c4433e33e..6c9a3ea96 100644 --- a/resources/views/components/documents/template/modern.blade.php +++ b/resources/views/components/documents/template/modern.blade.php @@ -177,33 +177,33 @@ @stack('name_th_start') @if (!$hideItems || (!$hideName && !$hideDescription)) - {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} + {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} @endif @stack('name_th_end') @stack('quantity_th_start') @if (!$hideQuantity) - {{ trans($textQuantity) }} + {{ trans($textQuantity) }} @endif @stack('quantity_th_end') @stack('price_th_start') @if (!$hidePrice) - {{ trans($textPrice) }} + {{ trans($textPrice) }} @endif @stack('price_th_end') @if (!$hideDiscount) @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) @stack('discount_td_start') - {{ trans('invoices.discount') }} + {{ trans('invoices.discount') }} @stack('discount_td_end') @endif @endif @stack('total_th_start') @if (!$hideAmount) - {{ trans($textAmount) }} + {{ trans($textAmount) }} @endif @stack('total_th_end') diff --git a/resources/views/components/index/default.blade.php b/resources/views/components/index/default.blade.php index 30bf4bd65..d4fdeef9f 100644 --- a/resources/views/components/index/default.blade.php +++ b/resources/views/components/index/default.blade.php @@ -1,5 +1,5 @@ - + {{ $icon }} diff --git a/resources/views/components/index/disable.blade.php b/resources/views/components/index/disable.blade.php index d32a58c4a..3dc70aab6 100644 --- a/resources/views/components/index/disable.blade.php +++ b/resources/views/components/index/disable.blade.php @@ -1,5 +1,5 @@ - + {{ $icon }} diff --git a/resources/views/components/transactions/template/default.blade.php b/resources/views/components/transactions/template/default.blade.php index f6cdda636..02f33a471 100644 --- a/resources/views/components/transactions/template/default.blade.php +++ b/resources/views/components/transactions/template/default.blade.php @@ -183,7 +183,7 @@ @if (! $hideContactInfo) - + {{ trans($textContactInfo) }}
@@ -276,7 +276,7 @@ - - @endif - - -
+ @if (!$hideRelatedDocumentNumber) {{ trans_choice($textRelatedDocumentNumber, 1) }}
@endif @@ -294,7 +294,7 @@ @endif -
+ @if (!$hideRelatedDocumentAmount) {{ trans($textRelatedDocumentAmount) }}
@endif @@ -309,7 +309,7 @@
+ @if (!$hideRelatedDocumentNumber) {{ $transaction->document->document_number }} @@ -327,7 +327,7 @@ + @if (!$hideRelatedDocumentAmount) @money($transaction->document->amount, $transaction->document->currency_code, true)
@endif From d2f4d52c862d26e3e057224245dcdf829ba17627 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 6 Jun 2022 11:10:17 +0300 Subject: [PATCH 3/3] styling for monthly preview for report details --- app/Abstracts/Report.php | 3 +++ public/css/print.css | 6 +++++- .../views/components/reports/detail/table/row.blade.php | 4 ++-- .../views/reports/profit_loss/content/footer.blade.php | 2 +- .../views/reports/profit_loss/content/header.blade.php | 2 +- resources/views/reports/profit_loss/table/footer.blade.php | 2 +- .../views/reports/tax_summary/content/header.blade.php | 2 +- resources/views/reports/tax_summary/table/footer.blade.php | 2 +- 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php index 66324dc26..5028c4c44 100644 --- a/app/Abstracts/Report.php +++ b/app/Abstracts/Report.php @@ -270,6 +270,9 @@ abstract class Report case 'yearly': $width = 'w-4/12 col-4'; break; + case 'monthly': + $width = 'col-1'; + break; } if (empty($width)) { diff --git a/public/css/print.css b/public/css/print.css index c3409705e..13374341a 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -283,7 +283,7 @@ html[dir='rtl'] .text-alignment-left { text-align: right !important; } -html[dir='lte'] .text-alignment-right { +html[dir='ltr'] .text-alignment-right { text-align: right !important; } @@ -681,6 +681,10 @@ html[dir='rtl'] .text-alignment-right { /*--Print--*/ +.col-1 { + width: 8.333333%; +} + .col-2 { width: 16.666667%; } diff --git a/resources/views/components/reports/detail/table/row.blade.php b/resources/views/components/reports/detail/table/row.blade.php index 38ac57180..f5823c7ca 100644 --- a/resources/views/components/reports/detail/table/row.blade.php +++ b/resources/views/components/reports/detail/table/row.blade.php @@ -41,10 +41,10 @@ @if ($row_total = array_sum($parent_row_values)) @if (isset($parent_id))
+ @else
+ @endif {{ $class->row_names[$table_key][$id] }} diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php index 59c076e3d..f58f632fa 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -2,7 +2,7 @@ - diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php index 83f8c3066..284cd78ae 100644 --- a/resources/views/reports/profit_loss/content/header.blade.php +++ b/resources/views/reports/profit_loss/content/header.blade.php @@ -2,7 +2,7 @@
+ {{ trans('reports.net_profit') }}
- + @foreach($class->dates as $date) - diff --git a/resources/views/reports/tax_summary/content/header.blade.php b/resources/views/reports/tax_summary/content/header.blade.php index 9d59c3c25..34be3ec76 100644 --- a/resources/views/reports/tax_summary/content/header.blade.php +++ b/resources/views/reports/tax_summary/content/header.blade.php @@ -2,7 +2,7 @@
   diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php index 887e4036f..d62bc329d 100644 --- a/resources/views/reports/profit_loss/table/footer.blade.php +++ b/resources/views/reports/profit_loss/table/footer.blade.php @@ -2,7 +2,7 @@
+ {{ trans_choice('general.totals', 1) }}
- + @foreach($class->dates as $date) -
   diff --git a/resources/views/reports/tax_summary/table/footer.blade.php b/resources/views/reports/tax_summary/table/footer.blade.php index b9b5ddefb..10ccf6a95 100644 --- a/resources/views/reports/tax_summary/table/footer.blade.php +++ b/resources/views/reports/tax_summary/table/footer.blade.php @@ -2,7 +2,7 @@
+ {{ trans('reports.net') }}