From 52206b582f779c01135a92baf013250b2e9c47bc Mon Sep 17 00:00:00 2001 From: Glenn Hermans Date: Sun, 2 May 2021 19:18:30 +0200 Subject: [PATCH 1/2] Added optional custom order status --- .../src/Repositories/OrderRepository.php | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php index 462c94eb3..1f79f9ff5 100755 --- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php +++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php @@ -304,18 +304,22 @@ class OrderRepository extends Repository * @param \Webkul\Sales\Contracts\Order $order * @return void */ - public function updateOrderStatus($order) + public function updateOrderStatus($order, $orderState = null) { - $status = 'processing'; + if (!empty($orderState)){ + $status = $orderState; + } else { + $status = "processing"; - if ($this->isInCompletedState($order)) { - $status = 'completed'; - } + if ($this->isInCompletedState($order)) { + $status = 'completed'; + } - if ($this->isInCanceledState($order)) { - $status = 'canceled'; - } elseif ($this->isInClosedState($order)) { - $status = 'closed'; + if ($this->isInCanceledState($order)) { + $status = 'canceled'; + } elseif ($this->isInClosedState($order)) { + $status = 'closed'; + } } $order->status = $status; From db505d5551e60773d1af92e642e0d6b6066805c6 Mon Sep 17 00:00:00 2001 From: Glenn Hermans Date: Sun, 2 May 2021 19:39:03 +0200 Subject: [PATCH 2/2] fixed spacing --- packages/Webkul/Sales/src/Repositories/OrderRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php index 1f79f9ff5..598708204 100755 --- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php +++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php @@ -306,7 +306,7 @@ class OrderRepository extends Repository */ public function updateOrderStatus($order, $orderState = null) { - if (!empty($orderState)){ + if (!empty($orderState)) { $status = $orderState; } else { $status = "processing";