From 3f70ead69ad56d72699755c4e57025f6ea8a6b95 Mon Sep 17 00:00:00 2001 From: Fairuz Date: Tue, 3 Aug 2021 02:01:20 +0800 Subject: [PATCH] Activate contract --- .../DataTransferObjects/OrderStepsObject.php | 13 ++++++-- .../Processors/CreateOrderStepsProcessor.php | 2 +- .../GenerateOrderStepsProcessor.php | 4 ++- .../Processors/UpdateOrderStepsProcessor.php | 2 +- .../Services/CreatesManyOrderSteps.php | 3 +- app/Models/OrderStep.php | 2 +- .../2021_08_03_014833_modify_order_steps.php | 30 +++++++++++++++++++ 7 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 database/migrations/2021_08_03_014833_modify_order_steps.php diff --git a/app/Classes/Modules/OrderSteps/DataTransferObjects/OrderStepsObject.php b/app/Classes/Modules/OrderSteps/DataTransferObjects/OrderStepsObject.php index 4ec1fd41..c039f479 100644 --- a/app/Classes/Modules/OrderSteps/DataTransferObjects/OrderStepsObject.php +++ b/app/Classes/Modules/OrderSteps/DataTransferObjects/OrderStepsObject.php @@ -25,7 +25,9 @@ class OrderStepsObject implements DataTransferObject private $completed_date; - public function __construct(int $order_id, int $appointee_id, string $reference, bool $primary, float $sequence, int $status, int $contract_status, ?string $completed_date, int $id=0) + private $hash_id; + + public function __construct(int $order_id, int $appointee_id, string $reference, bool $primary, float $sequence, int $status, int $contract_status, ?string $completed_date, int $id=0, ?string $hash_id) { $this->order_id = $order_id; $this->appointee_id = $appointee_id; @@ -38,6 +40,7 @@ class OrderStepsObject implements DataTransferObject $this->completed_date = $completed_date; $this->id = $id; + $this->hash_id = $hash_id; } public function getOrderId(): int @@ -49,10 +52,12 @@ class OrderStepsObject implements DataTransferObject { return $this->appointee_id; } + public function getReference(): string { return $this->reference; } + public function getPrimary(): bool { return $this->primary; @@ -83,4 +88,8 @@ class OrderStepsObject implements DataTransferObject return $this->id; } -} \ No newline at end of file + public function getHashId(): ?string + { + return $this->hash_id; + } +} diff --git a/app/Classes/Modules/OrderSteps/Processors/CreateOrderStepsProcessor.php b/app/Classes/Modules/OrderSteps/Processors/CreateOrderStepsProcessor.php index 9f781c9a..3edd3a28 100644 --- a/app/Classes/Modules/OrderSteps/Processors/CreateOrderStepsProcessor.php +++ b/app/Classes/Modules/OrderSteps/Processors/CreateOrderStepsProcessor.php @@ -37,7 +37,7 @@ class CreateOrderStepsProcessor public function execute(Model $order, string $currentStep, $appointee_id){ - $order_steps_object = new OrderStepsObject($order->id, $appointee_id, $currentStep, true, 0, OrderStatus::PROCESSING, 0, null); + $order_steps_object = new OrderStepsObject($order->id, $appointee_id, $currentStep, true, 0, OrderStatus::PROCESSING, 0, null, 0, null); $this->canCreateOrderStep->passes($order_steps_object); diff --git a/app/Classes/Modules/OrderSteps/Processors/GenerateOrderStepsProcessor.php b/app/Classes/Modules/OrderSteps/Processors/GenerateOrderStepsProcessor.php index d7439e3e..c384626d 100644 --- a/app/Classes/Modules/OrderSteps/Processors/GenerateOrderStepsProcessor.php +++ b/app/Classes/Modules/OrderSteps/Processors/GenerateOrderStepsProcessor.php @@ -54,7 +54,9 @@ class GenerateOrderStepsProcessor $step->sequence??0, 0, 0, - null + null, + 0, + $step->hash_id ); } diff --git a/app/Classes/Modules/OrderSteps/Processors/UpdateOrderStepsProcessor.php b/app/Classes/Modules/OrderSteps/Processors/UpdateOrderStepsProcessor.php index 40903d5d..598b2a8a 100644 --- a/app/Classes/Modules/OrderSteps/Processors/UpdateOrderStepsProcessor.php +++ b/app/Classes/Modules/OrderSteps/Processors/UpdateOrderStepsProcessor.php @@ -31,7 +31,7 @@ class UpdateOrderStepsProcessor public function execute(string $currentStep){ - $orderStepsObject = new OrderStepsObject(0,0,$currentStep, 0, 0, 1, 1, null); + $orderStepsObject = new OrderStepsObject(0,0,$currentStep, 0, 0, 1, 1, null, 0, null); $this->canUpdateOrderStep->passes($orderStepsObject); diff --git a/app/Classes/Modules/OrderSteps/Services/CreatesManyOrderSteps.php b/app/Classes/Modules/OrderSteps/Services/CreatesManyOrderSteps.php index 7771692d..54e2c295 100644 --- a/app/Classes/Modules/OrderSteps/Services/CreatesManyOrderSteps.php +++ b/app/Classes/Modules/OrderSteps/Services/CreatesManyOrderSteps.php @@ -21,7 +21,8 @@ class CreatesManyOrderSteps extends AbstractUpdateRecord 'primary' => $step->getPrimary(), 'sequence' => $step->getSequence(), 'status' => 0, - 'contract_status' => 0 + 'contract_status' => 0, + 'unity_hash_id' => $step->getHashId(), ]; } $order->orderSteps()->createMany($orderStepsModel); diff --git a/app/Models/OrderStep.php b/app/Models/OrderStep.php index ceedfee5..68995006 100644 --- a/app/Models/OrderStep.php +++ b/app/Models/OrderStep.php @@ -12,5 +12,5 @@ class OrderStep extends AbstractModel protected $dates = ['deleted_at']; - protected $fillable = ['order_id','appointee_id','reference','primary','sequence','status','contract_status','complete_date']; + protected $fillable = ['order_id','appointee_id','reference','primary','sequence','status','contract_status','complete_date','unity_hash_id']; } diff --git a/database/migrations/2021_08_03_014833_modify_order_steps.php b/database/migrations/2021_08_03_014833_modify_order_steps.php new file mode 100644 index 00000000..cc566a9a --- /dev/null +++ b/database/migrations/2021_08_03_014833_modify_order_steps.php @@ -0,0 +1,30 @@ +string('unity_hash_id',200)->nullable(true)->after('contract_status'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +}