From 7935be29126606b7cc214c16b8dfdb5409e5c0f2 Mon Sep 17 00:00:00 2001 From: "marjuqi@ad" Date: Thu, 19 May 2022 05:40:13 +0700 Subject: [PATCH] update logic for state_rate --- .../ShippingEstimationCalculatorLogic.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ShippingEstimationCalculatorLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ShippingEstimationCalculatorLogic.php index 6f7d7369..401dee3a 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/ShippingEstimationCalculatorLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/ShippingEstimationCalculatorLogic.php @@ -63,6 +63,9 @@ class ShippingEstimationCalculatorLogic extends AbstractControllerLogic $selected_warehouse_rate = $this->getConstantByKey($warehouse_rate_constant, $request->input('warehouse_id')); $warehouse_rate = is_object($selected_warehouse_rate) ? $selected_warehouse_rate->amount : 0; + $stateId = 1; // TODO: should query from DB + $state_rate_constant = $this->getConstantByKey($state_rate_constant, $stateId); + $this->checkPostcodeExistInConstant($center_postcode_constant, $request->input('postcode')) === true ? $state_select = 'center' : '' ; $this->checkPostcodeExistInConstant($outstation_postcode_constant, $request->input('postcode')) === true ? $state_select = 'outstation' : '' ; $state_rate_constant = (array)$state_rate_constant; @@ -70,10 +73,14 @@ class ShippingEstimationCalculatorLogic extends AbstractControllerLogic $state_rate = $state_select == '' ? 0 : $state_rate_constant[$state_select]; $price_cbm = $base_price + $warehouse_rate + $state_rate; - $total_cbm = $price_cbm * $cbm; + $total_price_cbm = $price_cbm * $cbm; return $this->response([ - 'cbm' => $cbm, 'total_cbm' => $total_cbm + 'cbm' => $cbm, + 'base_price' => $base_price, + 'warehouse_rate' => $warehouse_rate, + 'state_rate' => $state_rate, + 'total_price_cbm' => $total_price_cbm ]); }