From 79150d4d840a70e90f5ad81235e8d18d40272210 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Wed, 11 Oct 2023 00:51:13 +0800 Subject: [PATCH 1/2] remove cron job regenerate invoice - not using any more --- app/Console/Kernel.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index cb9cf060..109256cd 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -39,10 +39,6 @@ class Kernel extends ConsoleKernel ->appendOutputTo(storage_path().'/logs/soft-delete-seasonal-segmant-company.log') ->withoutOverlapping(); - $schedule->command('regenerateInvoice') - ->everyMinute() - ->appendOutputTo(storage_path().'/logs/regenerateInvoice.log') - ->withoutOverlapping(); } /** From 926397996da836e03eff604d2e2b7a21c9f12fa8 Mon Sep 17 00:00:00 2001 From: Jia Sheng Lee Date: Wed, 11 Oct 2023 22:36:56 +0800 Subject: [PATCH 2/2] update invoice adjustment --- resources/views/pages/pdfs/purchase_order_table.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/pages/pdfs/purchase_order_table.blade.php b/resources/views/pages/pdfs/purchase_order_table.blade.php index 20fac9b8..3e28f011 100644 --- a/resources/views/pages/pdfs/purchase_order_table.blade.php +++ b/resources/views/pages/pdfs/purchase_order_table.blade.php @@ -71,7 +71,7 @@ @endif @php - $displayedTotal = bcadd(bcadd(bcadd($displayedSubtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5); + $displayedTotal = bcadd(bcadd(bcadd($displayedSubtotal, round($transaction->service_charge, 2), 5), $transaction->tax, 5), $voucherDiscount, 5); $expectedTotal = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5); $discrepancy = bcsub($expectedTotal, $displayedTotal, 5); $total = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);