From 05adf091a8ad8dbf2085233b1793f0fb52f031e9 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 13 Dec 2024 20:00:07 +0800
Subject: [PATCH 1/3] update export segment customers

---
 .../components/segments/elements/SegmentCompanyComponent.vue    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue b/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue
index 120e71b2..e5834e1f 100644
--- a/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue
+++ b/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue
@@ -96,8 +96,6 @@ export default {
         },
         downloadReport() {
             if (window.LARAVEL_VAPOR_ENABLED) {
-                this.isValidationEnabled = !this.isValidationEnabled;
-                this.parameters = null;
                 this.submit(this.route('segment-customers.export', this.options.company_segments_in, this.options.marking_in ?? 0), 'get', this.section, false, false);
             }
             else {

From aa4fcae07ed05a175e0d2e8c17b87b8467461f6b Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 13 Dec 2024 20:34:32 +0800
Subject: [PATCH 2/3] update export segment customers

---
 .../general/elements/OpenLinkInNewTabComponent.vue       | 3 ++-
 .../segments/elements/SegmentCompanyComponent.vue        | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/general/elements/OpenLinkInNewTabComponent.vue b/resources/assets/vue/components/general/elements/OpenLinkInNewTabComponent.vue
index 971c8ed2..7979fb24 100644
--- a/resources/assets/vue/components/general/elements/OpenLinkInNewTabComponent.vue
+++ b/resources/assets/vue/components/general/elements/OpenLinkInNewTabComponent.vue
@@ -58,10 +58,11 @@
                 } else {
                     console.error('Request failed with status:', response.status);
                 }
-                this.isDownloading = false;
             })
             .catch((error) => {
                 console.error('Network error:', error);
+            })
+            .finally(() => {
                 this.isDownloading = false;
             });
         },
diff --git a/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue b/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue
index e5834e1f..25d4776a 100644
--- a/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue
+++ b/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue
@@ -29,11 +29,16 @@
             </div>
         </div>
 
-        <div class="btn btn-md btn-complete fs-11" @click="downloadReport()" v-if="parameters.has_filters_and_searched">
+        <!-- <div class="btn btn-md btn-complete fs-11" @click="downloadReport()" v-if="parameters.has_filters_and_searched">
             <span>
                 Export
             </span>
-        </div>
+        </div> -->
+        <open-link-in-new-tab-component custom-class="btn btn-complete"
+            :url="route('segment-customers.export', options.company_segments_in, options.marking_in ?? 0)"
+            :is-url-protected="true" v-if="parameters.has_filters_and_searched">
+            <i class="fa fa-download"></i> Export
+        </open-link-in-new-tab-component>
         <small v-else>Download is only available after filters has been applied.</small>
 
         <list-component class="mt-4" :key="parameters.vueKey" section="listSegmentSection"

From 8276fef3e13d45989e0195d9ac52ecf9828bb441 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 15 Dec 2024 09:46:54 +0800
Subject: [PATCH 3/3] YD API - Added logs for debugging

---
 .../V2/FetchPackingListsFromYdPortalV2Processor.php         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/V2/FetchPackingListsFromYdPortalV2Processor.php b/app/Classes/Modules/PackingLists/Processors/V2/FetchPackingListsFromYdPortalV2Processor.php
index 99b2ccab..53c9db9a 100644
--- a/app/Classes/Modules/PackingLists/Processors/V2/FetchPackingListsFromYdPortalV2Processor.php
+++ b/app/Classes/Modules/PackingLists/Processors/V2/FetchPackingListsFromYdPortalV2Processor.php
@@ -159,17 +159,21 @@ class FetchPackingListsFromYdPortalV2Processor
 
                 try{
                     $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
+                    Log::info('Fetch SHIPPING_PACKING_LIST id: ' . $packingList->id);
 
                     $packingList->packages()->delete();
                     $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
                     if($replica) $replica->packages()->delete();
 
                     $warehouseReceiveList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST]);
+                    Log::info('Fetch WAREHOUSE_RECEIVE_LIST id: ' . $warehouseReceiveList->id);
+
                     $warehouseReceiveList->packages()->delete();
                     $replica = $warehouseReceiveList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
                     if($replica) $replica->packages()->delete();
 
                 } catch (ResourceNotFoundException $exception) {
+                    Log::info('SHIPPING_PACKING_LIST/WAREHOUSE_RECEIVE_LIST NOT FOUND');
 
                     if (!$allow_contract) {
                         $appointee_id = 2307;
@@ -181,6 +185,7 @@ class FetchPackingListsFromYdPortalV2Processor
 
                     /** @var PackingList $warehouseReceiveList */
                     $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
+                    Log::info('Create WAREHOUSE_RECEIVE_LIST id: ' . $warehouseReceiveList->id);
 
                     $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
                     $transport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
@@ -209,6 +214,7 @@ class FetchPackingListsFromYdPortalV2Processor
 
                     /** @var PackingList $packingList */
                     $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+                    Log::info('Create SHIPPING_PACKING_LIST id: ' . $packingList->id);
 
                     if ($allow_contract) {
                         foreach ($contractObligations as $obligation) {