cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-20 04:53:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'invoice-adjustment' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development

Browse Source 
# Conflicts:
#	app/Console/Kernel.php
This commit is contained in:
edmondlang
2023-10-12 10:33:50 +08:00
parent 2227139dd0 926397996d
commit 549cd018fa
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Kernel.php
-4
View File
@@ -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();
$schedule->command('delete:bulk-invoice-files')
->dailyAt('00:00')
resources/views/pages/pdfs/purchase_order_table.blade.php
+1 -1
View File
@@ -71,7 +71,7 @@
</tr>
@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);