From bea5a2d24cbf293a4039ceba63630c8a5acc64ee Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Mon, 17 Jun 2019 11:04:21 +0800 Subject: [PATCH] large commit --- .../Orders/UpdateReceiveNoteLogic.php | 56 +++++++------------ .../ReceiveNote/CreatesReceiveNote.php | 0 ...teDate.php => UpdatesStepCompleteDate.php} | 19 ++++--- 3 files changed, 31 insertions(+), 44 deletions(-) delete mode 100644 app/Classes/Modules/Orders/Services/ReceiveNote/CreatesReceiveNote.php rename app/Classes/Modules/Orders/Services/Steps/{UpdatesOrderReceiveNoteDate.php => UpdatesStepCompleteDate.php} (76%) diff --git a/app/Classes/Modules/ControllersLogic/Orders/UpdateReceiveNoteLogic.php b/app/Classes/Modules/ControllersLogic/Orders/UpdateReceiveNoteLogic.php index 3f42442..3310c37 100644 --- a/app/Classes/Modules/ControllersLogic/Orders/UpdateReceiveNoteLogic.php +++ b/app/Classes/Modules/ControllersLogic/Orders/UpdateReceiveNoteLogic.php @@ -1,66 +1,52 @@ repository = $repository; - $this->SetsOrderWarehouse = $SetsOrderWarehouse; - $this->UpdatesOrderReceiveNoteDate = $UpdatesOrderReceiveNoteDate; - $this->CreatesReceiveNote = $CreatesReceiveNote; + $this->setsOrderWarehouse = $setsOrderWarehouse; + $this->updatesStepCompleteDate = $updatesStepCompleteDate; } + /** + * @param string $orderId + * @param Request $request + * @return JsonResponse + * @throws InternalServerErrorException + */ public function execute(string $orderId, Request $request){ try{ $orderObject = new OrderObject($orderId, null, $request->input('warehouse_id')); - $this->SetsOrderWarehouse->execute($orderObject); + $this->setsOrderWarehouse->execute($orderObject); - $receiveNoteObject = new ReceiveNoteObject($request->input('tracking_no')); - $this->CreatesReceiveNote->execute($orderObject, $receiveNoteObject); + $stepObject = new StepObject(Constants::ORDER_WAREHOUSE_RECEIVING_STEP, $request->input('complete_date')); + $this->updatesStepCompleteDate->execute($orderObject, $stepObject); - $repository = $this->repository->findOrFail($orderId); - $stepObject = new StepObject($repository->current_step, $request->input('complete_date')); - return $this->UpdatesOrderReceiveNoteDate->execute($orderId, $stepObject); return new JsonResponse([], HttpStatus::RESOURCE_CREATED); diff --git a/app/Classes/Modules/Orders/Services/ReceiveNote/CreatesReceiveNote.php b/app/Classes/Modules/Orders/Services/ReceiveNote/CreatesReceiveNote.php deleted file mode 100644 index e69de29..0000000 diff --git a/app/Classes/Modules/Orders/Services/Steps/UpdatesOrderReceiveNoteDate.php b/app/Classes/Modules/Orders/Services/Steps/UpdatesStepCompleteDate.php similarity index 76% rename from app/Classes/Modules/Orders/Services/Steps/UpdatesOrderReceiveNoteDate.php rename to app/Classes/Modules/Orders/Services/Steps/UpdatesStepCompleteDate.php index cbfca31..9116ee7 100644 --- a/app/Classes/Modules/Orders/Services/Steps/UpdatesOrderReceiveNoteDate.php +++ b/app/Classes/Modules/Orders/Services/Steps/UpdatesStepCompleteDate.php @@ -1,20 +1,16 @@ repository = $repository; } + /** + * @param string $orderId + * @param StepObject $step + * @return JsonResponse + * @throws InternalServerErrorException + */ public function execute(string $orderId, StepObject $step){ try{ $repository = $this->repository->where('order_id',$orderId)->where('reference_id',$step->getReferenceId())->first(); $repository->complete_date = $step->getCompleteDate(); $repository->save(); - return $repository; return new JsonResponse([], HttpStatus::OK); } catch (\Exception $exception){ - throw new InternalServerErrorException("Failed to update receive note because {$exception->getMessage()}"); + throw new InternalServerErrorException("Failed to update step complete date because {$exception->getMessage()}"); }