diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php index 097b7e1e..50371cc6 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php @@ -56,28 +56,23 @@ class ReschedulePackingListLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - try { - $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]); + $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]); - $transport = $packing_list->transports()->first(); + $transport = $packing_list->transports()->first(); - $old_sechedule = $transport->schedules()->first(); + $old_sechedule = $transport->schedules()->first(); - $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED); + $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED); - $scheduleObject = new ScheduleObject( - Carbon::parse($request->input('eta')), - Carbon::parse($request->input('etd')), - ApprovalStatus::APPROVED - ); - $schedule = $this->createsSchedule->execute($transport, $scheduleObject); - - return $this->resourceResponse(new PackingListResource($packing_list)); - - } catch (\Exception $exception){ - throw new ErrorException($exception->getMessage(), $exception->getCode()); - } + $scheduleObject = new ScheduleObject( + Carbon::parse($request->input('eta')), + Carbon::parse($request->input('etd')), + ApprovalStatus::APPROVED + ); + + $schedule = $this->createsSchedule->execute($transport, $scheduleObject); + return $this->resourceResponse(new PackingListResource($packing_list)); } } diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue index 991eccc5..d92f35a7 100644 --- a/resources/assets/vue/components/containers/elements/PackingListComponent.vue +++ b/resources/assets/vue/components/containers/elements/PackingListComponent.vue @@ -25,6 +25,10 @@

{{ item.transport.current_schedule.eta }}

{{ item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days+' Days': 'n/a'}}

+
Reschedule Transport
+ + +
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue index a0880e40..44d30669 100644 --- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue +++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue @@ -274,7 +274,7 @@ style=" fill:#000000;">
-
+
Add Arrived Parcel