merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4837 from bagisto-europe/shipping 

Define a custom order status for shipments
This commit is contained in:
Glenn Hermans 2021-05-03 04:15:57 +02:00 committed by GitHub
parent fb48f61497 899d70483d
commit 60b40fc478
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
View File

@ -80,7 +80,9 @@ class InvoiceRepository extends Repository
}
/**
* @param array $data
* @param array $data
* @param string $invoiceState
* @param string $orderState
* @return \Webkul\Sales\Contracts\Invoice
*/
public function create(array $data, $invoiceState = null, $orderState = null)

1
packages/Webkul/Sales/src/Repositories/OrderRepository.php
View File

@ -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)

11
packages/Webkul/Sales/src/Repositories/ShipmentRepository.php
View File

@ -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;
}
}
}