cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-19 04:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

update eta arrival date

Browse Source
This commit is contained in:
omair saleh
2022-08-05 15:26:02 +08:00
parent f1c2ff7364
commit 3106750be6
7 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+1 -1
View File
@@ -204,7 +204,7 @@ class FetchOrderListsFromYdPortalProcessor
$rescheduleDate = $dates->sortDesc()->first();
if ($trackingRow->tracking === '到港') {
if ($trackingRow->tracking == '到港') {
$rescheduleDate = Carbon::parse($trackingRow->trackingtime);
}
app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php
+2 -2
View File
@@ -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'),
app/Classes/Modules/Segments/Services/UpdatesConstantValue.php
+3 -3
View File
@@ -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) {
app/Classes/ValueObjects/Constants/SegmentConstants.php
+2
View File
@@ -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';
app/Http/Resources/SegmentResource.php
+2 -4
View File
@@ -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
];
}
}
resources/assets/vue/components/settings/elements/SegmentComponent.vue
+1 -1
View File
@@ -27,7 +27,7 @@
</div>
<div class="row">
<div class="col">
<div class="font-heading all-caps">MYR 0.00 <i class="fa fa-edit pointer fa-fw m-l-5 requestModal text-primary" data-type="editSegmentPrice"></i></div>
<div class="font-heading all-caps">MYR {{item.price[data.id].amount}} <i class="fa fa-edit pointer fa-fw m-l-5 requestModal text-primary" data-type="editSegmentPrice"></i></div>
<modal-component class="animate__animated animate__fast animate__fadeIn" type="editSegmentPrice">
<edit-segment-price-form-component :data="item" :section="section"></edit-segment-price-form-component>
</modal-component>
resources/assets/vue/components/settings/forms/EditSegmentPriceFormComponent.vue
+3 -2
View File
@@ -9,7 +9,7 @@
<validation-wrapper-component class="m-b-15" :validator="$v.parameters.value.amount">
<label class="text-primary">Segment Price (MYR)</label>
<div class="controls">
<input type="text" class="form-control fs-12" v-model.trim="parameters.value.amount" v-money="money">
<input type="text" class="form-control fs-12" v-model.trim="parameters.price[data.id].amount" v-money="money">
</div>
</validation-wrapper-component>
<div class="row m-t-15">
@@ -41,8 +41,9 @@
return {
parameters: {
reference: 'CUSTOM_PRICE',
id: this.data.id,
value : {
amount: 0
amount: this.data.price[this.data.id].amount
}
}
};