From 86e6ef7af561deade503bd6badc244fe00b52505 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 02:11:07 +0800 Subject: [PATCH 01/19] update yd new delivery api --- .../FetchOrderListsFromYdPortalProcessor.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 99ebf9c1..9a54fa28 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -35,6 +35,7 @@ use App\Models\PackingList; use App\Models\Transport; use Carbon\Carbon; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; @@ -170,7 +171,6 @@ class FetchOrderListsFromYdPortalProcessor $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest); if(!$rows){ - Log::debug($row->expressno); continue; } @@ -218,7 +218,6 @@ class FetchOrderListsFromYdPortalProcessor $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5'); } - if ($trackingRow->tracking === '货物已进目的港仓库') { $unstuffingDate = Carbon::parse($trackingRow->trackingtime); } @@ -228,6 +227,21 @@ class FetchOrderListsFromYdPortalProcessor } } + $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]); + + $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$row->expressno.'&sOrgId=sti'); + $deliveryTracking = json_decode($request->getBody()->getContents()); + foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) { + $trackingDate = Carbon::createFromFormat('d/m/y H:i', $trackingRow->LocalDateTime); + if (Str::contains($trackingRow->PublicDescription, ['accepted/picked'])){ + $unstuffingDate = $trackingDate; + } + + if (Str::contains($trackingRow->PublicDescription, ['delivered'])) { + $deliveryDate = $trackingDate; + } + } + $customerno = preg_split('(-|\(|\)|\/)', $row->customerno); $orderNumber = $customerno[array_key_last($customerno)]; @@ -433,7 +447,6 @@ class FetchOrderListsFromYdPortalProcessor } } catch (\Exception $exception) { - dump($exception); Log::debug($exception); } From 6335e90aab4b7ab2dd42e87b574c94374a6a3ef6 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 02:13:19 +0800 Subject: [PATCH 02/19] update yd new delivery api --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 9a54fa28..963480ce 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -35,7 +35,6 @@ use App\Models\PackingList; use App\Models\Transport; use Carbon\Carbon; use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; @@ -133,6 +132,7 @@ class FetchOrderListsFromYdPortalProcessor * @param Carbon|null $start * @param Carbon|null $end * @return void + * @throws \GuzzleHttp\Exception\GuzzleException */ public function execute(?Carbon $start = null, ?Carbon $end = null) { From c62231fe3a88aa6930dd3d75e43d2e9278e33ecc Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 02:15:03 +0800 Subject: [PATCH 03/19] hide notification temp --- .../ApproveIdentificationDocumentLogic.php | 18 +++++++++--------- resources/views/partials/header.blade.php | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php b/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php index af42a35a..928a9c01 100644 --- a/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php +++ b/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php @@ -97,15 +97,15 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic $this->updatesCompanyStatus->execute($document->owner, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED); - $object = new NotificationObject( - 'ID Verification ' . ( $status === 'approve' ? 'Approved' : 'Rejected' ), - ( $status === 'approve' ? 'Dear user, congratulations that your ' : 'Dear user, we are sorry to inform you that your ' ) . ( $document->type === 'IDENTITY_CARD' ? 'IC' : 'SSM' ) . ( $status === 'approve' ? ' has been approved. Start your first order now!' : ' has been rejected due to ' . ( $request->input('rejectRemark') ?? '' ) . ', please resubmit it for further action.' ), - $document->owner, - $document->owner->companyModules()->first()->employees()->first(), - $document, - ); - - $this->createNotificationProcessor->execute($object); +// $object = new NotificationObject( +// 'ID Verification ' . ( $status === 'approve' ? 'Approved' : 'Rejected' ), +// ( $status === 'approve' ? 'Dear user, congratulations that your ' : 'Dear user, we are sorry to inform you that your ' ) . ( $document->type === 'IDENTITY_CARD' ? 'IC' : 'SSM' ) . ( $status === 'approve' ? ' has been approved. Start your first order now!' : ' has been rejected due to ' . ( $request->input('rejectRemark') ?? '' ) . ', please resubmit it for further action.' ), +// $document->owner, +// $document->owner->companyModules()->first()->employees()->first(), +// $document, +// ); +// +// $this->createNotificationProcessor->execute($object); if($status === 'approve'){ $orders = $this->updatesOrdersStatus->execute($document->owner, ApprovalStatus::APPROVED); diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php index 5a37f886..9bc45c20 100644 --- a/resources/views/partials/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -10,7 +10,7 @@ -
+
From 894799a801d43ccb4f9f15b260269aeef86d926d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 02:47:56 +0800 Subject: [PATCH 04/19] disable addon migration temp --- .../2022_03_14_133563_create_addons_table.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/database/migrations/2022_03_14_133563_create_addons_table.php b/database/migrations/2022_03_14_133563_create_addons_table.php index 42bc4ae6..5fc6157d 100644 --- a/database/migrations/2022_03_14_133563_create_addons_table.php +++ b/database/migrations/2022_03_14_133563_create_addons_table.php @@ -13,16 +13,16 @@ class CreateAddonsTables extends Migration */ public function up() { - Schema::table('addons', function (Blueprint $table) { - $table->id(); - $table->morphs('owner'); - $table->string('reference',200); - $table->integer('type')->default(0); - $table->integer('quantity')->default(1); - $table->integer('status')->default(0); - $table->softDeletes(); - $table->timestamps(); - }); +// Schema::table('addons', function (Blueprint $table) { +// $table->id(); +// $table->morphs('owner'); +// $table->string('reference',200); +// $table->integer('type')->default(0); +// $table->integer('quantity')->default(1); +// $table->integer('status')->default(0); +// $table->softDeletes(); +// $table->timestamps(); +// }); } /** From df69ff6fecde3fcc7ef463cfdc1f82a26c016261 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 02:49:01 +0800 Subject: [PATCH 05/19] disable addon migration temp --- database/migrations/2022_03_14_133563_create_addons_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2022_03_14_133563_create_addons_table.php b/database/migrations/2022_03_14_133563_create_addons_table.php index 5fc6157d..64df676f 100644 --- a/database/migrations/2022_03_14_133563_create_addons_table.php +++ b/database/migrations/2022_03_14_133563_create_addons_table.php @@ -32,6 +32,6 @@ class CreateAddonsTables extends Migration */ public function down() { - Schema::dropIfExists('addons'); +// Schema::dropIfExists('addons'); } } From 8b4105612986ed6b3f2e9731947554d10f1b5f21 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 02:50:11 +0800 Subject: [PATCH 06/19] rename addon table --- .../2022_03_14_133563_create_addons_table.php | 37 ------------------- ...03_14_133563_create_order_addons_table.php | 37 +++++++++++++++++++ 2 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 database/migrations/2022_03_14_133563_create_addons_table.php create mode 100644 database/migrations/2022_03_14_133563_create_order_addons_table.php diff --git a/database/migrations/2022_03_14_133563_create_addons_table.php b/database/migrations/2022_03_14_133563_create_addons_table.php deleted file mode 100644 index 64df676f..00000000 --- a/database/migrations/2022_03_14_133563_create_addons_table.php +++ /dev/null @@ -1,37 +0,0 @@ -id(); -// $table->morphs('owner'); -// $table->string('reference',200); -// $table->integer('type')->default(0); -// $table->integer('quantity')->default(1); -// $table->integer('status')->default(0); -// $table->softDeletes(); -// $table->timestamps(); -// }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { -// Schema::dropIfExists('addons'); - } -} diff --git a/database/migrations/2022_03_14_133563_create_order_addons_table.php b/database/migrations/2022_03_14_133563_create_order_addons_table.php new file mode 100644 index 00000000..d58e5756 --- /dev/null +++ b/database/migrations/2022_03_14_133563_create_order_addons_table.php @@ -0,0 +1,37 @@ +id(); + $table->morphs('owner'); + $table->string('reference',200); + $table->integer('type')->default(0); + $table->integer('quantity')->default(1); + $table->integer('status')->default(0); + $table->softDeletes(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('order_addons'); + } +} From e4aa8fdd57146d13220f8242dcb4b254f30558e7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 02:51:59 +0800 Subject: [PATCH 07/19] rename addon table --- ..._table.php => 2022_03_14_133563_create_addons_table.php} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename database/migrations/{2022_03_14_133563_create_order_addons_table.php => 2022_03_14_133563_create_addons_table.php} (81%) diff --git a/database/migrations/2022_03_14_133563_create_order_addons_table.php b/database/migrations/2022_03_14_133563_create_addons_table.php similarity index 81% rename from database/migrations/2022_03_14_133563_create_order_addons_table.php rename to database/migrations/2022_03_14_133563_create_addons_table.php index d58e5756..42bc4ae6 100644 --- a/database/migrations/2022_03_14_133563_create_order_addons_table.php +++ b/database/migrations/2022_03_14_133563_create_addons_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateOrderAddonsTables extends Migration +class CreateAddonsTables extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class CreateOrderAddonsTables extends Migration */ public function up() { - Schema::table('order_addons', function (Blueprint $table) { + Schema::table('addons', function (Blueprint $table) { $table->id(); $table->morphs('owner'); $table->string('reference',200); @@ -32,6 +32,6 @@ class CreateOrderAddonsTables extends Migration */ public function down() { - Schema::dropIfExists('order_addons'); + Schema::dropIfExists('addons'); } } From 61eae220d1d3a325cf1d33512aa90223843148f3 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 02:55:22 +0800 Subject: [PATCH 08/19] rename addon table --- database/migrations/2022_03_14_133563_create_addons_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2022_03_14_133563_create_addons_table.php b/database/migrations/2022_03_14_133563_create_addons_table.php index 42bc4ae6..60909dfc 100644 --- a/database/migrations/2022_03_14_133563_create_addons_table.php +++ b/database/migrations/2022_03_14_133563_create_addons_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateAddonsTables extends Migration +class CreateAddonsTable extends Migration { /** * Run the migrations. From c018fa9050aa68dddf62a77d60ef51c255cf3437 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 02:56:15 +0800 Subject: [PATCH 09/19] rename addon table --- database/migrations/2022_03_14_133563_create_addons_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2022_03_14_133563_create_addons_table.php b/database/migrations/2022_03_14_133563_create_addons_table.php index 60909dfc..2e040069 100644 --- a/database/migrations/2022_03_14_133563_create_addons_table.php +++ b/database/migrations/2022_03_14_133563_create_addons_table.php @@ -13,7 +13,7 @@ class CreateAddonsTable extends Migration */ public function up() { - Schema::table('addons', function (Blueprint $table) { + Schema::create('addons', function (Blueprint $table) { $table->id(); $table->morphs('owner'); $table->string('reference',200); From a667e236470f775e6679a2a5b6c6265051147713 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 03:05:20 +0800 Subject: [PATCH 10/19] rename addon table --- .../ReschedulePackingListLogic.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php index 50371cc6..2aaeb169 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php @@ -7,9 +7,13 @@ use App\Classes\Modules\PackingLists\Services\FetchesPackingList; use App\Classes\Modules\Schedules\Services\CreatesSchedule; use App\Classes\Modules\Schedules\Services\UpdatesScheduleStatus; use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject; +use App\Classes\Modules\Transports\DataTransferObjects\TransportObject; +use App\Classes\Modules\Transports\Services\CreatesTransport; use App\Classes\ValueObjects\Constants\ApprovalStatus; +use App\Classes\ValueObjects\Constants\TransportType; use App\Http\Resources\PackingListResource; +use App\Models\Transport; use ErrorException; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -33,6 +37,9 @@ class ReschedulePackingListLogic extends AbstractControllerLogic /** @var UpdatesScheduleStatus */ private $updatesScheduleStatus; + /** @var CreatesTransport */ + private $createsTransport; + /** @var CreatesSchedule */ private $createsSchedule; @@ -52,7 +59,7 @@ class ReschedulePackingListLogic extends AbstractControllerLogic /** * @param Request $request * @return JsonResponse - * @throws ErrorException + * @throws \App\Classes\Exceptions\MalformedRequestException */ public function logic(Request $request) : JsonResponse { @@ -60,9 +67,15 @@ class ReschedulePackingListLogic extends AbstractControllerLogic $transport = $packing_list->transports()->first(); - $old_sechedule = $transport->schedules()->first(); + if(!$transport) { + $object = new TransportObject(TransportType::LAND, null, '', $request->input('etd'), $request->input('eta'),ApprovalStatus::APPROVED); + /** @var Transport $transport */ + $transport = $this->createsTransport->execute($object, $packing_list); + } - $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED); + $transport->schedules()->update([ + 'status' => ApprovalStatus::REJECTED + ]); $scheduleObject = new ScheduleObject( Carbon::parse($request->input('eta')), From d6616c0c5c497ec3f9fe8f0192bed9dacfad1952 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 03:06:07 +0800 Subject: [PATCH 11/19] rename addon table --- .../ControllersLogic/ReschedulePackingListLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php index 2aaeb169..aec1f73c 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php @@ -68,7 +68,7 @@ class ReschedulePackingListLogic extends AbstractControllerLogic $transport = $packing_list->transports()->first(); if(!$transport) { - $object = new TransportObject(TransportType::LAND, null, '', $request->input('etd'), $request->input('eta'),ApprovalStatus::APPROVED); + $object = new TransportObject(TransportType::LAND, null, '', Carbon::parse($request->input('etd')), Carbon::parse($request->input('eta')),ApprovalStatus::APPROVED); /** @var Transport $transport */ $transport = $this->createsTransport->execute($object, $packing_list); } From be3d10e055c8b390a802b93d3bb18e3a8a988605 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 03:06:52 +0800 Subject: [PATCH 12/19] rename addon table --- .../ControllersLogic/ReschedulePackingListLogic.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php index aec1f73c..004390ef 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php @@ -21,6 +21,8 @@ use Carbon\Carbon; class ReschedulePackingListLogic extends AbstractControllerLogic { + + /** * @return array */ @@ -44,18 +46,20 @@ class ReschedulePackingListLogic extends AbstractControllerLogic private $createsSchedule; /** - * DeleteContainerControllersLogic constructor. + * ReschedulePackingListLogic constructor. * @param FetchesPackingList $fetchesPackingList + * @param UpdatesScheduleStatus $updatesScheduleStatus + * @param CreatesTransport $createsTransport * @param CreatesSchedule $createsSchedule */ - public function __construct(FetchesPackingList $fetchesPackingList, UpdatesScheduleStatus $updatesScheduleStatus, CreatesSchedule $createsSchedule) + public function __construct(FetchesPackingList $fetchesPackingList, UpdatesScheduleStatus $updatesScheduleStatus, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule) { $this->fetchesPackingList = $fetchesPackingList; $this->updatesScheduleStatus = $updatesScheduleStatus; + $this->createsTransport = $createsTransport; $this->createsSchedule = $createsSchedule; } - /** * @param Request $request * @return JsonResponse From 83351f17b151906611a6f9d0cf6d7ba32dcbbcf2 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 1 Aug 2022 03:09:49 +0800 Subject: [PATCH 13/19] hide payment and billing page from menu --- resources/views/partials/menu.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 952060c7..42dd5141 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -147,7 +147,7 @@
Shipping Queue
-
+
Date: Fri, 5 Aug 2022 10:40:49 +0800 Subject: [PATCH 14/19] disable yiwu warehouse temp --- .../vue/components/orders/forms/OrderFormComponent.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue index 8c07e194..51c2ec09 100644 --- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue +++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue @@ -27,7 +27,8 @@
-
+ +
@@ -39,6 +40,7 @@
+

Due to pandemic prevention, we have decided to temporarily disable our Yiwu warehouse.

@@ -53,6 +55,7 @@

近期由于船期的安排和马来西亚海关的运作等一些不可控因数，导致船期延迟，请大家提前做好采购安排。若有不便之处，敬请谅解。
Due to inevitable circumstances, shipping arrangements and Malaysia custom clearance may have delays. Kindly plan your purchases in advance, thank you for your cooperation.

+

由于义乌船期不稳定，建议发广州仓库。
Due to unexpected shipping delays for Yiwu warehouse, you may select an alternative warehouse.

由于义乌船期不稳定，建议发广州仓库。
Due to unexpected shipping delays for Yiwu warehouse, you may select an alternative warehouse.

From 0f307bda1fddcffdc1549fa151dbaa1e02ec63da Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 5 Aug 2022 15:15:48 +0800 Subject: [PATCH 15/19] update eta on arrival --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 963480ce..5df446d3 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -203,6 +203,11 @@ class FetchOrderListsFromYdPortalProcessor } $rescheduleDate = $dates->sortDesc()->first(); + + if (strpos($trackingRow->tracking, '到港') !== false) { + $rescheduleDate = Carbon::parse($trackingRow->trackingtime); + } + if(!$delayDate || $rescheduleDate > $delayDate){ /** @var Carbon $delayDate */ $delayDate = $rescheduleDate; From f1c2ff73646311696092151125861c748d9498c7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 5 Aug 2022 15:22:53 +0800 Subject: [PATCH 16/19] update eta when arrival --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 5df446d3..4c6ac3a4 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 (strpos($trackingRow->tracking, '到港') !== false) { + if ($trackingRow->tracking === '到港') { $rescheduleDate = Carbon::parse($trackingRow->trackingtime); } From 3106750be6a775ace4918f70955600222631403e Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 5 Aug 2022 15:26:02 +0800 Subject: [PATCH 17/19] update eta arrival date --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 2 +- .../Segments/ControllersLogic/UpdateConstantLogic.php | 4 ++-- .../Modules/Segments/Services/UpdatesConstantValue.php | 6 +++--- app/Classes/ValueObjects/Constants/SegmentConstants.php | 2 ++ app/Http/Resources/SegmentResource.php | 6 ++---- .../vue/components/settings/elements/SegmentComponent.vue | 2 +- .../settings/forms/EditSegmentPriceFormComponent.vue | 5 +++-- 7 files changed, 14 insertions(+), 13 deletions(-) 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 @@
-
MYR 0.00
+
MYR {{item.price[data.id].amount}}
diff --git a/resources/assets/vue/components/settings/forms/EditSegmentPriceFormComponent.vue b/resources/assets/vue/components/settings/forms/EditSegmentPriceFormComponent.vue index 910ba2fe..df9bab4b 100644 --- a/resources/assets/vue/components/settings/forms/EditSegmentPriceFormComponent.vue +++ b/resources/assets/vue/components/settings/forms/EditSegmentPriceFormComponent.vue @@ -9,7 +9,7 @@
- +
@@ -41,8 +41,9 @@ return { parameters: { reference: 'CUSTOM_PRICE', + id: this.data.id, value : { - amount: 0 + amount: this.data.price[this.data.id].amount } } }; From b6a62fed2b29b35ff054f0894f8fc1b015da1866 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 5 Aug 2022 15:34:35 +0800 Subject: [PATCH 18/19] update eta arrival date --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index e12a2f28..e6a66927 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -204,10 +204,6 @@ class FetchOrderListsFromYdPortalProcessor $rescheduleDate = $dates->sortDesc()->first(); - if ($trackingRow->tracking == '到港') { - $rescheduleDate = Carbon::parse($trackingRow->trackingtime); - } - if(!$delayDate || $rescheduleDate > $delayDate){ /** @var Carbon $delayDate */ $delayDate = $rescheduleDate; @@ -219,6 +215,11 @@ class FetchOrderListsFromYdPortalProcessor } + if ($trackingRow->tracking === '到港') { + $rescheduleDate = Carbon::parse($trackingRow->trackingtime); + dd($rescheduleDate); + } + if ($trackingRow->tracking === '已开船') { $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5'); } From ea880a1a549ed8ee85b7775b05e73fa6520bbf40 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 5 Aug 2022 15:35:31 +0800 Subject: [PATCH 19/19] update eta arrival date --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index e6a66927..a5a1901b 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -216,8 +216,7 @@ class FetchOrderListsFromYdPortalProcessor } if ($trackingRow->tracking === '到港') { - $rescheduleDate = Carbon::parse($trackingRow->trackingtime); - dd($rescheduleDate); + $delayDate = Carbon::parse($trackingRow->trackingtime); } if ($trackingRow->tracking === '已开船') {