diff --git a/resources/assets/js/components/base/modal/TaxTypeModal.vue b/resources/assets/js/components/base/modal/TaxTypeModal.vue index 7461cee9..151ba30c 100644 --- a/resources/assets/js/components/base/modal/TaxTypeModal.vue +++ b/resources/assets/js/components/base/modal/TaxTypeModal.vue @@ -124,7 +124,7 @@ export default { }, percent: { required, - between: between(-1, 100) + between: between(0, 100) }, description: { maxLength: maxLength(255) diff --git a/resources/views/app/pdf/estimate/partials/table.blade.php b/resources/views/app/pdf/estimate/partials/table.blade.php index b7ec1471..0278ff56 100644 --- a/resources/views/app/pdf/estimate/partials/table.blade.php +++ b/resources/views/app/pdf/estimate/partials/table.blade.php @@ -18,24 +18,48 @@ @endphp @foreach ($estimate->items as $item)
{{ $expenseCategory->category->name }}
++ {{ $expenseCategory->category->name }} +
{!! format_money_pdf($expenseCategory->total_amount) !!}
++ {!! format_money_pdf($expenseCategory->total_amount) !!} +
{{ $expenseCategory->category->name }}
++ {{ $expenseCategory->category->name }} +
{!! format_money_pdf($expenseCategory->total_amount) !!}
++ {!! format_money_pdf($expenseCategory->total_amount) !!} +
{{ $invoice->formattedInvoiceDate }} ({{ $invoice->invoice_number }})
++ {{ $invoice->formattedInvoiceDate }} ({{ $invoice->invoice_number }}) +
{!! format_money_pdf($invoice->total) !!}
++ {!! format_money_pdf($invoice->total) !!} +
|
- {!! format_money_pdf($customer->totalAmount) !!} ++ {!! format_money_pdf($customer->totalAmount) !!} + |
TOTAL SALES
{!! format_money_pdf($totalAmount) !!}
++ {!! format_money_pdf($totalAmount) !!} +
|
- {{ $item->name }} ++ {{ $item->name }} + |
- {!! format_money_pdf($item->total_amount) !!} ++ {!! format_money_pdf($item->total_amount) !!} + |
|
- {!! format_money_pdf($totalAmount) !!} ++ {!! format_money_pdf($totalAmount) !!} + |
TOTAL SALES
{!! format_money_pdf($totalAmount) !!}
++ {!! format_money_pdf($totalAmount) !!} +
|
- {{ $company->name }} ++ {{ $company->name }} + |
- {{ $from_date }} - {{ $to_date }} ++ {{ $from_date }} - {{ $to_date }} + |
|
- {{ $tax->taxType->name }} ++ {{ $tax->taxType->name }} + |
- {!! format_money_pdf($tax->total_tax_amount) !!} ++ {!! format_money_pdf($tax->total_tax_amount) !!} + |
|
- {!! format_money_pdf($totalTaxAmount) !!} ++ {!! format_money_pdf($totalTaxAmount) !!} + |
TOTAL TAX
{!! format_money_pdf($totalTaxAmount) !!}
++ {!! format_money_pdf($totalTaxAmount) !!} +