From 1cd59b4b867f92dc76cf9083511e5c19f8ce5b05 Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Mon, 29 Oct 2018 14:51:59 +0530
Subject: [PATCH 1/5] Webkul copyright text, Search now working on product
 names only with a dedicated page for displaying results

---
 packages/Webkul/Core/src/Models/Search.php    |  9 --
 .../src/Repositories/SearchRepository.php     |  4 +-
 .../src/Http/Controllers/SearchController.php |  9 +-
 .../Shop/src/Resources/assets/sass/app.scss   | 95 +++++++++++--------
 .../Webkul/Shop/src/Resources/lang/en/app.php |  4 +-
 .../views/layouts/footer/footer.blade.php     |  2 +-
 .../Resources/views/layouts/master.blade.php  |  5 +
 .../Resources/views/search/search.blade.php   | 28 +++++-
 8 files changed, 101 insertions(+), 55 deletions(-)
 delete mode 100644 packages/Webkul/Core/src/Models/Search.php
 rename packages/Webkul/{Core => Product}/src/Repositories/SearchRepository.php (93%)

diff --git a/packages/Webkul/Core/src/Models/Search.php b/packages/Webkul/Core/src/Models/Search.php
deleted file mode 100644
index 218bb83f9..000000000
--- a/packages/Webkul/Core/src/Models/Search.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Webkul\Core\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Search extends Model
-{
-}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Repositories/SearchRepository.php b/packages/Webkul/Product/src/Repositories/SearchRepository.php
similarity index 93%
rename from packages/Webkul/Core/src/Repositories/SearchRepository.php
rename to packages/Webkul/Product/src/Repositories/SearchRepository.php
index 37d4dabb6..0b1e1eea2 100644
--- a/packages/Webkul/Core/src/Repositories/SearchRepository.php
+++ b/packages/Webkul/Product/src/Repositories/SearchRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Core\Repositories;
+namespace Webkul\Product\Repositories;
 
 use Illuminate\Container\Container as App;
 
@@ -46,6 +46,6 @@ class SearchRepository extends Repository
 
         $products = $this->product->searchProductByAttribute($term);
 
-        dd($products);
+        return $products;
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Http/Controllers/SearchController.php b/packages/Webkul/Shop/src/Http/Controllers/SearchController.php
index 9733142a1..d03ca4989 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/SearchController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/SearchController.php
@@ -6,7 +6,7 @@ use Webkul\Shop\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
-use Webkul\Core\Repositories\SearchRepository as Search;
+use Webkul\Product\Repositories\SearchRepository as Search;
 
 /**
  * Search controller
@@ -31,15 +31,16 @@ use Webkul\Core\Repositories\SearchRepository as Search;
     /**
      * Index to handle the view loaded with the search results
      */
