From c3622fa53b18840bedac5ecc76c0f0bf3d0ea0ae Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Thu, 4 Jul 2019 14:29:49 +0530
Subject: [PATCH] Fixed bug related to preorder

---
 .../Webkul/SAASPreOrder/src/Listeners/Order.php     | 13 +++++++++++--
 .../views/admin/sales/orders/view.blade.php         |  6 +++---
 .../shop/customers/account/orders/view.blade.php    |  4 ++--
 .../shop/customers/account/orders/view.blade.php    |  4 ++--
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/packages/Webkul/SAASPreOrder/src/Listeners/Order.php b/packages/Webkul/SAASPreOrder/src/Listeners/Order.php
index cab5cec6a..2d59c7585 100644
--- a/packages/Webkul/SAASPreOrder/src/Listeners/Order.php
+++ b/packages/Webkul/SAASPreOrder/src/Listeners/Order.php
@@ -61,8 +61,17 @@ class Order
                     'payment_order_item_id' => $item->id
                 ], $preOrderItem->id);
             } else {
-                if ($item->product->totalQuantity() > 0 || ! $item->product->allow_preorder)
-                    continue;
+                if ($item->product->type == 'configurable') {
+                    if (isset($item->child->product_id)) {
+                        if ($item->child->product->totalQuantity() > 0 || ! $item->child->product->allow_preorder)
+                            continue;
+                    } else {
+                        return;
+                    }
+                } else {
+                    if ($item->product->totalQuantity() > 0 || ! $item->product->allow_preorder)
+                        continue;
+                }
 
                 if (core()->getConfigData('preorder.settings.general.preorder_type') == 'partial') {
                     $preOrderType = 'partial';
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 e20617f88..065ec8bd8 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')->isPreOrderPaymentOrder($order->id))
+                @if ($order->canShip() && ! app('Webkul\PreOrder\Repositories\PreOrderItemRepository')->resetScope()->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>
@@ -46,7 +46,7 @@
                     <div class="sale-container">
 
                         <?php
-                            $preOrderItemRepository = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository');
+                            $preOrderItemRepository = app('Webkul\PreOrder\Repositories\PreOrderItemRepository');
 
                             $havePreOrderItems = $preOrderItemRepository->havePreOrderItems($order->id);
                         ?>
@@ -296,7 +296,7 @@
                                                                     </span>
                                                                 @endif
                                                             </div>
-                                                        @elseif ($preOrderItem = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->findOneByField('payment_order_item_id', $item->id))
+                                                        @elseif ($preOrderItem = app('Webkul\PreOrder\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.admin.sales.orders.preorder-payment-information') }}
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/customers/account/orders/view.blade.php b/packages/Webkul/SAASPreOrder/src/Resources/views/shop/customers/account/orders/view.blade.php
index 020760917..a5a1b8764 100644
--- a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/customers/account/orders/view.blade.php
+++ b/packages/Webkul/SAASPreOrder/src/Resources/views/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->findOneByField('order_item_id', $item->id))
+                                                        @if ($preOrderItem = $preOrderItemRepository->resetScope()->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')->findOneByField('payment_order_item_id', $item->id))
+                                                        @elseif ($preOrderItem = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->resetScope()->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') }}
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 020760917..a5a1b8764 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->findOneByField('order_item_id', $item->id))
+                                                        @if ($preOrderItem = $preOrderItemRepository->resetScope()->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')->findOneByField('payment_order_item_id', $item->id))
+                                                        @elseif ($preOrderItem = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->resetScope()->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') }}