From 07e90ae0f46176efd055efb2c20ddedb8097dc8d Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Sat, 29 Jun 2019 20:40:28 +0530
Subject: [PATCH] git add .

---
 .env.example                                       | 14 +++++++-------
 .../SAASPreOrder/src/DataGrids/Admin/Order.php     |  2 +-
 .../src/Repositories/PreOrderItemRepository.php    |  8 ++++----
 .../views/customers/account/orders/view.blade.php  |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.env.example b/.env.example
index e119dd364..5e31a2f04 100644
--- a/.env.example
+++ b/.env.example
@@ -1,18 +1,18 @@
 APP_NAME=Razzo
 APP_ENV=local
 APP_VERSION=0.1.6
-APP_KEY=base64:uHLkdcrc7RN8pzmDeJNtZrHCI6NmuCXETdocCr1ogAY=
+APP_KEY=
 APP_DEBUG=true
-APP_URL=http://bagsaas.com
+APP_URL=http://yourdomain.com
 
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=bagsaas1
-DB_USERNAME=root
-DB_PASSWORD=12345678
+DB_DATABASE=
+DB_USERNAME=
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -31,8 +31,8 @@ MAIL_USERNAME=
 MAIL_PASSWORD=
 MAIL_ENCRYPTION=tls
 
-SHOP_MAIL_FROM=shop@bagsaas.com
-ADMIN_MAIL_TO=admin@bagsaas.com
+SHOP_MAIL_FROM=
+ADMIN_MAIL_TO=
 
 STRIPE_ENABLE_TESTING=
 STRIPE_TEST_PUBLISHABLE_KEY=
diff --git a/packages/Webkul/SAASPreOrder/src/DataGrids/Admin/Order.php b/packages/Webkul/SAASPreOrder/src/DataGrids/Admin/Order.php
index ff6bbcf77..8728fe590 100644
--- a/packages/Webkul/SAASPreOrder/src/DataGrids/Admin/Order.php
+++ b/packages/Webkul/SAASPreOrder/src/DataGrids/Admin/Order.php
@@ -142,7 +142,7 @@ class Order extends DataGrid
             'index' => 'is_preorder',
             'label' => trans('preorder::app.datagrid.order-type'),
             'type' => 'string',
-            'searchable' => true,
+            'searchable' => false,
             'sortable' => true,
             'filterable' => true,
             'wrapper' => function ($row) {
diff --git a/packages/Webkul/SAASPreOrder/src/Repositories/PreOrderItemRepository.php b/packages/Webkul/SAASPreOrder/src/Repositories/PreOrderItemRepository.php
index bdad9d121..3df38097b 100755
--- a/packages/Webkul/SAASPreOrder/src/Repositories/PreOrderItemRepository.php
+++ b/packages/Webkul/SAASPreOrder/src/Repositories/PreOrderItemRepository.php
@@ -27,9 +27,9 @@ class PreOrderItemRepository extends Repository
      * @param integer $orderId
      * @return boolean
      */
-    public function havePreOrderItems($orderId)
+    public function isPreOrderPaymentOrder($orderId)
     {
-        return $this->scopeQuery(function ($query) use ($orderId) {
+        return $this->resetScope()->scopeQuery(function ($query) use ($orderId) {
             return $query->leftJoin('order_items', 'pre_order_items.payment_order_item_id', '=', 'order_items.id')
                 ->leftJoin('orders', 'order_items.order_id', '=', 'orders.id')
                 ->where('orders.id', $orderId);
@@ -40,9 +40,9 @@ class PreOrderItemRepository extends Repository
      * @param integer $orderId
      * @return boolean
      */
-    public function isPreOrderPaymentOrder($orderId)
+    public function havePreOrderItems($orderId)
     {
-        return $this->scopeQuery(function ($query) use ($orderId) {
+        return $this->resetScope()->scopeQuery(function ($query) use ($orderId) {
             return $query->where('pre_order_items.order_id', $orderId);
         })->count();
     }
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 de912d92f..fa5901a6b 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 @@
                                                     <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') }}