From bb60cbf67d3b1899451661780c518944c8c6b475 Mon Sep 17 00:00:00 2001 From: mhmj Date: Tue, 28 May 2019 15:56:46 +0800 Subject: [PATCH] Receive-Note-BackEnd --- .../Orders/UpdateReceiveNoteLogic.php | 49 +++++++------------ ...ReceiveNote.php => UpdatesReceiveNote.php} | 2 +- ...teDate.php => UpdatesStepCompleteDate.php} | 8 +-- .../Orders/UpdateReceiveNoteController.php | 7 --- 4 files changed, 21 insertions(+), 45 deletions(-) rename app/Classes/Modules/Orders/Services/ReceiveNote/{CreatesReceiveNote.php => UpdatesReceiveNote.php} (97%) rename app/Classes/Modules/Orders/Services/Steps/{UpdatesOrderReceiveNoteDate.php => UpdatesStepCompleteDate.php} (90%) diff --git a/app/Classes/Modules/ControllersLogic/Orders/UpdateReceiveNoteLogic.php b/app/Classes/Modules/ControllersLogic/Orders/UpdateReceiveNoteLogic.php index 3f42442..f4079bf 100644 --- a/app/Classes/Modules/ControllersLogic/Orders/UpdateReceiveNoteLogic.php +++ b/app/Classes/Modules/ControllersLogic/Orders/UpdateReceiveNoteLogic.php @@ -1,66 +1,55 @@ repository = $repository; $this->SetsOrderWarehouse = $SetsOrderWarehouse; - $this->UpdatesOrderReceiveNoteDate = $UpdatesOrderReceiveNoteDate; - $this->CreatesReceiveNote = $CreatesReceiveNote; + $this->UpdatesStepCompleteDate = $UpdatesStepCompleteDate; + $this->UpdatesReceiveNote = $UpdatesReceiveNote; } public function execute(string $orderId, Request $request){ try{ + $orderObject = new OrderObject($orderId, null, $request->input('warehouse_id')); - $this->SetsOrderWarehouse->execute($orderObject); - + $stepObject = new StepObject(Constants::ORDER_WAREHOUSE_RECEIVING_STEP, $request->input('complete_date')); $receiveNoteObject = new ReceiveNoteObject($request->input('tracking_no')); - $this->CreatesReceiveNote->execute($orderObject, $receiveNoteObject); - $repository = $this->repository->findOrFail($orderId); - $stepObject = new StepObject($repository->current_step, $request->input('complete_date')); - return $this->UpdatesOrderReceiveNoteDate->execute($orderId, $stepObject); + $this->SetsOrderWarehouse->execute($orderObject); + $this->UpdatesReceiveNote->execute($orderObject, $receiveNoteObject); + $this->UpdatesStepCompleteDate->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/UpdatesReceiveNote.php similarity index 97% rename from app/Classes/Modules/Orders/Services/ReceiveNote/CreatesReceiveNote.php rename to app/Classes/Modules/Orders/Services/ReceiveNote/UpdatesReceiveNote.php index b973ca6..3de7b7d 100644 --- a/app/Classes/Modules/Orders/Services/ReceiveNote/CreatesReceiveNote.php +++ b/app/Classes/Modules/Orders/Services/ReceiveNote/UpdatesReceiveNote.php @@ -10,7 +10,7 @@ use App\Classes\ValueObjects\Constants\HttpStatus; use App\Models\ReceiveNote; use Illuminate\Http\JsonResponse; -class CreatesReceiveNote +class UpdatesReceiveNote { /** @var ReceiveNote */ diff --git a/app/Classes/Modules/Orders/Services/Steps/UpdatesOrderReceiveNoteDate.php b/app/Classes/Modules/Orders/Services/Steps/UpdatesStepCompleteDate.php similarity index 90% rename from app/Classes/Modules/Orders/Services/Steps/UpdatesOrderReceiveNoteDate.php rename to app/Classes/Modules/Orders/Services/Steps/UpdatesStepCompleteDate.php index cbfca31..80fc215 100644 --- a/app/Classes/Modules/Orders/Services/Steps/UpdatesOrderReceiveNoteDate.php +++ b/app/Classes/Modules/Orders/Services/Steps/UpdatesStepCompleteDate.php @@ -1,10 +1,4 @@