diff --git a/packages/Webkul/SAASPreOrder/src/Commands/Console/GenerateData.php b/packages/Webkul/SAASPreOrder/src/Commands/Console/GenerateData.php
index 6a317f4af..9497eb9d2 100644
--- a/packages/Webkul/SAASPreOrder/src/Commands/Console/GenerateData.php
+++ b/packages/Webkul/SAASPreOrder/src/Commands/Console/GenerateData.php
@@ -9,6 +9,12 @@ use Webkul\Attribute\Repositories\AttributeRepository;
 use Webkul\Attribute\Repositories\AttributeFamilyRepository;
 use Validator;
 
+/**
+ * SAASPreOrderSeeder
+ *
+ * @author  Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
 class GenerateData extends Command
 {
     /**
diff --git a/packages/Webkul/SAASPreOrder/src/Http/Controllers/Shop/PreOrderController.php b/packages/Webkul/SAASPreOrder/src/Http/Controllers/Shop/PreOrderController.php
index 0d3edbfd4..1050878f7 100644
--- a/packages/Webkul/SAASPreOrder/src/Http/Controllers/Shop/PreOrderController.php
+++ b/packages/Webkul/SAASPreOrder/src/Http/Controllers/Shop/PreOrderController.php
@@ -45,7 +45,7 @@ class PreOrderController extends Controller
      *
      * @param  Webkul\Product\Repositories\ProductRepository       $productRepository
      * @param  Webkul\Sales\Repositories\OrderItemRepository       $orderItemRepository
-     * @param  Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
+     * @param  Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
      * @return void
      */
     public function __construct(
diff --git a/packages/Webkul/SAASPreOrder/src/Listeners/Cart.php b/packages/Webkul/SAASPreOrder/src/Listeners/Cart.php
index 3c2987e6f..88fccc784 100644
--- a/packages/Webkul/SAASPreOrder/src/Listeners/Cart.php
+++ b/packages/Webkul/SAASPreOrder/src/Listeners/Cart.php
@@ -41,7 +41,7 @@ class Cart
      *
      * @param  Webkul\Product\Helpers\Price                        $priceHelper
      * @param  Webkul\Product\Repositories\ProductRepository       $productRepository
-     * @param  Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
+     * @param  Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
      * @return void
      */
     public function __construct(
@@ -160,6 +160,14 @@ class Cart
         if (! request()->input('pre_order_payment')) {
             $product = $this->productRepository->find($cartItem->product_id);
 
+            if ($product->type == 'configurable') {
+                if (isset($cartItem->child->product_id)) {
+                    $product = $this->productRepository->find($cartItem->child->product_id);
+                } else {
+                    return;
+                }
+            }
+
             if ($product->totalQuantity() > 0 || ! $product->allow_preorder)
                 return;
 
diff --git a/packages/Webkul/SAASPreOrder/src/Listeners/Invoice.php b/packages/Webkul/SAASPreOrder/src/Listeners/Invoice.php
index 7933bd46e..308c5e4cb 100644
--- a/packages/Webkul/SAASPreOrder/src/Listeners/Invoice.php
+++ b/packages/Webkul/SAASPreOrder/src/Listeners/Invoice.php
@@ -30,7 +30,7 @@ class Invoice
     /**
      * Create a new Order event listener instance.
      *
-     * @param  Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
+     * @param  Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
      * @param  Webkul\Sales\Repositories\OrderRepository $orderRepository
      * @return void
      */
@@ -73,4 +73,4 @@ class Invoice
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/packages/Webkul/SAASPreOrder/src/Listeners/Order.php b/packages/Webkul/SAASPreOrder/src/Listeners/Order.php
index a5ff8efd2..cab5cec6a 100644
--- a/packages/Webkul/SAASPreOrder/src/Listeners/Order.php
+++ b/packages/Webkul/SAASPreOrder/src/Listeners/Order.php
@@ -32,7 +32,7 @@ class Order
      * Create a new Order event listener instance.
      *
      * @param  Webkul\Product\Helpers\Price                        $priceHelper
-     * @param  Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
+     * @param  Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
      * @return void
      */
     public function __construct(
diff --git a/packages/Webkul/SAASPreOrder/src/Observers/PreOrderObserver.php b/packages/Webkul/SAASPreOrder/src/Observers/SAASPreOrderObserver.php
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Observers/PreOrderObserver.php
rename to packages/Webkul/SAASPreOrder/src/Observers/SAASPreOrderObserver.php
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/admin/sales/orders/view.blade.php b/packages/Webkul/SAASPreOrder/src/Resources/views/admin/sales/orders/view.blade.php
index 32b0197f9..e20617f88 100644
--- a/packages/Webkul/SAASPreOrder/src/Resources/views/admin/sales/orders/view.blade.php
+++ b/packages/Webkul/SAASPreOrder/src/Resources/views/admin/sales/orders/view.blade.php
@@ -31,7 +31,7 @@
                     </a>
                 @endif
 
-                @if ($order->canShip() && ! app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->resetScope()->findOneByField('payment_order_item_id', $item->id))
+                @if ($order->canShip() && ! app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->isPreOrderPaymentOrder($order->id))
                     <a href="{{ route('admin.sales.shipments.create', $order->id) }}" class="btn btn-lg btn-primary">
                         {{ __('admin::app.sales.orders.shipment-btn-title') }}
                     </a>
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/view/product-add.blade.php b/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/view/product-add.blade.php
index 1903ae6ba..1e7a00908 100644
--- a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/view/product-add.blade.php
+++ b/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/view/product-add.blade.php
@@ -16,7 +16,7 @@
 
         @include ('shop::products.buy-now')
 
-        <button type="submit" class="btn btn-lg btn-primary pre-order-btn" style="width: 100%; display: none;">
+        <button type="submit" class="btn btn-lg btn-black pre-order-btn" style="width: 100%; display: none;">
             {{ __('preorder::app.shop.products.preorder') }}
         </button>
     @endif
diff --git a/resources/views/vendor/admin/sales/orders/view.blade.php b/resources/views/vendor/admin/sales/orders/view.blade.php
index adc395d8f..e20617f88 100644
--- a/resources/views/vendor/admin/sales/orders/view.blade.php
+++ b/resources/views/vendor/admin/sales/orders/view.blade.php
@@ -31,7 +31,7 @@
                     </a>
                 @endif
 
-                @if ($order->canShip())
+                @if ($order->canShip() && ! app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->isPreOrderPaymentOrder($order->id))
                     <a href="{{ route('admin.sales.shipments.create', $order->id) }}" class="btn btn-lg btn-primary">
                         {{ __('admin::app.sales.orders.shipment-btn-title') }}
                     </a>
diff --git a/resources/views/vendor/shop/customers/account/orders/view.blade.php b/resources/views/vendor/shop/customers/account/orders/view.blade.php
index f77967460..020760917 100755
--- a/resources/views/vendor/shop/customers/account/orders/view.blade.php
+++ b/resources/views/vendor/shop/customers/account/orders/view.blade.php
@@ -86,7 +86,7 @@
                                                     <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
                                                         {{ $item->name }}
 
-                                                        @if ($preOrderItem = $preOrderItemRepository->resetScope()->findOneByField('order_item_id', $item->id))
+                                                        @if ($preOrderItem = $preOrderItemRepository->findOneByField('order_item_id', $item->id))
                                                             <div class="pre-order-item-info">
                                                                 <span class="heading" @if($item->type == 'configurable')style="margin-top: 0"@endif>
                                                                     {{ __('preorder::app.shop.sales.orders.preorder-information') }}
@@ -114,7 +114,7 @@
                                                                     </span>
                                                                 @endif
                                                             </div>
-                                                        @elseif ($preOrderItem = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->resetScope()->findOneByField('payment_order_item_id', $item->id))
+                                                        @elseif ($preOrderItem = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->findOneByField('payment_order_item_id', $item->id))
                                                             <div class="pre-order-item-info">
                                                                 <span class="heading" @if($item->type == 'configurable')style="margin-top: 0"@endif>
                                                                     {{ __('preorder::app.shop.sales.orders.preorder-payment-information') }}
@@ -411,4 +411,4 @@
 
     </div>
 
-@endsection
+@endsection
\ No newline at end of file