diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php
index df7479293..3d868f873 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php
@@ -3,8 +3,8 @@
 namespace Webkul\Admin\Http\Controllers\Sales;
 
 use Webkul\Admin\Http\Controllers\Controller;
-use Webkul\Sales\Repositories\OrderRepository;
 use Webkul\Sales\Repositories\OrderItemRepository;
+use Webkul\Sales\Repositories\OrderRepository;
 use Webkul\Sales\Repositories\ShipmentRepository;
 
 class ShipmentController extends Controller
@@ -17,21 +17,21 @@ class ShipmentController extends Controller
     protected $_config;
 
     /**
-     * OrderRepository object
+     * Order repository instance.
      *
      * @var \Webkul\Sales\Repositories\OrderRepository
      */
     protected $orderRepository;
 
     /**
-     * OrderItemRepository object
+     * Order item repository instance.
      *
      * @var \Webkul\Sales\Repositories\OrderItemRepository
      */
     protected $orderItemRepository;
 
     /**
-     * ShipmentRepository object
+     * Shipment repository instance.
      *
      * @var \Webkul\Sales\Repositories\ShipmentRepository
      */
@@ -49,8 +49,7 @@ class ShipmentController extends Controller
         ShipmentRepository $shipmentRepository,
         OrderRepository $orderRepository,
         OrderItemRepository $orderItemRepository
-    )
-    {
+    ) {
         $this->middleware('admin');
 
         $this->_config = request('_config');
@@ -82,7 +81,7 @@ class ShipmentController extends Controller
     {
         $order = $this->orderRepository->findOrFail($orderId);
 
-        if (! $order->channel || !$order->canShip()) {
+        if (! $order->channel || ! $order->canShip()) {
             session()->flash('error', trans('admin::app.sales.shipments.creation-error'));
 
             return redirect()->back();
@@ -108,8 +107,8 @@ class ShipmentController extends Controller
         }
 
         $this->validate(request(), [
-            'shipment.source'        => 'required',
-            'shipment.items.*.*'     => 'required|numeric|min:0',
+            'shipment.source'    => 'required',
+            'shipment.items.*.*' => 'required|numeric|min:0',
         ]);
 
         $data = request()->all();
@@ -128,7 +127,7 @@ class ShipmentController extends Controller
     }
 
     /**
-     * Checks if requested quantity available or not
+     * Checks if requested quantity available or not.
      *
      * @param  array  $data
      * @return bool
@@ -136,7 +135,7 @@ class ShipmentController extends Controller
     public function isInventoryValidate(&$data)
     {
         if (! isset($data['shipment']['items'])) {
-            return ;
+            return;
         }
 
         $valid = false;
@@ -144,7 +143,9 @@ class ShipmentController extends Controller
         $inventorySourceId = $data['shipment']['source'];
 
         foreach ($data['shipment']['items'] as $itemId => $inventorySource) {
-            if ($qty = $inventorySource[$inventorySourceId]) {
+            $qty = $inventorySource[$inventorySourceId];
+
+            if ((int) $qty) {
                 $orderItem = $this->orderItemRepository->find($itemId);
 
                 if ($orderItem->qty_to_ship < $qty) {
@@ -169,8 +170,8 @@ class ShipmentController extends Controller
                     }
                 } else {
                     $availableQty = $orderItem->product->inventories()
-                            ->where('inventory_source_id', $inventorySourceId)
-                            ->sum('qty');
+                        ->where('inventory_source_id', $inventorySourceId)
+                        ->sum('qty');
 
                     if ($orderItem->qty_to_ship < $qty || $availableQty < $qty) {
                         return false;
diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
index 387b610e0..fc1036c3e 100755
--- a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
@@ -234,8 +234,8 @@ class InvoiceRepository extends Repository
      */
     public function haveProductToInvoice(array $data): bool
     {
-        foreach ($data['invoice']['items'] as $itemId => $qty) {
-            if ($qty) {
+        foreach ($data['invoice']['items'] as $qty) {
+            if ((int) $qty) {
                 return true;
             }
         }