diff --git a/packages/Webkul/Admin/src/Mail/CancelOrderNotification.php b/packages/Webkul/Admin/src/Mail/CancelOrderNotification.php
index efdcb65d5..d934817d5 100644
--- a/packages/Webkul/Admin/src/Mail/CancelOrderNotification.php
+++ b/packages/Webkul/Admin/src/Mail/CancelOrderNotification.php
@@ -28,8 +28,8 @@ class CancelOrderNotification extends Mailable
     public function build()
     {
         return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name'])
-            ->to($this->order->customer_email, $this->order->customer_full_name)
-            ->subject(trans('shop::app.mail.order.cancel.subject'))
-            ->view('shop::emails.sales.order-cancel');
+                    ->to($this->order->customer_email, $this->order->customer_full_name)
+                    ->subject(trans('shop::app.mail.order.cancel.subject'))
+                    ->view('shop::emails.sales.order-cancel');
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Mail/NewAdminNotification.php b/packages/Webkul/Admin/src/Mail/NewAdminNotification.php
index 7329cbe35..d3cbb6303 100644
--- a/packages/Webkul/Admin/src/Mail/NewAdminNotification.php
+++ b/packages/Webkul/Admin/src/Mail/NewAdminNotification.php
@@ -37,8 +37,8 @@ class NewAdminNotification extends Mailable
     public function build()
     {
         return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name'])
-            ->to(core()->getAdminEmailDetails()['email'])
-            ->subject(trans('shop::app.mail.order.subject'))
-            ->view('shop::emails.sales.new-admin-order');
+                    ->to(core()->getAdminEmailDetails()['email'])
+                    ->subject(trans('shop::app.mail.order.subject'))
+                    ->view('shop::emails.sales.new-admin-order');
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Mail/NewCustomerNotification.php b/packages/Webkul/Admin/src/Mail/NewCustomerNotification.php
index 7a29f5484..71cffe6c1 100644
--- a/packages/Webkul/Admin/src/Mail/NewCustomerNotification.php
+++ b/packages/Webkul/Admin/src/Mail/NewCustomerNotification.php
@@ -50,8 +50,8 @@ class NewCustomerNotification extends Mailable
     public function build()
     {
         return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name'])
-            ->to($this->customer->email)
-            ->subject(trans('shop::app.mail.customer.new.subject'))
-            ->view('shop::emails.customer.new-customer')->with(['customer' => $this->customer, 'password' => $this->password]);
+                    ->to($this->customer->email)
+                    ->subject(trans('shop::app.mail.customer.new.subject'))
+                    ->view('shop::emails.customer.new-customer')->with(['customer' => $this->customer, 'password' => $this->password]);
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php b/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php
index 5ef23bd5e..e75d820dd 100644
--- a/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php
+++ b/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php
@@ -41,8 +41,8 @@ class NewInventorySourceNotification extends Mailable
         $inventory = $this->shipment->inventory_source;
 
         return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name'])
-            ->to($inventory->contact_email, $inventory->name)
-            ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id]))
-            ->view('shop::emails.sales.new-inventorysource-shipment');
+                    ->to($inventory->contact_email, $inventory->name)
+                    ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id]))
+                    ->view('shop::emails.sales.new-inventorysource-shipment');
     }
 }
diff --git a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php
index e7c45ce93..bea555d7d 100755
--- a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php
+++ b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php
@@ -39,8 +39,8 @@ class NewInvoiceNotification extends Mailable
         $order = $this->invoice->order;
 
         return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name'])
-            ->to($order->customer_email, $order->customer_full_name)
-            ->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->increment_id]))
-            ->view('shop::emails.sales.new-invoice');
+                    ->to($order->customer_email, $order->customer_full_name)
+                    ->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->increment_id]))
+                    ->view('shop::emails.sales.new-invoice');
     }
 }
