From 0f4da659379cc7279517c5a2cfb45b1eb203fee9 Mon Sep 17 00:00:00 2001
From: Glenn Hermans <glhermans@gmail.com>
Date: Mon, 3 May 2021 02:03:28 +0200
Subject: [PATCH 1/5] Define custom order state on shipments

---
 .../Sales/src/Repositories/ShipmentRepository.php     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php b/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php
index 7005f292a..969114cdc 100755
--- a/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php
@@ -70,9 +70,10 @@ class ShipmentRepository extends Repository
 
     /**
      * @param  array  $data
+     * @param  string $orderState
      * @return \Webkul\Sales\Contracts\Shipment
      */
-    public function create(array $data)
+    public function create(array $data, $orderState = null)
     {
         DB::beginTransaction();
 
@@ -155,7 +156,11 @@ class ShipmentRepository extends Repository
                 'inventory_source_name' => $shipment->inventory_source->name,
             ]);
 
-            $this->orderRepository->updateOrderStatus($order);
+            if (isset($orderState)){
+                $this->orderRepository->updateOrderStatus($order, $orderState);
+            } else {
+                $this->orderRepository->updateOrderStatus($order);
+            }
 
             Event::dispatch('sales.shipment.save.after', $shipment);
         } catch (\Exception $e) {
@@ -168,4 +173,4 @@ class ShipmentRepository extends Repository
 
         return $shipment;
     }
-}
\ No newline at end of file
+}

From 06803fa8665de97600811585b115a692d409385e Mon Sep 17 00:00:00 2001
From: Glenn Hermans <glhermans@gmail.com>
Date: Mon, 3 May 2021 02:05:40 +0200
Subject: [PATCH 2/5] Updated php doc

---
 packages/Webkul/Sales/src/Repositories/OrderRepository.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
index 598708204..a46bad069 100755
--- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
@@ -302,6 +302,7 @@ class OrderRepository extends Repository
      * Update order status.
      *
      * @param  \Webkul\Sales\Contracts\Order  $order
+     * @param  string $orderState
      * @return void
      */
     public function updateOrderStatus($order, $orderState = null)

From e6c23a98109319d42d454f42074d2096821605c3 Mon Sep 17 00:00:00 2001
From: Glenn Hermans <glhermans@gmail.com>
Date: Mon, 3 May 2021 02:07:34 +0200
Subject: [PATCH 3/5] Added missing params

---
 packages/Webkul/Sales/src/Repositories/InvoiceRepository.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
index 8b667c997..a845d245d 100755
--- a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
@@ -82,6 +82,8 @@ class InvoiceRepository extends Repository
     /**
      * @param  array  $data
      * @return \Webkul\Sales\Contracts\Invoice
+     * @param  string $invoiceState
+     * @param  string $orderState
      */
     public function create(array $data, $invoiceState = null, $orderState = null)
     {

From b2fda6bea9489141affb3936d43ea3d417e922cd Mon Sep 17 00:00:00 2001
From: Glenn Hermans <glhermans@gmail.com>
Date: Mon, 3 May 2021 03:12:41 +0200
Subject: [PATCH 4/5] fixed order

---
 packages/Webkul/Sales/src/Repositories/InvoiceRepository.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
index a845d245d..4be69dffe 100755
--- a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
@@ -80,10 +80,10 @@ class InvoiceRepository extends Repository
     }
 
     /**
-     * @param  array  $data
-     * @return \Webkul\Sales\Contracts\Invoice
+     * @param  array  $data     
      * @param  string $invoiceState
      * @param  string $orderState
+     * @return \Webkul\Sales\Contracts\Invoice
      */
     public function create(array $data, $invoiceState = null, $orderState = null)
     {

From 899d70483d2f4a815b7e4e65eba92307d690dbf0 Mon Sep 17 00:00:00 2001
From: Glenn Hermans <glhermans@gmail.com>
Date: Mon, 3 May 2021 03:22:24 +0200
Subject: [PATCH 5/5] Added missing space

---
 packages/Webkul/Sales/src/Repositories/ShipmentRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php b/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php
index 969114cdc..c8bd5b0cf 100755
--- a/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php
@@ -156,7 +156,7 @@ class ShipmentRepository extends Repository
                 'inventory_source_name' => $shipment->inventory_source->name,
             ]);
 
-            if (isset($orderState)){
+            if (isset($orderState)) {
                 $this->orderRepository->updateOrderStatus($order, $orderState);
             } else {
                 $this->orderRepository->updateOrderStatus($order);