diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierBillGroupLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierBillGroupLogic.php index db433e0a..e75ab158 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierBillGroupLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierBillGroupLogic.php @@ -113,8 +113,8 @@ class CreateSupplierBillGroupLogic extends AbstractControllerLogic $original_amount = 0; foreach ($payments as $payment) { - $amount += round($payment['amount'], 2); - $original_amount += round($payment['original_amount'], 2); + $amount += $payment['amount']; + $original_amount += $payment['original_amount']; } $service_charges = 0; @@ -122,7 +122,7 @@ class CreateSupplierBillGroupLogic extends AbstractControllerLogic // if ($supplier->id === 4548 || $supplier->id === 2729) { // $amount = round(floatval(str_replace(',', '', $request->input('payment_total'))), 2); // } else { - $service_charges = round(floatval(str_replace(',', '', $request->input('service_charges'))), 2); + $service_charges = floatval(str_replace(',', '', $request->input('service_charges'))); // } $rate = $original_amount / $amount; @@ -140,13 +140,13 @@ class CreateSupplierBillGroupLogic extends AbstractControllerLogic $billGroup->issuer = $supplier->id; $billGroup->receiver = 1; $billGroup->reference = $this->generatesTransactionBillNumber->execute('BSPO-'); - $billGroup->amount = $amount + $service_charges; - $billGroup->original_amount = $original_amount; + $billGroup->amount = round(($amount + $service_charges), 2); + $billGroup->original_amount = round($original_amount, 2); $billGroup->currency_id = 1; $billGroup->original_currency_id = $payments[0]['original_currency']['id']; $billGroup->currency_rate = $rate; $billGroup->tax = 0; - $billGroup->service_charge = $service_charges; + $billGroup->service_charge = round($service_charges, 2); $billGroup->status = ApprovalStatus::PENDING_SUBMISSION; $billGroup->save(); @@ -160,8 +160,8 @@ class CreateSupplierBillGroupLogic extends AbstractControllerLogic foreach ($supplierRefunds as $supplierRefund) { $refund = Transaction::find($supplierRefund['id']); $deductedRefunds = $refund->transactions()->where('type', TransactionType::BILL_REFUND)->where('status', ApprovalStatus::APPROVED)->get(); - $refundDeductableAmount = round(($refund->amount - $deductedRefunds->sum('amount')), 2); - $refundDeductableOriginalAmount = round(($refund->original_amount - $deductedRefunds->sum('original_amount')), 2); + $refundDeductableAmount = $refund->amount - $deductedRefunds->sum('amount'); + $refundDeductableOriginalAmount = $refund->original_amount - $deductedRefunds->sum('original_amount'); $amount -= $refundDeductableAmount; $original_amount -= $refundDeductableOriginalAmount; @@ -204,7 +204,7 @@ class CreateSupplierBillGroupLogic extends AbstractControllerLogic $billGroup->billRefunds()->sync($transaction->id, false); } - $billGroup->amount = $amount; + $billGroup->amount = round($amount, 2); $billGroup->save(); return $this->response([]); diff --git a/resources/assets/vue/components/bookings/forms/SupplierWhiteFormPlaceOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/SupplierWhiteFormPlaceOrderFormComponent.vue index bd01832f..adfe9acb 100644 --- a/resources/assets/vue/components/bookings/forms/SupplierWhiteFormPlaceOrderFormComponent.vue +++ b/resources/assets/vue/components/bookings/forms/SupplierWhiteFormPlaceOrderFormComponent.vue @@ -94,7 +94,7 @@