diff --git a/packages/Webkul/Admin/src/Mail/NewOrderNotification.php b/packages/Webkul/Admin/src/Mail/NewOrderNotification.php
index 30c2e8101..e98a5fc9a 100755
--- a/packages/Webkul/Admin/src/Mail/NewOrderNotification.php
+++ b/packages/Webkul/Admin/src/Mail/NewOrderNotification.php
@@ -37,8 +37,8 @@ class NewOrderNotification extends Mailable
     public function build()
     {
         return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name'])
-            ->to($this->order->customer_email, $this->order->customer_full_name)
-            ->subject(trans('shop::app.mail.order.subject'))
-            ->view('shop::emails.sales.new-order');
+                    ->to($this->order->customer_email, $this->order->customer_full_name)
+                    ->subject(trans('shop::app.mail.order.subject'))
+                    ->view('shop::emails.sales.new-order');
     }
 }
diff --git a/packages/Webkul/Admin/src/Mail/NewRefundNotification.php b/packages/Webkul/Admin/src/Mail/NewRefundNotification.php
index 3d7cb473c..3da428348 100644
--- a/packages/Webkul/Admin/src/Mail/NewRefundNotification.php
+++ b/packages/Webkul/Admin/src/Mail/NewRefundNotification.php
@@ -39,8 +39,8 @@ class NewRefundNotification extends Mailable
         $order = $this->refund->order;
 
         return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name'])
-            ->to($order->customer_email, $order->customer_full_name)
-            ->subject(trans('shop::app.mail.refund.subject', ['order_id' => $order->increment_id]))
-            ->view('shop::emails.sales.new-refund');
+                    ->to($order->customer_email, $order->customer_full_name)
+                    ->subject(trans('shop::app.mail.refund.subject', ['order_id' => $order->increment_id]))
+                    ->view('shop::emails.sales.new-refund');
     }
 }
diff --git a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php
index ab7b65fd8..c19460c1c 100755
--- a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php
+++ b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php
@@ -39,8 +39,8 @@ class NewShipmentNotification extends Mailable
         $order = $this->shipment->order;
 
         return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name'])
-            ->to($order->customer_email, $order->customer_full_name)
-            ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id]))
-            ->view('shop::emails.sales.new-shipment');
+                    ->to($order->customer_email, $order->customer_full_name)
+                    ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id]))
+                    ->view('shop::emails.sales.new-shipment');
     }
 }
diff --git a/packages/Webkul/Sales/src/Repositories/RefundItemRepository.php b/packages/Webkul/Sales/src/Repositories/RefundItemRepository.php
index 849be742c..44def98dc 100644
--- a/packages/Webkul/Sales/src/Repositories/RefundItemRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/RefundItemRepository.php
@@ -49,8 +49,8 @@ class RefundItemRepository extends Repository
 
                     if ($orderItem->parent) {
                         $shippedQty = $orderItem->qty_ordered
-                                ? ($orderItem->qty_ordered / $orderItem->parent->qty_ordered) * $shipmentItem->qty
-                                : $orderItem->parent->qty_ordered;
+                                      ? ($orderItem->qty_ordered / $orderItem->parent->qty_ordered) * $shipmentItem->qty
+                                      : $orderItem->parent->qty_ordered;
                     } else {
                         $shippedQty = $shipmentItem->qty;
                     }
@@ -69,7 +69,9 @@ class RefundItemRepository extends Repository
 
                 $quantity -= $totalShippedQtyToRefund;
             }
-        } elseif ($orderItem->getTypeInstance()->showQuantityBox()) {
+        } elseif (! $orderItem->getTypeInstance()->isStockable()
+                  && $orderItem->getTypeInstance()->showQuantityBox()
+        ) {
             $inventory = $orderItem->product->inventories()
                                             // ->where('vendor_id', $data['vendor_id'])
                                             ->whereIn('inventory_source_id', $orderItem->order->channel->inventory_sources()->pluck('id'))