-    public function index() {
+    public function index()
+    {
         $results = null;
 
         $results = $this->search->search(request()->all());
 
         if($results) {
-            return view($this->_config['view'])->with('results', $results);
+            return view($this->_config['view'])->with('products', $results);
         } else {
-            return view($this->_config['view'])->with('results', null);
+            return view($this->_config['view'])->with('products', null);
         }
 
     }
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 7a62ba1ff..59e2aab07 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -316,6 +316,14 @@ input {
     display: block;
     width: 100%;
 }
+//no search results
+.search-result-status {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
 
 //main store front layouting
 .main-container-wrapper {
@@ -346,27 +354,6 @@ input {
         grid-auto-rows: auto;
     }
 
-    @media only screen and (max-width: 551px) {
-        .product-grid-3 {
-            grid-template-columns: 48.5% 48.5%;
-            grid-column-gap: 20px;
-        }
-    }
-
-    @media only screen and (max-width: 854px) {
-        .product-grid-4 {
-            grid-template-columns: 29.5% 29.5% 29.5%;
-            grid-column-gap: 35px;
-        }
-    }
-
-    @media only screen and (max-width: 653px) {
-        .product-grid-4 {
-            grid-template-columns: 48.5% 48.5%;
-            grid-column-gap: 17px;
-        }
-    }
-
     .product-card {
         position: relative;
 
@@ -442,21 +429,6 @@ input {
         }
     }
 
-    @media only screen and (max-width: 425px) {
-        .product-card {
-            font-size: 90%;
-
-            .btn.btn-md {
-                padding: 5px;
-            }
-        }
-
-        .product-grid-4 {
-            grid-template-columns: 48.5% 48.5%;
-            grid-column-gap: 10px;
-        }
-    }
-
     .product-list {
         min-height: 200px;
 
@@ -560,6 +532,42 @@ input {
         }
     }
 }
+//product components
+@media only screen and (max-width: 551px) {
+    .product-grid-3 {
+        grid-template-columns: 48.5% 48.5%;
+        grid-column-gap: 20px;
+    }
+}
+
+@media only screen and (max-width: 854px) {
+    .product-grid-4 {
+        grid-template-columns: 29.5% 29.5% 29.5%;
+        grid-column-gap: 35px;
+    }
+}
+
+@media only screen and (max-width: 653px) {
+    .product-grid-4 {
+        grid-template-columns: 48.5% 48.5%;
+        grid-column-gap: 17px;
+    }
+}
+
+@media only screen and (max-width: 425px) {
+    .product-card {
+        font-size: 90%;
+
+        .btn.btn-md {
+            padding: 5px;
+        }
+    }
+
+    .product-grid-4 {
+        grid-template-columns: 48.5% 48.5%;
+        grid-column-gap: 10px;
+    }
+}
 
 //slider styles
 section.slider-block {
@@ -1158,7 +1166,7 @@ section.slider-block {
     }
 }
 
-//footer responsive with out media query.
+//footer
 .footer {
     background-color: $background-color;
     padding-left: 10%;
@@ -1242,6 +1250,19 @@ section.slider-block {
     }
 }
 
+.footer-bottom {
+    margin-top: -16px;
+    width: 100%;
+    height: 120px;
+    font-size: 16px;
+    color: #A5A5A5;
+    letter-spacing: -0.26px;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+}
+
 //category page
 .main {
     .category-container {
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index b5e6e0d8d..cf7838409 100644
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -26,7 +26,9 @@ return [
 
     'search' => [
         'no-results' => 'No Results Found.',
-        'page-title' => 'Bagisto - Search'
+        'page-title' => 'Bagisto - Search',
+        'found-results' => 'Search Results Found',
+        'found-result' => 'Search Result Found'
     ],
 
     'reviews' => [
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php
index 9160d3027..2ca601ca4 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php
@@ -70,4 +70,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
index 10fa05c1f..a9e591313 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
@@ -46,6 +46,11 @@
         </div>
 
         @include('shop::layouts.footer.footer')
+        <div class="footer-bottom">
+            <p>
+                © Copyright 2018 Webkul Software, All rights reserved.
+            </p>
+        </div>
 
     </div>
     <script type="text/javascript">
diff --git a/packages/Webkul/Shop/src/Resources/views/search/search.blade.php b/packages/Webkul/Shop/src/Resources/views/search/search.blade.php
index deb5c3fe4..a394f2ad1 100644
--- a/packages/Webkul/Shop/src/Resources/views/search/search.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/search/search.blade.php
@@ -5,7 +5,33 @@
 @endsection
 
 @section('content-wrapper')
-    @if(!$results)
+    @if(!$products)
         {{  __('shop::app.search.no-results') }}
     @endif
+    <div class="main mb-30" style="min-height: 27vh;">
+        @if($products->isEmpty())
+            <div class="search-result-status">
+                <h2>{{ __('shop::app.products.whoops') }}</h2>
+                <span>{{ __('shop::app.search.no-results') }}</span>
+            </div>
+        @else
+            @if($products->count() == 1)
+                <div class="search-result-status mb-20">
+                    <span><b>{{ $products->count() }} </b>{{ __('shop::app.search.found-result') }}</span>
+                </div>
+            @else
+                <div class="search-result-status mb-20">
+                    <span><b>{{ $products->count() }} </b>{{ __('shop::app.search.found-results') }}</span>
+                </div>
+            @endif
+            {{-- @include ('shop::products.list.toolbar')
+
+            @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar') --}}
+            <div class="product-grid-4">
+                @foreach ($products as $product)
+                    @include ('shop::products.list.card', ['product' => $product])
+                @endforeach
+            </div>
+        @endif
+    </div>
 @endsection

From e59f5a775b4ce14496ad149720ed4c8e276cffde Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Tue, 30 Oct 2018 10:01:01 +0530
Subject: [PATCH 2/5] Order Grid, Wishlist Bug Fixes

---
 .../Admin/src/DataGrids/OrderDataGrid.php     |  6 ++
 packages/Webkul/Checkout/src/Cart.php         | 52 ++++++++++--
 .../src/Http/Controllers/CartController.php   | 12 +++
 packages/Webkul/Shop/src/Http/routes.php      |  3 +
 .../Shop/src/Resources/assets/sass/app.scss   | 81 +++++++++++--------
 .../Webkul/Shop/src/Resources/lang/en/app.php |  4 +
 .../views/checkout/cart/index.blade.php       | 11 ++-
 .../Resources/views/layouts/master.blade.php  |  3 +-
 8 files changed, 127 insertions(+), 45 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
index 1ac188592..862e73a87 100644
--- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
@@ -90,6 +90,12 @@ class OrderDataGrid
                     'wrapper' => function ($value) {
                         return core()->currency($value);
                     }
+                ], [
+                    'name' => 'or.created_at',
+                    'alias' => 'created_at',
+                    'type' => 'string',
+                    'label' => 'Order Date',
+                    'sortable' => false,
                 ], [
                     'name' => 'or.status',
                     'alias' => 'orstatus',
diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index f9bb47978..3a969547d 100644
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -10,6 +10,7 @@ use Webkul\Customer\Repositories\CustomerRepository;
 use Webkul\Product\Repositories\ProductRepository;
 use Webkul\Tax\Repositories\TaxCategoryRepository;
 use Webkul\Checkout\Models\CartPayment;
+use Webkul\Customer\Repositories\WishlistRepository;
 
 /**
  * Facade for all the methods to be implemented in Cart.
@@ -62,6 +63,13 @@ class Cart {
      */
     protected $taxCategory;
 
+    /**
+     * WishlistRepository model
+     *
+     * @var mixed
+     */
+    protected $wishlist;
+
     /**
      * Create a new controller instance.
      *
@@ -79,7 +87,8 @@ class Cart {
         CartAddressRepository $cartAddress,
         CustomerRepository $customer,
         ProductRepository $product,
-        TaxCategoryRepository $taxCategory
+        TaxCategoryRepository $taxCategory,
+        WishlistRepository $wishlist
     )
     {
         $this->customer = $customer;
@@ -93,6 +102,8 @@ class Cart {
         $this->product = $product;
 
         $this->taxCategory = $taxCategory;
+
+        $this->wishlist = $wishlist;
     }
 
     /**
@@ -700,6 +711,7 @@ class Cart {
 
         $labels = [];
 
+        $attribute = $product->parent->super_attributes;
         foreach($product->parent->super_attributes as $attribute) {
             $option = $attribute->options()->where('id', $product->{$attribute->code})->first();
 
@@ -1178,11 +1190,17 @@ class Cart {
 
         unset($productAddtionalData['html']);
 
-        $additional = [
-            'request' => $childData,
-            'variant_id' => $productId,
-            'attributes' => $productAddtionalData
-        ];
+        // $additional = [
+        //     'request' => $childData,
+        //     'variant_id' => $productId,
+        //     'attributes' => $productAddtionalData
+        // ];
+        $additional['_token'] = null;
+        $additional['product'] = $product->id;
+        $additional['quantity'] = 1;
+        $additional['is_configurable'] = true;
+        $additional['selected_configurable_option'] = $child->id;
+        $additional['super_attributes'] = $productAddtionalData;
 
         $parentData = [
             'sku' => $product->sku,
@@ -1199,10 +1217,30 @@ class Cart {
             'base_total_weight' => $weight,
             'additional' => $additional
         ];
-
+        // dd(['parent' => $parentData, 'child' => $childData]);
         return ['parent' => $parentData, 'child' => $childData];
     }
 
+    /**
+     * Function to move a already added product to wishlist
+     * will run only on customer authentication.
+     *
+     * @param instance cartItem $id
+     */
+    public function moveToWishlist($itemId) {
+        $item = $this->findOneByField($itemId);
+
+        if(!$item)
+            return false;
+
+        if($item->parent_id == 'null' ||$item->parent_id == null) {
+            $variantSku = $item->child->sku;
+            $variantName = $item->child->name;
+        } else {
+
+        }
+    }
+
     /**
      * Handle the buy now process for simple as well as configurable products
      *
diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
index 5bd465823..682cf0026 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
@@ -150,4 +150,16 @@ class CartController extends Controller
             return redirect()->back();
         }
     }
+
+    /**
+     * Function to move a already added product to wishlist
+     * will run only on customer authentication.
+     *
+     * @param instance cartItem $id
+     */
+    public function moveToWishlist($id) {
+        $result = Cart::moveToWishlist($id);
+
+        dd($result);
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index c0eaf2540..164530f1e 100644
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -67,6 +67,9 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function
     //Shop buynow button action
     Route::get('buynow/{id}', 'Webkul\Shop\Http\Controllers\CartController@test')->name('shop.product.buynow');
 
+    //Shop buynow button action
+    Route::get('move/cart/{id}', 'Webkul\Shop\Http\Controllers\CartController@moveToWishlist')->name('shop.movetowishlist');
+
     //Show Product Details Page(For individually Viewable Product)
     Route::get('/products/{slug}', 'Webkul\Shop\Http\Controllers\ProductController@index')->defaults('_config', [
         'view' => 'shop::products.view'
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 59e2aab07..593048e70 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -429,6 +429,48 @@ input {
         }
     }
 
+    @media only screen and (max-width: 580px) {
+        .main-container-wrapper {
+            padding: 0px;
+        }
+    }
+    //product components
+    @media only screen and (max-width: 551px) {
+        .product-grid-3 {
+            grid-template-columns: 48.5% 48.5%;
+            grid-column-gap: 20px;
+        }
+    }
+
+    @media only screen and (max-width: 854px) {
+        .product-grid-4 {
+            grid-template-columns: 29.5% 29.5% 29.5%;
+            grid-column-gap: 35px;
+        }
+    }
+
+    @media only screen and (max-width: 653px) {
+        .product-grid-4 {
+            grid-template-columns: 48.5% 48.5%;
+            grid-column-gap: 17px;
+        }
+    }
+
+    @media only screen and (max-width: 425px) {
+        .product-card {
+            font-size: 90%;
+
+            .btn.btn-md {
+                padding: 5px;
+            }
+        }
+
+        .product-grid-4 {
+            grid-template-columns: 48.5% 48.5%;
+            grid-column-gap: 10px;
+        }
+    }
+
     .product-list {
         min-height: 200px;
 
@@ -532,40 +574,11 @@ input {
         }
     }
 }
-//product components
-@media only screen and (max-width: 551px) {
-    .product-grid-3 {
-        grid-template-columns: 48.5% 48.5%;
-        grid-column-gap: 20px;
-    }
-}
 
-@media only screen and (max-width: 854px) {
-    .product-grid-4 {
-        grid-template-columns: 29.5% 29.5% 29.5%;
-        grid-column-gap: 35px;
-    }
-}
-
-@media only screen and (max-width: 653px) {
-    .product-grid-4 {
-        grid-template-columns: 48.5% 48.5%;
-        grid-column-gap: 17px;
-    }
-}
-
-@media only screen and (max-width: 425px) {
-    .product-card {
-        font-size: 90%;
-
-        .btn.btn-md {
-            padding: 5px;
-        }
-    }
-
-    .product-grid-4 {
-        grid-template-columns: 48.5% 48.5%;
-        grid-column-gap: 10px;
+@media only screen and (max-width: 530px) {
+    .main-container-wrapper {
+        padding-left: 0px;
+        padding-right: 0px;
     }
 }
 
@@ -2649,7 +2662,7 @@ section.review {
 
         border: 1px solid $border-color;
         flex-direction: column;
-        max-width: 530px;
+        max-width: 500px;
         min-width: 380px;
         padding: 25px;
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index cf7838409..a1141aedf 100644
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -380,4 +380,8 @@ return [
             'thanks' => 'Thanks!'
         ]
     ],
+
+    'webkul' => [
+        'copy-right' => '© Copyright 2018 Webkul Software, All rights reserved.'
+    ]
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
index 000577c97..f1adab0a1 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
@@ -67,9 +67,16 @@
 
                                             <span class="control-error" v-if="errors.has('qty[{{$item->id}}]')">@{{ errors.first('qty') }}</span>
 
-                                            <span class="remove"><a href="{{ route('shop.checkout.cart.remove', $item->id) }}">{{ __('shop::app.checkout.cart.remove-link') }}</a></span>
+                                            <span class="remove">
+                                                <a href="{{ route('shop.checkout.cart.remove', $item->id) }}">{{ __('shop::app.checkout.cart.remove-link') }}</a></span>
 
-                                            <span class="towishlist">{{ __('shop::app.checkout.cart.move-to-wishlist') }}</span>
+                                            <span class="towishlist">
+                                                @if($item->parent_id != 'null' ||$item->parent_id != null)
+                                                    <a href="{{ route('shop.movetowishlist', $item->id) }}">{{ __('shop::app.checkout.cart.move-to-wishlist') }}</a>
+                                                @else
+                                                    <a href="{{ route('shop.movetowishlist', $item->child->id) }}">{{ __('shop::app.checkout.cart.move-to-wishlist') }}</a>
+                                                @endif
+                                            </span>
                                         </div>
 
                                         @if (!cart()->isItemHaveQuantity($item))
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
index a9e591313..5a922f71c 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
@@ -48,10 +48,9 @@
         @include('shop::layouts.footer.footer')
         <div class="footer-bottom">
             <p>
-                © Copyright 2018 Webkul Software, All rights reserved.
+                {{ __('shop::app.webkul.copy-right') }}
             </p>
         </div>
-
     </div>
     <script type="text/javascript">
         window.flashMessages = [];

From b55720244c228ccf8aab4b28fc6da8559d71219e Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Tue, 30 Oct 2018 11:49:22 +0530
Subject: [PATCH 3/5] Move Configurable Item To Cart From Wishlist Bug Removed
 and Storefront UI Fix

---
 packages/Webkul/Checkout/src/Cart.php         | 32 ++++++++-----------
 .../Webkul/Product/src/Models/Product.php     |  8 ++---
 .../Shop/src/Resources/assets/sass/app.scss   | 13 ++++++--
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index 3a969547d..73d840104 100644
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -309,6 +309,7 @@ class Cart {
      * @return Booleans
      */
     public function createNewCart($id, $data, $prepared = false, $preparedData = []) {
+        // dd($id, $data, $prepared,$preparedData);
         if($prepared == false) {
             if(isset($data['selected_configurable_option'])) {
                 $canAdd = $this->canAdd($data['selected_configurable_option'], $data['quantity']);
@@ -368,8 +369,6 @@ class Cart {
                 //parent item entry
                 if($prepared == false) {
                     $itemData['parent']['additional'] = json_encode($data);
-                } else {
-                    $itemData['parent']['additional'] = json_encode($preparedData);
                 }
 
                 if($parent = $this->cartItem->create($itemData['parent'])) {
@@ -1140,11 +1139,12 @@ class Cart {
             $result = $this->moveConfigurableFromWishlistToCart($product->parent_id, $product->id);
 
             if(is_array($result)) {
+                $data['_token'] = 'null';
                 $data['quantity'] = 1;
+                $data['product'] = $product->parent_id;
+                $data['selected_configurable_option'] = $product->id;
 
-                $data['selected_configurable_option'] = $product->parent_id;
-
-                $moved = $this->add($data['selected_configurable_option'], $data, true, $result);
+                $moved = $this->add($product->parent_id, $data, true, $result);
 
                 if($moved) {
                     return true;
@@ -1161,7 +1161,7 @@ class Cart {
      * @return mixed
      */
     public function moveConfigurableFromWishlistToCart($configurableproductId, $productId) {
-        // dd('moving configurable');
+        // dd($configurableproductId, $productId);
         $product = $this->product->find($configurableproductId);
 
         $canAdd = $this->product->find($productId)->haveSufficientQuantity(1);
@@ -1177,7 +1177,7 @@ class Cart {
             $child = $this->product->findOneByField('id', $productId);
 
             $childData = [
-                'product_id' => $configurableproductId,
+                'product_id' => $productId,
                 'sku' => $child->sku,
                 'name' => $child->name,
                 'type' => 'simple'
@@ -1190,21 +1190,15 @@ class Cart {
 
         unset($productAddtionalData['html']);
 
-        // $additional = [
-        //     'request' => $childData,
-        //     'variant_id' => $productId,
-        //     'attributes' => $productAddtionalData
-        // ];
-        $additional['_token'] = null;
-        $additional['product'] = $product->id;
-        $additional['quantity'] = 1;
-        $additional['is_configurable'] = true;
-        $additional['selected_configurable_option'] = $child->id;
-        $additional['super_attributes'] = $productAddtionalData;
+        $additional = [
+            'request' => $childData,
+            'variant_id' => $productId,
+            'attributes' => $productAddtionalData['attributes']
+        ];
 
         $parentData = [
             'sku' => $product->sku,
-            'product_id' => $productId,
+            'product_id' => $configurableproductId,
             'quantity' => 1,
             'type' => $product->type,
             'name' => $product->name,
diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php
index fa3d14dd4..4bf20d078 100644
--- a/packages/Webkul/Product/src/Models/Product.php
+++ b/packages/Webkul/Product/src/Models/Product.php
@@ -57,7 +57,7 @@ class Product extends Model
      */
     public function parent()
     {
-        return $this->belongsTo(self::class);
+        return $this->belongsTo(self::class, 'parent_id');
     }
 
     /**
@@ -133,10 +133,10 @@ class Product extends Model
     {
         if(!$this->status)
             return false;
-        
+
         if($this->haveSufficientQuantity(1))
             return true;
-    
+
         return false;
     }
 
@@ -247,5 +247,5 @@ class Product extends Model
     {
         return new \Webkul\Product\Database\Eloquent\Builder($query);
     }
-    
+
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 593048e70..1597e147e 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -621,10 +621,15 @@ section.slider-block {
                     flex-direction: row;
                     justify-content: center;
                     align-items: center;
-                    color: white;
+                    color: $font-color;
                     height: 100%;
                     width: 100%;
                     top: 0px;
+
+                    // * {
+                    //     color: blue;
+                    //     font-size: 112px;
+                    // }
                 }
             }
 
@@ -928,6 +933,10 @@ section.slider-block {
                             justify-content: space-between;
                             align-items: center;
                             margin-bottom: 8px;
+
+                            .btn {
+                                margin: 0;
+                            }
                         }
 
                         .dropdown-footer .btn {
@@ -2873,7 +2882,7 @@ section.review {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
-    align-items: center;
+    align-items: flex-start;
     flex-wrap: wrap;
     width: 100%;
 }

From 97c7ca84c63f6c8e2674c97a140205c8a219686f Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Tue, 30 Oct 2018 11:58:15 +0530
Subject: [PATCH 4/5] Dashboard issue fixed

---
 .../Webkul/Admin/src/Http/Controllers/DashboardController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php
index c2ba72402..8e7ad4477 100644
--- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php
@@ -184,10 +184,10 @@ class DashboardController extends Controller
         foreach (core()->getTimeInterval($this->startDate, $this->endDate) as $interval) {
             $statistics['sale_graph']['label'][] = $interval['start']->format('d M');
 
-            $total = number_format($this->order->scopeQuery(function($query) use($interval) {
+            $total = $this->order->scopeQuery(function($query) use($interval) {
                         return $query->where('orders.created_at', '>=', $interval['start'])
                             ->where('orders.created_at', '<=', $interval['end']);
-                    })->sum('base_grand_total'), 2);
+                    })->sum('base_grand_total');
                 
             $statistics['sale_graph']['total'][] = $total;
             $statistics['sale_graph']['formated_total'][] = core()->formatBasePrice($total);

From f0c5db81774f021a2caf17fb7c26d3a3d816cbed Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Tue, 30 Oct 2018 11:59:44 +0530
Subject: [PATCH 5/5] before merge

---
 packages/Webkul/Checkout/src/Cart.php               | 13 +++++--------
 .../src/Resources/views/products/buy-now.blade.php  |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index 73d840104..845e050c3 100644
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -1222,17 +1222,14 @@ class Cart {
      * @param instance cartItem $id
      */
     public function moveToWishlist($itemId) {
-        $item = $this->findOneByField($itemId);
-
+        $item = $this->cartItem->findOneByField('id', $itemId);
+        dd($item->cart);
         if(!$item)
             return false;
 
-        if($item->parent_id == 'null' ||$item->parent_id == null) {
-            $variantSku = $item->child->sku;
-            $variantName = $item->child->name;
-        } else {
-
-        }
+        // $wishlist[
+        //     'channel_id' =>
+        // ];
     }
 
     /**
diff --git a/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php b/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php
index 9778a92e6..fee364aca 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php
@@ -1,3 +1,3 @@
-{{-- <a href="{{ route('shop.product.buynow', $product->id)}}" class="btn btn-lg btn-primary buynow" style="text-align: center;">
+{{-- <a href="{{ route('shop.product.buynow', $product->id)}}" class="btn btn-lg btn-primary buynow" style="text-align: center;" id="buynow-changer">
     {{ __('shop::app.products.buy-now') }}
 </a> --}}
\ No newline at end of file