diff --git a/public/css/custom.css b/public/css/custom.css index 64173324a..f616c94a3 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -690,6 +690,13 @@ table .align-items-center td span.badge { } /*--------Font Size 50 Finish--------*/ +/*--------Report Column--------*/ +.report-column +{ + width: 160px !important; + max-width: 100px !important; +} +/*--------Report Column Finish--------*/ /*----------------RESPONSIVE START LINE----------------*/ diff --git a/resources/views/partials/reports/header.blade.php b/resources/views/partials/reports/header.blade.php index 03265fd41..8fabf97ac 100644 --- a/resources/views/partials/reports/header.blade.php +++ b/resources/views/partials/reports/header.blade.php @@ -2,9 +2,13 @@ @section('new_button') -  {{ trans('general.print') }} + +  {{ trans('general.print') }} + -  {{ trans('general.export') }} + +  {{ trans('general.export') }} + @endsection diff --git a/resources/views/partials/reports/table.blade.php b/resources/views/partials/reports/table.blade.php index 13a844d95..863c41680 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 0fe951b45..d99d18dd6 100644 --- a/resources/views/partials/reports/table/footer.blade.php +++ b/resources/views/partials/reports/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 - + diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php index 6deb164f3..110c6a1c3 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 f37361d0c..0f2cbbf55 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -1,13 +1,15 @@ -
+
{{ 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)
{{ $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 - + - +
{{ 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) + @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 9c3ed4420..b242d6dae 100644 --- a/resources/views/reports/profit_loss/content/header.blade.php +++ b/resources/views/reports/profit_loss/content/header.blade.php @@ -2,11 +2,13 @@ - + @foreach($class->dates as $date) - + @endforeach - +
{{ $date }}{{ $date }}{{ trans_choice('general.totals', 1) }} +
{{ trans_choice('general.totals', 1) }}
+
diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php index b661de354..3870a5472 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 @@ - {{ trans_choice('general.totals', 1) }} + {{ trans_choice('general.totals', 1) }} @php $total_total = 0; @endphp @foreach($class->totals[$table] as $date => $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/reports/profit_loss/table/header.blade.php b/resources/views/reports/profit_loss/table/header.blade.php index 02ce4081e..0843023e2 100644 --- a/resources/views/reports/profit_loss/table/header.blade.php +++ b/resources/views/reports/profit_loss/table/header.blade.php @@ -1,5 +1,7 @@ - {{ $table }} + +
{{ $table }}
+ diff --git a/resources/views/reports/tax_summary/content/header.blade.php b/resources/views/reports/tax_summary/content/header.blade.php index 9c3ed4420..b242d6dae 100644 --- a/resources/views/reports/tax_summary/content/header.blade.php +++ b/resources/views/reports/tax_summary/content/header.blade.php @@ -2,11 +2,13 @@ - + @foreach($class->dates as $date) - + @endforeach - +
{{ $date }}{{ $date }}{{ trans_choice('general.totals', 1) }} +
{{ trans_choice('general.totals', 1) }}
+
diff --git a/resources/views/reports/tax_summary/table/footer.blade.php b/resources/views/reports/tax_summary/table/footer.blade.php index 5bbe7e7b3..8888b6267 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 @@ - {{ trans('reports.net') }} + {{ trans('reports.net') }} @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/sales/invoices/item.blade.php b/resources/views/sales/invoices/item.blade.php index ff0cac97e..5158cc446 100644 --- a/resources/views/sales/invoices/item.blade.php +++ b/resources/views/sales/invoices/item.blade.php @@ -16,23 +16,15 @@ @stack('name_td_start') @stack('name_input_start') - {{ Form::selectAddNewGroup('name', '', '', $items, '', [ - 'data-item' => 'name', - 'v-model' => 'row.name', - '@input' => 'onGetItem($event, index)', - 'class' => 'form-control', - 'autocomplete' => 'form-control', - 'path' => route('modals.taxes.create') - ], 'mb-0 select-item') }} - - + + {!! $errors->first('item.name', '

:message

') !!} @stack('name_input_end') @stack('name_td_end')