diff --git a/app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php b/app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php deleted file mode 100644 index aae9336c..00000000 --- a/app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php +++ /dev/null @@ -1,20 +0,0 @@ -with('transports'); - } - -} \ No newline at end of file diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php index ed41ed08..2776124d 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php @@ -124,12 +124,11 @@ class FetchLoadedContainersFromVTPortalProcessor */ public function execute(?Carbon $start = null, ?Carbon $end = null){ -// DB::beginTransaction(); + DB::beginTransaction(); try { - $start = Carbon::parse('01-06-2021'); $start = $start ? $start : Carbon::now()->subMonth(); - $startLimit = Carbon::parse('01-06-2021'); + $startLimit = Carbon::parse('11-08-2021'); if($start->isBefore($startLimit)){ $start = $startLimit; @@ -222,7 +221,7 @@ class FetchLoadedContainersFromVTPortalProcessor } -// DB::commit(); + DB::commit(); return []; } diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php index bc6042b6..476b1426 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -116,11 +116,9 @@ class FetchWarehouseReceiveListFromVTPortalProcessor try { - $start = Carbon::parse('01-06-2021'); - $start = $start ? $start : Carbon::now()->subMonth(); - $startLimit = Carbon::parse('01-06-2021'); + $startLimit = Carbon::parse('11-08-2021'); if($start->isBefore($startLimit)){ $start = $startLimit; diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue index 7f50b346..f306502d 100644 --- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue +++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue @@ -38,7 +38,7 @@
Marking