From e8db1cf1a43afe28b3a15a967c73bb0a90fcfe60 Mon Sep 17 00:00:00 2001 From: batuhanbas Date: Mon, 13 Jan 2020 16:26:41 +0300 Subject: [PATCH] money alignment is updated --- public/css/custom.css | 2 +- resources/views/partials/reports/table/footer.blade.php | 4 ++-- resources/views/partials/reports/table/header.blade.php | 6 +++--- resources/views/partials/reports/table/rows.blade.php | 4 ++-- .../views/reports/profit_loss/content/footer.blade.php | 4 ++-- .../views/reports/profit_loss/content/header.blade.php | 6 +++--- resources/views/reports/profit_loss/table/footer.blade.php | 4 ++-- .../views/reports/tax_summary/content/header.blade.php | 6 +++--- resources/views/reports/tax_summary/table/footer.blade.php | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/public/css/custom.css b/public/css/custom.css index f616c94a3..44447ef5f 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -693,8 +693,8 @@ table .align-items-center td span.badge { /*--------Report Column--------*/ .report-column { + max-width: 100px; width: 160px !important; - max-width: 100px !important; } /*--------Report Column Finish--------*/ diff --git a/resources/views/partials/reports/table/footer.blade.php b/resources/views/partials/reports/table/footer.blade.php index d99d18dd6..2bce5b020 100644 --- a/resources/views/partials/reports/table/footer.blade.php +++ b/resources/views/partials/reports/table/footer.blade.php @@ -4,8 +4,8 @@ @php $total_total = 0; @endphp @foreach($class->totals[$table] as $total) @php $total_total += $total; @endphp - @money($total, setting('default.currency'), true) + @money($total, setting('default.currency'), true) @endforeach - @money($total_total, setting('default.currency'), true) + @money($total_total, setting('default.currency'), true) diff --git a/resources/views/partials/reports/table/header.blade.php b/resources/views/partials/reports/table/header.blade.php index 2c5d532d4..447bd1d81 100644 --- a/resources/views/partials/reports/table/header.blade.php +++ b/resources/views/partials/reports/table/header.blade.php @@ -3,11 +3,11 @@ @if ($table == 'default') {{ $class->groups[$class->report->group] }} @else - {{ $table }} + {{ $table }} @endif @foreach($class->dates as $date) - {{ $date }} + {{ $date }} @endforeach - {{ trans_choice('general.totals', 1) }} + {{ trans_choice('general.totals', 1) }} diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php index 110c6a1c3..7b5eb0ece 100644 --- a/resources/views/partials/reports/table/rows.blade.php +++ b/resources/views/partials/reports/table/rows.blade.php @@ -3,7 +3,7 @@ {{ $class->getTableRowList()[$id] }} @foreach($items as $item) @php $row_total += $item; @endphp - @money($item, setting('default.currency'), true) + @money($item, setting('default.currency'), true) @endforeach - @money($row_total, setting('default.currency'), true) + @money($row_total, setting('default.currency'), true) diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php index 0f2cbbf55..039b9d5ac 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -4,9 +4,9 @@ {{ trans('reports.net_profit') }} @foreach($class->net_profit as $profit) - @money($profit, setting('default.currency'), true) + @money($profit, setting('default.currency'), true) @endforeach - + @money(array_sum($class->net_profit), setting('default.currency'), true) diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php index b242d6dae..9a8c96de6 100644 --- a/resources/views/reports/profit_loss/content/header.blade.php +++ b/resources/views/reports/profit_loss/content/header.blade.php @@ -2,11 +2,11 @@ - + @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 3870a5472..386d749cd 100644 --- a/resources/views/reports/profit_loss/table/footer.blade.php +++ b/resources/views/reports/profit_loss/table/footer.blade.php @@ -4,8 +4,8 @@ @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 b242d6dae..9a8c96de6 100644 --- a/resources/views/reports/tax_summary/content/header.blade.php +++ b/resources/views/reports/tax_summary/content/header.blade.php @@ -2,11 +2,11 @@
{{ $date }}{{ $date }} +
{{ 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)
- + @foreach($class->dates as $date) - + @endforeach - diff --git a/resources/views/reports/tax_summary/table/footer.blade.php b/resources/views/reports/tax_summary/table/footer.blade.php index 8888b6267..51c39daab 100644 --- a/resources/views/reports/tax_summary/table/footer.blade.php +++ b/resources/views/reports/tax_summary/table/footer.blade.php @@ -4,8 +4,8 @@ @php $total_total = 0; @endphp @foreach($class->totals[$table] as $total) @php $total_total += $total; @endphp - + @endforeach - +
{{ $date }}{{ $date }} +
{{ 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)