From e522b2689977b02086ccda2efc732278e75e3ad7 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 18 Jan 2020 16:43:04 +0300 Subject: [PATCH 1/5] styling --- resources/views/purchases/bills/index.blade.php | 4 ++-- resources/views/sales/invoices/index.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/purchases/bills/index.blade.php b/resources/views/purchases/bills/index.blade.php index 66609a29a..4049129d2 100644 --- a/resources/views/purchases/bills/index.blade.php +++ b/resources/views/purchases/bills/index.blade.php @@ -37,7 +37,7 @@ {{ Form::bulkActionAllGroup() }} @sortablelink('bill_number', trans_choice('general.numbers', 1), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) - @sortablelink('contact_name', trans_choice('general.vendors', 1)) + @sortablelink('contact_name', trans_choice('general.vendors', 1)) @sortablelink('amount', trans('general.amount')) @sortablelink('billed_at', trans('bills.bill_date')) @sortablelink('due_at', trans('bills.due_date')) @@ -52,7 +52,7 @@ {{ Form::bulkActionGroup($item->id, $item->bill_number) }} {{ $item->bill_number }} - {{ $item->contact_name }} + {{ $item->contact_name }} @money($item->amount, $item->currency_code, true) @date($item->billed_at) @date($item->due_at) diff --git a/resources/views/sales/invoices/index.blade.php b/resources/views/sales/invoices/index.blade.php index 7df0d157e..a44e86770 100644 --- a/resources/views/sales/invoices/index.blade.php +++ b/resources/views/sales/invoices/index.blade.php @@ -37,7 +37,7 @@ {{ Form::bulkActionAllGroup() }} @sortablelink('invoice_number', trans_choice('general.numbers', 1), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) - @sortablelink('contact_name', trans_choice('general.customers', 1)) + @sortablelink('contact_name', trans_choice('general.customers', 1)) @sortablelink('amount', trans('general.amount')) @sortablelink('invoiced_at', trans('invoices.invoice_date')) @sortablelink('due_at', trans('invoices.due_date')) @@ -52,7 +52,7 @@ {{ Form::bulkActionGroup($item->id, $item->invoice_number) }} {{ $item->invoice_number }} - {{ $item->contact_name }} + {{ $item->contact_name }} @money($item->amount, $item->currency_code, true) @date($item->invoiced_at) @date($item->due_at) From adb7f1e2e327717be8201993f80786c14b524f93 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 18 Jan 2020 17:04:30 +0300 Subject: [PATCH 2/5] more styling --- resources/views/purchases/payments/index.blade.php | 4 ++-- resources/views/sales/revenues/index.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php index d3f9dd86b..7795a384b 100644 --- a/resources/views/purchases/payments/index.blade.php +++ b/resources/views/purchases/payments/index.blade.php @@ -38,7 +38,7 @@ {{ Form::bulkActionAllGroup() }} @sortablelink('paid_at', trans('general.date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) @sortablelink('amount', trans('general.amount')) - @sortablelink('contact.name', trans_choice('general.vendors', 1)) + @sortablelink('contact.name', trans_choice('general.vendors', 1)) @sortablelink('category.name', trans_choice('general.categories', 1)) @sortablelink('account.name', trans_choice('general.accounts', 1)) {{ trans('general.actions') }} @@ -56,7 +56,7 @@ @date($item->paid_at) @endif @money($item->amount, $item->currency_code, true) - {{ !empty($item->contact->name) ? $item->contact->name : trans('general.na') }} + {{ !empty($item->contact->name) ? $item->contact->name : trans('general.na') }} {{ $item->category ? $item->category->name : trans('general.na') }} {{ $item->account ? $item->account->name : trans('general.na') }} diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php index 348f23363..178d904ec 100644 --- a/resources/views/sales/revenues/index.blade.php +++ b/resources/views/sales/revenues/index.blade.php @@ -38,7 +38,7 @@ {{ Form::bulkActionAllGroup() }} @sortablelink('paid_at', trans('general.date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) @sortablelink('amount', trans('general.amount')) - @sortablelink('contact.name', trans_choice('general.customers', 1)) + @sortablelink('contact.name', trans_choice('general.customers', 1)) @sortablelink('category.name', trans_choice('general.categories', 1)) @sortablelink('account.name', trans_choice('general.accounts', 1)) {{ trans('general.actions') }} @@ -56,7 +56,7 @@ @date($item->paid_at) @endif @money($item->amount, $item->currency_code, true) - {{ !empty($item->contact->name) ? $item->contact->name : trans('general.na') }} + {{ !empty($item->contact->name) ? $item->contact->name : trans('general.na') }} {{ $item->category ? $item->category->name : trans('general.na') }} {{ $item->account ? $item->account->name : trans('general.na') }} From 3eee5f63edd0c1bce89cc94ed24f314ab07c901b Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 18 Jan 2020 17:13:58 +0300 Subject: [PATCH 3/5] removed old check --- resources/views/purchases/payments/index.blade.php | 6 +++--- resources/views/sales/revenues/index.blade.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php index 7795a384b..e63c10740 100644 --- a/resources/views/purchases/payments/index.blade.php +++ b/resources/views/purchases/payments/index.blade.php @@ -56,9 +56,9 @@ @date($item->paid_at) @endif @money($item->amount, $item->currency_code, true) - {{ !empty($item->contact->name) ? $item->contact->name : trans('general.na') }} - {{ $item->category ? $item->category->name : trans('general.na') }} - {{ $item->account ? $item->account->name : trans('general.na') }} + {{ $item->contact->name }} + {{ $item->category->name }} + {{ $item->account->name }} @if (!$is_transfer)
diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php index 178d904ec..674342bd2 100644 --- a/resources/views/sales/revenues/index.blade.php +++ b/resources/views/sales/revenues/index.blade.php @@ -56,9 +56,9 @@ @date($item->paid_at) @endif @money($item->amount, $item->currency_code, true) - {{ !empty($item->contact->name) ? $item->contact->name : trans('general.na') }} - {{ $item->category ? $item->category->name : trans('general.na') }} - {{ $item->account ? $item->account->name : trans('general.na') }} + {{ $item->contact->name }} + {{ $item->category->name }} + {{ $item->account->name }} @if (!$is_transfer)
From c2719dcbcadfe844dca74a98fbfb73c7d751c34a Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 18 Jan 2020 17:24:13 +0300 Subject: [PATCH 4/5] removed extra transfer check --- app/Http/Controllers/Purchases/Payments.php | 4 +- app/Http/Controllers/Sales/Revenues.php | 4 +- .../views/purchases/payments/index.blade.php | 41 +++++++--------- .../views/sales/revenues/index.blade.php | 47 ++++++++----------- 4 files changed, 37 insertions(+), 59 deletions(-) diff --git a/app/Http/Controllers/Purchases/Payments.php b/app/Http/Controllers/Purchases/Payments.php index 06b6d0e76..15c1e7263 100644 --- a/app/Http/Controllers/Purchases/Payments.php +++ b/app/Http/Controllers/Purchases/Payments.php @@ -39,9 +39,7 @@ class Payments extends Controller $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id'); - $transfer_cat_id = Category::transfer(); - - return view('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts', 'transfer_cat_id')); + return view('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts')); } /** diff --git a/app/Http/Controllers/Sales/Revenues.php b/app/Http/Controllers/Sales/Revenues.php index 4339f1b5e..1bd77e447 100644 --- a/app/Http/Controllers/Sales/Revenues.php +++ b/app/Http/Controllers/Sales/Revenues.php @@ -39,9 +39,7 @@ class Revenues extends Controller $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id'); - $transfer_cat_id = Category::transfer(); - - return view('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts', 'transfer_cat_id')); + return view('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts')); } /** diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php index e63c10740..e9ae47432 100644 --- a/resources/views/purchases/payments/index.blade.php +++ b/resources/views/purchases/payments/index.blade.php @@ -47,7 +47,6 @@ @foreach($payments as $item) - @php $is_transfer = ($item->category && ($item->category->id == $transfer_cat_id)); @endphp {{ Form::bulkActionGroup($item->id, $item->contact->name) }} @if ($item->reconciled) @@ -60,34 +59,26 @@ {{ $item->category->name }} {{ $item->account->name }} - @if (!$is_transfer) -
- -
+
+ +
+ @if (!$item->reconciled) + {{ trans('general.edit') }} +
+ @endif + @permission('create-purchases-payments') + {{ trans('general.duplicate') }} + @endpermission + @permission('delete-purchases-payments') @if (!$item->reconciled) - {{ trans('general.edit') }}
+ {!! Form::deleteLink($item, 'purchases/payments') !!} @endif - @permission('create-purchases-payments') - {{ trans('general.duplicate') }} - @endpermission - @permission('delete-purchases-payments') - @if (!$item->reconciled) -
- {!! Form::deleteLink($item, 'purchases/payments') !!} - @endif - @endpermission -
+ @endpermission
- @else -
- -
- @endif +
@endforeach diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php index 674342bd2..99dd07eb5 100644 --- a/resources/views/sales/revenues/index.blade.php +++ b/resources/views/sales/revenues/index.blade.php @@ -47,7 +47,6 @@ @foreach($revenues as $item) - @php $is_transfer = ($item->category && ($item->category->id == $transfer_cat_id)); @endphp {{ Form::bulkActionGroup($item->id, $item->contact->name) }} @if ($item->reconciled) @@ -60,35 +59,27 @@ {{ $item->category->name }} {{ $item->account->name }} - @if (!$is_transfer) -
- -
- @if (!$item->reconciled) - {{ trans('general.edit') }} -
- @endif - @permission('create-sales-revenues') - {{ trans('general.duplicate') }} - @endpermission +
+ +
+ @if (!$item->reconciled) + {{ trans('general.edit') }} +
+ @endif + @permission('create-sales-revenues') + {{ trans('general.duplicate') }} + @endpermission - @permission('delete-sales-revenues') - @if (!$item->reconciled) -
- {!! Form::deleteLink($item, 'sales/revenues') !!} - @endif - @endpermission -
+ @permission('delete-sales-revenues') + @if (!$item->reconciled) +
+ {!! Form::deleteLink($item, 'sales/revenues') !!} + @endif + @endpermission
- @else -
- -
- @endif +
@endforeach From 1337664841fd0666f616755b7a2f71498b9b70db Mon Sep 17 00:00:00 2001 From: batuhanbas Date: Sat, 18 Jan 2020 18:45:40 +0300 Subject: [PATCH 5/5] report print updated --- public/css/print.css | 20 +++++++++++++------ .../views/partials/reports/table.blade.php | 2 +- .../partials/reports/table/footer.blade.php | 2 +- .../partials/reports/table/rows.blade.php | 8 ++++---- .../profit_loss/content/footer.blade.php | 10 +++++----- .../profit_loss/content/header.blade.php | 10 +++++----- .../profit_loss/table/footer.blade.php | 8 ++++---- .../tax_summary/content/header.blade.php | 2 +- .../tax_summary/table/footer.blade.php | 8 ++++---- 9 files changed, 39 insertions(+), 31 deletions(-) diff --git a/public/css/print.css b/public/css/print.css index e55916445..e707250c1 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -348,13 +348,25 @@ th, td { */ .rp-border-top-1 { - border-top: 1px solid #3c3f72; + border-top: 1px solid #e5e5e5; } .rp-border-bottom-1 { - border-bottom: 1px solid #3c3f72; + border-bottom: 1px solid #e5e5e5; } +.rp-border-top-1 { + border-top: 1px solid #e5e5e5; +} + +.rp-border-0 { + border: 0 !important; +} + +.rp-border-collapse +{ + border-collapse: collapse; +} .rp-float-left { float: left; @@ -371,7 +383,3 @@ th, td { ========================================================= */ - - - - diff --git a/resources/views/partials/reports/table.blade.php b/resources/views/partials/reports/table.blade.php index cf43132f9..5726f91c8 100644 --- a/resources/views/partials/reports/table.blade.php +++ b/resources/views/partials/reports/table.blade.php @@ -1,5 +1,5 @@
- +
@include($class->views['table.header']) @if (!empty($class->rows[$table])) diff --git a/resources/views/partials/reports/table/footer.blade.php b/resources/views/partials/reports/table/footer.blade.php index 9d804562d..495050780 100644 --- a/resources/views/partials/reports/table/footer.blade.php +++ b/resources/views/partials/reports/table/footer.blade.php @@ -1,5 +1,5 @@ - + @php $total_total = 0; @endphp @foreach($class->totals[$table] as $total) diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php index 5b5396715..eaffc1ea0 100644 --- a/resources/views/partials/reports/table/rows.blade.php +++ b/resources/views/partials/reports/table/rows.blade.php @@ -1,9 +1,9 @@ @php $row_total = 0; @endphp - - + + @foreach($items as $item) @php $row_total += $item; @endphp - + @endforeach - + diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php index 32c03b2a8..02e139b7c 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -1,12 +1,12 @@
-
{{ trans_choice('general.totals', 1) }}
{{ $class->getTableRowList()[$id] }}
{{ $class->getTableRowList()[$id] }}@money($item, setting('default.currency'), true)@money($item, setting('default.currency'), true)@money($row_total, setting('default.currency'), true)@money($row_total, setting('default.currency'), true)
+
- - + + @foreach($class->net_profit as $profit) - + @endforeach - diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php index 8773e9d89..2f8335c02 100644 --- a/resources/views/reports/profit_loss/content/header.blade.php +++ b/resources/views/reports/profit_loss/content/header.blade.php @@ -1,12 +1,12 @@
-
{{ trans('reports.net_profit') }}
{{ trans('reports.net_profit') }}@money($profit, setting('default.currency'), true)@money($profit, setting('default.currency'), true) + @money(array_sum($class->net_profit), setting('default.currency'), true)
+
- - + + @foreach($class->dates as $date) - + @endforeach - diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php index 11400788f..e92f826ad 100644 --- a/resources/views/reports/profit_loss/table/footer.blade.php +++ b/resources/views/reports/profit_loss/table/footer.blade.php @@ -1,11 +1,11 @@ - - + + @php $total_total = 0; @endphp @foreach($class->totals[$table] as $date => $total) @php $total_total += $total; @endphp - + @endforeach - + diff --git a/resources/views/reports/tax_summary/content/header.blade.php b/resources/views/reports/tax_summary/content/header.blade.php index f53aef113..018a553f6 100644 --- a/resources/views/reports/tax_summary/content/header.blade.php +++ b/resources/views/reports/tax_summary/content/header.blade.php @@ -1,5 +1,5 @@
-
{{ $date }}{{ $date }} + {{ trans_choice('general.totals', 1) }}
{{ trans_choice('general.totals', 1) }}
{{ trans_choice('general.totals', 1) }}@money($total, setting('default.currency'), true)@money($total, setting('default.currency'), true)@money($total_total, setting('default.currency'), true)@money($total_total, setting('default.currency'), true)
+
diff --git a/resources/views/reports/tax_summary/table/footer.blade.php b/resources/views/reports/tax_summary/table/footer.blade.php index 742048303..7dbb0dc2b 100644 --- a/resources/views/reports/tax_summary/table/footer.blade.php +++ b/resources/views/reports/tax_summary/table/footer.blade.php @@ -1,11 +1,11 @@ - - + + @php $total_total = 0; @endphp @foreach($class->totals[$table] as $total) @php $total_total += $total; @endphp - + @endforeach - +
{{ trans('reports.net') }}
{{ trans('reports.net') }}@money($total, setting('default.currency'), true)@money($total, setting('default.currency'), true)@money($total_total, setting('default.currency'), true)@money($total_total, setting('default.currency'), true)