diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 4c6ac3a4..e12a2f28 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -204,7 +204,7 @@ class FetchOrderListsFromYdPortalProcessor $rescheduleDate = $dates->sortDesc()->first(); - if ($trackingRow->tracking === '到港') { + if ($trackingRow->tracking == '到港') { $rescheduleDate = Carbon::parse($trackingRow->trackingtime); } diff --git a/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php b/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php index 13054a6c..64c41820 100644 --- a/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php +++ b/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php @@ -102,7 +102,7 @@ class UpdateConstantLogic extends AbstractControllerLogic $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]); - $constantValue = $this->updatesConstantValue->execute($constant->value, $request->input('id'), $request->input('rate')); + $constantValue = $this->updatesConstantValue->execute($constant->value, $request->input('id'), $request->input('value')); $object = new ConstantObject($request->input('reference'), $constantValue); @@ -112,7 +112,7 @@ class UpdateConstantLogic extends AbstractControllerLogic $constantObject = []; - $constantObject[$request->input('id')] = $request->input('rate'); + $constantObject[$request->input('id')] = $request->input('value'); $object = new ConstantObject( $request->input('reference'), diff --git a/app/Classes/Modules/Segments/Services/UpdatesConstantValue.php b/app/Classes/Modules/Segments/Services/UpdatesConstantValue.php index c8060940..fac73d6b 100644 --- a/app/Classes/Modules/Segments/Services/UpdatesConstantValue.php +++ b/app/Classes/Modules/Segments/Services/UpdatesConstantValue.php @@ -7,9 +7,9 @@ class UpdatesConstantValue /** * @param $json - * @param int $status_id - * @param Array $rate - * @return Array + * @param int $state_id + * @param array $rate + * @return array */ public function execute($json, int $state_id, Array $rate) { diff --git a/app/Classes/ValueObjects/Constants/SegmentConstants.php b/app/Classes/ValueObjects/Constants/SegmentConstants.php index 88be0247..4a43c44f 100644 --- a/app/Classes/ValueObjects/Constants/SegmentConstants.php +++ b/app/Classes/ValueObjects/Constants/SegmentConstants.php @@ -11,6 +11,8 @@ class SegmentConstants public const BASE_PRICE = 'BASE_PRICE'; + public const CUSTOM_PRICE = 'CUSTOM_PRICE'; + public const WAREHOUSE_RATE = 'WAREHOUSE_RATE'; public const STATE_RATE = 'STATE_RATE'; diff --git a/app/Http/Resources/SegmentResource.php b/app/Http/Resources/SegmentResource.php index a4e1c858..a587a7ff 100644 --- a/app/Http/Resources/SegmentResource.php +++ b/app/Http/Resources/SegmentResource.php @@ -15,13 +15,11 @@ class SegmentResource extends JsonResource */ public function toArray($request) { + $constant = $this->constants->where('reference', SegmentConstants::CUSTOM_PRICE)->first(); return [ 'id' => $this->id, 'name' => $this->name, - // 'time_limit' => $this->when($this->whereHas('constants', function($query){ - // $query->where('reference', SegmentConstants::PAYMENT_ATTEMPT_DURATION_LIMIT); - // }), $this->constants->where('reference', SegmentConstants::PAYMENT_ATTEMPT_DURATION_LIMIT)->first()), - // 'services' => CustomServiceTypeResource::collection($this->constants->where('reference', SegmentConstants::CUSTOM_SERVICE_TYPE)) + 'price' => $constant ? $constant->value : 0 ]; } } diff --git a/resources/assets/vue/components/settings/elements/SegmentComponent.vue b/resources/assets/vue/components/settings/elements/SegmentComponent.vue index cb43c64a..0c0e8866 100644 --- a/resources/assets/vue/components/settings/elements/SegmentComponent.vue +++ b/resources/assets/vue/components/settings/elements/SegmentComponent.vue @@ -27,7 +27,7 @@