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) { 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 120e71b2..25d4776a 100644 --- a/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue +++ b/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue @@ -29,11 +29,16 @@ -
+ + + Export + Download is only available after filters has been applied.