From 1c1dc3c83484008b65cb8fec0e8b2e0120d930cd Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Sat, 29 Jun 2019 19:34:04 +0530 Subject: [PATCH] fixed issue with preorder button not coming on storefront --- .../SAASPreOrder/src/Repositories/PreOrderItemRepository.php | 2 ++ .../src/Resources/views/customers/account/orders/view.blade.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/SAASPreOrder/src/Repositories/PreOrderItemRepository.php b/packages/Webkul/SAASPreOrder/src/Repositories/PreOrderItemRepository.php index 8db7e1270..bdad9d121 100755 --- a/packages/Webkul/SAASPreOrder/src/Repositories/PreOrderItemRepository.php +++ b/packages/Webkul/SAASPreOrder/src/Repositories/PreOrderItemRepository.php @@ -53,6 +53,8 @@ class PreOrderItemRepository extends Repository */ public function canBeComplete($orderItem) { + $this->resetScope(); + $preOrderItem = $this->findOneByField('order_item_id', $orderItem->id); if (! $preOrderItem || $preOrderItem->status == 'completed') diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php index fa5901a6b..de912d92f 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php @@ -86,7 +86,7 @@ {{ $item->name }} - @if ($preOrderItem = $preOrderItemRepository->findOneByField('order_item_id', $item->id)) + @if ($preOrderItem = $preOrderItemRepository->resetScope()->findOneByField('order_item_id', $item->id))
type == 'configurable')style="margin-top: 0"@endif> {{ __('preorder::app.shop.sales.orders.preorder-information') }}