From 3420f282ff5c0e7f70f860662446d06d0b67d476 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Fri, 15 Jan 2021 18:26:27 +0530
Subject: [PATCH 1/7] Issue #4432 fixed

---
 .../Customer/src/Http/Controllers/RegistrationController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
index f38e96513..a3b14395f 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
@@ -49,7 +49,7 @@ class RegistrationController extends Controller
      * @param  \Webkul\Customer\Repositories\CustomerRepository  $customer
      * @param  \Webkul\Customer\Repositories\CustomerGroupRepository  $customerGroupRepository
      * @param  \Webkul\Core\Repositories\SubscribersListRepository  $subscriptionRepository
-     * 
+     *
      * @return void
      */
     public function __construct(
@@ -97,6 +97,7 @@ class RegistrationController extends Controller
             'is_verified'       => core()->getConfigData('customer.settings.email.verification') ? 0 : 1,
             'customer_group_id' => $this->customerGroupRepository->findOneWhere(['code' => 'general'])->id,
             'token'             => md5(uniqid(rand(), true)),
+            'subscribed_to_news_letter' => isset(request()->input()['is_subscribed']) ? 1 : 0,
         ]);
 
         Event::dispatch('customer.registration.before');
@@ -220,7 +221,7 @@ class RegistrationController extends Controller
 
             return redirect()->back();
         }
-        
+
         session()->flash('success', trans('shop::app.customer.signup-form.verification-sent'));
 
         return redirect()->back();

From 57b89f53eeb3e6d212ddaad4f2da730eb529607d Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Fri, 15 Jan 2021 19:00:55 +0530
Subject: [PATCH 2/7] enhancement #4468 added for velocity theme

---
 .../Http/Controllers/Shop/ShopController.php  |   8 +-
 .../shop/views/checkout/cart/coupon.blade.php | 119 ++++
 .../shop/views/checkout/cart/index.blade.php  | 274 ++++++++
 .../views/checkout/cart/mini-cart.blade.php   | 116 ++++
 .../shop/views/checkout/onepage.blade.php     | 613 ++++++++++++++++++
 .../onepage/customer-checkout.blade.php       |  23 +
 .../checkout/onepage/customer-info.blade.php  | 475 ++++++++++++++
 .../views/checkout/onepage/payment.blade.php  |  51 ++
 .../views/checkout/onepage/review.blade.php   | 170 +++++
 .../views/checkout/onepage/shipping.blade.php |  48 ++
 .../shop/views/checkout/success.blade.php     |  27 +
 .../views/checkout/total/summary.blade.php    |  45 ++
 .../themes/shop/views/cms/page.blade.php      |  17 +
 .../account/address/country-state.blade.php   |  74 +++
 .../account/address/create.blade.php          | 124 ++++
 .../customers/account/address/edit.blade.php  | 125 ++++
 .../customers/account/address/index.blade.php | 112 ++++
 .../customers/account/compare/index.blade.php |  29 +
 .../downloadable_products/index.blade.php     |  39 ++
 .../views/customers/account/index.blade.php   |   9 +
 .../customers/account/orders/index.blade.php  |  39 ++
 .../customers/account/orders/pdf.blade.php    | 324 +++++++++
 .../customers/account/orders/view.blade.php   | 562 ++++++++++++++++
 .../account/partials/sidemenu.blade.php       |  62 ++
 .../customers/account/profile/edit.blade.php  | 122 ++++
 .../customers/account/profile/index.blade.php | 114 ++++
 .../customers/account/reviews/index.blade.php |  82 +++
 .../account/reviews/reviews.blade.php         |  52 ++
 .../account/wishlist/wishlist.blade.php       |  94 +++
 .../views/customers/session/index.blade.php   |  57 ++
 .../signup/forgot-password.blade.php          |  61 ++
 .../views/customers/signup/index.blade.php    |  95 +++
 .../customers/signup/reset-password.blade.php |  52 ++
 .../emails/admin/forget-password.blade.php    |  38 ++
 .../emails/admin/update-password.blade.php    |  25 +
 .../emails/customer/forget-password.blade.php |  34 +
 .../emails/customer/new-customer.blade.php    |  30 +
 .../emails/customer/registration.blade.php    |  32 +
 .../customer/subscription-email.blade.php     |  26 +
 .../emails/customer/update-password.blade.php |  21 +
 .../customer/verification-email.blade.php     |  26 +
 .../shop/views/emails/layouts/logo.blade.php  |   5 +
 .../views/emails/layouts/master.blade.php     |  22 +
 .../emails/sales/new-admin-order.blade.php    | 221 +++++++
 .../new-inventorysource-shipment.blade.php    | 172 +++++
 .../views/emails/sales/new-invoice.blade.php  | 211 ++++++
 .../emails/sales/new-order-comment.blade.php  |  35 +
 .../views/emails/sales/new-order.blade.php    | 220 +++++++
 .../views/emails/sales/new-refund.blade.php   | 230 +++++++
 .../views/emails/sales/new-shipment.blade.php | 174 +++++
 .../emails/sales/order-cancel-admin.blade.php | 212 ++++++
 .../views/emails/sales/order-cancel.blade.php | 212 ++++++
 resources/themes/shop/views/error.blade.php   |  19 +
 .../themes/shop/views/errors/401.blade.php    |  38 ++
 .../themes/shop/views/errors/403.blade.php    |  38 ++
 .../themes/shop/views/errors/404.blade.php    |  40 ++
 .../themes/shop/views/errors/500.blade.php    |  40 ++
 .../themes/shop/views/errors/503.blade.php    |  32 +
 .../guest/compare/compare-products.blade.php  | 342 ++++++++++
 .../shop/views/guest/compare/index.blade.php  |  11 +
 .../shop/views/guest/wishlist/index.blade.php |   3 +
 .../views/home/featured-products.blade.php    |  27 +
 .../themes/shop/views/home/index.blade.php    |  53 ++
 .../shop/views/home/new-products.blade.php    |  27 +
 .../shop/views/home/news-updates.blade.php    |  15 +
 .../themes/shop/views/home/slider.blade.php   |   5 +
 resources/themes/shop/views/index.blade.php   |  13 +
 .../views/layouts/footer/footer.blade.php     |  91 +++
 .../shop/views/layouts/header/index.blade.php | 415 ++++++++++++
 .../layouts/header/nav-menu/navmenu.blade.php | 138 ++++
 .../shop/views/layouts/master.blade.php       | 129 ++++
 .../shop/views/partials/pagination.blade.php  |  50 ++
 .../shop/views/products/add-buttons.blade.php |  24 +
 .../shop/views/products/add-to-cart.blade.php |  12 +
 .../shop/views/products/add-to.blade.php      |   9 +
 .../shop/views/products/buy-now.blade.php     |   7 +
 .../shop/views/products/compare.blade.php     | 129 ++++
 .../shop/views/products/index.blade.php       | 135 ++++
 .../shop/views/products/list/card.blade.php   |  38 ++
 .../list/layered-navigation.blade.php         | 219 +++++++
 .../views/products/list/toolbar.blade.php     |  83 +++
 .../shop/views/products/price.blade.php       |   7 +
 .../shop/views/products/review.blade.php      |  28 +
 .../views/products/reviews/create.blade.php   | 118 ++++
 .../views/products/reviews/index.blade.php    | 165 +++++
 .../shop/views/products/sharelinks.blade.php  |   1 +
 .../themes/shop/views/products/view.blade.php | 291 +++++++++
 .../views/products/view/attributes.blade.php  |  45 ++
 .../products/view/bundle-options.blade.php    | 236 +++++++
 .../view/configurable-options.blade.php       | 324 +++++++++
 .../views/products/view/cross-sells.blade.php |  36 +
 .../products/view/downloadable.blade.php      |  50 ++
 .../views/products/view/gallery.blade.php     | 221 +++++++
 .../products/view/grouped-products.blade.php  |  38 ++
 .../views/products/view/product-add.blade.php |  11 +
 .../products/view/related-products.blade.php  |  24 +
 .../views/products/view/reviews.blade.php     |  98 +++
 .../shop/views/products/view/stock.blade.php  |  13 +
 .../views/products/view/up-sells.blade.php    |  28 +
 .../shop/views/products/wishlist.blade.php    |  21 +
 .../themes/shop/views/search/search.blade.php |  87 +++
 101 files changed, 10183 insertions(+), 1 deletion(-)
 create mode 100644 resources/themes/shop/views/checkout/cart/coupon.blade.php
 create mode 100644 resources/themes/shop/views/checkout/cart/index.blade.php
 create mode 100644 resources/themes/shop/views/checkout/cart/mini-cart.blade.php
 create mode 100644 resources/themes/shop/views/checkout/onepage.blade.php
 create mode 100644 resources/themes/shop/views/checkout/onepage/customer-checkout.blade.php
 create mode 100644 resources/themes/shop/views/checkout/onepage/customer-info.blade.php
 create mode 100644 resources/themes/shop/views/checkout/onepage/payment.blade.php
 create mode 100644 resources/themes/shop/views/checkout/onepage/review.blade.php
 create mode 100644 resources/themes/shop/views/checkout/onepage/shipping.blade.php
 create mode 100644 resources/themes/shop/views/checkout/success.blade.php
 create mode 100644 resources/themes/shop/views/checkout/total/summary.blade.php
 create mode 100644 resources/themes/shop/views/cms/page.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/address/country-state.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/address/create.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/address/edit.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/address/index.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/compare/index.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/downloadable_products/index.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/index.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/orders/index.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/orders/pdf.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/orders/view.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/partials/sidemenu.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/profile/edit.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/profile/index.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/reviews/index.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/reviews/reviews.blade.php
 create mode 100644 resources/themes/shop/views/customers/account/wishlist/wishlist.blade.php
 create mode 100644 resources/themes/shop/views/customers/session/index.blade.php
 create mode 100644 resources/themes/shop/views/customers/signup/forgot-password.blade.php
 create mode 100644 resources/themes/shop/views/customers/signup/index.blade.php
 create mode 100644 resources/themes/shop/views/customers/signup/reset-password.blade.php
 create mode 100644 resources/themes/shop/views/emails/admin/forget-password.blade.php
 create mode 100644 resources/themes/shop/views/emails/admin/update-password.blade.php
 create mode 100644 resources/themes/shop/views/emails/customer/forget-password.blade.php
 create mode 100644 resources/themes/shop/views/emails/customer/new-customer.blade.php
 create mode 100644 resources/themes/shop/views/emails/customer/registration.blade.php
 create mode 100644 resources/themes/shop/views/emails/customer/subscription-email.blade.php
 create mode 100644 resources/themes/shop/views/emails/customer/update-password.blade.php
 create mode 100644 resources/themes/shop/views/emails/customer/verification-email.blade.php
 create mode 100644 resources/themes/shop/views/emails/layouts/logo.blade.php
 create mode 100644 resources/themes/shop/views/emails/layouts/master.blade.php
 create mode 100644 resources/themes/shop/views/emails/sales/new-admin-order.blade.php
 create mode 100644 resources/themes/shop/views/emails/sales/new-inventorysource-shipment.blade.php
 create mode 100644 resources/themes/shop/views/emails/sales/new-invoice.blade.php
 create mode 100644 resources/themes/shop/views/emails/sales/new-order-comment.blade.php
 create mode 100644 resources/themes/shop/views/emails/sales/new-order.blade.php
 create mode 100644 resources/themes/shop/views/emails/sales/new-refund.blade.php
 create mode 100644 resources/themes/shop/views/emails/sales/new-shipment.blade.php
 create mode 100644 resources/themes/shop/views/emails/sales/order-cancel-admin.blade.php
 create mode 100644 resources/themes/shop/views/emails/sales/order-cancel.blade.php
 create mode 100644 resources/themes/shop/views/error.blade.php
 create mode 100644 resources/themes/shop/views/errors/401.blade.php
 create mode 100644 resources/themes/shop/views/errors/403.blade.php
 create mode 100644 resources/themes/shop/views/errors/404.blade.php
 create mode 100644 resources/themes/shop/views/errors/500.blade.php
 create mode 100644 resources/themes/shop/views/errors/503.blade.php
 create mode 100644 resources/themes/shop/views/guest/compare/compare-products.blade.php
 create mode 100644 resources/themes/shop/views/guest/compare/index.blade.php
 create mode 100644 resources/themes/shop/views/guest/wishlist/index.blade.php
 create mode 100644 resources/themes/shop/views/home/featured-products.blade.php
 create mode 100644 resources/themes/shop/views/home/index.blade.php
 create mode 100644 resources/themes/shop/views/home/new-products.blade.php
 create mode 100644 resources/themes/shop/views/home/news-updates.blade.php
 create mode 100644 resources/themes/shop/views/home/slider.blade.php
 create mode 100644 resources/themes/shop/views/index.blade.php
 create mode 100644 resources/themes/shop/views/layouts/footer/footer.blade.php
 create mode 100644 resources/themes/shop/views/layouts/header/index.blade.php
 create mode 100644 resources/themes/shop/views/layouts/header/nav-menu/navmenu.blade.php
 create mode 100644 resources/themes/shop/views/layouts/master.blade.php
 create mode 100644 resources/themes/shop/views/partials/pagination.blade.php
 create mode 100644 resources/themes/shop/views/products/add-buttons.blade.php
 create mode 100644 resources/themes/shop/views/products/add-to-cart.blade.php
 create mode 100644 resources/themes/shop/views/products/add-to.blade.php
 create mode 100644 resources/themes/shop/views/products/buy-now.blade.php
 create mode 100644 resources/themes/shop/views/products/compare.blade.php
 create mode 100644 resources/themes/shop/views/products/index.blade.php
 create mode 100644 resources/themes/shop/views/products/list/card.blade.php
 create mode 100644 resources/themes/shop/views/products/list/layered-navigation.blade.php
 create mode 100644 resources/themes/shop/views/products/list/toolbar.blade.php
 create mode 100644 resources/themes/shop/views/products/price.blade.php
 create mode 100644 resources/themes/shop/views/products/review.blade.php
 create mode 100644 resources/themes/shop/views/products/reviews/create.blade.php
 create mode 100644 resources/themes/shop/views/products/reviews/index.blade.php
 create mode 100644 resources/themes/shop/views/products/sharelinks.blade.php
 create mode 100644 resources/themes/shop/views/products/view.blade.php
 create mode 100644 resources/themes/shop/views/products/view/attributes.blade.php
 create mode 100644 resources/themes/shop/views/products/view/bundle-options.blade.php
 create mode 100644 resources/themes/shop/views/products/view/configurable-options.blade.php
 create mode 100644 resources/themes/shop/views/products/view/cross-sells.blade.php
 create mode 100644 resources/themes/shop/views/products/view/downloadable.blade.php
 create mode 100644 resources/themes/shop/views/products/view/gallery.blade.php
 create mode 100644 resources/themes/shop/views/products/view/grouped-products.blade.php
 create mode 100644 resources/themes/shop/views/products/view/product-add.blade.php
 create mode 100644 resources/themes/shop/views/products/view/related-products.blade.php
 create mode 100644 resources/themes/shop/views/products/view/reviews.blade.php
 create mode 100644 resources/themes/shop/views/products/view/stock.blade.php
 create mode 100644 resources/themes/shop/views/products/view/up-sells.blade.php
 create mode 100644 resources/themes/shop/views/products/wishlist.blade.php
 create mode 100644 resources/themes/shop/views/search/search.blade.php

diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
index 77b071f12..4dad820ea 100644
--- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
+++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
@@ -71,7 +71,13 @@ class ShopController extends Controller
                 }
 
                 foreach ($products as $product) {
-                    array_push($formattedProducts, $this->velocityHelper->formatProduct($product));
+                    if (core()->getConfigData('catalog.products.homepage.out_of_stock_items')) {
+                        array_push($formattedProducts, $this->velocityHelper->formatProduct($product));
+                    } else {
+                        if ($product->isSaleable()) {
+                            array_push($formattedProducts, $this->velocityHelper->formatProduct($product));
+                        }
+                    }
                 }
 
                 $response = [
diff --git a/resources/themes/shop/views/checkout/cart/coupon.blade.php b/resources/themes/shop/views/checkout/cart/coupon.blade.php
new file mode 100644
index 000000000..090740935
--- /dev/null
+++ b/resources/themes/shop/views/checkout/cart/coupon.blade.php
@@ -0,0 +1,119 @@
+@if ($cart)
+    <script type="text/x-template" id="coupon-component-template">
+        <div class="coupon-container">    
+            <div class="discount-control">
+                <form class="coupon-form" method="post" @submit.prevent="applyCoupon">
+                    <div class="control-group" :class="[error_message ? 'has-error' : '']">
+                        <input type="text" class="control" v-model="coupon_code" name="code" placeholder="{{ __('shop::app.checkout.onepage.enter-coupon-code') }}">
+
+                        <div class="control-error">@{{ error_message }}</div>
+                    </div>
+
+                    <button class="btn btn-lg btn-black" :disabled="disable_button">{{ __('shop::app.checkout.onepage.apply-coupon') }}</button>
+                </form>
+            </div>
+
+            <div class="applied-coupon-details" v-if="applied_coupon">
+                <label>{{ __('shop::app.checkout.total.coupon-applied') }}</label>
+
+                <label class="right" style="display: inline-flex; align-items: center;">
+                    <b>@{{ applied_coupon }}</b>
+
+                    <span class="icon cross-icon" title="{{ __('shop::app.checkout.total.remove-coupon') }}" v-on:click="removeCoupon"></span>
+                </label>
+            </div>
+        </div>
+    </script>
+
+    <script>
+        Vue.component('coupon-component', {
+            template: '#coupon-component-template',
+
+            inject: ['$validator'],
+
+            data: function() {
+                return {
+                    coupon_code: '',
+
+                    applied_coupon: "{{ $cart->coupon_code }}",
+
+                    error_message: '',
+
+                    route_name: "{{ request()->route()->getName() }}",
+
+                    disable_button: false
+                }
+            },
+            
+            methods: {
+                applyCoupon: function() {
+                    var self = this;
+
+                    if (! self.coupon_code.length)
+                        return;
+
+                    self.error_message = null;
+
+                    self.disable_button = true;
+
+                    axios.post('{{ route('shop.checkout.cart.coupon.apply') }}', {code: self.coupon_code})
+                        .then(function(response) {
+                            if (response.data.success) {
+                                self.$emit('onApplyCoupon');
+
+                                self.applied_coupon = self.coupon_code;
+
+                                self.coupon_code = '';
+
+                                window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}];
+
+                                self.$root.addFlashMessages();
+                                
+                                self.redirectIfCartPage();
+                            } else {
+                                self.error_message = response.data.message;
+                            }
+
+                            self.disable_button = false;
+                        })
+                        .catch(function(error) {
+                            self.error_message = error.response.data.message;
+
+                            self.disable_button = false;
+                        });
+                },
+
+                removeCoupon: function () {
+                    var self = this;
+
+                    axios.delete('{{ route('shop.checkout.coupon.remove.coupon') }}')
+                        .then(function(response) {
+                            self.$emit('onRemoveCoupon')
+
+                            self.applied_coupon = '';
+
+                            window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}];
+
+                            self.$root.addFlashMessages();
+
+                            self.redirectIfCartPage();
+                        })
+                        .catch(function(error) {
+                            window.flashMessages = [{'type': 'alert-error', 'message': error.response.data.message}];
+
+                            self.$root.addFlashMessages();
+                        });
+                },
+
+                redirectIfCartPage: function() {
+                    if (this.route_name != 'shop.checkout.cart.index')
+                        return;
+
+                    setTimeout(function() {
+                        window.location.reload();
+                    }, 700);
+                }
+            }
+        });
+    </script>
+@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/cart/index.blade.php b/resources/themes/shop/views/checkout/cart/index.blade.php
new file mode 100644
index 000000000..d44caa83c
--- /dev/null
+++ b/resources/themes/shop/views/checkout/cart/index.blade.php
@@ -0,0 +1,274 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.checkout.cart.title') }}
+@stop
+
+@section('content-wrapper')
+    @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+
+    <section class="cart">
+        @if ($cart)
+            <div class="title">
+                {{ __('shop::app.checkout.cart.title') }}
+            </div>
+
+            <div class="cart-content">
+                <div class="left-side">
+                    <form action="{{ route('shop.checkout.cart.update') }}" method="POST" @submit.prevent="onSubmit">
+
+                        <div class="cart-item-list" style="margin-top: 0">
+                            @csrf
+                            @foreach ($cart->items as $key => $item)
+                                @php
+                                    $productBaseImage = $item->product->getTypeInstance()->getBaseImage($item);
+
+                                    if (is_null ($item->product->url_key)) {
+                                        if (! is_null($item->product->parent)) {
+                                            $url_key = $item->product->parent->url_key;
+                                        }
+                                    } else {
+                                        $url_key = $item->product->url_key;
+                                    }
+                                @endphp
+
+                                <div class="item mt-5">
+                                    <div class="item-image" style="margin-right: 15px;">
+                                        <a href="{{ route('shop.productOrCategory.index', $url_key) }}"><img src="{{ $productBaseImage['medium_image_url'] }}" alt="" /></a>
+                                    </div>
+
+                                    <div class="item-details">
+
+                                        {!! view_render_event('bagisto.shop.checkout.cart.item.name.before', ['item' => $item]) !!}
+
+                                        <div class="item-title">
+                                            <a href="{{ route('shop.productOrCategory.index', $url_key) }}">
+                                                {{ $item->product->name }}
+                                            </a>
+                                        </div>
+
+                                        {!! view_render_event('bagisto.shop.checkout.cart.item.name.after', ['item' => $item]) !!}
+
+
+                                        {!! view_render_event('bagisto.shop.checkout.cart.item.price.before', ['item' => $item]) !!}
+
+                                        <div class="price">
+                                            {{ core()->currency($item->base_price) }}
+                                        </div>
+
+                                        {!! view_render_event('bagisto.shop.checkout.cart.item.price.after', ['item' => $item]) !!}
+
+
+                                        {!! view_render_event('bagisto.shop.checkout.cart.item.options.before', ['item' => $item]) !!}
+
+                                        @if (isset($item->additional['attributes']))
+                                            <div class="item-options">
+
+                                                @foreach ($item->additional['attributes'] as $attribute)
+                                                    <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                                @endforeach
+
+                                            </div>
+                                        @endif
+
+                                        {!! view_render_event('bagisto.shop.checkout.cart.item.options.after', ['item' => $item]) !!}
+
+
+                                        {!! view_render_event('bagisto.shop.checkout.cart.item.quantity.before', ['item' => $item]) !!}
+
+                                        <div class="misc">
+                                            @if ($item->product->getTypeInstance()->showQuantityBox() === true)
+                                                <quantity-changer
+                                                    :control-name="'qty[{{$item->id}}]'"
+                                                    quantity="{{$item->quantity}}">
+                                                </quantity-changer>
+                                            @endif
+
+                                            <span class="remove">
+                                                <a href="{{ route('shop.checkout.cart.remove', $item->id) }}" onclick="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')">{{ __('shop::app.checkout.cart.remove-link') }}</a></span>
+
+                                            @auth('customer')
+                                                    @php
+                                                        $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
+                                                    @endphp
+
+                                                    @if ($showWishlist)
+                                                        <span class="towishlist">
+                                                            @if ($item->parent_id != 'null' ||$item->parent_id != null)
+                                                                <a href="{{ route('shop.movetowishlist', $item->id) }}" onclick="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')">{{ __('shop::app.checkout.cart.move-to-wishlist') }}</a>
+                                                            @else
+                                                                <a href="{{ route('shop.movetowishlist', $item->child->id) }}" onclick="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')">{{ __('shop::app.checkout.cart.move-to-wishlist') }}</a>
+                                                            @endif
+                                                        </span>
+                                                    @endif
+                                            @endauth
+                                        </div>
+
+                                        {!! view_render_event('bagisto.shop.checkout.cart.item.quantity.after', ['item' => $item]) !!}
+
+                                        @if (! cart()->isItemHaveQuantity($item))
+                                            <div class="error-message mt-15">
+                                                * {{ __('shop::app.checkout.cart.quantity-error') }}
+                                            </div>
+                                        @endif
+                                    </div>
+
+                                </div>
+                            @endforeach
+                        </div>
+
+                        {!! view_render_event('bagisto.shop.checkout.cart.controls.after', ['cart' => $cart]) !!}
+
+                        <div class="misc-controls">
+                            <a href="{{ route('shop.home.index') }}" class="link">{{ __('shop::app.checkout.cart.continue-shopping') }}</a>
+
+                            <div>
+                                @if ($cart->hasProductsWithQuantityBox())
+                                <button type="submit" class="btn btn-lg btn-primary" id="update_cart_button">
+                                    {{ __('shop::app.checkout.cart.update-cart') }}
+                                </button>
+                                @endif
+
+                                @if (! cart()->hasError())
+                                    @php
+                                        $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
+                                    @endphp
+
+                                    <proceed-to-checkout
+                                        href="{{ route('shop.checkout.onepage.index') }}"
+                                        add-class="btn btn-lg btn-primary"
+                                        text="{{ __('shop::app.checkout.cart.proceed-to-checkout') }}"
+                                        is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}"
+                                        minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) }}">
+                                    </proceed-to-checkout>
+                                @endif
+                            </div>
+                        </div>
+
+                        {!! view_render_event('bagisto.shop.checkout.cart.controls.after', ['cart' => $cart]) !!}
+                    </form>
+                </div>
+
+                <div class="right-side">
+                    {!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!}
+
+                    @include('shop::checkout.total.summary', ['cart' => $cart])
+
+                    <coupon-component></coupon-component>
+
+                    {!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!}
+                </div>
+            </div>
+
+            @include ('shop::products.view.cross-sells')
+
+        @else
+
+            <div class="title">
+                {{ __('shop::app.checkout.cart.title') }}
+            </div>
+
+            <div class="cart-content">
+                <p>
+                    {{ __('shop::app.checkout.cart.empty') }}
+                </p>
+
+                <p style="display: inline-block;">
+                    <a style="display: inline-block;" href="{{ route('shop.home.index') }}" class="btn btn-lg btn-primary">{{ __('shop::app.checkout.cart.continue-shopping') }}</a>
+                </p>
+            </div>
+
+        @endif
+    </section>
+
+@endsection
+
+@push('scripts')
+    @include('shop::checkout.cart.coupon')
+
+    <script type="text/x-template" id="quantity-changer-template">
+        <div class="quantity control-group" :class="[errors.has(controlName) ? 'has-error' : '']">
+            <div class="wrap">
+                <label>{{ __('shop::app.products.quantity') }}</label>
+
+                <button type="button" class="decrease" @click="decreaseQty()">-</button>
+
+                <input :name="controlName" class="control" :value="qty" v-validate="'required|numeric|min_value:1'" data-vv-as="&quot;{{ __('shop::app.products.quantity') }}&quot;" readonly>
+
+                <button type="button" class="increase" @click="increaseQty()">+</button>
+
+                <span class="control-error" v-if="errors.has(controlName)">@{{ errors.first(controlName) }}</span>
+            </div>
+        </div>
+    </script>
+
+    <script>
+        Vue.component('quantity-changer', {
+            template: '#quantity-changer-template',
+
+            inject: ['$validator'],
+
+            props: {
+                controlName: {
+                    type: String,
+                    default: 'quantity'
+                },
+
+                quantity: {
+                    type: [Number, String],
+                    default: 1
+                }
+            },
+
+            data: function() {
+                return {
+                    qty: this.quantity
+                }
+            },
+
+            watch: {
+                quantity: function (val) {
+                    this.qty = val;
+
+                    this.$emit('onQtyUpdated', this.qty)
+                }
+            },
+
+            methods: {
+                decreaseQty: function() {
+                    if (this.qty > 1)
+                        this.qty = parseInt(this.qty) - 1;
+
+                    this.$emit('onQtyUpdated', this.qty)
+                },
+
+                increaseQty: function() {
+                    this.qty = parseInt(this.qty) + 1;
+
+                    this.$emit('onQtyUpdated', this.qty)
+                }
+            }
+        });
+
+        function removeLink(message) {
+            if (!confirm(message))
+            event.preventDefault();
+        }
+
+        function updateCartQunatity(operation, index) {
+            var quantity = document.getElementById('cart-quantity'+index).value;
+
+            if (operation == 'add') {
+                quantity = parseInt(quantity) + 1;
+            } else if (operation == 'remove') {
+                if (quantity > 1) {
+                    quantity = parseInt(quantity) - 1;
+                } else {
+                    alert('{{ __('shop::app.products.less-quantity') }}');
+                }
+            }
+            document.getElementById('cart-quantity'+index).value = quantity;
+            event.preventDefault();
+        }
+    </script>
+@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/cart/mini-cart.blade.php b/resources/themes/shop/views/checkout/cart/mini-cart.blade.php
new file mode 100644
index 000000000..4477af9b0
--- /dev/null
+++ b/resources/themes/shop/views/checkout/cart/mini-cart.blade.php
@@ -0,0 +1,116 @@
+@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+
+<?php $cart = cart()->getCart(); ?>
+
+@if ($cart)
+    <?php $items = $cart->items; ?>
+
+    <div class="dropdown-toggle">
+        <a class="cart-link" href="{{ route('shop.checkout.cart.index') }}">
+            <span class="icon cart-icon"></span>
+        </a>
+
+        <span class="name">
+            {{ __('shop::app.header.cart') }}
+            <span class="count"> ({{ $cart->items->count() }})</span>
+        </span>
+
+        <i class="icon arrow-down-icon"></i>
+    </div>
+
+    <div class="dropdown-list" style="display: none; top: 52px; right: 0px;">
+        <div class="dropdown-container">
+            <div class="dropdown-cart">
+                <div class="dropdown-header">
+                    <p class="heading">
+                        {{ __('shop::app.checkout.cart.cart-subtotal') }} -
+
+                        {!! view_render_event('bagisto.shop.checkout.cart-mini.subtotal.before', ['cart' => $cart]) !!}
+
+                        <b>{{ core()->currency($cart->base_sub_total) }}</b>
+
+                        {!! view_render_event('bagisto.shop.checkout.cart-mini.subtotal.after', ['cart' => $cart]) !!}
+                    </p>
+                </div>
+
+                <div class="dropdown-content">
+                    @foreach ($items as $item)
+
+                        <div class="item">
+                            <div class="item-image" >
+                                @php
+                                    $images = $item->product->getTypeInstance()->getBaseImage($item);
+                                @endphp
+                                <img src="{{ $images['small_image_url'] }}"  alt=""/>
+                            </div>
+
+                            <div class="item-details">
+                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.name.before', ['item' => $item]) !!}
+
+                                <div class="item-name">{{ $item->name }}</div>
+
+                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.name.after', ['item' => $item]) !!}
+
+
+                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.options.before', ['item' => $item]) !!}
+
+                                @if (isset($item->additional['attributes']))
+                                    <div class="item-options">
+
+                                        @foreach ($item->additional['attributes'] as $attribute)
+                                            <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                        @endforeach
+
+                                    </div>
+                                @endif
+
+                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.options.after', ['item' => $item]) !!}
+
+
+                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.price.before', ['item' => $item]) !!}
+
+                                <div class="item-price"><b>{{ core()->currency($item->base_total) }}</b></div>
+
+                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.price.after', ['item' => $item]) !!}
+
+
+                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.quantity.before', ['item' => $item]) !!}
+
+                                <div class="item-qty">Quantity - {{ $item->quantity }}</div>
+
+                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.quantity.after', ['item' => $item]) !!}
+                            </div>
+                        </div>
+
+                    @endforeach
+                </div>
+
+                <div class="dropdown-footer">
+                    <a href="{{ route('shop.checkout.cart.index') }}">{{ __('shop::app.minicart.view-cart') }}</a>
+
+                    @php
+                        $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
+                    @endphp
+
+                    <proceed-to-checkout
+                        href="{{ route('shop.checkout.onepage.index') }}"
+                        add-class="btn btn-primary btn-lg"
+                        text="{{ __('shop::app.minicart.checkout') }}"
+                        is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}"
+                        minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) }}"
+                        style="color: white;">
+                    </proceed-to-checkout>
+                </div>
+            </div>
+        </div>
+    </div>
+
+@else
+
+    <div class="dropdown-toggle" style="pointer-events: none;">
+        <div style="display: inline-block; cursor: pointer;">
+            <span class="icon cart-icon"></span>
+            <span class="name">{{ __('shop::app.minicart.cart') }}<span class="count"> ({{ __('shop::app.minicart.zero') }}) </span></span>
+        </div>
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/onepage.blade.php b/resources/themes/shop/views/checkout/onepage.blade.php
new file mode 100644
index 000000000..d18263480
--- /dev/null
+++ b/resources/themes/shop/views/checkout/onepage.blade.php
@@ -0,0 +1,613 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.checkout.onepage.title') }}
+@stop
+
+@section('content-wrapper')
+    <checkout></checkout>
+@endsection
+
+@push('scripts')
+    @include('shop::checkout.cart.coupon')
+
+    <script type="text/x-template" id="checkout-template">
+        <div id="checkout" class="checkout-process">
+            <div class="col-main">
+                <ul class="checkout-steps">
+                    <li class="active" :class="[completed_step >= 0 ? 'active' : '', completed_step > 0 ? 'completed' : '']" @click="navigateToStep(1)">
+                        <div class="decorator address-info"></div>
+                        <span>{{ __('shop::app.checkout.onepage.information') }}</span>
+                    </li>
+
+                    <div class="line mb-25"></div>
+
+                    @if ($cart->haveStockableItems())
+                        <li :class="[current_step == 2 || completed_step > 1 ? 'active' : '', completed_step > 1 ? 'completed' : '']" @click="navigateToStep(2)">
+                            <div class="decorator shipping"></div>
+                            <span>{{ __('shop::app.checkout.onepage.shipping') }}</span>
+                        </li>
+
+                        <div class="line mb-25"></div>
+                    @endif
+
+                    <li :class="[current_step == 3 || completed_step > 2 ? 'active' : '', completed_step > 2 ? 'completed' : '']" @click="navigateToStep(3)">
+                        <div class="decorator payment"></div>
+                        <span>{{ __('shop::app.checkout.onepage.payment') }}</span>
+                    </li>
+
+                    <div class="line mb-25"></div>
+
+                    <li :class="[current_step == 4 ? 'active' : '']">
+                        <div class="decorator review"></div>
+                        <span>{{ __('shop::app.checkout.onepage.review') }}</span>
+                    </li>
+                </ul>
+
+                <div class="step-content information" v-show="current_step == 1" id="address-section">
+                    @include('shop::checkout.onepage.customer-info')
+
+                    <div class="button-group">
+                        <button type="button" class="btn btn-lg btn-primary" @click="validateForm('address-form')" :disabled="disable_button" id="checkout-address-continue-button">
+                            {{ __('shop::app.checkout.onepage.continue') }}
+                        </button>
+                    </div>
+                </div>
+
+                <div class="step-content shipping" v-show="current_step == 2" id="shipping-section">
+                    <shipping-section v-if="current_step == 2" @onShippingMethodSelected="shippingMethodSelected($event)"></shipping-section>
+
+                    <div class="button-group">
+                        <button type="button" class="btn btn-lg btn-primary" @click="validateForm('shipping-form')" :disabled="disable_button" id="checkout-shipping-continue-button">
+                            {{ __('shop::app.checkout.onepage.continue') }}
+                        </button>
+
+                    </div>
+                </div>
+
+                <div class="step-content payment" v-show="current_step == 3" id="payment-section">
+                    <payment-section v-if="current_step == 3" @onPaymentMethodSelected="paymentMethodSelected($event)"></payment-section>
+
+                    <div class="button-group">
+                        <button type="button" class="btn btn-lg btn-primary" @click="validateForm('payment-form')" :disabled="disable_button" id="checkout-payment-continue-button">
+                            {{ __('shop::app.checkout.onepage.continue') }}
+                        </button>
+                    </div>
+                </div>
+
+                <div class="step-content review" v-show="current_step == 4" id="summary-section">
+                    <review-section v-if="current_step == 4" :key="reviewComponentKey">
+                        <div slot="summary-section">
+                            <summary-section :key="summeryComponentKey"></summary-section>
+
+                            <coupon-component
+                                @onApplyCoupon="getOrderSummary"
+                                @onRemoveCoupon="getOrderSummary">
+                            </coupon-component>
+                        </div>
+                    </review-section>
+
+                    <div class="button-group">
+                        <button type="button" class="btn btn-lg btn-primary" @click="placeOrder()" :disabled="disable_button" id="checkout-place-order-button" v-if="selected_payment_method.method != 'paypal_smart_button'">
+                            {{ __('shop::app.checkout.onepage.place-order') }}
+                        </button>
+
+                        <div class="paypal-button-container"></div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-right" v-show="current_step != 4">
+                <summary-section :key="summeryComponentKey"></summary-section>
+            </div>
+        </div>
+    </script>
+
+    <script>
+        var shippingHtml = '';
+        var paymentHtml = '';
+        var reviewHtml = '';
+        var summaryHtml = '';
+        var customerAddress = '';
+        var shippingMethods = '';
+        var paymentMethods = '';
+
+        @auth('customer')
+            @if(auth('customer')->user()->addresses)
+                customerAddress = @json(auth('customer')->user()->addresses);
+                customerAddress.email = "{{ auth('customer')->user()->email }}";
+                customerAddress.first_name = "{{ auth('customer')->user()->first_name }}";
+                customerAddress.last_name = "{{ auth('customer')->user()->last_name }}";
+            @endif
+        @endauth
+
+        Vue.component('checkout', {
+            template: '#checkout-template',
+            inject: ['$validator'],
+
+            data: function() {
+                return {
+                    step_numbers: {
+                        'information': 1,
+                        'shipping': 2,
+                        'payment': 3,
+                        'review': 4
+                    },
+
+                    current_step: 1,
+
+                    completed_step: 0,
+
+                    address: {
+                        billing: {
+                            address1: [''],
+
+                            use_for_shipping: true,
+                        },
+
+                        shipping: {
+                            address1: ['']
+                        },
+                    },
+
+                    selected_shipping_method: '',
+
+                    selected_payment_method: '',
+
+                    disable_button: false,
+
+                    new_shipping_address: false,
+
+                    new_billing_address: false,
+
+                    allAddress: {},
+
+                    countryStates: @json(core()->groupedStatesByCountries()),
+
+                    country: @json(core()->countries()),
+
+                    summeryComponentKey: 0,
+
+                    reviewComponentKey: 0,
+
+                    is_customer_exist: 0
+                }
+            },
+
+            created: function() {
+                this.getOrderSummary();
+
+                if(! customerAddress) {
+                    this.new_shipping_address = true;
+                    this.new_billing_address = true;
+                } else {
+                    this.address.billing.first_name = this.address.shipping.first_name = customerAddress.first_name;
+                    this.address.billing.last_name = this.address.shipping.last_name = customerAddress.last_name;
+                    this.address.billing.email = this.address.shipping.email = customerAddress.email;
+
+                    if (customerAddress.length < 1) {
+                        this.new_shipping_address = true;
+                        this.new_billing_address = true;
+                    } else {
+                        this.allAddress = customerAddress;
+
+                        for (var country in this.country) {
+                            for (var code in this.allAddress) {
+                                if (this.allAddress[code].country) {
+                                    if (this.allAddress[code].country == this.country[country].code) {
+                                        this.allAddress[code]['country'] = this.country[country].name;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+
+            methods: {
+                navigateToStep: function(step) {
+                    if (step <= this.completed_step) {
+                        this.current_step = step
+                        this.completed_step = step - 1;
+                    }
+                },
+
+                haveStates: function(addressType) {
+                    if (this.countryStates[this.address[addressType].country] && this.countryStates[this.address[addressType].country].length)
+                        return true;
+
+                    return false;
+                },
+
+                validateForm: async function(scope) {
+                    var this_this = this;
+
+                    await this.$validator.validateAll(scope).then(function (result) {
+                        if (result) {
+                            if (scope == 'address-form') {
+                                this_this.saveAddress();
+                            } else if (scope == 'shipping-form') {
+                                this_this.saveShipping();
+                            } else if (scope == 'payment-form') {
+                                this_this.savePayment();
+                            }
+                        }
+                    });
+                },
+
+                isCustomerExist: function() {
+                    this.$validator.attach({ name: "email", rules: "required|email" });
+
+                    var this_this = this;
+
+                    this.$validator.validate('email', this.address.billing.email)
+                        .then(function(isValid) {
+                            if (! isValid)
+                                return;
+
+                            this_this.$http.post("{{ route('customer.checkout.exist') }}", {email: this_this.address.billing.email})
+                                .then(function(response) {
+                                    this_this.is_customer_exist = response.data ? 1 : 0;
+                                })
+                                .catch(function (error) {})
+
+                        })
+                },
+
+                loginCustomer: function() {
+                    var this_this = this;
+
+                    this_this.$http.post("{{ route('customer.checkout.login') }}", {
+                            email: this_this.address.billing.email,
+                            password: this_this.address.billing.password
+                        })
+                        .then(function(response) {
+                            if (response.data.success) {
+                                window.location.href = "{{ route('shop.checkout.onepage.index') }}";
+                            } else {
+                                window.flashMessages = [{'type': 'alert-error', 'message': response.data.error }];
+
+                                this_this.$root.addFlashMessages()
+                            }
+                        })
+                        .catch(function (error) {})
+                },
+
+                getOrderSummary () {
+                    var this_this = this;
+
+                    this.$http.get("{{ route('shop.checkout.summary') }}")
+                        .then(function(response) {
+                            summaryHtml = Vue.compile(response.data.html)
+
+                            this_this.summeryComponentKey++;
+                            //this_this.reviewComponentKey++;
+                        })
+                        .catch(function (error) {})
+                },
+
+                saveAddress: async function() {
+                    var this_this = this;
+
+                    this.disable_button = true;
+
+                    if (this.allAddress.length > 0) {
+                        let address = this.allAddress.forEach(address => {
+                            if (address.id == this.address.billing.address_id) {
+                                this.address.billing.address1 = [address.address1];
+                            }
+
+                            if (address.id == this.address.shipping.address_id) {
+                                this.address.shipping.address1 = [address.address1];
+                            }
+                        });
+                    }
+
+                    this.$http.post("{{ route('shop.checkout.save-address') }}", this.address)
+                        .then(function(response) {
+                            this_this.disable_button = false;
+
+                            if (this_this.step_numbers[response.data.jump_to_section] == 2)
+                                shippingHtml = Vue.compile(response.data.html)
+                            else
+                                paymentHtml = Vue.compile(response.data.html)
+
+                            this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] - 1;
+                            this_this.current_step = this_this.step_numbers[response.data.jump_to_section];
+
+                            shippingMethods = response.data.shippingMethods;
+                            paymentMethods  = response.data.paymentMethods;
+
+                            this_this.getOrderSummary();
+                        })
+                        .catch(function (error) {
+                            this_this.disable_button = false;
+
+                            this_this.handleErrorResponse(error.response, 'address-form')
+                        })
+                },
+
+                saveShipping: async function() {
+                    var this_this = this;
+
+                    this.disable_button = true;
+
+                    this.$http.post("{{ route('shop.checkout.save-shipping') }}", {'shipping_method': this.selected_shipping_method})
+                        .then(function(response) {
+                            this_this.disable_button = false;
+
+                            paymentHtml = Vue.compile(response.data.html)
+                            this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] - 1;
+                            this_this.current_step = this_this.step_numbers[response.data.jump_to_section];
+
+                            paymentMethods = response.data.paymentMethods;
+
+                            this_this.getOrderSummary();
+                        })
+                        .catch(function (error) {
+                            this_this.disable_button = false;
+
+                            this_this.handleErrorResponse(error.response, 'shipping-form')
+                        })
+                },
+
+                savePayment: async function() {
+                    var this_this = this;
+
+                    this.disable_button = true;
+
+                    this.$http.post("{{ route('shop.checkout.save-payment') }}", {'payment': this.selected_payment_method})
+                    .then(function(response) {
+                        this_this.disable_button = false;
+
+                        reviewHtml = Vue.compile(response.data.html)
+                        this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] - 1;
+                        this_this.current_step = this_this.step_numbers[response.data.jump_to_section];
+
+                        this_this.getOrderSummary();
+                    })
+                    .catch(function (error) {
+                        this_this.disable_button = false;
+
+                        this_this.handleErrorResponse(error.response, 'payment-form')
+                    });
+                },
+
+                placeOrder: async function() {
+                    var this_this = this;
+
+                    this.disable_button = true;
+
+                    this.$http.post("{{ route('shop.checkout.save-order') }}", {'_token': "{{ csrf_token() }}"})
+                    .then(function(response) {
+                        if (response.data.success) {
+                            if (response.data.redirect_url) {
+                                window.location.href = response.data.redirect_url;
+                            } else {
+                                window.location.href = "{{ route('shop.checkout.success') }}";
+                            }
+                        }
+                    })
+                    .catch(function (error) {
+                        this_this.disable_button = true;
+
+                        window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('shop::app.common.error') }}" }];
+
+                        this_this.$root.addFlashMessages()
+                    })
+                },
+
+                handleErrorResponse: function(response, scope) {
+                    if (response.status == 422) {
+                        serverErrors = response.data.errors;
+                        this.$root.addServerErrors(scope)
+                    } else if (response.status == 403) {
+                        if (response.data.redirect_url) {
+                            window.location.href = response.data.redirect_url;
+                        }
+                    }
+                },
+
+                shippingMethodSelected: function(shippingMethod) {
+                    this.selected_shipping_method = shippingMethod;
+                },
+
+                paymentMethodSelected: function(paymentMethod) {
+                    this.selected_payment_method = paymentMethod;
+                },
+
+                newBillingAddress: function() {
+                    this.new_billing_address = true;
+                    this.address.billing.address_id = null;
+                },
+
+                newShippingAddress: function() {
+                    this.new_shipping_address = true;
+                    this.address.shipping.address_id = null;
+                },
+
+                backToSavedBillingAddress: function() {
+                    this.new_billing_address = false;
+                },
+
+                backToSavedShippingAddress: function() {
+                    this.new_shipping_address = false;
+                },
+            }
+        })
+
+        var shippingTemplateRenderFns = [];
+
+        Vue.component('shipping-section', {
+            inject: ['$validator'],
+
+            data: function() {
+                return {
+                    templateRender: null,
+
+                    selected_shipping_method: '',
+
+                    first_iteration : true,
+                }
+            },
+
+            staticRenderFns: shippingTemplateRenderFns,
+
+            mounted: function() {
+                for (method in shippingMethods) {
+                    if (this.first_iteration) {
+                        for (rate in shippingMethods[method]['rates']) {
+                            this.selected_shipping_method = shippingMethods[method]['rates'][rate]['method'];
+                            this.first_iteration = false;
+                            this.methodSelected();
+                        }
+                    }
+                }
+
+                this.templateRender = shippingHtml.render;
+                for (var i in shippingHtml.staticRenderFns) {
+                    shippingTemplateRenderFns.push(shippingHtml.staticRenderFns[i]);
+                }
+
+                eventBus.$emit('after-checkout-shipping-section-added');
+            },
+
+            render: function(h) {
+                return h('div', [
+                    (this.templateRender ?
+                        this.templateRender() :
+                        '')
+                    ]);
+            },
+
+            methods: {
+                methodSelected: function() {
+                    this.$emit('onShippingMethodSelected', this.selected_shipping_method)
+
+                    eventBus.$emit('after-shipping-method-selected', this.selected_shipping_method);
+                }
+            }
+        })
+
+        var paymentTemplateRenderFns = [];
+
+        Vue.component('payment-section', {
+            inject: ['$validator'],
+
+            data: function() {
+                return {
+                    templateRender: null,
+
+                    payment: {
+                        method: ""
+                    },
+
+                    first_iteration : true,
+                }
+            },
+
+            staticRenderFns: paymentTemplateRenderFns,
+
+            mounted: function() {
+                for (method in paymentMethods) {
+                    if (this.first_iteration) {
+                        this.payment.method = paymentMethods[method]['method'];
+                        this.first_iteration = false;
+                        this.methodSelected();
+                    }
+                }
+
+                this.templateRender = paymentHtml.render;
+                for (var i in paymentHtml.staticRenderFns) {
+                    paymentTemplateRenderFns.push(paymentHtml.staticRenderFns[i]);
+                }
+
+                eventBus.$emit('after-checkout-payment-section-added');
+            },
+
+            render: function(h) {
+                return h('div', [
+                    (this.templateRender ?
+                        this.templateRender() :
+                        '')
+                    ]);
+            },
+
+            methods: {
+                methodSelected: function() {
+                    this.$emit('onPaymentMethodSelected', this.payment)
+
+                    eventBus.$emit('after-payment-method-selected', this.payment);
+                }
+            }
+        })
+
+        var reviewTemplateRenderFns = [];
+
+        Vue.component('review-section', {
+            data: function() {
+                return {
+                    templateRender: null,
+
+                    error_message: ''
+                }
+            },
+
+            staticRenderFns: reviewTemplateRenderFns,
+
+            render: function(h) {
+                return h('div', [
+                    (this.templateRender ?
+                        this.templateRender() :
+                        '')
+                    ]);
+            },
+
+            mounted: function() {
+                this.templateRender = reviewHtml.render;
+
+                for (var i in reviewHtml.staticRenderFns) {
+                    // reviewTemplateRenderFns.push(reviewHtml.staticRenderFns[i]);
+                    reviewTemplateRenderFns[i] = reviewHtml.staticRenderFns[i];
+                }
+
+                this.$forceUpdate();
+            }
+        });
+
+
+        var summaryTemplateRenderFns = [];
+
+        Vue.component('summary-section', {
+            inject: ['$validator'],
+
+            data: function() {
+                return {
+                    templateRender: null
+                }
+            },
+
+            staticRenderFns: summaryTemplateRenderFns,
+
+            mounted: function() {
+                this.templateRender = summaryHtml.render;
+
+                for (var i in summaryHtml.staticRenderFns) {
+                    // summaryTemplateRenderFns.push(summaryHtml.staticRenderFns[i]);
+                    summaryTemplateRenderFns[i] = summaryHtml.staticRenderFns[i];
+                }
+
+                this.$forceUpdate();
+            },
+
+            render: function(h) {
+                return h('div', [
+                    (this.templateRender ?
+                        this.templateRender() :
+                        '')
+                    ]);
+            }
+        })
+    </script>
+
+@endpush
diff --git a/resources/themes/shop/views/checkout/onepage/customer-checkout.blade.php b/resources/themes/shop/views/checkout/onepage/customer-checkout.blade.php
new file mode 100644
index 000000000..4ad841c6e
--- /dev/null
+++ b/resources/themes/shop/views/checkout/onepage/customer-checkout.blade.php
@@ -0,0 +1,23 @@
+<div v-if="is_customer_exist">
+    <div class="control-group" id="password">
+        <label for="password">{{ __('shop::app.checkout.onepage.password') }}</label>
+
+        <input type="password" class="control" id="password" name="password" v-model="address.billing.password"/>
+    </div>
+
+    <div class="control-group" id="login-and-forgot-btn">
+        <div class="forgot-password-link"  style="float: right;margin-right: 503px; margin-top: 11px;">
+            <a href="{{ route('customer.forgot-password.create') }}">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
+
+            <div class="mt-10">
+                @if (Cookie::has('enable-resend') && Cookie::get('enable-resend') == true)
+                    <a href="{{ route('customer.resend.verification-email', Cookie::get('email-for-resend')) }}">{{ __('shop::app.customer.login-form.resend-verification') }}</a>
+                @endif
+            </div>
+        </div>
+
+        <button type='button' id="" class="btn btn-primary btn-lg btn-login" @click="loginCustomer">
+            {{ __('shop::app.customer.login-form.button_title') }}
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/onepage/customer-info.blade.php b/resources/themes/shop/views/checkout/onepage/customer-info.blade.php
new file mode 100644
index 000000000..40fbcba67
--- /dev/null
+++ b/resources/themes/shop/views/checkout/onepage/customer-info.blade.php
@@ -0,0 +1,475 @@
+<form data-vv-scope="address-form">
+
+    <div class="form-container" v-if="!this.new_billing_address">
+        <div class="form-header mb-30">
+            <span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.billing-address') }}</span>
+
+            <a class="btn btn-lg btn-primary" @click = newBillingAddress()>
+                {{ __('shop::app.checkout.onepage.new-address') }}
+            </a>
+        </div>
+        <div class="address-holder">
+            <div class="address-card" v-for='(addresses, index) in this.allAddress'>
+                <div class="checkout-address-content" style="display: flex; flex-direction: row; justify-content: space-between; width: 100%;">
+                    <label class="radio-container" style="float: right; width: 10%;">
+                        <input type="radio" v-validate="'required'" id="billing[address_id]" name="billing[address_id]" :value="addresses.id" v-model="address.billing.address_id" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.billing-address') }}&quot;">
+                        <span class="checkmark"></span>
+                    </label>
+
+                    <ul class="address-card-list" style="float: right; width: 85%;">
+                        <li class="mb-5" v-if="addresses.company_name != ''">
+                            @{{ addresses.company_name }}
+                        </li>
+
+                        <li class="mb-10">
+                            <b>@{{ allAddress.first_name }} @{{ allAddress.last_name }},</b>
+                        </li>
+
+                        <li class="mb-5">
+                            @{{ addresses.address1 }},
+                        </li>
+
+                        <li class="mb-5">
+                            @{{ addresses.city }},
+                        </li>
+
+                        <li class="mb-5">
+                            @{{ addresses.state }},
+                        </li>
+
+                        <li class="mb-15">
+                            @{{ addresses.country }}  @{{ addresses.postcode }}
+                        </li>
+
+                        <li>
+                            <b>{{ __('shop::app.customer.account.address.index.contact') }}</b> : @{{ addresses.phone }}
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div id="message"></div>
+            <div class="control-group" :class="[errors.has('address-form.billing[address_id]') ? 'has-error' : '']">
+                <span class="control-error" v-if="errors.has('address-form.billing[address_id]')">
+                    @{{ errors.first('address-form.billing[address_id]') }}
+                </span>
+            </div>
+        </div>
+
+        @if ($cart->haveStockableItems())
+            <div class="control-group mt-5">
+                <span class="checkbox">
+                    <input type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" v-model="address.billing.use_for_shipping"/>
+                        <label class="checkbox-view" for="billing[use_for_shipping]"></label>
+                        {{ __('shop::app.checkout.onepage.use_for_shipping') }}
+                </span>
+            </div>
+        @endif
+    </div>
+
+    <div class="form-container" v-if="this.new_billing_address">
+
+        <div class="form-header">
+            <h1>{{ __('shop::app.checkout.onepage.billing-address') }}</h1>
+
+            @auth('customer')
+                @if(count(auth('customer')->user()->addresses))
+                    <a class="btn btn-lg btn-primary" @click = backToSavedBillingAddress()>
+                        {{ __('shop::app.checkout.onepage.back') }}
+                    </a>
+                @endif
+            @endauth
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[email]') ? 'has-error' : '']">
+            <label for="billing[email]" class="required">
+                {{ __('shop::app.checkout.onepage.email') }}
+            </label>
+
+            <input type="text" v-validate="'required|email'" class="control" id="billing[email]" name="billing[email]" v-model="address.billing.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;" @blur="isCustomerExist"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[email]')">
+                @{{ errors.first('address-form.billing[email]') }}
+            </span>
+        </div>
+
+        {{--  for customer login checkout   --}}
+        @if (! auth()->guard('customer')->check())
+            @include('shop::checkout.onepage.customer-checkout')
+        @endif
+
+        <div class="control-group" :class="[errors.has('address-form.billing[company_name]') ? 'has-error' : '']">
+            <label for="billing[company_name]">
+                {{ __('shop::app.checkout.onepage.company-name') }}
+            </label>
+
+            <input type="text" class="control" id="billing[company_name]" name="billing[company_name]" v-model="address.billing.company_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.company-name') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[company_name]')">
+                @{{ errors.first('address-form.billing[company_name]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[first_name]') ? 'has-error' : '']">
+            <label for="billing[first_name]" class="required">
+                {{ __('shop::app.checkout.onepage.first-name') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing[first_name]" name="billing[first_name]" v-model="address.billing.first_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[first_name]')">
+                @{{ errors.first('address-form.billing[first_name]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[last_name]') ? 'has-error' : '']">
+            <label for="billing[last_name]" class="required">
+                {{ __('shop::app.checkout.onepage.last-name') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing[last_name]" name="billing[last_name]" v-model="address.billing.last_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[last_name]')">
+                @{{ errors.first('address-form.billing[last_name]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[address1][]') ? 'has-error' : '']">
+            <label for="billing_address_0" class="required">
+                {{ __('shop::app.checkout.onepage.address1') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing_address_0" name="billing[address1][]" v-model="address.billing.address1[0]" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[address1][]')">
+                @{{ errors.first('address-form.billing[address1][]') }}
+            </span>
+        </div>
+
+        @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
+            <div class="control-group" style="margin-top: -25px;">
+                @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
+                    <input type="text" class="control" name="billing[address1][{{ $i }}]" id="billing_address_{{ $i }}" v-model="address.billing.address1[{{$i}}]">
+                @endfor
+            </div>
+        @endif
+
+        <div class="control-group" :class="[errors.has('address-form.billing[city]') ? 'has-error' : '']">
+            <label for="billing[city]" class="required">
+                {{ __('shop::app.checkout.onepage.city') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing[city]" name="billing[city]" v-model="address.billing.city" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[city]')">
+                @{{ errors.first('address-form.billing[city]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[country]') ? 'has-error' : '']">
+            <label for="billing[country]" class="required">
+                {{ __('shop::app.checkout.onepage.country') }}
+            </label>
+
+            <select type="text" v-validate="'required'" class="control" id="billing[country]" name="billing[country]" v-model="address.billing.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
+                <option value=""></option>
+
+                @foreach (core()->countries() as $country)
+
+                    <option value="{{ $country->code }}">{{ $country->name }}</option>
+
+                @endforeach
+            </select>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[country]')">
+                @{{ errors.first('address-form.billing[country]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[state]') ? 'has-error' : '']">
+            <label for="billing[state]" class="required">
+                {{ __('shop::app.checkout.onepage.state') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="address.billing.state" v-if="!haveStates('billing')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;"/>
+
+            <select v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="address.billing.state" v-if="haveStates('billing')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
+
+                <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
+
+                <option v-for='(state, index) in countryStates[address.billing.country]' :value="state.code">
+                    @{{ state.default_name }}
+                </option>
+
+            </select>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[state]')">
+                @{{ errors.first('address-form.billing[state]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[postcode]') ? 'has-error' : '']">
+            <label for="billing[postcode]" class="required">
+                {{ __('shop::app.checkout.onepage.postcode') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing[postcode]" name="billing[postcode]" v-model="address.billing.postcode" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[postcode]')">
+                @{{ errors.first('address-form.billing[postcode]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[phone]') ? 'has-error' : '']">
+            <label for="billing[phone]" class="required">
+                {{ __('shop::app.checkout.onepage.phone') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing[phone]" name="billing[phone]" v-model="address.billing.phone" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[phone]')">
+                @{{ errors.first('address-form.billing[phone]') }}
+            </span>
+        </div>
+
+        @if ($cart->haveStockableItems())
+            <div class="control-group">
+                <span class="checkbox">
+                    <input type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" v-model="address.billing.use_for_shipping"/>
+                    <label class="checkbox-view" for="billing[use_for_shipping]"></label>
+                    {{ __('shop::app.checkout.onepage.use_for_shipping') }}
+                </span>
+            </div>
+        @endif
+
+        @auth('customer')
+            <div class="control-group">
+                <span class="checkbox">
+                    <input type="checkbox" id="billing[save_as_address]" name="billing[save_as_address]" v-model="address.billing.save_as_address"/>
+                    <label class="checkbox-view" for="billing[save_as_address]"></label>
+                    {{ __('shop::app.checkout.onepage.save_as_address') }}
+                </span>
+            </div>
+        @endauth
+
+    </div>
+
+    @if ($cart->haveStockableItems())
+        <div class="form-container" v-if="!address.billing.use_for_shipping && !this.new_shipping_address">
+            <div class="form-header mb-30">
+                <span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.shipping-address') }}</span>
+
+                <a class="btn btn-lg btn-primary" @click=newShippingAddress()>
+                    {{ __('shop::app.checkout.onepage.new-address') }}
+                </a>
+            </div>
+
+            <div class="address-holder">
+                <div class="address-card" v-for='(addresses, index) in this.allAddress'>
+                    <div class="checkout-address-content" style="display: flex; flex-direction: row; justify-content: space-between; width: 100%;">
+                        <label class="radio-container" style="float: right; width: 10%;">
+                            <input v-validate="'required'" type="radio" id="shipping[address_id]" name="shipping[address_id]" v-model="address.shipping.address_id" :value="addresses.id"
+                            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-address') }}&quot;">
+                            <span class="checkmark"></span>
+                        </label>
+
+                        <ul class="address-card-list" style="float: right; width: 85%;">
+                            <li class="mb-5" v-if="addresses.company_name != ''">
+                                @{{ addresses.company_name }}
+                            </li>
+
+                            <li class="mb-10">
+                                <b>@{{ addresses.first_name }} @{{ addresses.last_name }},</b>
+                            </li>
+
+                            <li class="mb-5">
+                                @{{ addresses.address1 }},
+                            </li>
+
+                            <li class="mb-5">
+                                @{{ addresses.city }},
+                            </li>
+
+                            <li class="mb-5">
+                                @{{ addresses.state }},
+                            </li>
+
+                            <li class="mb-15">
+                                @{{ addresses.country }} @{{ addresses.postcode }}
+                            </li>
+
+                            <li>
+                                <b>{{ __('shop::app.customer.account.address.index.contact') }}</b> : @{{ addresses.phone }}
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+
+                <div class="control-group" :class="[errors.has('address-form.shipping[address_id]') ? 'has-error' : '']">
+                    <span class="control-error" v-if="errors.has('address-form.shipping[address_id]')">
+                        @{{ errors.first('address-form.shipping[address_id]') }}
+                    </span>
+                </div>
+
+            </div>
+        </div>
+
+        <div class="form-container" v-if="!address.billing.use_for_shipping && this.new_shipping_address">
+
+            <div class="form-header">
+                <h1>{{ __('shop::app.checkout.onepage.shipping-address') }}</h1>
+                @auth('customer')
+                    @if(count(auth('customer')->user()->addresses))
+                        <a class="btn btn-lg btn-primary" @click = backToSavedShippingAddress()>
+                            {{ __('shop::app.checkout.onepage.back') }}
+                        </a>
+                    @endif
+                @endauth
+            </div>
+
+            <div class="control-group" :class="[errors.has('address-form.shipping[first_name]') ? 'has-error' : '']">
+                <label for="shipping[first_name]" class="required">
+                    {{ __('shop::app.checkout.onepage.first-name') }}
+                </label>
+
+                <input type="text" v-validate="'required'" class="control" id="shipping[first_name]" name="shipping[first_name]" v-model="address.shipping.first_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;"/>
+
+                <span class="control-error" v-if="errors.has('address-form.shipping[first_name]')">
+                    @{{ errors.first('address-form.shipping[first_name]') }}
+                </span>
+            </div>
+
+            <div class="control-group" :class="[errors.has('address-form.shipping[last_name]') ? 'has-error' : '']">
+                <label for="shipping[last_name]" class="required">
+                    {{ __('shop::app.checkout.onepage.last-name') }}
+                </label>
+
+                <input type="text" v-validate="'required'" class="control" id="shipping[last_name]" name="shipping[last_name]" v-model="address.shipping.last_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;"/>
+
+                <span class="control-error" v-if="errors.has('address-form.shipping[last_name]')">
+                    @{{ errors.first('address-form.shipping[last_name]') }}
+                </span>
+            </div>
+
+            <div class="control-group" :class="[errors.has('address-form.shipping[email]') ? 'has-error' : '']">
+                <label for="shipping[email]" class="required">
+                    {{ __('shop::app.checkout.onepage.email') }}
+                </label>
+
+                <input type="text" v-validate="'required|email'" class="control" id="shipping[email]" name="shipping[email]" v-model="address.shipping.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
+
+                <span class="control-error" v-if="errors.has('address-form.shipping[email]')">
+                    @{{ errors.first('address-form.shipping[email]') }}
+                </span>
+            </div>
+
+            <div class="control-group" :class="[errors.has('address-form.shipping[address1][]') ? 'has-error' : '']">
+                <label for="shipping_address_0" class="required">
+                    {{ __('shop::app.checkout.onepage.address1') }}
+                </label>
+
+                <input type="text" v-validate="'required'" class="control" id="shipping_address_0" name="shipping[address1][]" v-model="address.shipping.address1[0]" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
+
+                <span class="control-error" v-if="errors.has('address-form.shipping[address1][]')">
+                    @{{ errors.first('address-form.shipping[address1][]') }}
+                </span>
+            </div>
+
+            @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
+                <div class="control-group" style="margin-top: -25px;">
+                    @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
+                        <input type="text" class="control" name="shipping[address1][{{ $i }}]" id="shipping_address_{{ $i }}" v-model="address.shipping.address1[{{$i}}]">
+                    @endfor
+                </div>
+            @endif
+
+            <div class="control-group" :class="[errors.has('address-form.shipping[city]') ? 'has-error' : '']">
+                <label for="shipping[city]" class="required">
+                    {{ __('shop::app.checkout.onepage.city') }}
+                </label>
+
+                <input type="text" v-validate="'required'" class="control" id="shipping[city]" name="shipping[city]" v-model="address.shipping.city" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;"/>
+
+                <span class="control-error" v-if="errors.has('address-form.shipping[city]')">
+                    @{{ errors.first('address-form.shipping[city]') }}
+                </span>
+            </div>
+
+            <div class="control-group" :class="[errors.has('address-form.shipping[country]') ? 'has-error' : '']">
+                <label for="shipping[country]" class="required">
+                    {{ __('shop::app.checkout.onepage.country') }}
+                </label>
+
+                <select type="text" v-validate="'required'" class="control" id="shipping[country]" name="shipping[country]" v-model="address.shipping.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
+                    <option value=""></option>
+
+                    @foreach (core()->countries() as $country)
+                        <option value="{{ $country->code }}">{{ $country->name }}</option>
+                    @endforeach
+                </select>
+
+                <span class="control-error" v-if="errors.has('address-form.shipping[country]')">
+                    @{{ errors.first('address-form.shipping[country]') }}
+                </span>
+            </div>
+
+            <div class="control-group" :class="[errors.has('address-form.shipping[state]') ? 'has-error' : '']">
+                <label for="shipping[state]" class="required">
+                    {{ __('shop::app.checkout.onepage.state') }}
+                </label>
+
+
+                <input type="text" v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state" v-if="!haveStates('shipping')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;"/>
+
+                <select v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state" v-if="haveStates('shipping')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
+
+                    <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
+
+                    <option v-for='(state, index) in countryStates[address.shipping.country]' :value="state.code">
+                        @{{ state.default_name }}
+                    </option>
+
+                </select>
+
+                <span class="control-error" v-if="errors.has('address-form.shipping[state]')">
+                    @{{ errors.first('address-form.shipping[state]') }}
+                </span>
+            </div>
+
+            <div class="control-group" :class="[errors.has('address-form.shipping[postcode]') ? 'has-error' : '']">
+                <label for="shipping[postcode]" class="required">
+                    {{ __('shop::app.checkout.onepage.postcode') }}
+                </label>
+
+                <input type="text" v-validate="'required'" class="control" id="shipping[postcode]" name="shipping[postcode]" v-model="address.shipping.postcode" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;"/>
+
+                <span class="control-error" v-if="errors.has('address-form.shipping[postcode]')">
+                    @{{ errors.first('address-form.shipping[postcode]') }}
+                </span>
+            </div>
+
+            <div class="control-group" :class="[errors.has('address-form.shipping[phone]') ? 'has-error' : '']">
+                <label for="shipping[phone]" class="required">
+                    {{ __('shop::app.checkout.onepage.phone') }}
+                </label>
+
+                <input type="text" v-validate="'required'" class="control" id="shipping[phone]" name="shipping[phone]" v-model="address.shipping.phone" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;"/>
+
+                <span class="control-error" v-if="errors.has('address-form.shipping[phone]')">
+                    @{{ errors.first('address-form.shipping[phone]') }}
+                </span>
+            </div>
+
+            @auth('customer')
+                <div class="control-group">
+                    <span class="checkbox">
+                        <input type="checkbox" id="shipping[save_as_address]" name="shipping[save_as_address]" v-model="address.shipping.save_as_address"/>
+                        <label class="checkbox-view" for="shipping[save_as_address]"></label>
+                        {{ __('shop::app.checkout.onepage.save_as_address') }}
+                    </span>
+                </div>
+            @endauth
+
+        </div>
+    @endif
+
+</form>
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/onepage/payment.blade.php b/resources/themes/shop/views/checkout/onepage/payment.blade.php
new file mode 100644
index 000000000..487d31c7e
--- /dev/null
+++ b/resources/themes/shop/views/checkout/onepage/payment.blade.php
@@ -0,0 +1,51 @@
+<form data-vv-scope="payment-form">
+    <div class="form-container">
+        <div class="form-header mb-30">
+            <span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.payment-methods') }}</span>
+        </div>
+
+        <div class="payment-methods">
+
+            <div class="control-group" :class="[errors.has('payment-form.payment[method]') ? 'has-error' : '']">
+
+                @foreach ($paymentMethods as $payment)
+
+                    {!! view_render_event('bagisto.shop.checkout.payment-method.before', ['payment' => $payment]) !!}
+
+                    <div class="checkout-method-group mb-20">
+                        <div class="line-one">
+                            <label class="radio-container">
+                                <input v-validate="'required'" type="radio" id="{{ $payment['method'] }}" name="payment[method]" value="{{ $payment['method'] }}" v-model="payment.method" @change="methodSelected()" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.payment-method') }}&quot;">
+                                <span class="checkmark"></span>
+                            </label>
+                            <span class="payment-method method-label">
+                                <b>{{ $payment['method_title'] }}</b>
+                            </span>
+                        </div>
+
+                        <div class="line-two mt-5">
+                            <span class="method-summary">{{ __($payment['description']) }}</span>
+                        </div>
+
+                        <?php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($payment['method']); ?>
+
+                        @if (! empty($additionalDetails))
+                            <div class="instructions" v-show="payment.method == '{{$payment['method']}}'">
+                                <label>{{ $additionalDetails['title'] }}</label>
+                                <p>{{ $additionalDetails['value'] }}</p>
+                            </div>
+                        @endif
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.checkout.payment-method.after', ['payment' => $payment]) !!}
+
+                @endforeach
+
+                <span class="control-error" v-if="errors.has('payment-form.payment[method]')">
+                    @{{ errors.first('payment-form.payment[method]') }}
+                </span>
+
+            </div>
+        </div>
+    </div>
+</form>
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/onepage/review.blade.php b/resources/themes/shop/views/checkout/onepage/review.blade.php
new file mode 100644
index 000000000..223514041
--- /dev/null
+++ b/resources/themes/shop/views/checkout/onepage/review.blade.php
@@ -0,0 +1,170 @@
+<div class="form-container">
+    <div class="form-header mb-30">
+        <span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.summary') }}</span>
+    </div>
+
+    <div class="address-summary">
+        @if ($billingAddress = $cart->billing_address)
+            <div class="billing-address">
+                <div class="card-title mb-20">
+                    <b>{{ __('shop::app.checkout.onepage.billing-address') }}</b>
+                </div>
+
+                <div class="card-content">
+                    <ul>
+                        <li class="mb-10">
+                            {{ $billingAddress->company_name ?? '' }}
+                        </li>
+                        <li class="mb-10">
+                            <b>{{ $billingAddress->first_name }} {{ $billingAddress->last_name }}</b>
+                        </li>
+                        <li class="mb-10">
+                            {{ $billingAddress->address1 }},<br/> {{ $billingAddress->state }}
+                        </li>
+                        <li class="mb-10">
+                            {{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }}
+                        </li>
+
+                        <span class="horizontal-rule mb-15 mt-15"></span>
+
+                        <li class="mb-10">
+                            {{ __('shop::app.checkout.onepage.contact') }} : {{ $billingAddress->phone }}
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        @endif
+
+        @if ($cart->haveStockableItems() && $shippingAddress = $cart->shipping_address)
+            <div class="shipping-address">
+                <div class="card-title mb-20">
+                    <b>{{ __('shop::app.checkout.onepage.shipping-address') }}</b>
+                </div>
+
+                <div class="card-content">
+                    <ul>
+                        <li class="mb-10">
+                            {{ $shippingAddress->company_name ?? '' }}
+                        </li>
+                        <li class="mb-10">
+                            <b>{{ $shippingAddress->first_name }} {{ $shippingAddress->last_name }}</b>
+                        </li>
+                        <li class="mb-10">
+                            {{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
+                        </li>
+                        <li class="mb-10">
+                            {{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}
+                        </li>
+
+                        <span class="horizontal-rule mb-15 mt-15"></span>
+
+                        <li class="mb-10">
+                            {{ __('shop::app.checkout.onepage.contact') }} : {{ $shippingAddress->phone }}
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        @endif
+
+    </div>
+
+    @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+
+    <div class="cart-item-list mt-20">
+        @foreach ($cart->items as $item)
+            @php
+                $productBaseImage = $item->product->getTypeInstance()->getBaseImage($item);
+            @endphp
+
+            <div class="item mb-5" style="margin-bottom: 5px;">
+                <div class="item-image">
+                    <img src="{{ $productBaseImage['medium_image_url'] }}"  alt=""/>
+                </div>
+
+                <div class="item-details">
+
+                    {!! view_render_event('bagisto.shop.checkout.name.before', ['item' => $item]) !!}
+
+                    <div class="item-title">
+                        {{ $item->product->name }}
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.checkout.name.after', ['item' => $item]) !!}
+                    {!! view_render_event('bagisto.shop.checkout.price.before', ['item' => $item]) !!}
+
+                    <div class="row">
+                        <span class="title">
+                            {{ __('shop::app.checkout.onepage.price') }}
+                        </span>
+                        <span class="value">
+                            {{ core()->currency($item->base_price) }}
+                        </span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.checkout.price.after', ['item' => $item]) !!}
+                    {!! view_render_event('bagisto.shop.checkout.quantity.before', ['item' => $item]) !!}
+
+                    <div class="row">
+                        <span class="title">
+                            {{ __('shop::app.checkout.onepage.quantity') }}
+                        </span>
+                        <span class="value">
+                            {{ $item->quantity }}
+                        </span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.checkout.quantity.after', ['item' => $item]) !!}
+
+                    {!! view_render_event('bagisto.shop.checkout.options.before', ['item' => $item]) !!}
+
+                    @if (isset($item->additional['attributes']))
+                        <div class="item-options">
+
+                            @foreach ($item->additional['attributes'] as $attribute)
+                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                            @endforeach
+
+                        </div>
+                    @endif
+
+                    {!! view_render_event('bagisto.shop.checkout.options.after', ['item' => $item]) !!}
+                </div>
+            </div>
+        @endforeach
+    </div>
+
+    <div class="order-description mt-20">
+        <div class="pull-left" style="width: 60%; float: left;">
+            @if ($cart->haveStockableItems())
+                <div class="shipping">
+                    <div class="decorator">
+                        <i class="icon shipping-icon"></i>
+                    </div>
+
+                    <div class="text">
+                        {{ core()->currency($cart->selected_shipping_rate->base_price) }}
+
+                        <div class="info">
+                            {{ $cart->selected_shipping_rate->method_title }}
+                        </div>
+                    </div>
+                </div>
+            @endif
+
+            <div class="payment">
+                <div class="decorator">
+                    <i class="icon payment-icon"></i>
+                </div>
+
+                <div class="text">
+                    {{ core()->getConfigData('sales.paymentmethods.' . $cart->payment->method . '.title') }}
+                </div>
+            </div>
+
+        </div>
+
+        <div class="pull-right" style="width: 40%; float: left;">
+            <slot name="summary-section"></slot>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/onepage/shipping.blade.php b/resources/themes/shop/views/checkout/onepage/shipping.blade.php
new file mode 100644
index 000000000..e1a6dbab8
--- /dev/null
+++ b/resources/themes/shop/views/checkout/onepage/shipping.blade.php
@@ -0,0 +1,48 @@
+<form data-vv-scope="shipping-form">
+    <div class="form-container">
+        <div class="form-header mb-30">
+            <span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.shipping-method') }}</span>
+        </div>
+
+        <div class="shipping-methods">
+
+            <div class="control-group" :class="[errors.has('shipping-form.shipping_method') ? 'has-error' : '']">
+
+                @foreach ($shippingRateGroups as $rateGroup)
+                    {!! view_render_event('bagisto.shop.checkout.shipping-method.before', ['rateGroup' => $rateGroup]) !!}
+
+                    <span class="carrier-title" id="carrier-title" style="font-size:18px; font-weight: bold;">
+                        {{ $rateGroup['carrier_title'] }}
+                    </span>
+
+                    @foreach ($rateGroup['rates'] as $rate)
+                        <div class="checkout-method-group mb-20">
+                            <div class="line-one">
+                                <label class="radio-container">
+                                    <input v-validate="'required'" type="radio" id="{{ $rate->method }}" name="shipping_method" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-method') }}&quot;" value="{{ $rate->method }}" v-model="selected_shipping_method" @change="methodSelected()">
+                                    <span class="checkmark"></span>
+                                </label>
+                                {{-- <label class="radio-view" for="{{ $rate->method }}"></label> --}}
+                                <b class="ship-rate method-label">{{ core()->currency($rate->base_price) }}</b>
+                            </div>
+
+                            <div class="line-two mt-5">
+                                <div class="method-summary">
+                                    <b>{{ $rate->method_title }}</b> - {{ __($rate->method_description) }}
+                                </div>
+                            </div>
+                        </div>
+
+                    @endforeach
+
+                    {!! view_render_event('bagisto.shop.checkout.shipping-method.after', ['rateGroup' => $rateGroup]) !!}
+
+                @endforeach
+
+                <span class="control-error" v-if="errors.has('shipping-form.shipping_method')">
+                    @{{ errors.first('shipping-form.shipping_method') }}
+                </span>
+            </div>
+        </div>
+    </div>
+</form>
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/success.blade.php b/resources/themes/shop/views/checkout/success.blade.php
new file mode 100644
index 000000000..c403360ad
--- /dev/null
+++ b/resources/themes/shop/views/checkout/success.blade.php
@@ -0,0 +1,27 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.checkout.success.title') }}
+@stop
+
+@section('content-wrapper')
+
+    <div class="order-success-content" style="min-height: 300px;">
+        <h1>{{ __('shop::app.checkout.success.thanks') }}</h1>
+
+        <p>{{ __('shop::app.checkout.success.order-id-info', ['order_id' => $order->increment_id]) }}</p>
+
+        <p>{{ __('shop::app.checkout.success.info') }}</p>
+
+        {{ view_render_event('bagisto.shop.checkout.continue-shopping.before', ['order' => $order]) }}
+
+        <div class="misc-controls">
+            <a style="display: inline-block" href="{{ route('shop.home.index') }}" class="btn btn-lg btn-primary">
+                {{ __('shop::app.checkout.cart.continue-shopping') }}
+            </a>
+        </div>
+        
+        {{ view_render_event('bagisto.shop.checkout.continue-shopping.after', ['order' => $order]) }}
+        
+    </div>
+@endsection
diff --git a/resources/themes/shop/views/checkout/total/summary.blade.php b/resources/themes/shop/views/checkout/total/summary.blade.php
new file mode 100644
index 000000000..76a6b238b
--- /dev/null
+++ b/resources/themes/shop/views/checkout/total/summary.blade.php
@@ -0,0 +1,45 @@
+<div class="order-summary">
+    <h3>{{ __('shop::app.checkout.total.order-summary') }}</h3>
+
+    <div class="item-detail">
+        <label>
+            {{ intval($cart->items_qty) }}
+            {{ __('shop::app.checkout.total.sub-total') }}
+            {{ __('shop::app.checkout.total.price') }}
+        </label>
+        <label class="right">{{ core()->currency($cart->base_sub_total) }}</label>
+    </div>
+
+    @if ($cart->selected_shipping_rate)
+        <div class="item-detail">
+            <label>{{ __('shop::app.checkout.total.delivery-charges') }}</label>
+            <label class="right">{{ core()->currency($cart->selected_shipping_rate->base_price) }}</label>
+        </div>
+    @endif
+
+    @if ($cart->base_tax_total)
+        @foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($cart, true) as $taxRate => $baseTaxAmount )
+        <div class="item-detail">
+            <label id="taxrate-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ __('shop::app.checkout.total.tax') }} {{ $taxRate }} %</label>
+            <label class="right" id="basetaxamount-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ core()->currency($baseTaxAmount) }}</label>
+        </div>
+        @endforeach
+    @endif
+
+    <div class="item-detail" id="discount-detail" @if ($cart->base_discount_amount && $cart->base_discount_amount > 0) style="display: block;" @else style="display: none;" @endif>
+        <label>
+            {{ __('shop::app.checkout.total.disc-amount') }}
+        </label>
+        <label class="right">
+            -{{ core()->currency($cart->base_discount_amount) }}
+        </label>
+    </div>
+
+
+    <div class="payable-amount" id="grand-total-detail">
+        <label>{{ __('shop::app.checkout.total.grand-total') }}</label>
+        <label class="right" id="grand-total-amount-detail">
+            {{ core()->currency($cart->base_grand_total) }}
+        </label>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/themes/shop/views/cms/page.blade.php b/resources/themes/shop/views/cms/page.blade.php
new file mode 100644
index 000000000..fe29692bd
--- /dev/null
+++ b/resources/themes/shop/views/cms/page.blade.php
@@ -0,0 +1,17 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ $page->page_title }}
+@endsection
+
+@section('seo')
+    <meta name="title" content="{{ $page->meta_title }}" />
+
+    <meta name="description" content="{{ $page->meta_description }}" />
+
+    <meta name="keywords" content="{{ $page->meta_keywords }}" />
+@endsection
+
+@section('content-wrapper')
+    {!! DbView::make($page)->field('html_content')->render() !!}
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/address/country-state.blade.php b/resources/themes/shop/views/customers/account/address/country-state.blade.php
new file mode 100644
index 000000000..ba1bfb6c1
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/address/country-state.blade.php
@@ -0,0 +1,74 @@
+<country-state></country-state>
+
+@push('scripts')
+
+    <script type="text/x-template" id="country-state-template">
+        <div>
+            <div class="control-group" :class="[errors.has('country') ? 'has-error' : '']">
+                <label for="country" class="required">
+                    {{ __('shop::app.customer.account.address.create.country') }}
+                </label>
+
+                <select type="text" v-validate="'required'" class="control" id="country" name="country" v-model="country" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.country') }}&quot;">
+                    <option value=""></option>
+                    @foreach (core()->countries() as $country)
+                        <option {{ $country->code === $defaultCountry ? 'selected' : '' }}  value="{{ $country->code }}">{{ $country->name }}</option>
+                    @endforeach
+                </select>
+
+                <span class="control-error" v-if="errors.has('country')">
+                    @{{ errors.first('country') }}
+                </span>
+            </div>
+
+            <div class="control-group" :class="[errors.has('state') ? 'has-error' : '']">
+                <label for="state" class="required">
+                    {{ __('shop::app.customer.account.address.create.state') }}
+                </label>
+
+                <input type="text" v-validate="'required'" class="control" id="state" name="state" v-model="state" v-if="!haveStates()" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.state') }}&quot;"/>
+                <select v-validate="'required'" class="control" id="state" name="state" v-model="state" v-if="haveStates()" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.state') }}&quot;">
+
+                    <option value="">{{ __('shop::app.customer.account.address.create.select-state') }}</option>
+
+                    <option v-for='(state, index) in countryStates[country]' :value="state.code">
+                        @{{ state.default_name }}
+                    </option>
+
+                </select>
+
+                <span class="control-error" v-if="errors.has('state')">
+                    @{{ errors.first('state') }}
+                </span>
+            </div>
+        </div>
+    </script>
+
+    <script>
+        Vue.component('country-state', {
+
+            template: '#country-state-template',
+
+            inject: ['$validator'],
+
+            data() {
+                return {
+                    country: "{{ $countryCode ?? $defaultCountry }}",
+
+                    state: "{{ $stateCode }}",
+
+                    countryStates: @json(core()->groupedStatesByCountries())
+                }
+            },
+
+            methods: {
+                haveStates() {
+                    if (this.countryStates[this.country] && this.countryStates[this.country].length)
+                        return true;
+
+                    return false;
+                },
+            }
+        });
+    </script>
+@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/address/create.blade.php b/resources/themes/shop/views/customers/account/address/create.blade.php
new file mode 100644
index 000000000..f7ecf22ef
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/address/create.blade.php
@@ -0,0 +1,124 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.account.address.create.page-title') }}
+@endsection
+
+@section('content-wrapper')
+
+    <div class="account-content">
+
+        @include('shop::customers.account.partials.sidemenu')
+
+        <div class="account-layout">
+            <div class="account-head mb-15">
+                <span class="back-icon"><a href="{{ route('customer.address.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="account-heading">{{ __('shop::app.customer.account.address.create.title') }}</span>
+                <span></span>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.address.create.before') !!}
+
+            <form id="customer-address-form" method="post" action="{{ route('customer.address.store') }}" @submit.prevent="onSubmit">
+
+                <div class="account-table-content">
+                    @csrf
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.before') !!}
+
+                    <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
+                        <label for="company_name">{{ __('shop::app.customer.account.address.create.company_name') }}</label>
+                        <input value="{{ old('company_name') }}" type="text" class="control" name="company_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.company_name') }}&quot;">
+                        <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.company_name.after') !!}
+
+                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                        <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
+                        <input value="{{ old('first_name') }}" type="text" class="control" name="first_name" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
+                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.first_name.after') !!}
+
+                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
+                        <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
+                        <input value="{{ old('last_name') }}" type="text" class="control" name="last_name" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
+                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.last_name.after') !!}
+
+                    <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
+                        <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}
+                            <span class="help-note">{{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
+                        </label>
+                        <input type="text" class="control" name="vat_id" value="{{ old('vat_id') }}"
+                        v-validate="''" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
+                        <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.vat_id.after') !!}
+
+                    <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
+                        <label for="address1" class="required">{{ __('shop::app.customer.account.address.create.street-address') }}</label>
+                        <input type="text" class="control" name="address1[]" value="{{ old('address1') }}" id="address1" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
+                        <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
+                    </div>
+
+                    @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
+                        <div class="control-group" style="margin-top: -25px;">
+                            @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
+                                <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}">
+                            @endfor
+                        </div>
+                    @endif
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.street-address.after') !!}
+
+                    @include ('shop::customers.account.address.country-state', ['countryCode' => old('country'), 'stateCode' => old('state')])
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.country-state.after') !!}
+
+                    <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
+                        <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
+                        <input value="{{ old('city') }}" type="text" class="control" name="city" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
+                        <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.city.after') !!}
+
+                    <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
+                        <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
+                        <input value="{{ old('postcode') }}" type="text" class="control" name="postcode" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
+                        <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.postcode.after') !!}
+
+                    <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
+                        <label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
+                        <input value="{{ old('phone') }}" type="text" class="control" name="phone" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
+                        <span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.after') !!}
+
+                    <div class="button-group">
+                        <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.account.address.create.submit') }}">
+                        {{-- <button class="btn btn-primary btn-lg" type="submit">
+                            {{ __('shop::app.customer.account.address.edit.submit') }}
+                        </button> --}}
+                    </div>
+
+                </div>
+
+            </form>
+
+            {!! view_render_event('bagisto.shop.customers.account.address.create.after') !!}
+
+        </div>
+    </div>
+
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/address/edit.blade.php b/resources/themes/shop/views/customers/account/address/edit.blade.php
new file mode 100644
index 000000000..aa7bcbd34
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/address/edit.blade.php
@@ -0,0 +1,125 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.account.address.edit.page-title') }}
+@endsection
+
+@section('content-wrapper')
+
+    <div class="account-content">
+        @include('shop::customers.account.partials.sidemenu')
+
+        <div class="account-layout">
+
+            <div class="account-head mb-15">
+                <span class="back-icon"><a href="{{ route('customer.address.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="account-heading">{{ __('shop::app.customer.account.address.edit.title') }}</span>
+                <span></span>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.address.edit.before', ['address' => $address]) !!}
+
+            <form id="customer-address-form" method="post" action="{{ route('customer.address.update', $address->id) }}" @submit.prevent="onSubmit">
+
+                <div class="account-table-content">
+                    @method('PUT')
+                    @csrf
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.before', ['address' => $address]) !!}
+
+                    <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
+                        <label for="company_name">{{ __('shop::app.customer.account.address.edit.company_name') }}</label>
+                        <input type="text" value="{{ old('company_name') ?: $address->company_name }}"  class="control" name="company_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.edit.company_name') }}&quot;">
+                        <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.company_name.after') !!}
+
+                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                        <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
+                        <input type="text" class="control" name="first_name" v-validate="'required'" value="{{ old('first_name') ?: $address->first_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
+                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.first_name.after') !!}
+
+                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
+                        <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
+                        <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ old('last_name') ?: $address->last_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
+                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.last_name.after') !!}
+
+                    <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
+                        <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}
+                            <span class="help-note">{{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
+                        </label>
+                        <input type="text" class="control" name="vat_id" value="{{ old('vat_id') ?: $address->vat_id }}"
+                        v-validate="''" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
+                        <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.vat_id.after') !!}
+
+                    <?php $addresses = explode(PHP_EOL, $address->address1); ?>
+
+                    <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
+                        <label for="address_0" class="required">{{ __('shop::app.customer.account.address.edit.street-address') }}</label>
+                        <input type="text" class="control" name="address1[]" id="address_0" v-validate="'required'" value="{{ isset($addresses[0]) ? $addresses[0] : '' }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
+                        <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
+                    </div>
+
+                    @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
+                        <div class="control-group" style="margin-top: -25px;">
+                            @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
+                                <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}" value="{{ isset($addresses[$i]) ? $addresses[$i] : '' }}">
+                            @endfor
+                        </div>
+                    @endif
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.street-addres.after') !!}
+
+                    @include ('shop::customers.account.address.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state])
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.country-state.after') !!}
+
+                    <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
+                        <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
+                        <input type="text" class="control" name="city" v-validate="'required|regex:^[a-zA-Z \-]*$'" value="{{ old('city') ?: $address->city }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
+                        <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.create.after') !!}
+
+                    <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
+                        <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
+                        <input type="text" class="control" name="postcode" v-validate="'required'" value="{{ old('postcode') ?: $address->postcode }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
+                        <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.postcode.after') !!}
+
+                    <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
+                        <label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
+                        <input type="text" class="control" name="phone" v-validate="'required'" value="{{ old('phone') ?: $address->phone }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
+                        <span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.after', ['address' => $address]) !!}
+
+                    <div class="button-group">
+                        <button class="btn btn-primary btn-lg" type="submit">
+                            {{ __('shop::app.customer.account.address.create.submit') }}
+                        </button>
+                    </div>
+                </div>
+
+            </form>
+
+            {!! view_render_event('bagisto.shop.customers.account.address.edit.after', ['address' => $address]) !!}
+
+        </div>
+    </div>
+
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/address/index.blade.php b/resources/themes/shop/views/customers/account/address/index.blade.php
new file mode 100644
index 000000000..b099f377b
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/address/index.blade.php
@@ -0,0 +1,112 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.account.address.index.page-title') }}
+@endsection
+
+@section('content-wrapper')
+
+    <div class="account-content">
+
+        @include('shop::customers.account.partials.sidemenu')
+
+        <div class="account-layout">
+
+            <div class="account-head">
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span
+                    class="account-heading">{{ __('shop::app.customer.account.address.index.title') }}</span>
+
+                @if (! $addresses->isEmpty())
+                    <span class="account-action">
+                    <a href="{{ route('customer.address.create') }}">{{ __('shop::app.customer.account.address.index.add') }}</a>
+                </span>
+                @else
+                    <span></span>
+                @endif
+                <div class="horizontal-rule"></div>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.address.list.before', ['addresses' => $addresses]) !!}
+
+            <div class="account-table-content">
+                @if ($addresses->isEmpty())
+                    <div>{{ __('shop::app.customer.account.address.index.empty') }}</div>
+                    <br/>
+                    <a href="{{ route('customer.address.create') }}">{{ __('shop::app.customer.account.address.index.add') }}</a>
+                @else
+                    <div class="address-holder">
+                        @foreach ($addresses as $address)
+                            <div class="address-card">
+                                <div class="details">
+                                    <span
+                                        class="bold">{{ auth()->guard('customer')->user()->name }}</span>
+                                    <ul class="address-card-list">
+                                        <li class="mt-5">
+                                            {{ $address->company_name }}
+                                        </li>
+
+                                        <li class="mt-5">
+                                            {{ $address->first_name }}
+                                        </li>
+
+                                        <li class="mt-5">
+                                            {{ $address->last_name }}
+                                        </li>
+
+                                        <li class="mt-5">
+                                            {{ $address->address1 }},
+                                        </li>
+
+                                        <li class="mt-5">
+                                            {{ $address->city }}
+                                        </li>
+
+                                        <li class="mt-5">
+                                            {{ $address->state }}
+                                        </li>
+
+                                        <li class="mt-5">
+                                            {{ core()->country_name($address->country) }} {{ $address->postcode }}
+                                        </li>
+
+                                        <li class="mt-10">
+                                            {{ __('shop::app.customer.account.address.index.contact') }}
+                                            : {{ $address->phone }}
+                                        </li>
+                                    </ul>
+
+                                    <div class="control-links mt-20">
+                                    <span>
+                                        <a href="{{ route('customer.address.edit', $address->id) }}">
+                                            {{ __('shop::app.customer.account.address.index.edit') }}
+                                        </a>
+                                    </span>
+
+                                        <span>
+                                        <a href="{{ route('address.delete', $address->id) }}"
+                                           onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
+                                            {{ __('shop::app.customer.account.address.index.delete') }}
+                                        </a>
+                                    </span>
+                                    </div>
+                                </div>
+                            </div>
+                        @endforeach
+                    </div>
+                @endif
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.address.list.after', ['addresses' => $addresses]) !!}
+        </div>
+    </div>
+@endsection
+
+@push('scripts')
+    <script>
+        function deleteAddress(message) {
+            if (!confirm(message))
+                event.preventDefault();
+        }
+    </script>
+@endpush
diff --git a/resources/themes/shop/views/customers/account/compare/index.blade.php b/resources/themes/shop/views/customers/account/compare/index.blade.php
new file mode 100644
index 000000000..7b6de5e66
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/compare/index.blade.php
@@ -0,0 +1,29 @@
+@extends('shop::layouts.master')
+
+@include('shop::guest.compare.compare-products')
+
+@section('page_title')
+    {{ __('shop::app.customer.compare.compare_similar_items') }}
+@endsection
+
+@section('content-wrapper')
+
+    <div class="account-content">
+        @include('shop::customers.account.partials.sidemenu')
+
+        <div class="account-layout">
+            {!! view_render_event('bagisto.shop.customers.account.comparison.list.before') !!}
+
+            <div class="account-items-list">
+                <div class="account-table-content">
+                    <compare-product></compare-product>
+                </div>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.comparison.list.after') !!}
+
+        </div>
+
+    </div>
+
+@endsection
diff --git a/resources/themes/shop/views/customers/account/downloadable_products/index.blade.php b/resources/themes/shop/views/customers/account/downloadable_products/index.blade.php
new file mode 100644
index 000000000..583ebe97e
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/downloadable_products/index.blade.php
@@ -0,0 +1,39 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.account.downloadable_products.title') }}
+@endsection
+
+@section('content-wrapper')
+
+    <div class="account-content">
+        @include('shop::customers.account.partials.sidemenu')
+
+        <div class="account-layout">
+
+            <div class="account-head mb-10">
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="account-heading">
+                    {{ __('shop::app.customer.account.downloadable_products.title') }}
+                </span>
+
+                <div class="horizontal-rule"></div>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.downloadable_products.list.before') !!}
+
+            <div class="account-items-list">
+                <div class="account-table-content">
+
+                    {!! app('Webkul\Shop\DataGrids\DownloadableProductDataGrid')->render() !!}
+
+                </div>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.downloadable_products.list.after') !!}
+
+        </div>
+
+    </div>
+
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/index.blade.php b/resources/themes/shop/views/customers/account/index.blade.php
new file mode 100644
index 000000000..4097e93df
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/index.blade.php
@@ -0,0 +1,9 @@
+@extends('shop::layouts.master')
+
+@section('content-wrapper')
+    <div class="account-content">
+        @include('shop::customers.account.partials.sidemenu')
+        <h1>Account Index Page</h1>
+    </div>
+    
+@endsection
diff --git a/resources/themes/shop/views/customers/account/orders/index.blade.php b/resources/themes/shop/views/customers/account/orders/index.blade.php
new file mode 100644
index 000000000..6c53d4602
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/orders/index.blade.php
@@ -0,0 +1,39 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.account.order.index.page-title') }}
+@endsection
+
+@section('content-wrapper')
+
+    <div class="account-content">
+        @include('shop::customers.account.partials.sidemenu')
+
+        <div class="account-layout">
+
+            <div class="account-head mb-10">
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="account-heading">
+                    {{ __('shop::app.customer.account.order.index.title') }}
+                </span>
+
+                <div class="horizontal-rule"></div>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.orders.list.before') !!}
+
+            <div class="account-items-list">
+                <div class="account-table-content">
+
+                    {!! app('Webkul\Shop\DataGrids\OrderDataGrid')->render() !!}
+
+                </div>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.orders.list.after') !!}
+
+        </div>
+
+    </div>
+
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/orders/pdf.blade.php b/resources/themes/shop/views/customers/account/orders/pdf.blade.php
new file mode 100644
index 000000000..1826d8fe9
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/orders/pdf.blade.php
@@ -0,0 +1,324 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+    <head>
+        <meta http-equiv="Cache-control" content="no-cache">
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+        <style type="text/css">
+            * {
+                font-family: DejaVu Sans;
+            }
+
+            body, th, td, h5 {
+                font-size: 12px;
+                color: #000;
+            }
+
+            .container {
+                padding: 20px;
+                display: block;
+            }
+
+            .invoice-summary {
+                margin-bottom: 20px;
+            }
+
+            .table {
+                margin-top: 20px;
+            }
+
+            .table table {
+                width: 100%;
+                border-collapse: collapse;
+                text-align: left;
+                table-layout: fixed;
+            }
+
+            .table thead th {
+                font-weight: 700;
+                border-top: solid 1px #d3d3d3;
+                border-bottom: solid 1px #d3d3d3;
+                border-left: solid 1px #d3d3d3;
+                padding: 5px 10px;
+                background: #F4F4F4;
+            }
+
+            .table thead th:last-child {
+                border-right: solid 1px #d3d3d3;
+            }
+
+            .table tbody td {
+                padding: 5px 10px;
+                border-bottom: solid 1px #d3d3d3;
+                border-left: solid 1px #d3d3d3;
+                color: #3A3A3A;
+                vertical-align: middle;
+            }
+
+            .table tbody td p {
+                margin: 0;
+            }
+
+            .table tbody td:last-child {
+                border-right: solid 1px #d3d3d3;
+            }
+
+           .sale-summary {
+                margin-top: 40px;
+                float: right;
+            }
+
+            .sale-summary tr td {
+                padding: 3px 5px;
+            }
+
+            .sale-summary tr.bold {
+                font-weight: 700;
+            }
+
+            .label {
+                color: #000;
+                font-weight: bold;
+            }
+
+            .logo {
+                height: 70px;
+                width: 70px;
+            }
+
+            .merchant-details {
+                margin-bottom: 5px;
+            }
+
+            .merchant-details-title {
+                font-weight: bold;
+            }
+
+            .text-center {
+                text-align: center;
+            }
+        </style>
+    </head>
+
+    <body style="background-image: none;background-color: #fff;">
+        <div class="container">
+
+            <div class="header">
+                <div class="row">
+                    <div class="col-12">
+                        <h1 class="text-center">{{ __('admin::app.sales.invoices.invoice') }}</h1>
+                    </div>
+                </div>
+                @if (core()->getConfigData('sales.orderSettings.invoice_slip_design.logo'))
+                    <div class="image">
+                        <img class="logo" src="{{ Storage::url(core()->getConfigData('sales.orderSettings.invoice_slip_design.logo')) }}" alt=""/>
+                    </div>
+                @endif
+                <div class="merchant-details">
+                    <div><span class="merchant-details-title">{{ core()->getConfigData('sales.shipping.origin.store_name') ? core()->getConfigData('sales.shipping.origin.store_name') : '' }}</span></div>
+                    <div>{{ core()->getConfigData('sales.shipping.origin.address1') ? core()->getConfigData('sales.shipping.origin.address1') : '' }}</div>
+                    <div>
+                        <span>{{ core()->getConfigData('sales.shipping.origin.zipcode') ? core()->getConfigData('sales.shipping.origin.zipcode') : '' }}</span>
+                        <span>{{ core()->getConfigData('sales.shipping.origin.city') ? core()->getConfigData('sales.shipping.origin.city') : '' }}</span></div>
+                    <div>{{ core()->getConfigData('sales.shipping.origin.state') ? core()->getConfigData('sales.shipping.origin.state') : '' }}</div>
+                    <div>{{ core()->getConfigData('sales.shipping.origin.country') ?  core()->country_name(core()->getConfigData('sales.shipping.origin.country')) : '' }}</div>
+                </div>
+                <div class="merchant-details">
+                    @if (core()->getConfigData('sales.shipping.origin.contact'))
+                        <div><span class="merchant-details-title">{{ __('admin::app.admin.system.contact-number') }}:</span> {{ core()->getConfigData('sales.shipping.origin.contact') }}</div>
+                    @endif
+                    @if (core()->getConfigData('sales.shipping.origin.vat_number'))
+                        <div><span class="merchant-details-title">{{ __('admin::app.admin.system.vat-number') }}:</span> {{ core()->getConfigData('sales.shipping.origin.vat_number') }}</div>
+                    @endif
+                    @if (core()->getConfigData('sales.shipping.origin.bank_details'))
+                        <div><span class="merchant-details-title">{{ __('admin::app.admin.system.bank-details') }}:</span> {{ core()->getConfigData('sales.shipping.origin.bank_details') }}</div>
+                    @endif
+                </div>
+            </div>
+
+            <div class="invoice-summary">
+
+                <div class="row">
+                    <span class="label">{{ __('shop::app.customer.account.order.view.invoice-id') }} -</span>
+                    <span class="value">#{{ $invoice->id }}</span>
+                </div>
+
+                <div class="row">
+                    <span class="label">{{ __('shop::app.customer.account.order.view.order-id') }} -</span>
+                    <span class="value">#{{ $invoice->order->increment_id }}</span>
+                </div>
+
+                <div class="row">
+                    <span class="label">{{ __('shop::app.customer.account.order.view.order-date') }} -</span>
+                    <span class="value">{{ core()->formatDate($invoice->order->created_at, 'd-m-Y') }}</span>
+                </div>
+
+                <div class="table address">
+                    <table>
+                        <thead>
+                            <tr>
+                                <th style="width: 50%">{{ __('shop::app.customer.account.order.view.bill-to') }}</th>
+                                @if ($invoice->order->shipping_address)
+                                    <th>{{ __('shop::app.customer.account.order.view.ship-to') }}</th>
+                                @endif
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            <tr>
+                                <td>
+                                    <p>{{ $invoice->order->billing_address->company_name ?? '' }}</p>
+                                    <p>{{ $invoice->order->billing_address->name }}</p>
+                                    <p>{{ $invoice->order->billing_address->address1 }}</p>
+                                    <p>{{ $invoice->order->billing_address->city }}</p>
+                                    <p>{{ $invoice->order->billing_address->state }}</p>
+                                    <p>
+                                        {{ core()->country_name($invoice->order->billing_address->country) }}
+                                        {{ $invoice->order->billing_address->postcode }}
+                                    </p>
+                                    {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->billing_address->phone }}
+                                </td>
+
+                                @if ($invoice->order->shipping_address)
+                                    <td>
+                                        <p>{{ $invoice->order->shipping_address->company_name ?? '' }}</p>
+                                        <p>{{ $invoice->order->shipping_address->name }}</p>
+                                        <p>{{ $invoice->order->shipping_address->address1 }}</p>
+                                        <p>{{ $invoice->order->shipping_address->city }}</p>
+                                        <p>{{ $invoice->order->shipping_address->state }}</p>
+                                        <p>{{ core()->country_name($invoice->order->shipping_address->country) }} {{ $invoice->order->shipping_address->postcode }}</p>
+                                        {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->shipping_address->phone }}
+                                    </td>
+                                @endif
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+
+                <div class="table payment-shipment">
+                    <table>
+                        <thead>
+                            <tr>
+                                <th style="width: 50%">{{ __('shop::app.customer.account.order.view.payment-method') }}</th>
+
+                                @if ($invoice->order->shipping_address)
+                                    <th>{{ __('shop::app.customer.account.order.view.shipping-method') }}</th>
+                                @endif
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            <tr>
+                                <td>
+                                    {{ core()->getConfigData('sales.paymentmethods.' . $invoice->order->payment->method . '.title') }}
+
+                                    @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($invoice->order->payment->method); @endphp
+
+                                    @if (! empty($additionalDetails))
+                                        <div>
+                                            <label class="label">{{ $additionalDetails['title'] }}:</label>
+                                            <p class="value">{{ $additionalDetails['value'] }}</p>
+                                        </div>
+                                    @endif
+                                </td>
+
+                                @if ($invoice->order->shipping_address)
+                                    <td>
+                                        {{ $invoice->order->shipping_title }}
+                                    </td>
+                                @endif
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+
+                <div class="table items">
+                    <table>
+                        <thead>
+                            <tr>
+                                <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
+                                <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                                <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
+                                <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
+                                <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
+                            </tr>
+                        </thead>
+
+                        <tbody>
+
+                            @foreach ($invoice->items as $item)
+                                <tr>
+                                    <td>{{ $item->child ? $item->child->sku : $item->sku }}</td>
+
+                                    <td>
+                                        {{ $item->name }}
+
+                                        @if (isset($item->additional['attributes']))
+                                            <div class="item-options">
+
+                                                @foreach ($item->additional['attributes'] as $attribute)
+                                                    <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                                @endforeach
+
+                                            </div>
+                                        @endif
+                                    </td>
+
+                                    <td>{{ core()->formatPrice($item->price, $invoice->order->order_currency_code) }}</td>
+
+                                    <td>{{ $item->qty }}</td>
+
+                                    <td>{{ core()->formatPrice($item->total, $invoice->order->order_currency_code) }}</td>
+
+                                    <td>{{ core()->formatPrice($item->tax_amount, $invoice->order->order_currency_code) }}</td>
+
+                                    <td>{{ core()->formatPrice(($item->total + $item->tax_amount), $invoice->order->order_currency_code) }}</td>
+                                </tr>
+                            @endforeach
+
+                        </tbody>
+                    </table>
+                </div>
+
+
+                <table class="sale-summary">
+                    <tr>
+                        <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
+                        <td>-</td>
+                        <td>{{ core()->formatPrice($invoice->sub_total, $invoice->order->order_currency_code) }}</td>
+                    </tr>
+
+                    <tr>
+                        <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
+                        <td>-</td>
+                        <td>{{ core()->formatPrice($invoice->shipping_amount, $invoice->order->order_currency_code) }}</td>
+                    </tr>
+
+                    @if ($invoice->base_discount_amount > 0)
+                        <tr>
+                            <td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
+                            <td>-</td>
+                            <td>{{ core()->formatPrice($invoice->discount_amount, $invoice->order_currency_code) }}</td>
+                        </tr>
+                    @endif
+
+                    <tr>
+                        <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
+                        <td>-</td>
+                        <td>{{ core()->formatPrice($invoice->tax_amount, $invoice->order->order_currency_code) }}</td>
+                    </tr>
+
+                    <tr class="bold">
+                        <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
+                        <td>-</td>
+                        <td>{{ core()->formatPrice($invoice->grand_total, $invoice->order->order_currency_code) }}</td>
+                    </tr>
+                </table>
+
+            </div>
+
+        </div>
+    </body>
+</html>
diff --git a/resources/themes/shop/views/customers/account/orders/view.blade.php b/resources/themes/shop/views/customers/account/orders/view.blade.php
new file mode 100644
index 000000000..78d34d5d1
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/orders/view.blade.php
@@ -0,0 +1,562 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
+@endsection
+
+@section('content-wrapper')
+
+    <div class="account-content">
+        @include('shop::customers.account.partials.sidemenu')
+
+        <div class="account-layout">
+
+            <div class="account-head">
+                <span class="back-icon"><a href="{{ route('customer.orders.index') }}"><i class="icon icon-menu-back"></i></a></span>
+
+                <span class="account-heading">
+                    {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
+                </span>
+                <span></span>
+
+
+                @if ($order->canCancel())
+                    <a href="{{ route('customer.orders.cancel', $order->id) }}" class="btn btn-lg btn-primary" v-alert:message="'{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}'" style="float: right;">
+                        {{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
+                    </a>
+                @endif
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.orders.view.before', ['order' => $order]) !!}
+
+            <div class="sale-container">
+
+                <tabs>
+                    <tab name="{{ __('shop::app.customer.account.order.view.info') }}" :selected="true">
+
+                        <div class="sale-section">
+                            <div class="section-content">
+                                <div class="row">
+                                    <span class="title">
+                                        {{ __('shop::app.customer.account.order.view.placed-on') }}
+                                    </span>
+
+                                    <span class="value">
+                                        {{ core()->formatDate($order->created_at, 'd M Y') }}
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="sale-section">
+                            <div class="secton-title">
+                                <span>{{ __('shop::app.customer.account.order.view.products-ordered') }}</span>
+                            </div>
+
+                            <div class="section-content">
+                                <div class="table">
+                                    <table>
+                                        <thead>
+                                            <tr>
+                                                <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.item-status') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.tax-percent') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
+                                            </tr>
+                                        </thead>
+
+                                        <tbody>
+
+                                            @foreach ($order->items as $item)
+                                                <tr>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
+                                                        {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
+                                                    </td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
+                                                        {{ $item->name }}
+
+                                                        @if (isset($item->additional['attributes']))
+                                                            <div class="item-options">
+
+                                                                @foreach ($item->additional['attributes'] as $attribute)
+                                                                    <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                                                @endforeach
+
+                                                            </div>
+                                                        @endif
+                                                    </td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">
+                                                        {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                                                    </td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.item-status') }}">
+                                                        <span class="qty-row">
+                                                            {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }}
+                                                        </span>
+
+                                                        <span class="qty-row">
+                                                            {{ $item->qty_invoiced ? __('shop::app.customer.account.order.view.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }}
+                                                        </span>
+
+                                                        <span class="qty-row">
+                                                            {{ $item->qty_shipped ? __('shop::app.customer.account.order.view.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }}
+                                                        </span>
+
+                                                        <span class="qty-row">
+                                                            {{ $item->qty_refunded ? __('shop::app.customer.account.order.view.item-refunded', ['qty_refunded' => $item->qty_refunded]) : '' }}
+                                                        </span>
+
+                                                        <span class="qty-row">
+                                                            {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }}
+                                                        </span>
+                                                    </td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">
+                                                        {{ core()->formatPrice($item->total, $order->order_currency_code) }}
+                                                    </td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.tax-percent') }}">
+                                                        {{ number_format($item->tax_percent, 2) }}%
+                                                    </td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">
+                                                        {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}
+                                                    </td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">
+                                                        {{ core()->formatPrice($item->total + $item->tax_amount - $item->discount_amount, $order->order_currency_code) }}
+                                                    </td>
+                                                </tr>
+                                            @endforeach
+                                        </tbody>
+
+                                    </table>
+                                </div>
+
+                                <div class="totals">
+                                    <table class="sale-summary">
+                                        <tbody>
+                                            <tr>
+                                                <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}</td>
+                                            </tr>
+
+                                            @if ($order->haveStockableItems())
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}</td>
+                                                </tr>
+                                            @endif
+
+                                            @if ($order->base_discount_amount > 0)
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.discount') }}
+                                                        @if ($order->coupon_code)
+                                                            ({{ $order->coupon_code }})
+                                                        @endif
+                                                    </td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
+                                                </tr>
+                                            @endif
+
+                                            <tr class="border">
+                                                <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->tax_amount, $order->order_currency_code) }}</td>
+                                            </tr>
+
+                                            <tr class="bold">
+                                                <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}</td>
+                                            </tr>
+
+                                            <tr class="bold">
+                                                <td>{{ __('shop::app.customer.account.order.view.total-paid') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->grand_total_invoiced, $order->order_currency_code) }}</td>
+                                            </tr>
+
+                                            <tr class="bold">
+                                                <td>{{ __('shop::app.customer.account.order.view.total-refunded') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->grand_total_refunded, $order->order_currency_code) }}</td>
+                                            </tr>
+
+                                            <tr class="bold">
+                                                <td>{{ __('shop::app.customer.account.order.view.total-due') }}</td>
+                                                
+                                                <td>-</td>
+
+                                                @if($order->status !== 'canceled')
+                                                    <td>{{ core()->formatPrice($order->total_due, $order->order_currency_code) }}</td>
+                                                @else
+                                                    <td>{{ core()->formatPrice(0.00, $order->order_currency_code) }}</td>
+                                                @endif
+                                            </tr>
+                                        <tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </tab>
+
+                    @if ($order->invoices->count())
+                        <tab name="{{ __('shop::app.customer.account.order.view.invoices') }}">
+
+                            @foreach ($order->invoices as $invoice)
+
+                                <div class="sale-section">
+                                    <div class="secton-title">
+                                        <span>{{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->id]) }}</span>
+
+                                        <a href="{{ route('customer.orders.print', $invoice->id) }}" class="pull-right">
+                                            {{ __('shop::app.customer.account.order.view.print') }}
+                                        </a>
+                                    </div>
+
+                                    <div class="section-content">
+                                        <div class="table">
+                                            <table>
+                                                <thead>
+                                                    <tr>
+                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
+                                                    </tr>
+                                                </thead>
+
+                                                <tbody>
+
+                                                    @foreach ($invoice->items as $item)
+                                                        <tr>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
+                                                                {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
+                                                            </td>
+
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
+                                                                {{ $item->name }}
+                                                            </td>
+
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">
+                                                                {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                                                            </td>
+
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">
+                                                                {{ $item->qty }}
+                                                            </td>
+
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">
+                                                                {{ core()->formatPrice($item->total, $order->order_currency_code) }}
+                                                            </td>
+
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">
+                                                                {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}
+                                                            </td>
+
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">
+                                                                {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}
+                                                            </td>
+                                                        </tr>
+                                                    @endforeach
+                                                </tbody>
+                                            </table>
+                                        </div>
+
+                                        <div class="totals">
+                                            <table class="sale-summary">
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($invoice->sub_total, $order->order_currency_code) }}</td>
+                                                </tr>
+
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($invoice->shipping_amount, $order->order_currency_code) }}</td>
+                                                </tr>
+
+                                                @if ($order->base_discount_amount > 0)
+                                                    <tr>
+                                                        <td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
+                                                        <td>-</td>
+                                                        <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
+                                                    </tr>
+                                                @endif
+
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($invoice->tax_amount, $order->order_currency_code) }}</td>
+                                                </tr>
+
+                                                <tr class="bold">
+                                                    <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($invoice->grand_total, $order->order_currency_code) }}</td>
+                                                </tr>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            @endforeach
+
+                        </tab>
+                    @endif
+
+                    @if ($order->shipments->count())
+                        <tab name="{{ __('shop::app.customer.account.order.view.shipments') }}">
+
+                            @foreach ($order->shipments as $shipment)
+
+                                <div class="sale-section">
+                                    <div class="section-content">
+                                        <div class="row">
+                                            <span class="title">
+                                                {{ __('shop::app.customer.account.order.view.tracking-number') }}
+                                            </span>
+
+                                            <span class="value">
+                                                {{  $shipment->track_number }}
+                                            </span>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="sale-section">
+                                    <div class="secton-title">
+                                        <span>{{ __('shop::app.customer.account.order.view.individual-shipment', ['shipment_id' => $shipment->id]) }}</span>
+                                    </div>
+
+                                    <div class="section-content">
+
+                                        <div class="table">
+                                            <table>
+                                                <thead>
+                                                    <tr>
+                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                                                    </tr>
+                                                </thead>
+
+                                                <tbody>
+
+                                                    @foreach ($shipment->items as $item)
+
+                                                        <tr>
+                                                            <td data-value="{{  __('shop::app.customer.account.order.view.SKU') }}">{{ $item->sku }}</td>
+                                                            <td data-value="{{  __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
+                                                            <td data-value="{{  __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
+                                                        </tr>
+
+                                                    @endforeach
+
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            @endforeach
+
+                        </tab>
+                    @endif
+
+                    @if ($order->refunds->count())
+                        <tab name="{{ __('shop::app.customer.account.order.view.refunds') }}">
+
+                            @foreach ($order->refunds as $refund)
+
+                                <div class="sale-section">
+                                    <div class="secton-title">
+                                        <span>{{ __('shop::app.customer.account.order.view.individual-refund', ['refund_id' => $refund->id]) }}</span>
+                                    </div>
+
+                                    <div class="section-content">
+                                        <div class="table">
+                                            <table>
+                                                <thead>
+                                                    <tr>
+                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
+                                                    </tr>
+                                                </thead>
+
+                                                <tbody>
+
+                                                    @foreach ($refund->items as $item)
+                                                        <tr>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">{{ $item->child ? $item->child->sku : $item->sku }}</td>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">{{ core()->formatPrice($item->total, $order->order_currency_code) }}</td>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}</td>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">{{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}</td>
+                                                        </tr>
+                                                    @endforeach
+
+                                                    @if (! $refund->items->count())
+                                                        <tr>
+                                                            <td class="empty" colspan="7">{{ __('shop::app.common.no-result-found') }}</td>
+                                                        <tr>
+                                                    @endif
+                                                </tbody>
+                                            </table>
+                                        </div>
+
+                                        <div class="totals">
+                                            <table class="sale-summary">
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($refund->sub_total, $order->order_currency_code) }}</td>
+                                                </tr>
+
+                                                @if ($refund->shipping_amount > 0)
+                                                    <tr>
+                                                        <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
+                                                        <td>-</td>
+                                                        <td>{{ core()->formatPrice($refund->shipping_amount, $order->order_currency_code) }}</td>
+                                                    </tr>
+                                                @endif
+
+                                                @if ($refund->discount_amount > 0)
+                                                    <tr>
+                                                        <td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
+                                                        <td>-</td>
+                                                        <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
+                                                    </tr>
+                                                @endif
+
+                                                @if ($refund->tax_amount > 0)
+                                                    <tr>
+                                                        <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
+                                                        <td>-</td>
+                                                        <td>{{ core()->formatPrice($refund->tax_amount, $order->order_currency_code) }}</td>
+                                                    </tr>
+                                                @endif
+
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.adjustment-refund') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($refund->adjustment_refund, $order->order_currency_code) }}</td>
+                                                </tr>
+
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.adjustment-fee') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($refund->adjustment_fee, $order->order_currency_code) }}</td>
+                                                </tr>
+
+                                                <tr class="bold">
+                                                    <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($refund->grand_total, $order->order_currency_code) }}</td>
+                                                </tr>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            @endforeach
+
+                        </tab>
+                    @endif
+                </tabs>
+
+                <div class="sale-section">
+                    <div class="section-content" style="border-bottom: 0">
+                        <div class="order-box-container">
+                            <div class="box">
+                                <div class="box-title">
+                                    {{ __('shop::app.customer.account.order.view.billing-address') }}
+                                </div>
+
+                                <div class="box-content">
+                                    @include ('admin::sales.address', ['address' => $order->billing_address])
+
+                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
+                                </div>
+                            </div>
+
+                            @if ($order->shipping_address)
+                                <div class="box">
+                                    <div class="box-title">
+                                        {{ __('shop::app.customer.account.order.view.shipping-address') }}
+                                    </div>
+
+                                    <div class="box-content">
+                                        @include ('admin::sales.address', ['address' => $order->shipping_address])
+
+                                        {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-address.after', ['order' => $order]) !!}
+                                    </div>
+                                </div>
+
+                                <div class="box">
+                                    <div class="box-title">
+                                        {{ __('shop::app.customer.account.order.view.shipping-method') }}
+                                    </div>
+
+                                    <div class="box-content">
+                                        {{ $order->shipping_title }}
+
+                                        {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-method.after', ['order' => $order]) !!}
+                                    </div>
+                                </div>
+                            @endif
+
+                            <div class="box">
+                                <div class="box-title">
+                                    {{ __('shop::app.customer.account.order.view.payment-method') }}
+                                </div>
+
+                                <div class="box-content">
+                                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+
+                                    @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
+
+                                    @if (! empty($additionalDetails))
+                                        <div class="instructions">
+                                            <label>{{ $additionalDetails['title'] }}</label>
+                                            <p>{{ $additionalDetails['value'] }}</p>
+                                        </div>
+                                    @endif
+
+                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.payment-method.after', ['order' => $order]) !!}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.orders.view.after', ['order' => $order]) !!}
+
+        </div>
+
+    </div>
+
+@endsection
diff --git a/resources/themes/shop/views/customers/account/partials/sidemenu.blade.php b/resources/themes/shop/views/customers/account/partials/sidemenu.blade.php
new file mode 100644
index 000000000..df0d6ad1f
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/partials/sidemenu.blade.php
@@ -0,0 +1,62 @@
+<div class="sidebar">
+    @foreach ($menu->items as $menuItem)
+        <div class="menu-block">
+            <div class="menu-block-title">
+                {{ trans($menuItem['name']) }}
+
+                <i class="icon icon-arrow-down right" id="down-icon"></i>
+            </div>
+
+            <div class="menu-block-content">
+                <ul class="menubar">
+                    @php
+                        $showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false;
+
+                        $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
+                    @endphp
+
+                    @if (! $showCompare)
+                        @php
+                            unset($menuItem['children']['compare']);
+                        @endphp
+                    @endif
+
+                    @if (! $showWishlist)
+                        @php
+                            unset($menuItem['children']['wishlist']);
+                        @endphp
+                    @endif
+
+                    @foreach ($menuItem['children'] as $subMenuItem)
+                        <li class="menu-item {{ $menu->getActive($subMenuItem) }}">
+                            <a href="{{ $subMenuItem['url'] }}">
+                                {{ trans($subMenuItem['name']) }}
+                            </a>
+
+                            <i class="icon angle-right-icon"></i>
+                        </li>
+                    @endforeach
+                </ul>
+            </div>
+        </div>
+    @endforeach
+</div>
+
+@push('scripts')
+<script>
+    $(document).ready(function() {
+        $(".icon.icon-arrow-down.right").on('click', function(e){
+            var currentElement = $(e.currentTarget);
+            if (currentElement.hasClass('icon-arrow-down')) {
+                $(this).parents('.menu-block').find('.menubar').show();
+                currentElement.removeClass('icon-arrow-down');
+                currentElement.addClass('icon-arrow-up');
+            } else {
+                $(this).parents('.menu-block').find('.menubar').hide();
+                currentElement.removeClass('icon-arrow-up');
+                currentElement.addClass('icon-arrow-down');
+            }
+        });
+    });
+</script>
+@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/profile/edit.blade.php b/resources/themes/shop/views/customers/account/profile/edit.blade.php
new file mode 100644
index 000000000..db57418cf
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/profile/edit.blade.php
@@ -0,0 +1,122 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.account.profile.edit-profile.page-title') }}
+@endsection
+
+@section('content-wrapper')
+    <div class="account-content">
+
+        @include('shop::customers.account.partials.sidemenu')
+
+        <div class="account-layout">
+
+            <div class="account-head mb-10">
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
+
+                <span class="account-heading">{{ __('shop::app.customer.account.profile.edit-profile.title') }}</span>
+
+                <span></span>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.profile.edit.before', ['customer' => $customer]) !!}
+
+            <form method="post" action="{{ route('customer.profile.store') }}" @submit.prevent="onSubmit">
+
+                <div class="edit-form">
+                    @csrf
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.before', ['customer' => $customer]) !!}
+
+                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                        <label for="first_name" class="required">{{ __('shop::app.customer.account.profile.fname') }}</label>
+
+                        <input type="text" class="control" name="first_name" value="{{ old('first_name') ?? $customer->first_name }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.fname') }}&quot;">
+                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.first_name.after') !!}
+
+                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
+                        <label for="last_name" class="required">{{ __('shop::app.customer.account.profile.lname') }}</label>
+
+                        <input type="text" class="control" name="last_name" value="{{ old('last_name') ?? $customer->last_name }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.lname') }}&quot;">
+                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.last_name.after') !!}
+
+                    <div class="control-group" :class="[errors.has('gender') ? 'has-error' : '']">
+                        <label for="email" class="required">{{ __('shop::app.customer.account.profile.gender') }}</label>
+
+                        <select name="gender" class="control" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.gender') }}&quot;">
+                            <option value=""  @if ($customer->gender == "") selected @endif></option>
+                            <option value="Other"  @if ($customer->gender == "Other") selected @endif>{{ __('shop::app.customer.account.profile.other') }}</option>
+                            <option value="Male"  @if ($customer->gender == "Male") selected @endif>{{ __('shop::app.customer.account.profile.male') }}</option>
+                            <option value="Female" @if ($customer->gender == "Female") selected @endif>{{ __('shop::app.customer.account.profile.female') }}</option>
+                        </select>
+                        <span class="control-error" v-if="errors.has('gender')">@{{ errors.first('gender') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.gender.after') !!}
+
+                    <div class="control-group"  :class="[errors.has('date_of_birth') ? 'has-error' : '']">
+                        <label for="date_of_birth">{{ __('shop::app.customer.account.profile.dob') }}</label>
+                        <input type="date" class="control" name="date_of_birth" value="{{ old('date_of_birth') ?? $customer->date_of_birth }}" v-validate="" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.dob') }}&quot;">
+                        <span class="control-error" v-if="errors.has('date_of_birth')">@{{ errors.first('date_of_birth') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.date_of_birth.after') !!}
+
+                    <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
+                        <label for="email" class="required">{{ __('shop::app.customer.account.profile.email') }}</label>
+                        <input type="email" class="control" name="email" value="{{ old('email') ?? $customer->email }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.email') }}&quot;">
+                        <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.email.after') !!}
+
+                    <div class="control-group" :class="[errors.has('oldpassword') ? 'has-error' : '']">
+                        <label for="password">{{ __('shop::app.customer.account.profile.opassword') }}</label>
+                        <input type="password" class="control" name="oldpassword" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.opassword') }}&quot;" v-validate="'min:6'">
+                        <span class="control-error" v-if="errors.has('oldpassword')">@{{ errors.first('oldpassword') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.oldpassword.after') !!}
+
+                    <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
+                        <label for="password">{{ __('shop::app.customer.account.profile.password') }}</label>
+
+                        <input type="password" id="password" class="control" name="password" ref="password" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.password') }}&quot;" v-validate="'min:6'">
+                        <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.password.after') !!}
+
+                    <div class="control-group" :class="[errors.has('password_confirmation') ? 'has-error' : '']">
+                        <label for="password">{{ __('shop::app.customer.account.profile.cpassword') }}</label>
+
+                        <input type="password" id="password_confirmation" class="control" name="password_confirmation" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.cpassword') }}&quot;" v-validate="'min:6|confirmed:password'">
+                        <span class="control-error" v-if="errors.has('password_confirmation')">@{{ errors.first('password_confirmation') }}</span>
+                    </div>
+
+                    <div class="control-group">
+                        <input type="checkbox" id="checkbox2" name="subscribed_to_news_letter" value="{{ $customer->subscribed_to_news_letter }}" {{ $customer->subscribed_to_news_letter ? 'checked' : ''}}>
+                        <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
+                    </div>
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.after', ['customer' => $customer]) !!}
+
+                    <div class="button-group">
+                        <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.account.profile.submit') }}">
+                    </div>
+                </div>
+
+            </form>
+
+            {!! view_render_event('bagisto.shop.customers.account.profile.edit.after', ['customer' => $customer]) !!}
+
+        </div>
+
+    </div>
+@endsection
diff --git a/resources/themes/shop/views/customers/account/profile/index.blade.php b/resources/themes/shop/views/customers/account/profile/index.blade.php
new file mode 100644
index 000000000..6ad256cd7
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/profile/index.blade.php
@@ -0,0 +1,114 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.account.profile.index.title') }}
+@endsection
+
+@section('content-wrapper')
+
+<div class="account-content">
+
+    @include('shop::customers.account.partials.sidemenu')
+
+    <div class="account-layout">
+
+        <div class="account-head">
+
+            <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
+
+            <span class="account-heading">{{ __('shop::app.customer.account.profile.index.title') }}</span>
+
+            <span class="account-action">
+                <a href="{{ route('customer.profile.edit') }}">{{ __('shop::app.customer.account.profile.index.edit') }}</a>
+            </span>
+
+            <div class="horizontal-rule"></div>
+        </div>
+
+         {!! view_render_event('bagisto.shop.customers.account.profile.view.before', ['customer' => $customer]) !!}
+
+        <div class="account-table-content" style="width: 50%;">
+            <table style="color: #5E5E5E;">
+                <tbody>
+                    {!! view_render_event(
+                    'bagisto.shop.customers.account.profile.view.table.before', ['customer' => $customer])
+                    !!}
+                    <tr>
+                        <td>{{ __('shop::app.customer.account.profile.fname') }}</td>
+                        <td>{{ $customer->first_name }}</td>
+                    </tr>
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.first_name.after', ['customer' => $customer]) !!}
+
+                    <tr>
+                        <td>{{ __('shop::app.customer.account.profile.lname') }}</td>
+                        <td>{{ $customer->last_name }}</td>
+                    </tr>
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.last_name.after', ['customer' => $customer]) !!}
+
+                    <tr>
+                        <td>{{ __('shop::app.customer.account.profile.gender') }}</td>
+                        <td>{{ __($customer->gender) }}</td>
+                    </tr>
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.gender.after', ['customer' => $customer]) !!}
+
+                    <tr>
+                        <td>{{ __('shop::app.customer.account.profile.dob') }}</td>
+                        <td>{{ $customer->date_of_birth }}</td>
+                    </tr>
+
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.date_of_birth.after', ['customer' => $customer]) !!}
+
+                    <tr>
+                        <td>{{ __('shop::app.customer.account.profile.email') }}</td>
+                        <td>{{ $customer->email }}</td>
+                    </tr>
+                    {!! view_render_event(
+                    'bagisto.shop.customers.account.profile.view.table.after', ['customer' => $customer])
+                    !!}
+
+                    {{-- @if ($customer->subscribed_to_news_letter == 1)
+                        <tr>
+                            <td> {{ __('shop::app.footer.subscribe-newsletter') }}</td>
+                            <td>
+                                <a class="btn btn-sm btn-primary" href="{{ route('shop.unsubscribe', $customer->email) }}">{{ __('shop::app.subscription.unsubscribe') }} </a>
+                            </td>
+                        </tr>
+                    @endif --}}
+                </tbody>
+            </table>
+
+
+            <button type="submit" @click="showModal('deleteProfile')" class="btn btn-lg btn-primary mt-10">
+                {{ __('shop::app.customer.account.address.index.delete') }}
+            </button>
+
+            <form method="POST" action="{{ route('customer.profile.destroy') }}" @submit.prevent="onSubmit">
+                @csrf
+
+                <modal id="deleteProfile" :is-open="modalIds.deleteProfile">
+                    <h3 slot="header">{{ __('shop::app.customer.account.address.index.enter-password') }}</h3>
+
+                    <div slot="body">
+                        <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
+                            <label for="password" class="required">{{ __('admin::app.users.users.password') }}</label>
+                            <input type="password" v-validate="'required|min:6|max:18'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.users.password') }}&quot;"/>
+                            <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
+                        </div>
+
+                        <div class="page-action">
+                            <button type="submit"  class="btn btn-lg btn-primary mt-10">
+                            {{ __('shop::app.customer.account.address.index.delete') }}
+                            </button>
+                        </div>
+                    </div>
+                </modal>
+            </form>
+        </div>
+
+        {!! view_render_event('bagisto.shop.customers.account.profile.view.after', ['customer' => $customer]) !!}
+    </div>
+</div>
+@endsection
diff --git a/resources/themes/shop/views/customers/account/reviews/index.blade.php b/resources/themes/shop/views/customers/account/reviews/index.blade.php
new file mode 100644
index 000000000..28683a5c4
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/reviews/index.blade.php
@@ -0,0 +1,82 @@
+@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.account.review.index.page-title') }}
+@endsection
+
+@section('content-wrapper')
+    <div class="account-content">
+        @include('shop::customers.account.partials.sidemenu')
+
+        <div class="account-layout">
+
+            <div class="account-head">
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
+
+                <span class="account-heading">{{ __('shop::app.customer.account.review.index.title') }}</span>
+
+                @if (count($reviews) > 1)
+                    <div class="account-action">
+                        <a href="{{ route('customer.review.deleteall') }}">{{ __('shop::app.customer.account.wishlist.deleteall') }}</a>
+                    </div>
+                @endif
+
+                <span></span>
+                <div class="horizontal-rule"></div>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.reviews.list.before', ['reviews' => $reviews]) !!}
+
+            <div class="account-items-list">
+                @if (! $reviews->isEmpty())
+                    @foreach ($reviews as $review)
+                        <div class="account-item-card mt-15 mb-15">
+                            <div class="media-info">
+                                <?php $image = $productImageHelper->getProductBaseImage($review->product); ?>
+                                <a href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}" title="{{ $review->product->name }}">
+                                    <img class="media" src="{{ $image['small_image_url'] }}" alt=""/>
+                                </a>
+
+                                <div class="info">
+                                    <div class="product-name">
+                                        <a href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}" title="{{ $review->product->name }}">
+                                            {{$review->product->name}}
+                                        </a>
+                                    </div>
+
+                                    <div class="stars mt-10">
+                                        @for($i=0 ; $i < $review->rating ; $i++)
+                                            <span class="icon star-icon"></span>
+                                        @endfor
+                                    </div>
+
+                                    <div class="mt-10">
+                                        {{ $review->comment }}
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="operations">
+                                <a class="mb-50" href="{{ route('customer.review.delete', $review->id) }}"><span class="icon trash-icon"></span></a>
+                            </div>
+                        </div>
+                        <div class="horizontal-rule mb-10 mt-10"></div>
+                    @endforeach
+
+                    <div class="bottom-toolbar">
+                        {{ $reviews->links()  }}
+                    </div>
+                @else
+                    <div class="empty mt-15">
+                        {{ __('customer::app.reviews.empty') }}
+                    </div>
+                @endif
+
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.reviews.list.after', ['reviews' => $reviews]) !!}
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/reviews/reviews.blade.php b/resources/themes/shop/views/customers/account/reviews/reviews.blade.php
new file mode 100644
index 000000000..a86d410e1
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/reviews/reviews.blade.php
@@ -0,0 +1,52 @@
+@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.account.review.view.page-title') }}
+@endsection
+
+@section('content-wrapper')
+    <div class="account-content">
+        @include('shop::customers.account.partials.sidemenu')
+
+        <div class="account-layout">
+            <div class="account-head">
+                <span class="account-heading">Reviews</span>
+                <div class="horizontal-rule"></div>
+            </div>
+
+            <div class="account-items-list">
+                @if (count($reviews))
+                    @foreach ($reviews as $review)
+                    <div class="account-item-card mt-15 mb-15">
+                        <div class="media-info">
+                            <?php $image = $productImageHelper->getGalleryImages($review->product); ?>
+                            <img class="media" src="{{ $image[0]['small_image_url'] }}" alt="" />
+
+                            <div class="info mt-20">
+                                <div class="product-name">{{$review->product->name}}</div>
+
+                                <div>
+                                    @for($i=0;$i<$review->rating;$i++)
+                                        <span class="icon star-icon"></span>
+                                    @endfor
+                                </div>
+
+                                <div>
+                                    {{ $review->comment }}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="horizontal-rule mb-10 mt-10"></div>
+                    @endforeach
+                @else
+                    <div class="empty">
+                        {{ __('customer::app.reviews.empty') }}
+                    </div>
+                @endif
+            </div>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/wishlist/wishlist.blade.php b/resources/themes/shop/views/customers/account/wishlist/wishlist.blade.php
new file mode 100644
index 000000000..2ca3bd5a3
--- /dev/null
+++ b/resources/themes/shop/views/customers/account/wishlist/wishlist.blade.php
@@ -0,0 +1,94 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.account.wishlist.page-title') }}
+@endsection
+
+@section('content-wrapper')
+    <div class="account-content">
+        @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+
+        @include('shop::customers.account.partials.sidemenu')
+
+        @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
+
+        <div class="account-layout">
+
+            <div class="account-head mb-15">
+                <span class="account-heading">{{ __('shop::app.customer.account.wishlist.title') }}</span>
+
+                @if (count($items))
+                    <div class="account-action">
+                        <a href="{{ route('customer.wishlist.removeall') }}">{{ __('shop::app.customer.account.wishlist.deleteall') }}</a>
+                    </div>
+                @endif
+
+                <div class="horizontal-rule"></div>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.wishlist.list.before', ['wishlist' => $items]) !!}
+
+            <div class="account-items-list">
+
+                @if ($items->count())
+                    @foreach ($items as $item)
+                        <div class="account-item-card mt-15 mb-15">
+                            <div class="media-info">
+                                @php
+                                    $image = $item->product->getTypeInstance()->getBaseImage($item);
+                                @endphp
+
+                                <img class="media" src="{{ $image['small_image_url'] }}" alt="" />
+
+                                <div class="info">
+                                    <div class="product-name">
+                                        {{ $item->product->name }}
+
+                                        @if (isset($item->additional['attributes']))
+                                            <div class="item-options">
+
+                                                @foreach ($item->additional['attributes'] as $attribute)
+                                                    <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                                @endforeach
+
+                                            </div>
+                                        @endif
+                                    </div>
+
+                                    <span class="stars" style="display: inline">
+                                        @for ($i = 1; $i <= $reviewHelper->getAverageRating($item->product); $i++)
+                                            <span class="icon star-icon"></span>
+                                        @endfor
+                                    </span>
+                                </div>
+                            </div>
+
+                            <div class="operations">
+                                <a class="mb-50" href="{{ route('customer.wishlist.remove', $item->id) }}">
+                                    <span class="icon trash-icon"></span>
+                                </a>
+
+                                <a href="{{ route('customer.wishlist.move', $item->id) }}" class="btn btn-primary btn-md">
+                                    {{ __('shop::app.customer.account.wishlist.move-to-cart') }}
+                                </a>
+                            </div>
+                        </div>
+
+                        <div class="horizontal-rule mb-10 mt-10"></div>
+                    @endforeach
+
+                    <div class="bottom-toolbar">
+                        {{ $items->links()  }}
+                    </div>
+                @else
+                    <div class="empty">
+                        {{ __('customer::app.wishlist.empty') }}
+                    </div>
+                @endif
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.wishlist.list.after', ['wishlist' => $items]) !!}
+
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/session/index.blade.php b/resources/themes/shop/views/customers/session/index.blade.php
new file mode 100644
index 000000000..38bdbc9b1
--- /dev/null
+++ b/resources/themes/shop/views/customers/session/index.blade.php
@@ -0,0 +1,57 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.login-form.page-title') }}
+@endsection
+
+@section('content-wrapper')
+
+    <div class="auth-content">
+        <div class="sign-up-text">
+            {{ __('shop::app.customer.login-text.no_account') }} - <a href="{{ route('customer.register.index') }}">{{ __('shop::app.customer.login-text.title') }}</a>
+        </div>
+
+        {!! view_render_event('bagisto.shop.customers.login.before') !!}
+
+        <form method="POST" action="{{ route('customer.session.create') }}" @submit.prevent="onSubmit">
+            {{ csrf_field() }}
+            <div class="login-form">
+                <div class="login-text">{{ __('shop::app.customer.login-form.title') }}</div>
+
+                {!! view_render_event('bagisto.shop.customers.login_form_controls.before') !!}
+
+                <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
+                    <label for="email" class="required">{{ __('shop::app.customer.login-form.email') }}</label>
+                    <input type="text" class="control" name="email" v-validate="'required|email'" value="{{ old('email') }}" data-vv-as="&quot;{{ __('shop::app.customer.login-form.email') }}&quot;">
+                    <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
+                </div>
+
+                <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
+                    <label for="password" class="required">{{ __('shop::app.customer.login-form.password') }}</label>
+                    <input type="password" v-validate="'required|min:6'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.sessions.password') }}&quot;" value=""/>
+                    <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.login_form_controls.after') !!}
+
+                <div class="forgot-password-link">
+                    <a href="{{ route('customer.forgot-password.create') }}">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
+
+                    <div class="mt-10">
+                        @if (Cookie::has('enable-resend'))
+                            @if (Cookie::get('enable-resend') == true)
+                                <a href="{{ route('customer.resend.verification-email', Cookie::get('email-for-resend')) }}">{{ __('shop::app.customer.login-form.resend-verification') }}</a>
+                            @endif
+                        @endif
+                    </div>
+                </div>
+
+                <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.login-form.button_title') }}">
+            </div>
+        </form>
+
+        {!! view_render_event('bagisto.shop.customers.login.after') !!}
+    </div>
+
+@stop
+
diff --git a/resources/themes/shop/views/customers/signup/forgot-password.blade.php b/resources/themes/shop/views/customers/signup/forgot-password.blade.php
new file mode 100644
index 000000000..f21a32a6e
--- /dev/null
+++ b/resources/themes/shop/views/customers/signup/forgot-password.blade.php
@@ -0,0 +1,61 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+ {{ __('shop::app.customer.forgot-password.page_title') }}
+@stop
+
+@push('css')
+    <style>
+        .button-group {
+            margin-bottom: 25px;
+        }
+        .primary-back-icon {
+            vertical-align: middle;
+        }
+    </style>
+@endpush
+
+@section('content-wrapper')
+
+<div class="auth-content">
+
+    {!! view_render_event('bagisto.shop.customers.forget_password.before') !!}
+
+    <form method="post" action="{{ route('customer.forgot-password.store') }}" @submit.prevent="onSubmit">
+
+        {{ csrf_field() }}
+
+        <div class="login-form">
+
+            <div class="login-text">{{ __('shop::app.customer.forgot-password.title') }}</div>
+
+            {!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!}
+
+            <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
+                <label for="email">{{ __('shop::app.customer.forgot-password.email') }}</label>
+                <input type="email" class="control" name="email" v-validate="'required|email'">
+                <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!}
+
+            <div class="button-group">
+                <button type="submit" class="btn btn-lg btn-primary">
+                    {{ __('shop::app.customer.forgot-password.submit') }}
+                </button>
+            </div>
+
+            <div class="control-group" style="margin-bottom: 0px;">
+                <a href="{{ route('customer.session.index') }}">
+                    <i class="icon primary-back-icon"></i>
+                    {{ __('shop::app.customer.reset-password.back-link-title') }}
+                </a>
+            </div>
+
+        </div>
+    </form>
+
+    {!! view_render_event('bagisto.shop.customers.forget_password.before') !!}
+
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/signup/index.blade.php b/resources/themes/shop/views/customers/signup/index.blade.php
new file mode 100644
index 000000000..9f1598a08
--- /dev/null
+++ b/resources/themes/shop/views/customers/signup/index.blade.php
@@ -0,0 +1,95 @@
+@extends('shop::layouts.master')
+@section('page_title')
+    {{ __('shop::app.customer.signup-form.page-title') }}
+@endsection
+@section('content-wrapper')
+
+<div class="auth-content">
+
+    <div class="sign-up-text">
+        {{ __('shop::app.customer.signup-text.account_exists') }} - <a href="{{ route('customer.session.index') }}">{{ __('shop::app.customer.signup-text.title') }}</a>
+    </div>
+
+    {!! view_render_event('bagisto.shop.customers.signup.before') !!}
+
+    <form method="post" action="{{ route('customer.register.create') }}" @submit.prevent="onSubmit">
+
+        {{ csrf_field() }}
+
+        <div class="login-form">
+            <div class="login-text">{{ __('shop::app.customer.signup-form.title') }}</div>
+
+            {!! view_render_event('bagisto.shop.customers.signup_form_controls.before') !!}
+
+            <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                <label for="first_name" class="required">{{ __('shop::app.customer.signup-form.firstname') }}</label>
+                <input type="text" class="control" name="first_name" v-validate="'required'" value="{{ old('first_name') }}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.firstname') }}&quot;">
+                <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.signup_form_controls.firstname.after') !!}
+
+            <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
+                <label for="last_name" class="required">{{ __('shop::app.customer.signup-form.lastname') }}</label>
+                <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ old('last_name') }}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.lastname') }}&quot;">
+                <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.signup_form_controls.lastname.after') !!}
+
+            <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
+                <label for="email" class="required">{{ __('shop::app.customer.signup-form.email') }}</label>
+                <input type="email" class="control" name="email" v-validate="'required|email'" value="{{ old('email') }}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.email') }}&quot;">
+                <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.signup_form_controls.email.after') !!}
+
+            <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
+                <label for="password" class="required">{{ __('shop::app.customer.signup-form.password') }}</label>
+                <input type="password" class="control" name="password" v-validate="'required|min:6'" ref="password" value="{{ old('password') }}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.password') }}&quot;">
+                <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.signup_form_controls.password.after') !!}
+
+            <div class="control-group" :class="[errors.has('password_confirmation') ? 'has-error' : '']">
+                <label for="password_confirmation" class="required">{{ __('shop::app.customer.signup-form.confirm_pass') }}</label>
+                <input type="password" class="control" name="password_confirmation"  v-validate="'required|min:6|confirmed:password'" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.confirm_pass') }}&quot;">
+                <span class="control-error" v-if="errors.has('password_confirmation')">@{{ errors.first('password_confirmation') }}</span>
+            </div>
+
+            {{-- <div class="signup-confirm" :class="[errors.has('agreement') ? 'has-error' : '']">
+                <span class="checkbox">
+                    <input type="checkbox" id="checkbox2" name="agreement" v-validate="'required'">
+                    <label class="checkbox-view" for="checkbox2"></label>
+                    <span>{{ __('shop::app.customer.signup-form.agree') }}
+                        <a href="">{{ __('shop::app.customer.signup-form.terms') }}</a> & <a href="">{{ __('shop::app.customer.signup-form.conditions') }}</a> {{ __('shop::app.customer.signup-form.using') }}.
+                    </span>
+                </span>
+                <span class="control-error" v-if="errors.has('agreement')">@{{ errors.first('agreement') }}</span>
+            </div> --}}
+
+            {{-- <span class="checkbox">
+                <input type="checkbox" id="checkbox1" name="checkbox[]">
+                <label class="checkbox-view" for="checkbox1"></label>
+                Checkbox Value 1
+            </span> --}}
+
+            <div class="control-group">
+                <input type="checkbox" id="checkbox2" name="is_subscribed">
+                <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.signup_form_controls.after') !!}
+
+            <button class="btn btn-primary btn-lg" type="submit">
+                {{ __('shop::app.customer.signup-form.button_title') }}
+            </button>
+
+        </div>
+    </form>
+
+    {!! view_render_event('bagisto.shop.customers.signup.after') !!}
+</div>
+@endsection
diff --git a/resources/themes/shop/views/customers/signup/reset-password.blade.php b/resources/themes/shop/views/customers/signup/reset-password.blade.php
new file mode 100644
index 000000000..feb0962ad
--- /dev/null
+++ b/resources/themes/shop/views/customers/signup/reset-password.blade.php
@@ -0,0 +1,52 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+ {{ __('shop::app.customer.reset-password.title') }}
+@endsection
+
+@section('content-wrapper')
+
+<div class="auth-content">
+
+    {!! view_render_event('bagisto.shop.customers.reset_password.before') !!}
+
+    <form method="post" action="{{ route('customer.reset-password.store') }}" >
+
+        {{ csrf_field() }}
+
+        <div class="login-form">
+
+            <div class="login-text">{{ __('shop::app.customer.reset-password.title') }}</div>
+
+            <input type="hidden" name="token" value="{{ old('token') ?: $token }}">
+
+            {!! view_render_event('bagisto.shop.customers.reset_password_form_controls.before') !!}
+
+            <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
+                <label for="email">{{ __('shop::app.customer.reset-password.email') }}</label>
+                <input type="text" v-validate="'required|email'" class="control" id="email" name="email" value="{{ old('email') }}"/>
+                <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
+            </div>
+
+            <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
+                <label for="password">{{ __('shop::app.customer.reset-password.password') }}</label>
+                <input type="password" class="control" name="password" v-validate="'required|min:6'" ref="password">
+                <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
+            </div>
+
+            <div class="control-group" :class="[errors.has('confirm_password') ? 'has-error' : '']">
+                <label for="confirm_password">{{ __('shop::app.customer.reset-password.confirm-password') }}</label>
+                <input type="password" class="control" name="password_confirmation"  v-validate="'required|min:6|confirmed:password'">
+                <span class="control-error" v-if="errors.has('confirm_password')">@{{ errors.first('confirm_password') }}</span>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.reset_password_form_controls.before') !!}
+
+            <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.reset-password.submit-btn-title') }}">
+
+        </div>
+    </form>
+
+    {!! view_render_event('bagisto.shop.customers.reset_password.before') !!}
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/admin/forget-password.blade.php b/resources/themes/shop/views/emails/admin/forget-password.blade.php
new file mode 100644
index 000000000..4e312d436
--- /dev/null
+++ b/resources/themes/shop/views/emails/admin/forget-password.blade.php
@@ -0,0 +1,38 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
+                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
+            @else
+                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
+            @endif
+        </a>
+    </div>
+
+    <div style="padding: 30px;">
+        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.forget-password.dear', ['name' => $user_name]) }},
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.forget-password.info') }}
+            </p>
+
+            <p style="text-align: center;padding: 20px 0;">
+                <a href="{{ route('admin.reset-password.create', $token) }}" style="padding: 10px 20px;background: #0041FF;color: #ffffff;text-transform: uppercase;text-decoration: none; font-size: 16px">
+                    {{ __('shop::app.mail.forget-password.reset-password') }}
+                </a>
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.forget-password.final-summary') }}
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.forget-password.thanks') }}
+            </p>
+
+        </div>
+    </div>
+@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/admin/update-password.blade.php b/resources/themes/shop/views/emails/admin/update-password.blade.php
new file mode 100644
index 000000000..f1759daed
--- /dev/null
+++ b/resources/themes/shop/views/emails/admin/update-password.blade.php
@@ -0,0 +1,25 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
+                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
+            @else
+                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
+            @endif
+        </a>
+    </div>
+
+    <div style="padding: 30px;">
+        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+            {{ __('shop::app.mail.update-password.dear', ['name' => $user->name]) }},
+        </p>
+
+        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+            {{ __('shop::app.mail.update-password.info') }}
+        </p>
+
+        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+            {{ __('shop::app.mail.update-password.thanks') }}
+        </p>
+    </div>
+@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/customer/forget-password.blade.php b/resources/themes/shop/views/emails/customer/forget-password.blade.php
new file mode 100644
index 000000000..685346631
--- /dev/null
+++ b/resources/themes/shop/views/emails/customer/forget-password.blade.php
@@ -0,0 +1,34 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @include ('shop::emails.layouts.logo')
+        </a>
+    </div>
+
+    <div style="padding: 30px;">
+        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.forget-password.dear', ['name' => $user_name]) }},
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.forget-password.info') }}
+            </p>
+
+            <p style="text-align: center;padding: 20px 0;">
+                <a href="{{ route('customer.reset-password.create', $token) }}" style="padding: 10px 20px;background: #0041FF;color: #ffffff;text-transform: uppercase;text-decoration: none; font-size: 16px">
+                    {{ __('shop::app.mail.forget-password.reset-password') }}
+                </a>
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.forget-password.final-summary') }}
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.forget-password.thanks') }}
+            </p>
+
+        </div>
+    </div>
+@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/customer/new-customer.blade.php b/resources/themes/shop/views/emails/customer/new-customer.blade.php
new file mode 100644
index 000000000..8fcbfd931
--- /dev/null
+++ b/resources/themes/shop/views/emails/customer/new-customer.blade.php
@@ -0,0 +1,30 @@
+@component('shop::emails.layouts.master')
+
+    <div>
+        <div style="text-align: center;">
+            <a href="{{ config('app.url') }}">
+                @include ('shop::emails.layouts.logo')
+            </a>
+        </div>
+
+        <div  style="font-size:16px; color:#242424; font-weight:600; margin-top: 60px; margin-bottom: 15px">
+            {{ __('shop::app.mail.customer.new.dear', ['customer_name' => $customer['name']]) }},
+
+        </div>
+
+        <div>
+            {!! __('shop::app.mail.customer.new.summary') !!}
+
+        </div>
+
+        <div>
+            <b> {!! __('shop::app.mail.customer.new.username-email') !!} </b> - {{ $customer['email'] }} <br>
+            <b> {!! __('shop::app.mail.customer.new.password') !!} </b> - {{ $password}}
+        </div>
+
+        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+            {{ __('shop::app.mail.customer.new.thanks') }}
+        </p>
+    </div>
+
+@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/customer/registration.blade.php b/resources/themes/shop/views/emails/customer/registration.blade.php
new file mode 100644
index 000000000..384fd29e7
--- /dev/null
+++ b/resources/themes/shop/views/emails/customer/registration.blade.php
@@ -0,0 +1,32 @@
+@component('shop::emails.layouts.master')
+
+    <div>
+        <div style="text-align: center;">
+            <a href="{{ config('app.url') }}">
+                @include ('shop::emails.layouts.logo')
+            </a>
+        </div>
+
+
+        <div style="padding: 30px;">
+            <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
+                <p style="font-weight: bold;font-size: 20px;color: #242424;line-height: 24px;">
+                    {{ __('shop::app.mail.customer.registration.dear', ['customer_name' => $data['first_name']. ' ' .$data['last_name']]) }},
+                </p>
+
+                <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                    {!! __('shop::app.mail.customer.registration.greeting') !!}
+                </p>
+            </div>
+
+            <div style="font-size: 16px;color: #5E5E5E;line-height: 30px;margin-bottom: 20px !important;">
+                {{ __('shop::app.mail.customer.registration.summary') }}
+            </div>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.customer.registration.thanks') }}
+            </p>
+        </div>
+    </div>
+
+@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/customer/subscription-email.blade.php b/resources/themes/shop/views/emails/customer/subscription-email.blade.php
new file mode 100644
index 000000000..b7be2a8d2
--- /dev/null
+++ b/resources/themes/shop/views/emails/customer/subscription-email.blade.php
@@ -0,0 +1,26 @@
+@component('shop::emails.layouts.master')
+
+    <div>
+        <div style="text-align: center;">
+            <a href="{{ config('app.url') }}">
+                @include ('shop::emails.layouts.logo')
+            </a>
+        </div>
+
+        <div  style="font-size:16px; color:#242424; font-weight:600; margin-top: 60px; margin-bottom: 15px">
+            {!! __('shop::app.mail.customer.subscription.greeting') !!}
+        </div>
+
+        <div>
+            {!! __('shop::app.mail.customer.subscription.summary') !!}
+        </div>
+
+        <div  style="margin-top: 40px; text-align: center">
+            <a href="{{ route('shop.unsubscribe', $data['token']) }}" style="font-size: 16px;
+            color: #FFFFFF; text-align: center; background: #0031F0; padding: 10px 100px;text-decoration: none;">
+                {!! __('shop::app.mail.customer.subscription.unsubscribe') !!}
+            </a>
+        </div>
+    </div>
+
+@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/customer/update-password.blade.php b/resources/themes/shop/views/emails/customer/update-password.blade.php
new file mode 100644
index 000000000..4d616875f
--- /dev/null
+++ b/resources/themes/shop/views/emails/customer/update-password.blade.php
@@ -0,0 +1,21 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @include ('shop::emails.layouts.logo')
+        </a>
+    </div>
+
+    <div style="padding: 30px;">
+        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+            {{ __('shop::app.mail.update-password.dear', ['name' => $user->name]) }},
+        </p>
+
+        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+            {{ __('shop::app.mail.update-password.info') }}
+        </p>
+
+        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+            {{ __('shop::app.mail.update-password.thanks') }}
+        </p>
+    </div>
+@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/customer/verification-email.blade.php b/resources/themes/shop/views/emails/customer/verification-email.blade.php
new file mode 100644
index 000000000..fda82f400
--- /dev/null
+++ b/resources/themes/shop/views/emails/customer/verification-email.blade.php
@@ -0,0 +1,26 @@
+@component('shop::emails.layouts.master')
+
+    <div>
+        <div style="text-align: center;">
+            <a href="{{ config('app.url') }}">
+                @include ('shop::emails.layouts.logo')
+            </a>
+        </div>
+
+        <div  style="font-size:16px; color:#242424; font-weight:600; margin-top: 60px; margin-bottom: 15px">
+                {!! __('shop::app.mail.customer.verification.heading') !!}
+        </div>
+
+        <div>
+            {!! __('shop::app.mail.customer.verification.summary') !!}
+        </div>
+
+        <div  style="margin-top: 40px; text-align: center">
+            <a href="{{ route('customer.verify', $data['token']) }}" style="font-size: 16px;
+            color: #FFFFFF; text-align: center; background: #0031F0; padding: 10px 100px;text-decoration: none;">
+                {!! __('shop::app.mail.customer.verification.verify') !!}
+            </a>
+        </div>
+    </div>
+
+@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/layouts/logo.blade.php b/resources/themes/shop/views/emails/layouts/logo.blade.php
new file mode 100644
index 000000000..20ed0570d
--- /dev/null
+++ b/resources/themes/shop/views/emails/layouts/logo.blade.php
@@ -0,0 +1,5 @@
+@if ($logo = core()->getCurrentChannel()->logo_url)
+    <img src="{{ $logo }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
+@else
+    <img src="{{ bagisto_asset('images/logo.svg') }}" alt="">
+@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/layouts/master.blade.php b/resources/themes/shop/views/emails/layouts/master.blade.php
new file mode 100644
index 000000000..9451f8cf1
--- /dev/null
+++ b/resources/themes/shop/views/emails/layouts/master.blade.php
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <link href="https://fonts.googleapis.com/css?family=Montserrat:400,500" rel="stylesheet" type="text/css">
+    </head>
+
+    <body style="font-family: montserrat, sans-serif;">
+        <div style="max-width: 1000px; margin-left: auto; margin-right: auto;">
+            <div style="text-align: center;">
+                {{ $header ?? '' }}
+            </div>
+
+            <div>
+                {{ $slot }}
+
+                {{ $subcopy ?? '' }}
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/resources/themes/shop/views/emails/sales/new-admin-order.blade.php b/resources/themes/shop/views/emails/sales/new-admin-order.blade.php
new file mode 100644
index 000000000..6009ab0d8
--- /dev/null
+++ b/resources/themes/shop/views/emails/sales/new-admin-order.blade.php
@@ -0,0 +1,221 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
+                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
+            @else
+                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
+            @endif
+        </a>
+    </div>
+
+    <div style="padding: 30px;">
+        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
+            <span style="font-weight: bold;">
+                {{ __('shop::app.mail.order.heading') }}
+            </span> <br>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+            {{ __('shop::app.mail.order.dear-admin', ['admin_name' => config('mail.from.name')]) }},
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!! __('shop::app.mail.order.greeting-admin', [
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
+                    'created_at' => $order->created_at
+                    ])
+                !!}
+            </p>
+        </div>
+
+        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
+            {{ __('shop::app.mail.order.summary') }}
+        </div>
+
+        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.shipping-address') }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
+                </div>
+
+                <div style="font-size: 16px;color: #242424; font-weight: bold">
+                    {{ __('shop::app.mail.order.shipping') }}
+                </div>
+
+                <div style="font-size: 16px;color: #242424;">
+                    {{ $order->shipping_title }}
+                </div>
+            </div>
+
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.billing-address') }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
+                </div>
+
+                <div style="font-size: 16px; color: #242424; font-weight: bold">
+                    {{ __('shop::app.mail.order.payment') }}
+                </div>
+
+                <div style="font-size: 16px; color: #242424;">
+                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                </div>
+
+                @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
+
+                @if (! empty($additionalDetails))
+                    <div style="font-size: 16px; color: #242424;">
+                        <div>{{ $additionalDetails['title'] }}</div>
+                        <div>{{ $additionalDetails['value'] }}</div>
+                    </div>
+                @endif
+            </div>
+        </div>
+
+        <div class="section-content">
+            <div class="table mb-20">
+                <table style="overflow-x: auto; border-collapse: collapse;
+                border-spacing: 0;width: 100%">
+                    <thead>
+                        <tr style="background-color: #f2f2f2">
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                        </tr>
+                    </thead>
+
+                    <tbody>
+                        @foreach ($order->items as $item)
+                            <tr>
+                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">
+                                    {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
+                                </td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
+                                    {{ $item->name }}
+
+                                    @if (isset($item->additional['attributes']))
+                                        <div class="item-options">
+
+                                            @foreach ($item->additional['attributes'] as $attribute)
+                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                            @endforeach
+
+                                        </div>
+                                    @endif
+                                </td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">
+                                    {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                                </td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">
+                                    {{ $item->qty_ordered }}
+                                </td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
+            <div>
+                <span>{{ __('shop::app.mail.order.subtotal') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatBasePrice($order->base_sub_total) }}
+                </span>
+            </div>
+
+            <div>
+                <span>{{ __('shop::app.mail.order.shipping-handling') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatBasePrice($order->base_shipping_amount) }}
+                </span>
+            </div>
+
+            @foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($order, true) as $taxRate => $baseTaxAmount )
+            <div>
+                <span id="taxrate-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ __('shop::app.mail.order.tax') }} {{ $taxRate }} %</span>
+                <span id="basetaxamount-{{ core()->taxRateAsIdentifier($taxRate) }}" style="float: right;">
+                    {{ core()->formatBasePrice($baseTaxAmount) }}
+                </span>
+            </div>
+            @endforeach
+
+            @if ($order->discount_amount > 0)
+                <div>
+                    <span>{{ __('shop::app.mail.order.discount') }}</span>
+                    <span style="float: right;">
+                        {{ core()->formatBasePrice($order->base_discount_amount) }}
+                    </span>
+                </div>
+            @endif
+
+            <div style="font-weight: bold">
+                <span>{{ __('shop::app.mail.order.grand-total') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatBasePrice($order->base_grand_total) }}
+                </span>
+            </div>
+        </div>
+
+        <div style="width: 100%;margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!!
+                    __('shop::app.mail.order.help', [
+                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.admin.address') . '">' . config('mail.admin.address') . '</a>'
+                        ])
+                !!}
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.thanks') }}
+            </p>
+        </div>
+    </div>
+@endcomponent
diff --git a/resources/themes/shop/views/emails/sales/new-inventorysource-shipment.blade.php b/resources/themes/shop/views/emails/sales/new-inventorysource-shipment.blade.php
new file mode 100644
index 000000000..487d297ca
--- /dev/null
+++ b/resources/themes/shop/views/emails/sales/new-inventorysource-shipment.blade.php
@@ -0,0 +1,172 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
+                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
+            @else
+                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
+            @endif
+        </a>
+    </div>
+
+    <?php $order = $shipment->order; ?>
+    <?php $inventory = $shipment->inventory_source; ?>
+
+    <div style="padding: 30px;">
+        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
+            <span style="font-weight: bold;">
+                {{ __('shop::app.mail.shipment.inventory-heading', ['order_id' => $order->increment_id, 'shipment_id' => $shipment->id]) }}
+            </span> <br>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.dear', ['customer_name' => $inventory->name]) }},
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!! __('shop::app.mail.shipment.greeting', [
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
+                    'created_at' => $order->created_at
+                    ])
+                !!}
+            </p>
+        </div>
+
+
+
+        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.shipping-address') }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
+                </div>
+
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.shipping') }}
+                </div>
+
+                <div style="font-size: 16px;color: #242424;">
+                    <div style="font-weight: bold;">
+                        {{ $order->shipping_title }}
+                    </div>
+
+                    <div style="margin-top: 5px;">
+                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
+                    </div>
+
+                    <div style="margin-top: 5px;">
+                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
+                    </div>
+                </div>
+            </div>
+
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.billing-address') }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
+                </div>
+
+                <div style="font-weight: bold; font-size: 16px; color: #242424;">
+                    {{ __('shop::app.mail.order.payment') }}
+                </div>
+
+                <div style="font-weight: bold; font-size: 16px; color: #242424;">
+                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                </div>
+            </div>
+        </div>
+
+        <div class="section-content">
+            <div class="table mb-20">
+                <table style="overflow-x: auto; border-collapse: collapse;
+                border-spacing: 0;width: 100%">
+                    <thead>
+                        <tr style="background-color: #f2f2f2">
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                        </tr>
+                    </thead>
+
+                    <tbody>
+                        @foreach ($shipment->items as $item)
+                            <tr>
+                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">{{ $item->sku }}</td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
+                                    {{ $item->name }}
+
+                                    @if (isset($item->additional['attributes']))
+                                        <div class="item-options">
+
+                                            @foreach ($item->additional['attributes'] as $attribute)
+                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                            @endforeach
+
+                                        </div>
+                                    @endif
+                                </td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">{{ $item->qty }}</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        {{-- <div style="margin-top: 20px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block;width: 100%">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!!
+                    __('shop::app.mail.order.help', [
+                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
+                        ])
+                !!}
+            </p>
+        </div> --}}
+    </div>
+@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/sales/new-invoice.blade.php b/resources/themes/shop/views/emails/sales/new-invoice.blade.php
new file mode 100644
index 000000000..6a1b71ce5
--- /dev/null
+++ b/resources/themes/shop/views/emails/sales/new-invoice.blade.php
@@ -0,0 +1,211 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @include ('shop::emails.layouts.logo')
+        </a>
+    </div>
+
+    <?php $order = $invoice->order; ?>
+
+    <div style="padding: 30px;">
+        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
+            <span style="font-weight: bold;">
+                {{ __('shop::app.mail.invoice.heading', ['order_id' => $order->increment_id, 'invoice_id' => $invoice->id]) }}
+            </span> <br>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!! __('shop::app.mail.order.greeting', [
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
+                    'created_at' => $order->created_at
+                    ])
+                !!}
+            </p>
+        </div>
+
+        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
+            {{ __('shop::app.mail.invoice.summary') }}
+        </div>
+
+        <div
+            style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
+            @if ($order->shipping_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.shipping-address') }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->name }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
+                    </div>
+
+                    <div>
+                        {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
+                    </div>
+
+                    <div>---</div>
+
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
+                    </div>
+
+                    <div style="font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.shipping') }}
+                    </div>
+
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ $order->shipping_title }}
+                    </div>
+                </div>
+            @endif
+
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.billing-address') }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
+                </div>
+
+                <div style="font-size: 16px; color: #242424;">
+                    {{ __('shop::app.mail.order.payment') }}
+                </div>
+
+                <div style="font-weight: bold;font-size: 16px; color: #242424;">
+                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                </div>
+            </div>
+        </div>
+
+        <div class="section-content">
+            <div class="table mb-20">
+                <table style="overflow-x: auto; border-collapse: collapse;
+                border-spacing: 0;width: 100%">
+                    <thead>
+                    <tr style="background-color: #f2f2f2">
+                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
+                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                    </tr>
+                    </thead>
+
+                    <tbody>
+                    @foreach ($invoice->items as $item)
+                        <tr>
+                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}"
+                                style="text-align: left;padding: 8px">
+                                {{ $item->name }}
+
+                                @if (isset($item->additional['attributes']))
+                                    <div class="item-options">
+
+                                        @foreach ($item->additional['attributes'] as $attribute)
+                                            <b>{{ $attribute['attribute_name'] }}
+                                                : </b>{{ $attribute['option_label'] }}</br>
+                                        @endforeach
+
+                                    </div>
+                                @endif
+                            </td>
+
+                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}"
+                                style="text-align: left;padding: 8px">{{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                            </td>
+
+                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}"
+                                style="text-align: left;padding: 8px">{{ $item->qty }}</td>
+                        </tr>
+
+                    @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
+            <div>
+                <span>{{ __('shop::app.mail.order.subtotal') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatPrice($invoice->sub_total, $invoice->order_currency_code) }}
+                </span>
+            </div>
+
+            @if ($order->shipping_address)
+                <div>
+                    <span>{{ __('shop::app.mail.order.shipping-handling') }}</span>
+                    <span style="float: right;">
+                        {{ core()->formatPrice($invoice->shipping_amount, $invoice->order_currency_code) }}
+                    </span>
+                </div>
+            @endif
+
+            <div>
+                <span>{{ __('shop::app.mail.order.tax') }}</span>
+                <span id="taxamount" style="float: right;">
+                    {{ core()->formatPrice($invoice->tax_amount, $order->order_currency_code) }}
+                </span>
+            </div>
+
+            @if ($invoice->discount_amount > 0)
+                <div>
+                    <span>{{ __('shop::app.mail.order.discount') }}</span>
+                    <span style="float: right;">
+                        {{ core()->formatPrice($invoice->discount_amount, $invoice->order_currency_code) }}
+                    </span>
+                </div>
+            @endif
+
+            <div style="font-weight: bold">
+                <span>{{ __('shop::app.mail.order.grand-total') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatPrice($invoice->grand_total, $invoice->order_currency_code) }}
+                </span>
+            </div>
+        </div>
+
+        <div
+            style="margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block;width: 100%">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!!
+                    __('shop::app.mail.order.help', [
+                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
+                        ])
+                !!}
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.thanks') }}
+            </p>
+        </div>
+    </div>
+@endcomponent
diff --git a/resources/themes/shop/views/emails/sales/new-order-comment.blade.php b/resources/themes/shop/views/emails/sales/new-order-comment.blade.php
new file mode 100644
index 000000000..0d8c19672
--- /dev/null
+++ b/resources/themes/shop/views/emails/sales/new-order-comment.blade.php
@@ -0,0 +1,35 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @include ('shop::emails.layouts.logo')
+        </a>
+    </div>
+
+    <div style="padding: 30px;">
+        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.comment.dear', ['customer_name' => $comment->order->customer_full_name]) }},
+            </p>
+        </div>
+
+        <div style="line-height: 30px;margin-bottom: 20px !important;">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;font-style: italic;">
+                {{ $comment->comment }}
+            </p>
+        </div>
+
+        <div style="margin-top: 20px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!!
+                    __('shop::app.mail.order.comment.help', [
+                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
+                        ])
+                !!}
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.comment.thanks') }}
+            </p>
+        </div>
+    </div>
+@endcomponent
diff --git a/resources/themes/shop/views/emails/sales/new-order.blade.php b/resources/themes/shop/views/emails/sales/new-order.blade.php
new file mode 100644
index 000000000..2db328e2b
--- /dev/null
+++ b/resources/themes/shop/views/emails/sales/new-order.blade.php
@@ -0,0 +1,220 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @include ('shop::emails.layouts.logo')
+        </a>
+    </div>
+
+    <div style="padding: 30px;">
+        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
+            <span style="font-weight: bold;">
+                {{ __('shop::app.mail.order.heading') }}
+            </span> <br>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!! __('shop::app.mail.order.greeting', [
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
+                    'created_at' => $order->created_at
+                    ])
+                !!}
+            </p>
+        </div>
+
+        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
+            {{ __('shop::app.mail.order.summary') }}
+        </div>
+
+        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
+            @if ($order->shipping_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.shipping-address') }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->name }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
+                    </div>
+
+                    <div>
+                        {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
+                    </div>
+
+                    <div>---</div>
+
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
+                    </div>
+
+                    <div style="font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.shipping') }}
+                    </div>
+
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ $order->shipping_title }}
+                    </div>
+                </div>
+            @endif
+
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.billing-address') }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
+                </div>
+
+                <div style="font-size: 16px; color: #242424;">
+                    {{ __('shop::app.mail.order.payment') }}
+                </div>
+
+                <div style="font-weight: bold; font-size: 16px; color: #242424; margin-bottom: 20px;">
+                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                </div>
+
+                @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
+
+                @if (! empty($additionalDetails))
+                    <div style="font-size: 16px; color: #242424;">
+                        <div>{{ $additionalDetails['title'] }}</div>
+                        <div>{{ $additionalDetails['value'] }}</div>
+                    </div>
+                @endif
+            </div>
+        </div>
+
+        <div class="section-content">
+            <div class="table mb-20">
+                <table style="overflow-x: auto; border-collapse: collapse;
+                border-spacing: 0;width: 100%">
+                    <thead>
+                        <tr style="background-color: #f2f2f2">
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                        </tr>
+                    </thead>
+
+                    <tbody>
+                        @foreach ($order->items as $item)
+                            <tr>
+                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">{{ $item->getTypeInstance()->getOrderedItem($item)->sku }}</td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
+                                    {{ $item->name }}
+
+                                    @if (isset($item->additional['attributes']))
+                                        <div class="item-options">
+
+                                            @foreach ($item->additional['attributes'] as $attribute)
+                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                            @endforeach
+
+                                        </div>
+                                    @endif
+                                </td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">{{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                                </td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">{{ $item->qty_ordered }}</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
+            <div>
+                <span>{{ __('shop::app.mail.order.subtotal') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}
+                </span>
+            </div>
+
+            @if ($order->shipping_address)
+                <div>
+                    <span>{{ __('shop::app.mail.order.shipping-handling') }}</span>
+                    <span style="float: right;">
+                        {{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}
+                    </span>
+                </div>
+            @endif
+
+            @foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($order, false) as $taxRate => $taxAmount )
+                <div>
+                    <span id="taxrate-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ __('shop::app.mail.order.tax') }} {{ $taxRate }} %</span>
+                    <span id="taxamount-{{ core()->taxRateAsIdentifier($taxRate) }}" style="float: right;">
+                        {{ core()->formatPrice($taxAmount, $order->order_currency_code) }}
+                    </span>
+                </div>
+            @endforeach
+
+            @if ($order->discount_amount > 0)
+                <div>
+                    <span>{{ __('shop::app.mail.order.discount') }}</span>
+                    <span style="float: right;">
+                        {{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}
+                    </span>
+                </div>
+            @endif
+
+            <div style="font-weight: bold">
+                <span>{{ __('shop::app.mail.order.grand-total') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}
+                </span>
+            </div>
+        </div>
+
+        <div style="margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.final-summary') }}
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!!
+                    __('shop::app.mail.order.help', [
+                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
+                        ])
+                !!}
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.thanks') }}
+            </p>
+        </div>
+    </div>
+@endcomponent
diff --git a/resources/themes/shop/views/emails/sales/new-refund.blade.php b/resources/themes/shop/views/emails/sales/new-refund.blade.php
new file mode 100644
index 000000000..993108341
--- /dev/null
+++ b/resources/themes/shop/views/emails/sales/new-refund.blade.php
@@ -0,0 +1,230 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @include ('shop::emails.layouts.logo')
+        </a>
+    </div>
+
+    <?php $order = $refund->order; ?>
+
+    <div style="padding: 30px;">
+        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
+            <span style="font-weight: bold;">
+                {{ __('shop::app.mail.refund.heading', ['order_id' => $order->increment_id, 'refund_id' => $refund->id]) }}
+            </span> <br>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!! __('shop::app.mail.order.greeting', [
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
+                    'created_at' => $order->created_at
+                    ])
+                !!}
+            </p>
+        </div>
+
+        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
+            {{ __('shop::app.mail.refund.summary') }}
+        </div>
+
+        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
+            @if ($order->shipping_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.shipping-address') }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->name }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
+                    </div>
+
+                    <div>
+                        {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
+                    </div>
+
+                    <div>---</div>
+
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
+                    </div>
+
+                    <div style="font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.shipping') }}
+                    </div>
+
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ $order->shipping_title }}
+                    </div>
+                </div>
+            @endif
+
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.billing-address') }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
+                </div>
+
+                <div style="font-size: 16px; color: #242424;">
+                    {{ __('shop::app.mail.order.payment') }}
+                </div>
+
+                <div style="font-weight: bold;font-size: 16px; color: #242424;">
+                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                </div>
+            </div>
+        </div>
+
+        <div class="section-content">
+            <div class="table mb-20">
+                <table style="overflow-x: auto; border-collapse: collapse;
+                border-spacing: 0;width: 100%">
+                    <thead>
+                        <tr style="background-color: #f2f2f2">
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                        </tr>
+                    </thead>
+
+                    <tbody>
+                        @foreach ($refund->items as $item)
+                            <tr>
+                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
+                                    {{ $item->name }}
+
+                                    @if (isset($item->additional['attributes']))
+                                        <div class="item-options">
+
+                                            @foreach ($item->additional['attributes'] as $attribute)
+                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                            @endforeach
+
+                                        </div>
+                                    @endif
+                                </td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">
+                                    {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                                </td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">
+                                    {{ $item->qty }}
+                                </td>
+                            </tr>
+
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
+            <div>
+                <span>{{ __('shop::app.mail.order.subtotal') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatPrice($refund->sub_total, $refund->order_currency_code) }}
+                </span>
+            </div>
+
+            @if ($order->shipping_address)
+                <div>
+                    <span>{{ __('shop::app.mail.order.shipping-handling') }}</span>
+                    <span style="float: right;">
+                        {{ core()->formatPrice($refund->shipping_amount, $refund->order_currency_code) }}
+                    </span>
+                </div>
+            @endif
+
+            @if ($refund->tax_amount > 0)
+                @foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($refund, false) as $taxRate => $taxAmount)
+                <div>
+                    <span>{{ __('shop::app.mail.order.tax') }}</span>
+                    <span style="float: right;">
+                        {{ core()->formatPrice($refund->tax_amount, $refund->order_currency_code) }}
+                    </span>
+                </div>
+                @endforeach
+            @endif
+
+            @if ($refund->discount_amount > 0)
+                <div>
+                    <span>{{ __('shop::app.mail.order.discount') }}</span>
+                    <span style="float: right;">
+                        {{ core()->formatPrice($refund->discount_amount, $refund->order_currency_code) }}
+                    </span>
+                </div>
+            @endif
+
+            @if ($refund->adjustment_refund > 0)
+                <div>
+                    <span>{{ __('shop::app.mail.refund.adjustment-refund') }}</span>
+                    <span style="float: right;">
+                        {{ core()->formatPrice($refund->adjustment_refund, $refund->order_currency_code) }}
+                    </span>
+                </div>
+            @endif
+
+            @if ($refund->adjustment_fee > 0)
+                <div>
+                    <span>{{ __('shop::app.mail.refund.adjustment-fee') }}</span>
+                    <span style="float: right;">
+                        {{ core()->formatPrice($refund->adjustment_fee, $refund->order_currency_code) }}
+                    </span>
+                </div>
+            @endif
+
+            <div style="font-weight: bold">
+                <span>{{ __('shop::app.mail.order.grand-total') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatPrice($refund->grand_total, $refund->order_currency_code) }}
+                </span>
+            </div>
+        </div>
+
+        <div style="margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block;width: 100%">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!!
+                    __('shop::app.mail.order.help', [
+                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
+                        ])
+                !!}
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.thanks') }}
+            </p>
+        </div>
+    </div>
+@endcomponent
diff --git a/resources/themes/shop/views/emails/sales/new-shipment.blade.php b/resources/themes/shop/views/emails/sales/new-shipment.blade.php
new file mode 100644
index 000000000..10d93391d
--- /dev/null
+++ b/resources/themes/shop/views/emails/sales/new-shipment.blade.php
@@ -0,0 +1,174 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @include ('shop::emails.layouts.logo')
+        </a>
+    </div>
+
+    <?php $order = $shipment->order; ?>
+
+    <div style="padding: 30px;">
+        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
+            <span style="font-weight: bold;">
+                {{ __('shop::app.mail.shipment.heading', ['order_id' => $order->increment_id, 'shipment_id' => $shipment->id]) }}
+            </span> <br>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!! __('shop::app.mail.order.greeting', [
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
+                    'created_at' => $order->created_at
+                    ])
+                !!}
+            </p>
+        </div>
+
+        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
+            {{ __('shop::app.mail.shipment.summary') }}
+        </div>
+
+        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.shipping-address') }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
+                </div>
+
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.shipping') }}
+                </div>
+
+                <div style="font-size: 16px;color: #242424;">
+                    <div style="font-weight: bold;">
+                        {{ $order->shipping_title }}
+                    </div>
+
+                    <div style="margin-top: 5px;">
+                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
+                    </div>
+
+                    <div style="margin-top: 5px;">
+                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
+                    </div>
+                </div>
+            </div>
+
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.billing-address') }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
+                </div>
+
+                <div style="font-weight: bold; font-size: 16px; color: #242424;">
+                    {{ __('shop::app.mail.order.payment') }}
+                </div>
+
+                <div style="font-weight: bold; font-size: 16px; color: #242424;">
+                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                </div>
+            </div>
+        </div>
+
+        <div class="section-content">
+            <div class="table mb-20">
+                <table style="overflow-x: auto; border-collapse: collapse;
+                border-spacing: 0;width: 100%">
+                    <thead>
+                        <tr style="background-color: #f2f2f2">
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                        </tr>
+                    </thead>
+
+                    <tbody>
+                        @foreach ($shipment->items as $item)
+                            <tr>
+                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">{{ $item->sku }}</td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
+                                    {{ $item->name }}
+
+                                    @if (isset($item->additional['attributes']))
+                                        <div class="item-options">
+
+                                            @foreach ($item->additional['attributes'] as $attribute)
+                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                            @endforeach
+
+                                        </div>
+                                    @endif
+                                </td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">{{ $item->qty }}</td>
+                            </tr>
+
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        <div style="margin-top: 20px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block;width: 100%">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!!
+                    __('shop::app.mail.order.help', [
+                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
+                        ])
+                !!}
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.thanks') }}
+            </p>
+        </div>
+    </div>
+@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/sales/order-cancel-admin.blade.php b/resources/themes/shop/views/emails/sales/order-cancel-admin.blade.php
new file mode 100644
index 000000000..b768036de
--- /dev/null
+++ b/resources/themes/shop/views/emails/sales/order-cancel-admin.blade.php
@@ -0,0 +1,212 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
+                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
+            @else
+                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
+            @endif
+        </a>
+    </div>
+
+    <div style="padding: 30px;">
+        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
+            <span style="font-weight: bold;">
+                {{ __('shop::app.mail.order.cancel.heading') }}
+            </span> <br>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.cancel.dear', ['customer_name' => config('mail.from.name')]) }},
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!! __('shop::app.mail.order.cancel.greeting', [
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
+                    'created_at' => $order->created_at
+                    ])
+                !!}
+            </p>
+        </div>
+
+        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
+            {{ __('shop::app.mail.order.cancel.summary') }}
+        </div>
+
+        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.cancel.shipping-address') }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->shipping_address->phone }}
+                </div>
+
+                <div style="font-size: 16px;color: #242424; font-weight: bold">
+                    {{ __('shop::app.mail.order.cancel.shipping') }}
+                </div>
+
+                <div style="font-size: 16px;color: #242424;">
+                    {{ $order->shipping_title }}
+                </div>
+            </div>
+
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.cancel.billing-address') }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->billing_address->phone }}
+                </div>
+
+                <div style="font-size: 16px; color: #242424; font-weight: bold">
+                    {{ __('shop::app.mail.order.cancel.payment') }}
+                </div>
+
+                <div style="font-size: 16px; color: #242424;">
+                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                </div>
+            </div>
+        </div>
+
+        <div class="section-content">
+            <div class="table mb-20">
+                <table style="overflow-x: auto; border-collapse: collapse;
+                border-spacing: 0;width: 100%">
+                    <thead>
+                    <tr style="background-color: #f2f2f2">
+                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
+                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                    </tr>
+                    </thead>
+
+                    <tbody>
+                    @foreach ($order->items as $item)
+                        <tr>
+                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">
+                                {{ $item->child ? $item->child->sku : $item->sku }}
+                            </td>
+
+                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
+                                {{ $item->name }}
+
+                                @if (isset($item->additional['attributes']))
+                                    <div class="item-options">
+
+                                        @foreach ($item->additional['attributes'] as $attribute)
+                                            <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                        @endforeach
+
+                                    </div>
+                                @endif
+                            </td>
+
+                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">
+                                {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                            </td>
+
+                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">
+                                {{ $item->qty_canceled }}
+                            </td>
+                        </tr>
+                    @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
+            <div>
+                <span>{{ __('shop::app.mail.order.cancel.subtotal') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}
+                </span>
+            </div>
+
+            <div>
+                <span>{{ __('shop::app.mail.order.cancel.shipping-handling') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}
+                </span>
+            </div>
+
+            @foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($order, false) as $taxRate => $taxAmount )
+                <div>
+                    <span id="taxrate-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ __('shop::app.mail.order.cancel.tax') }} {{ $taxRate }} %</span>
+                    <span id="taxamount-{{ core()->taxRateAsIdentifier($taxRate) }}" style="float: right;">
+                    {{ core()->formatPrice($taxAmount, $order->order_currency_code) }}
+                </span>
+                </div>
+            @endforeach
+
+            @if ($order->discount_amount > 0)
+                <div>
+                    <span>{{ __('shop::app.mail.order.cancel.discount') }}</span>
+                    <span style="float: right;">
+                        {{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}
+                    </span>
+                </div>
+            @endif
+
+            <div style="font-weight: bold">
+                <span>{{ __('shop::app.mail.order.cancel.grand-total') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}
+                </span>
+            </div>
+        </div>
+
+        <div style="margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!!
+                    __('shop::app.mail.order.cancel.help', [
+                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
+                        ])
+                !!}
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.cancel.thanks') }}
+            </p>
+        </div>
+    </div>
+@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/sales/order-cancel.blade.php b/resources/themes/shop/views/emails/sales/order-cancel.blade.php
new file mode 100644
index 000000000..494c2747c
--- /dev/null
+++ b/resources/themes/shop/views/emails/sales/order-cancel.blade.php
@@ -0,0 +1,212 @@
+@component('shop::emails.layouts.master')
+    <div style="text-align: center;">
+        <a href="{{ config('app.url') }}">
+            @include ('shop::emails.layouts.logo')
+        </a>
+    </div>
+
+    <div style="padding: 30px;">
+        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
+            <span style="font-weight: bold;">
+                {{ __('shop::app.mail.order.cancel.heading') }}
+            </span> <br>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.cancel.dear', ['customer_name' => $order->customer_full_name]) }},
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!! __('shop::app.mail.order.cancel.greeting', [
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
+                    'created_at' => $order->created_at
+                    ])
+                !!}
+            </p>
+        </div>
+
+        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
+            {{ __('shop::app.mail.order.cancel.summary') }}
+        </div>
+
+        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.cancel.shipping-address') }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->shipping_address->phone }}
+                </div>
+
+                <div style="font-size: 16px;color: #242424; font-weight: bold">
+                    {{ __('shop::app.mail.order.cancel.shipping') }}
+                </div>
+
+                <div style="font-size: 16px;color: #242424;">
+                    {{ $order->shipping_title }}
+                </div>
+            </div>
+
+            <div style="line-height: 25px;">
+                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                    {{ __('shop::app.mail.order.cancel.billing-address') }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->name }}
+                </div>
+
+                <div>
+                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
+                </div>
+
+                <div>
+                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
+                </div>
+
+                <div>---</div>
+
+                <div style="margin-bottom: 40px;">
+                    {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->billing_address->phone }}
+                </div>
+
+                <div style="font-size: 16px; color: #242424; font-weight: bold">
+                    {{ __('shop::app.mail.order.cancel.payment') }}
+                </div>
+
+                <div style="font-size: 16px; color: #242424;">
+                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                </div>
+            </div>
+        </div>
+
+        <div class="section-content">
+            <div class="table mb-20">
+                <table style="overflow-x: auto; border-collapse: collapse;
+                border-spacing: 0;width: 100%">
+                    <thead>
+                    <tr style="background-color: #f2f2f2">
+                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
+                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                    </tr>
+                    </thead>
+
+                    <tbody>
+                    @foreach ($order->items as $item)
+                        <tr>
+                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">
+                                {{ $item->child ? $item->child->sku : $item->sku }}
+                            </td>
+
+                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
+                                {{ $item->name }}
+
+                                @if (isset($item->additional['attributes']))
+                                    <div class="item-options">
+
+                                        @foreach ($item->additional['attributes'] as $attribute)
+                                            <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                        @endforeach
+
+                                    </div>
+                                @endif
+                            </td>
+
+                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">
+                                {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                            </td>
+
+                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">
+                                {{ $item->qty_canceled }}
+                            </td>
+                        </tr>
+                    @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
+            <div>
+                <span>{{ __('shop::app.mail.order.cancel.subtotal') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}
+                </span>
+            </div>
+
+            <div>
+                <span>{{ __('shop::app.mail.order.cancel.shipping-handling') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}
+                </span>
+            </div>
+
+            @foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($order, false) as $taxRate => $taxAmount )
+                <div>
+                    <span id="taxrate-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ __('shop::app.mail.order.cancel.tax') }} {{ $taxRate }} %</span>
+                    <span id="taxamount-{{ core()->taxRateAsIdentifier($taxRate) }}" style="float: right;">
+                    {{ core()->formatPrice($taxAmount, $order->order_currency_code) }}
+                </span>
+                </div>
+            @endforeach
+
+            @if ($order->discount_amount > 0)
+                <div>
+                    <span>{{ __('shop::app.mail.order.cancel.discount') }}</span>
+                    <span style="float: right;">
+                        {{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}
+                    </span>
+                </div>
+            @endif
+
+            <div style="font-weight: bold">
+                <span>{{ __('shop::app.mail.order.cancel.grand-total') }}</span>
+                <span style="float: right;">
+                    {{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}
+                </span>
+            </div>
+        </div>
+
+        <div style="margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block">
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.cancel.final-summary') }}
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {!!
+                    __('shop::app.mail.order.cancel.help', [
+                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
+                        ])
+                !!}
+            </p>
+
+            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
+                {{ __('shop::app.mail.order.cancel.thanks') }}
+            </p>
+        </div>
+    </div>
+@endcomponent
diff --git a/resources/themes/shop/views/error.blade.php b/resources/themes/shop/views/error.blade.php
new file mode 100644
index 000000000..d78938fdb
--- /dev/null
+++ b/resources/themes/shop/views/error.blade.php
@@ -0,0 +1,19 @@
+@extends('shop::layouts.master')
+@section('content-wrapper')
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+        <div class="wrapper" style="display: flex; height: 100vh; width: 80vw;
+    justify-content: space-between; align-items: center;">
+            <div class="error-box">
+                <div class="error-title">404</div>
+                <div class="error-messgae">Page Not Found</div>
+                <div class="error-description"></div>
+                <a href="url()->to('/')">GO TO HOME</a>
+                {{-- pass the content dynamically --}}
+                Show the exception here or error message here.
+            </div>
+
+        <div class="error-graphic" style="height: 236px; width: 255px; border: 1px solid red; background-image: url('.{{ asset('images.error') }}.')">
+        </div>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/errors/401.blade.php b/resources/themes/shop/views/errors/401.blade.php
new file mode 100644
index 000000000..f12e056c3
--- /dev/null
+++ b/resources/themes/shop/views/errors/401.blade.php
@@ -0,0 +1,38 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('admin::app.error.401.page-title') }}
+@stop
+
+@section('content-wrapper')
+
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+
+        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
+            justify-content: start; align-items: center;">
+
+            <div class="error-box"  style="width: 50%">
+
+                <div class="error-title" style="font-size: 100px;color: #5E5E5E">  {{ __('admin::app.error.401.name') }}  </div>
+
+                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E; margin-top: 40px;">
+                    {{ __('admin::app.error.401.title') }}
+                </div>
+
+                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">
+                    {{ __('admin::app.error.401.message') }}
+                </div>
+
+                <a href="{{ route('shop.home.index') }}">
+                    {{ __('admin::app.error.go-to-home') }}
+                </a>
+
+            </div>
+
+            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
+
+        </div>
+
+    </div>
+
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/errors/403.blade.php b/resources/themes/shop/views/errors/403.blade.php
new file mode 100644
index 000000000..6d61554d5
--- /dev/null
+++ b/resources/themes/shop/views/errors/403.blade.php
@@ -0,0 +1,38 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('admin::app.error.403.page-title') }}
+@stop
+
+@section('content-wrapper')
+
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+
+        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
+            justify-content: start; align-items: center;">
+
+            <div class="error-box"  style="width: 50%">
+
+                <div class="error-title" style="font-size: 100px;color: #5E5E5E">  {{ __('admin::app.error.403.name') }}  </div>
+
+                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E; margin-top: 40px">
+                    {{ __('admin::app.error.403.title') }}
+                </div>
+
+                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">
+                    {{ __('admin::app.error.403.message') }}
+                </div>
+
+                <a href="{{ route('shop.home.index') }}">
+                    {{ __('admin::app.error.go-to-home') }}
+                </a>
+
+            </div>
+
+            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
+
+        </div>
+
+    </div>
+
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/errors/404.blade.php b/resources/themes/shop/views/errors/404.blade.php
new file mode 100644
index 000000000..6f34dee9c
--- /dev/null
+++ b/resources/themes/shop/views/errors/404.blade.php
@@ -0,0 +1,40 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('admin::app.error.404.page-title') }}
+@stop
+
+@section('content-wrapper')
+
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+
+        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
+            justify-content: start; align-items: center;">
+
+            <div class="error-box"  style="width: 50%">
+
+                <div class="error-title" style="font-size: 100px;color: #5E5E5E">
+                    {{ __('admin::app.error.404.name') }}
+                </div>
+
+                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E; margin-top: 40px">
+                    {{ __('admin::app.error.404.title') }}
+                </div>
+
+                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">
+                    {{ __('admin::app.error.404.message') }}
+                </div>
+
+                <a href="{{ route('shop.home.index') }}">
+                    {{ __('admin::app.error.go-to-home') }}
+                </a>
+
+            </div>
+
+            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
+
+        </div>
+
+    </div>
+
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/errors/500.blade.php b/resources/themes/shop/views/errors/500.blade.php
new file mode 100644
index 000000000..2ae0f5a41
--- /dev/null
+++ b/resources/themes/shop/views/errors/500.blade.php
@@ -0,0 +1,40 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('admin::app.error.500.page-title') }}
+@stop
+
+@section('content-wrapper')
+
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+
+        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
+            justify-content: start; align-items: center;">
+
+            <div class="error-box"  style="width: 50%">
+
+                <div class="error-title" style="font-size: 100px;color: #5E5E5E">
+                    {{ __('admin::app.error.500.name') }}
+                </div>
+
+                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E; margin-top: 40px">
+                    {{ __('admin::app.error.500.title') }}
+                </div>
+
+                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">
+                    {{ __('admin::app.error.500.message') }}
+                </div>
+
+                <a href="{{ route('shop.home.index') }}">
+                    {{ __('admin::app.error.go-to-home') }}
+                </a>
+
+            </div>
+
+            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
+
+        </div>
+
+    </div>
+
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/errors/503.blade.php b/resources/themes/shop/views/errors/503.blade.php
new file mode 100644
index 000000000..40d93e596
--- /dev/null
+++ b/resources/themes/shop/views/errors/503.blade.php
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Document</title>
+</head>
+<body>
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+
+        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
+            justify-content: start; align-items: center;">
+
+            <div class="error-box"  style="width: 50%">
+
+                <div class="error-title" style="font-size: 100px;color: #5E5E5E">
+                    {{ __('admin::app.error.in-maitainace') }}
+                </div>
+
+                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E">
+                    {{ core()->getCurrentChannel()->maintenance_mode_text ?: __('admin::app.error.right-back') }}
+                </div>
+            </div>
+
+            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
+
+        </div>
+
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/themes/shop/views/guest/compare/compare-products.blade.php b/resources/themes/shop/views/guest/compare/compare-products.blade.php
new file mode 100644
index 000000000..b6f65a053
--- /dev/null
+++ b/resources/themes/shop/views/guest/compare/compare-products.blade.php
@@ -0,0 +1,342 @@
+@php
+    $attributeRepository = app('\Webkul\Attribute\Repositories\AttributeFamilyRepository');
+    $comparableAttributes = $attributeRepository->getComparableAttributesBelongsToFamily();
+
+    $locale = request()->get('locale') ?: app()->getLocale();
+
+    $attributeOptionTranslations = DB::table('attribute_option_translations')->where('locale', $locale)->get()->toJson();
+@endphp
+
+@push('scripts')
+    <script type="text/x-template" id="compare-product-template">
+        <section class="comparison-component">
+            <h1>
+                {{ __('shop::app.customer.compare.compare_similar_items') }}
+            </h1>
+
+            <button
+                v-if="products.length > 0"
+                class="btn btn-primary btn-md {{ core()->getCurrentLocale()->direction == 'rtl' ? 'pull-left' : 'pull-right' }}"
+                @click="removeProductCompare('all')">
+                {{ __('shop::app.customer.account.wishlist.deleteall') }}
+            </button>
+
+            {!! view_render_event('bagisto.shop.customers.account.compare.view.before') !!}
+
+            <table class="compare-products">
+                <template v-if="isProductListLoaded && products.length > 0">
+                    @php
+                        $comparableAttributes = $comparableAttributes->toArray();
+
+                        array_splice($comparableAttributes, 1, 0, [[
+                            'code' => 'product_image',
+                            'admin_name' => __('velocity::app.customer.compare.product_image'),
+                        ]]);
+
+                        array_splice($comparableAttributes, 2, 0, [[
+                            'code' => 'addToCartHtml',
+                            'admin_name' => __('velocity::app.customer.compare.actions'),
+                        ]]);
+                    @endphp
+
+                    @foreach ($comparableAttributes as $attribute)
+                        <tr>
+                            <td>
+                                <span class="fs16">{{ $attribute['admin_name'] }}</span>
+                            </td>
+
+                            <td :key="`title-${index}`" v-for="(product, index) in products">
+                                @switch ($attribute['code'])
+                                    @case('name')
+                                        <a :href="`${baseUrl}/${product.url_key}`" class="unset remove-decoration active-hover">
+                                            <h3 class="fw6 fs18 mt-0" v-text="product['{{ $attribute['code'] }}']"></h3>
+                                        </a>
+                                        @break
+
+                                    @case('product_image')
+                                        <a :href="`${baseUrl}/${product.url_key}`" class="unset">
+                                            <img
+                                                class="image-wrapper"
+                                                :src="product['{{ $attribute['code'] }}']"
+                                                :onerror="`this.src='${baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" alt="" />
+                                        </a>
+                                        @break
+
+                                    @case('price')
+                                        <span v-html="product['priceHTML']"></span>
+                                        @break
+
+                                    @case('addToCartHtml')
+                                        <div class="action">
+                                            <div v-html="product.defaultAddToCart"></div>
+
+                                            <span class="icon white-cross-sm-icon remove-product" @click="removeProductCompare(product.id)"></span>
+                                        </div>
+                                        @break
+
+                                    @case('color')
+                                        <span v-html="product.color_label" class="fs16"></span>
+                                        @break
+
+                                    @case('size')
+                                        <span v-html="product.size_label" class="fs16"></span>
+                                        @break
+
+                                    @case('description')
+                                        <span v-html="product.description" class="desc"></span>
+                                        @break
+
+                                    @default
+                                        @switch ($attribute['type'])
+                                            @case('boolean')
+                                                <span
+                                                    v-text="product.product['{{ $attribute['code'] }}']
+                                                            ? '{{ __('velocity::app.shop.general.yes') }}'
+                                                            : '{{ __('velocity::app.shop.general.no') }}'"
+                                                ></span>
+                                                @break;
+
+                                            @case('checkbox')
+                                                <span v-if="product.product['{{ $attribute['code'] }}']" v-html="getAttributeOptions(product['{{ $attribute['code'] }}'] ? product : product.product['{{ $attribute['code'] }}'] ? product.product : null, '{{ $attribute['code'] }}', 'multiple')" class="fs16"></span>
+                                                <span v-else class="fs16">__</span>
+                                                @break;
+
+                                            @case('select')
+                                                <span v-if="product.product['{{ $attribute['code'] }}']" v-html="getAttributeOptions(product['{{ $attribute['code'] }}'] ? product : product.product['{{ $attribute['code'] }}'] ? product.product : null, '{{ $attribute['code'] }}', 'single')" class="fs16"></span>
+                                                <span v-else class="fs16">__</span>
+                                                @break;
+
+                                            @case ('file')
+                                            @case ('image')
+                                                <a :href="`${baseUrl}/${product.url_key}`" class="unset">
+                                                    <img
+                                                        class="image-wrapper"
+                                                        :src="'storage/' + product.product['{{ $attribute['code'] }}']"
+                                                        :onerror="`this.src='${baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" alt="" />
+                                                </a>
+                                                @break;
+                                            @default
+                                                <span v-html="product['{{ $attribute['code'] }}'] ? product['{{ $attribute['code'] }}'] : product.product['{{ $attribute['code'] }}'] ? product.product['{{ $attribute['code'] }}'] : '__'" class="fs16"></span>
+                                                @break;
+                                        @endswitch
+
+                                        @break
+
+                                @endswitch
+                            </td>
+                        </tr>
+                    @endforeach
+                </template>
+
+                <span v-else-if="isProductListLoaded && products.length == 0">
+                    {{ __('shop::app.customer.compare.empty-text') }}
+                </span>
+            </table>
+
+            {!! view_render_event('bagisto.shop.customers.account.compare.view.after') !!}
+        </section>
+    </script>
+
+    <script>
+        Vue.component('compare-product', {
+            template: '#compare-product-template',
+
+            data: function () {
+                return {
+                    'products': [],
+                    'isProductListLoaded': false,
+                    'baseUrl': "{{ url()->to('/') }}",
+                    'attributeOptions': JSON.parse(@json($attributeOptionTranslations)),
+                    'isCustomer': '{{ auth()->guard('customer')->user() ? "true" : "false" }}' == "true",
+                }
+            },
+
+            mounted: function () {
+                this.getComparedProducts();
+            },
+
+            methods: {
+                'getComparedProducts': function () {
+                    let items = '';
+                    let url = `${this.baseUrl}/${this.isCustomer ? 'comparison' : 'detailed-products'}`;
+
+                    let data = {
+                        params: {'data': true}
+                    }
+
+                    if (! this.isCustomer) {
+                        items = this.getStorageValue('compared_product');
+                        items = items ? items.join('&') : '';
+
+                        data = {
+                            params: {
+                                items
+                            }
+                        };
+                    }
+
+                    if (this.isCustomer || (! this.isCustomer && items != "")) {
+                        this.$http.get(url, data)
+                        .then(response => {
+                            this.isProductListLoaded = true;
+
+                            if (response.data.products.length > 2) {
+                                $('.comparison-component').css('overflow-x', 'scroll');
+                            }
+
+                            this.products = response.data.products;
+                        })
+                        .catch(error => {
+                            this.isProductListLoaded = true;
+                            console.log("{{ __('shop::app.common.error') }}");
+                        });
+                    } else {
+                        this.isProductListLoaded = true;
+                    }
+
+                },
+
+                'removeProductCompare': function (productId) {
+                    if (this.isCustomer) {
+                        this.$http.delete(`${this.baseUrl}/comparison?productId=${productId}`)
+                        .then(response => {
+                            if (productId == 'all') {
+                                this.$set(this, 'products', this.products.filter(product => false));
+                            } else {
+                                this.$set(this, 'products', this.products.filter(product => product.id != productId));
+                            }
+
+                            window.flashMessages = [{'type': 'alert-success', 'message': response.data.message }];
+
+                            this.$root.addFlashMessages();
+                        })
+                        .catch(error => {
+                            console.log("{{ __('shop::app.common.error') }}");
+                        });
+                    } else {
+                        let existingItems = this.getStorageValue('compared_product');
+
+                        if (productId == "all") {
+                            updatedItems = [];
+                            this.$set(this, 'products', []);
+                            window.flashMessages = [{'type': 'alert-success', 'message': '{{ __('shop::app.customer.compare.removed-all') }}' }];
+                        } else {
+                            updatedItems = existingItems.filter(item => item != productId);
+                            this.$set(this, 'products', this.products.filter(product => product.id != productId));
+                            window.flashMessages = [{'type': 'alert-success', 'message': '{{ __('shop::app.customer.compare.removed') }}' }];
+                        }
+
+                        this.setStorageValue('compared_product', updatedItems);
+
+                        this.$root.addFlashMessages();
+                    }
+
+                    this.updateCompareCount();
+                },
+
+                'getDynamicHTML': function (input) {
+                    var _staticRenderFns;
+                    const { render, staticRenderFns } = Vue.compile(input);
+
+                    if (this.$options.staticRenderFns.length > 0) {
+                        _staticRenderFns = this.$options.staticRenderFns;
+                    } else {
+                        _staticRenderFns = this.$options.staticRenderFns = staticRenderFns;
+                    }
+
+                    try {
+                        var output = render.call(this, this.$createElement);
+                    } catch (exception) {
+                        console.log(this.__('error.something_went_wrong'));
+                    }
+
+                    this.$options.staticRenderFns = _staticRenderFns;
+
+                    return output;
+                },
+
+                'isMobile': function () {
+                    if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
+                    return true
+                    } else {
+                    return false
+                    }
+                },
+
+                'getStorageValue': function (key) {
+                    let value = window.localStorage.getItem(key);
+
+                    if (value) {
+                        value = JSON.parse(value);
+                    }
+
+                    return value;
+                },
+
+                'setStorageValue': function (key, value) {
+                    window.localStorage.setItem(key, JSON.stringify(value));
+
+                    return true;
+                },
+
+                'getAttributeOptions': function (productDetails, attributeValues, type) {
+                    var attributeOptions = '__';
+
+                    if (productDetails && attributeValues) {
+                        var attributeItems;
+
+                        if (type == "multiple") {
+                            attributeItems = productDetails[attributeValues].split(',');
+                        } else if (type == "single") {
+                            attributeItems = productDetails[attributeValues];
+                        }
+
+                        attributeOptions = this.attributeOptions.filter(option => {
+                            if (type == "multiple") {
+                                if (attributeItems.indexOf(option.attribute_option_id.toString()) > -1) {
+                                    return true;
+                                }
+                            } else if (type == "single") {
+                                if (attributeItems == option.attribute_option_id.toString()) {
+                                    return true;
+                                }
+                            }
+
+                            return false;
+                        });
+
+                        attributeOptions = attributeOptions.map(option => {
+                            return option.label;
+                        });
+
+                        attributeOptions = attributeOptions.join(', ');
+                    }
+
+                    return attributeOptions;
+                },
+
+                'updateCompareCount': function () {
+                    if (this.isCustomer == "true" || this.isCustomer == true) {
+                        this.$http.get(`${this.baseUrl}/items-count`)
+                        .then(response => {
+                            $('#compare-items-count').html(response.data.compareProductsCount);
+                        })
+                        .catch(exception => {
+                            window.flashMessages = [{
+                                'type': `alert-error`,
+                                'message': "{{ __('shop::app.common.error') }}"
+                            }];
+
+                            this.$root.addFlashMessages();
+                        });
+                    } else {
+                        let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
+                        comparedItemsCount = comparedItems ? comparedItems.length : 0;
+
+                        $('#compare-items-count').html(comparedItemsCount);
+                    }
+                }
+            }
+        });
+    </script>
+@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/guest/compare/index.blade.php b/resources/themes/shop/views/guest/compare/index.blade.php
new file mode 100644
index 000000000..08cd183db
--- /dev/null
+++ b/resources/themes/shop/views/guest/compare/index.blade.php
@@ -0,0 +1,11 @@
+@extends('shop::layouts.master')
+
+@include('shop::guest.compare.compare-products')
+
+@section('page_title')
+    {{ __('shop::app.customer.compare.compare_similar_items') }}
+@endsection
+
+@section('content-wrapper')
+    <compare-product></compare-product>
+@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/guest/wishlist/index.blade.php b/resources/themes/shop/views/guest/wishlist/index.blade.php
new file mode 100644
index 000000000..be3b6a35b
--- /dev/null
+++ b/resources/themes/shop/views/guest/wishlist/index.blade.php
@@ -0,0 +1,3 @@
+<script>
+    window.location.href = window.location.href.replace('/guest-wishlist', '');
+</script>
\ No newline at end of file
diff --git a/resources/themes/shop/views/home/featured-products.blade.php b/resources/themes/shop/views/home/featured-products.blade.php
new file mode 100644
index 000000000..654a02043
--- /dev/null
+++ b/resources/themes/shop/views/home/featured-products.blade.php
@@ -0,0 +1,27 @@
+@if (count(app('Webkul\Product\Repositories\ProductRepository')->getFeaturedProducts()))
+    <section class="featured-products">
+
+        <div class="featured-heading">
+            {{ __('shop::app.home.featured-products') }}<br/>
+
+            <span class="featured-seperator" style="color: #d7dfe2;">_____</span>
+        </div>
+
+        <div class="featured-grid product-grid-4">
+
+            @foreach (app('Webkul\Product\Repositories\ProductRepository')->getFeaturedProducts() as $productFlat)
+
+                @if (core()->getConfigData('catalog.products.homepage.out_of_stock_items'))
+                    @include ('shop::products.list.card', ['product' => $productFlat])
+                @else
+                    @if ($productFlat->isSaleable())
+                        @include ('shop::products.list.card', ['product' => $productFlat])
+                    @endif
+                @endif
+
+            @endforeach
+
+        </div>
+
+    </section>
+@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/home/index.blade.php b/resources/themes/shop/views/home/index.blade.php
new file mode 100644
index 000000000..b3021bcf3
--- /dev/null
+++ b/resources/themes/shop/views/home/index.blade.php
@@ -0,0 +1,53 @@
+@extends('shop::layouts.master')
+
+@php
+    $channel = core()->getCurrentChannel();
+
+    $homeSEO = $channel->home_seo;
+
+    if (isset($homeSEO)) {
+        $homeSEO = json_decode($channel->home_seo);
+
+        $metaTitle = $homeSEO->meta_title;
+
+        $metaDescription = $homeSEO->meta_description;
+
+        $metaKeywords = $homeSEO->meta_keywords;
+    }
+@endphp
+
+@section('page_title')
+    {{ isset($metaTitle) ? $metaTitle : "" }}
+@endsection
+
+@section('head')
+
+    @if (isset($homeSEO))
+        @isset($metaTitle)
+            <meta name="title" content="{{ $metaTitle }}" />
+        @endisset
+
+        @isset($metaDescription)
+            <meta name="description" content="{{ $metaDescription }}" />
+        @endisset
+
+        @isset($metaKeywords)
+            <meta name="keywords" content="{{ $metaKeywords }}" />
+        @endisset
+    @endif
+@endsection
+
+@section('content-wrapper')
+    {!! view_render_event('bagisto.shop.home.content.before') !!}
+
+    @if (! is_null($channel->home_page_content))
+        {!! DbView::make($channel)->field('home_page_content')->with(['sliderData' => $sliderData])->render() !!}
+    @else
+        @include('shop::home.slider', ['sliderData' => $sliderData])
+        @include('shop::home.featured-products')
+        @include('shop::home.new-products')
+    @endif
+
+    {{ view_render_event('bagisto.shop.home.content.after') }}
+
+@endsection
diff --git a/resources/themes/shop/views/home/new-products.blade.php b/resources/themes/shop/views/home/new-products.blade.php
new file mode 100644
index 000000000..5a31b168c
--- /dev/null
+++ b/resources/themes/shop/views/home/new-products.blade.php
@@ -0,0 +1,27 @@
+@if (count(app('Webkul\Product\Repositories\ProductRepository')->getNewProducts()))
+    <section class="featured-products">
+
+        <div class="featured-heading">
+            {{ __('shop::app.home.new-products') }}<br/>
+
+            <span class="featured-seperator" style="color: #d7dfe2;">_____</span>
+        </div>
+
+        <div class="product-grid-4">
+
+            @foreach (app('Webkul\Product\Repositories\ProductRepository')->getNewProducts() as $productFlat)
+
+                @if (core()->getConfigData('catalog.products.homepage.out_of_stock_items'))
+                    @include ('shop::products.list.card', ['product' => $productFlat])
+                @else
+                    @if ($productFlat->isSaleable())
+                        @include ('shop::products.list.card', ['product' => $productFlat])
+                    @endif
+                @endif
+
+            @endforeach
+
+        </div>
+
+    </section>
+@endif
diff --git a/resources/themes/shop/views/home/news-updates.blade.php b/resources/themes/shop/views/home/news-updates.blade.php
new file mode 100644
index 000000000..4cb478208
--- /dev/null
+++ b/resources/themes/shop/views/home/news-updates.blade.php
@@ -0,0 +1,15 @@
+<section class="news-update">
+    <div class="news-update-grid">
+        <div class="block1">
+            <img src="vendor/webkul/shop/assets/images/1.png" alt="" />
+        </div>
+        <div class="block2">
+            <div class="sub-block1">
+                <img src="vendor/webkul/shop/assets/images/2.png" alt="" />
+            </div>
+            <div class="sub-block2">
+                <img src="vendor/webkul/shop/assets/images/3.png" alt="" />
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/resources/themes/shop/views/home/slider.blade.php b/resources/themes/shop/views/home/slider.blade.php
new file mode 100644
index 000000000..abdbf9452
--- /dev/null
+++ b/resources/themes/shop/views/home/slider.blade.php
@@ -0,0 +1,5 @@
+@if (count($sliderData))
+    <section class="slider-block" style="height: 500px">
+        <image-slider :slides='@json($sliderData)' public_path="{{ url()->to('/') }}"></image-slider>
+    </section>
+@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/index.blade.php b/resources/themes/shop/views/index.blade.php
new file mode 100644
index 000000000..5d0687bbe
--- /dev/null
+++ b/resources/themes/shop/views/index.blade.php
@@ -0,0 +1,13 @@
+@inject('rateHelper' , 'Webkul\Shipping\Helper\Rate')
+<div>
+    @foreach ($rateHelper->collectRates() as $key=>$count)
+        <div class="shipping-method">
+            <input type="radio" name="price"> ${{ core()->currency($count) }}  <span> {{ $key }} </span>
+        </div>
+    @endforeach
+</div>
+<style>
+    span {
+        margin-left: 10px;
+    }
+</style>
\ No newline at end of file
diff --git a/resources/themes/shop/views/layouts/footer/footer.blade.php b/resources/themes/shop/views/layouts/footer/footer.blade.php
new file mode 100644
index 000000000..493d12e3f
--- /dev/null
+++ b/resources/themes/shop/views/layouts/footer/footer.blade.php
@@ -0,0 +1,91 @@
+<div class="footer">
+    <div class="footer-content">
+        <div class="footer-list-container">
+
+            <?php
+                $categories = [];
+
+                foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category){
+                    if ($category->slug)
+                        array_push($categories, $category);
+                }
+            ?>
+
+            @if (count($categories))
+                <div class="list-container">
+                    <span class="list-heading">Categories</span>
+
+                    <ul class="list-group">
+                        @foreach ($categories as $key => $category)
+                            <li>
+                                <a href="{{ route('shop.productOrCategory.index', $category->slug) }}">{{ $category->name }}</a>
+                            </li>
+                        @endforeach
+                    </ul>
+                </div>
+            @endif
+
+            {!! DbView::make(core()->getCurrentChannel())->field('footer_content')->render() !!}
+
+            <div class="list-container">
+                @if(core()->getConfigData('customer.settings.newsletter.subscription'))
+                    <label class="list-heading" for="subscribe-field">{{ __('shop::app.footer.subscribe-newsletter') }}</label>
+                    <div class="form-container">
+                        <form action="{{ route('shop.subscribe') }}">
+                            <div class="control-group" :class="[errors.has('subscriber_email') ? 'has-error' : '']">
+                                <input type="email" id="subscribe-field" class="control subscribe-field" name="subscriber_email" placeholder="Email Address" required><br/>
+
+                                <button class="btn btn-md btn-primary">{{ __('shop::app.subscription.subscribe') }}</button>
+                            </div>
+                        </form>
+                    </div>
+                @endif
+
+                <?php
+                    $term = request()->input('term');
+
+                    if (! is_null($term)) {
+                        $serachQuery = 'term='.request()->input('term');
+                    }
+                ?>
+
+                <label class="list-heading" for="locale-switcher">{{ __('shop::app.footer.locale') }}</label>
+                <div class="form-container">
+                    <div class="control-group">
+                        <select class="control locale-switcher" id="locale-switcher" onchange="window.location.href = this.value" @if (count(core()->getCurrentChannel()->locales) == 1) disabled="disabled" @endif>
+
+                            @foreach (core()->getCurrentChannel()->locales as $locale)
+                                @if (isset($serachQuery))
+                                    <option value="?{{ $serachQuery }}&locale={{ $locale->code }}" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>{{ $locale->name }}</option>
+                                @else
+                                    <option value="?locale={{ $locale->code }}" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>{{ $locale->name }}</option>
+                                @endif
+                            @endforeach
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="currency">
+                    <label class="list-heading" for="currency-switcher">{{ __('shop::app.footer.currency') }}</label>
+                    <div class="form-container">
+                        <div class="control-group">
+                            <select class="control locale-switcher" id="currency-switcher" onchange="window.location.href = this.value">
+
+                                @foreach (core()->getCurrentChannel()->currencies as $currency)
+                                    @if (isset($serachQuery))
+                                        <option value="?{{ $serachQuery }}&currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
+                                    @else
+                                        <option value="?currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
+                                    @endif
+                                @endforeach
+
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/themes/shop/views/layouts/header/index.blade.php b/resources/themes/shop/views/layouts/header/index.blade.php
new file mode 100644
index 000000000..771d88d22
--- /dev/null
+++ b/resources/themes/shop/views/layouts/header/index.blade.php
@@ -0,0 +1,415 @@
+<?php
+    $term = request()->input('term');
+    $image_search = request()->input('image-search');
+
+    if (! is_null($term)) {
+        $serachQuery = 'term='.request()->input('term');
+    }
+?>
+
+<div class="header" id="header">
+    <div class="header-top">
+        <div class="left-content">
+            <ul class="logo-container">
+                <li>
+                    <a href="{{ route('shop.home.index') }}" aria-label="Logo">
+                        @if ($logo = core()->getCurrentChannel()->logo_url)
+                            <img class="logo" src="{{ $logo }}" alt="" />
+                        @else
+                            <img class="logo" src="{{ bagisto_asset('images/logo.svg') }}" alt="" />
+                        @endif
+                    </a>
+                </li>
+            </ul>
+
+            <ul class="search-container">
+                <li class="search-group">
+                    <form role="search" action="{{ route('shop.search.index') }}" method="GET" style="display: inherit;">
+                        <label for="search-bar" style="position: absolute; z-index: -1;">Search</label>
+                        <input
+                            required
+                            name="term"
+                            type="search"
+                            value="{{ ! $image_search ? $term : '' }}"
+                            class="search-field"
+                            id="search-bar"
+                            placeholder="{{ __('shop::app.header.search-text') }}"
+                        >
+
+                        <image-search-component></image-search-component>
+
+                        <div class="search-icon-wrapper">
+
+                            <button class="" class="background: none;" aria-label="Search">
+                                <i class="icon icon-search"></i>
+                            </button>
+                        </div>
+                    </form>
+                </li>
+            </ul>
+        </div>
+
+        <div class="right-content">
+
+            <span class="search-box"><span class="icon icon-search" id="search"></span></span>
+
+            <ul class="right-content-menu">
+
+                {!! view_render_event('bagisto.shop.layout.header.comppare-item.before') !!}
+
+                @php
+                    $showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false
+                @endphp
+
+                @if ($showCompare)
+                    <li class="compare-dropdown-container">
+                        <a
+                            @auth('customer')
+                                href="{{ route('velocity.customer.product.compare') }}"
+                            @endauth
+
+                            @guest('customer')
+                                href="{{ route('velocity.product.compare') }}"
+                            @endguest
+                            style="color: #242424;"
+                            >
+
+                            <i class="icon compare-icon"></i>
+                            <span class="name">
+                                {{ __('shop::app.customer.compare.text') }}
+                                <span class="count">(<span id="compare-items-count"></span>)<span class="count">
+                            </span>
+                        </a>
+                    </li>
+                @endif
+
+                {!! view_render_event('bagisto.shop.layout.header.compare-item.after') !!}
+
+                {!! view_render_event('bagisto.shop.layout.header.currency-item.before') !!}
+
+                @if (core()->getCurrentChannel()->currencies->count() > 1)
+                    <li class="currency-switcher">
+                        <span class="dropdown-toggle">
+                            {{ core()->getCurrentCurrencyCode() }}
+
+                            <i class="icon arrow-down-icon"></i>
+                        </span>
+
+                        <ul class="dropdown-list currency">
+                            @foreach (core()->getCurrentChannel()->currencies as $currency)
+                                <li>
+                                    @if (isset($serachQuery))
+                                        <a href="?{{ $serachQuery }}&currency={{ $currency->code }}">{{ $currency->code }}</a>
+                                    @else
+                                        <a href="?currency={{ $currency->code }}">{{ $currency->code }}</a>
+                                    @endif
+                                </li>
+                            @endforeach
+                        </ul>
+                    </li>
+                @endif
+
+                {!! view_render_event('bagisto.shop.layout.header.currency-item.after') !!}
+
+
+                {!! view_render_event('bagisto.shop.layout.header.account-item.before') !!}
+
+                <li>
+                    <span class="dropdown-toggle">
+                        <i class="icon account-icon"></i>
+
+                        <span class="name">{{ __('shop::app.header.account') }}</span>
+
+                        <i class="icon arrow-down-icon"></i>
+                    </span>
+
+                    @guest('customer')
+                        <ul class="dropdown-list account guest">
+                            <li>
+                                <div>
+                                    <label style="color: #9e9e9e; font-weight: 700; text-transform: uppercase; font-size: 15px;">
+                                        {{ __('shop::app.header.title') }}
+                                    </label>
+                                </div>
+
+                                <div style="margin-top: 5px;">
+                                    <span style="font-size: 12px;">{{ __('shop::app.header.dropdown-text') }}</span>
+                                </div>
+
+                                <div style="margin-top: 15px;">
+                                    <a class="btn btn-primary btn-md" href="{{ route('customer.session.index') }}" style="color: #ffffff">
+                                        {{ __('shop::app.header.sign-in') }}
+                                    </a>
+
+                                    <a class="btn btn-primary btn-md" href="{{ route('customer.register.index') }}" style="float: right; color: #ffffff">
+                                        {{ __('shop::app.header.sign-up') }}
+                                    </a>
+                                </div>
+                            </li>
+                        </ul>
+                    @endguest
+
+                    @auth('customer')
+                        @php
+                           $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
+                        @endphp
+
+                        <ul class="dropdown-list account customer">
+                            <li>
+                                <div>
+                                    <label style="color: #9e9e9e; font-weight: 700; text-transform: uppercase; font-size: 15px;">
+                                        {{ auth()->guard('customer')->user()->first_name }}
+                                    </label>
+                                </div>
+
+                                <ul>
+                                    <li>
+                                        <a href="{{ route('customer.profile.index') }}">{{ __('shop::app.header.profile') }}</a>
+                                    </li>
+
+                                    @if ($showWishlist)
+                                        <li>
+                                            <a href="{{ route('customer.wishlist.index') }}">{{ __('shop::app.header.wishlist') }}</a>
+                                        </li>
+                                    @endif
+
+                                    <li>
+                                        <a href="{{ route('shop.checkout.cart.index') }}">{{ __('shop::app.header.cart') }}</a>
+                                    </li>
+
+                                    <li>
+                                        <a href="{{ route('customer.session.destroy') }}">{{ __('shop::app.header.logout') }}</a>
+                                    </li>
+                                </ul>
+                            </li>
+                        </ul>
+                    @endauth
+                </li>
+
+                {!! view_render_event('bagisto.shop.layout.header.account-item.after') !!}
+
+
+                {!! view_render_event('bagisto.shop.layout.header.cart-item.before') !!}
+
+                <li class="cart-dropdown-container">
+
+                    @include('shop::checkout.cart.mini-cart')
+
+                </li>
+
+                {!! view_render_event('bagisto.shop.layout.header.cart-item.after') !!}
+
+            </ul>
+
+            <span class="menu-box" ><span class="icon icon-menu" id="hammenu"></span>
+        </div>
+    </div>
+
+    <div class="header-bottom" id="header-bottom">
+        @include('shop::layouts.header.nav-menu.navmenu')
+    </div>
+
+    <div class="search-responsive mt-10" id="search-responsive">
+        <form role="search" action="{{ route('shop.search.index') }}" method="GET" style="display: inherit;">
+            <div class="search-content">
+                <button style="background: none; border: none; padding: 0px;">
+                    <i class="icon icon-search"></i>
+                </button>
+
+                <image-search-component></image-search-component>
+
+                <input type="search" name="term" class="search">
+                <i class="icon icon-menu-back right"></i>
+            </div>
+        </form>
+    </div>
+</div>
+
+@push('scripts')
+    <script src="https://cdn.jsdelivr.net/npm/@tensorflow/tfjs" defer></script>
+    <script src="https://cdn.jsdelivr.net/npm/@tensorflow-models/mobilenet" defer></script>
+
+    <script type="text/x-template" id="image-search-component-template">
+        <div v-if="image_search_status">
+            <label class="image-search-container" :for="'image-search-container-' + _uid">
+                <i class="icon camera-icon"></i>
+
+                <input type="file" :id="'image-search-container-' + _uid" ref="image_search_input" v-on:change="uploadImage()"/>
+
+                <img :id="'uploaded-image-url-' +  + _uid" :src="uploaded_image_url" alt="" width="20" height="20" />
+            </label>
+        </div>
+    </script>
+
+    <script>
+
+        Vue.component('image-search-component', {
+
+            template: '#image-search-component-template',
+
+            data: function() {
+                return {
+                    uploaded_image_url: '',
+                    image_search_status: "{{core()->getConfigData('general.content.shop.image_search') == '1' ? 'true' : 'false'}}" == 'true'
+                }
+            },
+
+            methods: {
+                uploadImage: function() {
+                    var imageInput = this.$refs.image_search_input;
+
+                    if (imageInput.files && imageInput.files[0]) {
+                        if (imageInput.files[0].type.includes('image/')) {
+                            var self = this;
+
+                            if (imageInput.files[0].size <= 2000000) { 
+                                self.$root.showLoader();
+
+                                var formData = new FormData();
+
+                                formData.append('image', imageInput.files[0]);
+
+                                axios.post("{{ route('shop.image.search.upload') }}", formData, {headers: {'Content-Type': 'multipart/form-data'}})
+                                    .then(function(response) {
+                                        self.uploaded_image_url = response.data;
+
+                                        var net;
+
+                                        async function app() {
+                                            var analysedResult = [];
+
+                                            var queryString = '';
+
+                                            net = await mobilenet.load();
+
+                                            const imgElement = document.getElementById('uploaded-image-url-' +  + self._uid);
+
+                                            try {
+                                                const result = await net.classify(imgElement);
+
+                                                result.forEach(function(value) {
+                                                    queryString = value.className.split(',');
+
+                                                    if (queryString.length > 1) {
+                                                        analysedResult = analysedResult.concat(queryString)
+                                                    } else {
+                                                        analysedResult.push(queryString[0])
+                                                    }
+                                                });
+                                            } catch (error) {
+                                                self.$root.hideLoader();
+
+                                                window.flashMessages = [
+                                                    {
+                                                        'type': 'alert-error',
+                                                        'message': "{{ __('shop::app.common.error') }}"
+                                                    }
+                                                ];
+
+                                                self.$root.addFlashMessages();
+                                            };
+
+                                            localStorage.searched_image_url = self.uploaded_image_url;
+
+                                            queryString = localStorage.searched_terms = analysedResult.join('_');
+
+                                            self.$root.hideLoader();
+
+                                            window.location.href = "{{ route('shop.search.index') }}" + '?term=' + queryString + '&image-search=1';
+                                        }
+
+                                        app();
+                                    })
+                                    .catch(function(error) {
+                                        self.$root.hideLoader();
+
+                                        window.flashMessages = [
+                                            {
+                                                'type': 'alert-error',
+                                                'message': "{{ __('shop::app.common.error') }}"
+                                            }
+                                        ];
+
+                                        self.$root.addFlashMessages();
+                                    });
+                            } else {
+
+                                imageInput.value = '';
+
+                                        window.flashMessages = [
+                                            {
+                                                'type': 'alert-error',
+                                                'message': "{{ __('shop::app.common.image-upload-limit') }}"
+                                            }
+                                        ];
+
+                                self.$root.addFlashMessages();
+                                
+                            }        
+                        } else {
+                            imageInput.value = '';
+
+                            alert('Only images (.jpeg, .jpg, .png, ..) are allowed.');
+                        }
+                    }
+                }
+            }
+        });
+
+    </script>
+
+    <script>
+        $(document).ready(function() {
+
+            $('body').delegate('#search, .icon-menu-close, .icon.icon-menu', 'click', function(e) {
+                toggleDropdown(e);
+            });
+
+            @auth('customer')
+                @php
+                    $compareCount = app('Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository')
+                        ->count([
+                            'customer_id' => auth()->guard('customer')->user()->id,
+                        ]);
+                @endphp
+
+                let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
+                $('#compare-items-count').html({{ $compareCount }});
+            @endauth
+
+            @guest('customer')
+                let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
+                $('#compare-items-count').html(comparedItems ? comparedItems.length : 0);
+            @endguest
+
+            function toggleDropdown(e) {
+                var currentElement = $(e.currentTarget);
+
+                if (currentElement.hasClass('icon-search')) {
+                    currentElement.removeClass('icon-search');
+                    currentElement.addClass('icon-menu-close');
+                    $('#hammenu').removeClass('icon-menu-close');
+                    $('#hammenu').addClass('icon-menu');
+                    $("#search-responsive").css("display", "block");
+                    $("#header-bottom").css("display", "none");
+                } else if (currentElement.hasClass('icon-menu')) {
+                    currentElement.removeClass('icon-menu');
+                    currentElement.addClass('icon-menu-close');
+                    $('#search').removeClass('icon-menu-close');
+                    $('#search').addClass('icon-search');
+                    $("#search-responsive").css("display", "none");
+                    $("#header-bottom").css("display", "block");
+                } else {
+                    currentElement.removeClass('icon-menu-close');
+                    $("#search-responsive").css("display", "none");
+                    $("#header-bottom").css("display", "none");
+                    if (currentElement.attr("id") == 'search') {
+                        currentElement.addClass('icon-search');
+                    } else {
+                        currentElement.addClass('icon-menu');
+                    }
+                }
+            }
+        });
+    </script>
+@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/layouts/header/nav-menu/navmenu.blade.php b/resources/themes/shop/views/layouts/header/nav-menu/navmenu.blade.php
new file mode 100644
index 000000000..0e9e3085a
--- /dev/null
+++ b/resources/themes/shop/views/layouts/header/nav-menu/navmenu.blade.php
@@ -0,0 +1,138 @@
+{!! view_render_event('bagisto.shop.layout.header.category.before') !!}
+
+<?php
+
+$categories = [];
+
+foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category) {
+    if ($category->slug) {
+        array_push($categories, $category);
+    }
+}
+
+?>
+
+<category-nav categories='@json($categories)' url="{{url()->to('/')}}"></category-nav>
+
+{!! view_render_event('bagisto.shop.layout.header.category.after') !!}
+
+
+@push('scripts')
+
+
+<script type="text/x-template" id="category-nav-template">
+
+    <ul class="nav">
+        <category-item
+            v-for="(item, index) in items"
+            :key="index"
+            :url="url"
+            :item="item"
+            :parent="index">
+        </category-item>
+    </ul>
+
+</script>
+
+<script>
+    Vue.component('category-nav', {
+
+        template: '#category-nav-template',
+
+        props: {
+            categories: {
+                type: [Array, String, Object],
+                required: false,
+                default: (function () {
+                    return [];
+                })
+            },
+
+            url: String
+        },
+
+        data: function(){
+            return {
+                items_count:0
+            };
+        },
+
+        computed: {
+            items: function() {
+                return JSON.parse(this.categories)
+            }
+        },
+    });
+</script>
+
+<script type="text/x-template" id="category-item-template">
+    <li>
+        <a :href="url+'/'+this.item['translations'][0].url_path">
+            @{{ name }}&emsp;
+            <i class="icon dropdown-right-icon" v-if="haveChildren && item.parent_id != null"></i>
+        </a>
+
+        <i :class="[show ? 'icon icon-arrow-down mt-15' : 'icon dropdown-right-icon left mt-15']"
+        v-if="haveChildren"  @click="showOrHide"></i>
+
+        <ul v-if="haveChildren && show">
+            <category-item
+                v-for="(child, index) in item.children"
+                :key="index"
+                :url="url"
+                :item="child">
+            </category-item>
+        </ul>
+    </li>
+</script>
+
+<script>
+    Vue.component('category-item', {
+
+        template: '#category-item-template',
+
+        props: {
+            item:  Object,
+            url: String,
+        },
+
+        data: function() {
+            return {
+                items_count:0,
+                show: false,
+            };
+        },
+
+        mounted: function() {
+            if(window.innerWidth > 770){
+                this.show = true;
+            }
+        },
+
+        computed: {
+            haveChildren: function() {
+                return this.item.children.length ? true : false;
+            },
+
+            name: function() {
+                if (this.item.translations && this.item.translations.length) {
+                    this.item.translations.forEach(function(translation) {
+                        if (translation.locale == document.documentElement.lang)
+                            return translation.name;
+                    });
+                }
+
+                return this.item.name;
+            }
+        },
+
+        methods: {
+            showOrHide: function() {
+                this.show = !this.show;
+            }
+        }
+    });
+</script>
+
+
+@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/layouts/master.blade.php b/resources/themes/shop/views/layouts/master.blade.php
new file mode 100644
index 000000000..83f6c798b
--- /dev/null
+++ b/resources/themes/shop/views/layouts/master.blade.php
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="{{ app()->getLocale() }}">
+
+<head>
+
+    <title>@yield('page_title')</title>
+
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+    <meta http-equiv="content-language" content="{{ app()->getLocale() }}">
+    <link rel="stylesheet" href="{{ asset('vendor/webkul/ui/assets/css/ui.css') }}">
+
+    <link rel="stylesheet" href="{{ bagisto_asset('css/shop.css') }}">
+
+    @if ($favicon = core()->getCurrentChannel()->favicon_url)
+        <link rel="icon" sizes="16x16" href="{{ $favicon }}" />
+    @else
+        <link rel="icon" sizes="16x16" href="{{ bagisto_asset('images/favicon.ico') }}" />
+    @endif
+
+    @yield('head')
+
+    @section('seo')
+        @if (! request()->is('/'))
+            <meta name="description" content="{{ core()->getCurrentChannel()->description }}"/>
+        @endif
+    @show
+
+    @stack('css')
+
+    {!! view_render_event('bagisto.shop.layout.head') !!}
+
+    <style>
+        {!! core()->getConfigData('general.content.custom_scripts.custom_css') !!}
+    </style>
+
+</head>
+
+
+<body @if (core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl') class="rtl" @endif style="scroll-behavior: smooth;">
+
+    {!! view_render_event('bagisto.shop.layout.body.before') !!}
+
+    <div id="app">
+        <flash-wrapper ref='flashes'></flash-wrapper>
+
+        <div class="main-container-wrapper">
+
+            {!! view_render_event('bagisto.shop.layout.header.before') !!}
+
+            @include('shop::layouts.header.index')
+
+            {!! view_render_event('bagisto.shop.layout.header.after') !!}
+
+            @yield('slider')
+
+            <main class="content-container">
+
+                {!! view_render_event('bagisto.shop.layout.content.before') !!}
+
+                @yield('content-wrapper')
+
+                {!! view_render_event('bagisto.shop.layout.content.after') !!}
+
+            </main>
+
+        </div>
+
+        {!! view_render_event('bagisto.shop.layout.footer.before') !!}
+
+        @include('shop::layouts.footer.footer')
+
+        {!! view_render_event('bagisto.shop.layout.footer.after') !!}
+
+        @if (core()->getConfigData('general.content.footer.footer_toggle'))
+            <div class="footer">
+                <p style="text-align: center;">
+                    @if (core()->getConfigData('general.content.footer.footer_content'))
+                        {{ core()->getConfigData('general.content.footer.footer_content') }}
+                    @else
+                        {!! trans('admin::app.footer.copy-right') !!}
+                    @endif
+                </p>
+            </div>
+        @endif
+
+        <overlay-loader :is-open="show_loader"></overlay-loader>
+    </div>
+
+    <script type="text/javascript">
+        window.flashMessages = [];
+
+        @if ($success = session('success'))
+            window.flashMessages = [{'type': 'alert-success', 'message': "{{ $success }}" }];
+        @elseif ($warning = session('warning'))
+            window.flashMessages = [{'type': 'alert-warning', 'message': "{{ $warning }}" }];
+        @elseif ($error = session('error'))
+            window.flashMessages = [{'type': 'alert-error', 'message': "{{ $error }}" }];
+        @elseif ($info = session('info'))
+            window.flashMessages = [{'type': 'alert-info', 'message': "{{ $info }}" }];
+        @endif
+
+        window.serverErrors = [];
+
+        @if (isset($errors))
+            @if (count($errors))
+                window.serverErrors = @json($errors->getMessages());
+            @endif
+        @endif
+    </script>
+
+    <script type="text/javascript" src="{{ bagisto_asset('js/shop.js') }}"></script>
+    <script type="text/javascript" src="{{ asset('vendor/webkul/ui/assets/js/ui.js') }}"></script>
+
+    @stack('scripts')
+
+    {!! view_render_event('bagisto.shop.layout.body.after') !!}
+
+    <div class="modal-overlay"></div>
+
+    <script>
+        {!! core()->getConfigData('general.content.custom_scripts.custom_javascript') !!}
+    </script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/resources/themes/shop/views/partials/pagination.blade.php b/resources/themes/shop/views/partials/pagination.blade.php
new file mode 100644
index 000000000..7350ddb24
--- /dev/null
+++ b/resources/themes/shop/views/partials/pagination.blade.php
@@ -0,0 +1,50 @@
+@if ($paginator->hasPages())
+    <div class="pagination shop mt-50">
+        {{-- Previous Page Link --}}
+        @if ($paginator->onFirstPage())
+            <a class="page-item previous">
+                <i class="icon angle-left-icon"></i>
+            </a>
+        @else
+            <a data-page="{{ urldecode($paginator->previousPageUrl()) }}" href="{{ urldecode($paginator->previousPageUrl()) }}" id="previous" class="page-item previous">
+                <i class="icon angle-left-icon"></i>
+            </a>
+        @endif
+
+        {{-- Pagination Elements --}}
+        @foreach ($elements as $element)
+            {{-- "Three Dots" Separator --}}
+            @if (is_string($element))
+                <a class="page-item disabled" aria-disabled="true">
+                    {{ $element }}
+                </a>
+            @endif
+
+            {{-- Array Of Links --}}
+            @if (is_array($element))
+                @foreach ($element as $page => $url)
+                    @if ($page == $paginator->currentPage())
+                        <a class="page-item active">
+                            {{ $page }}
+                        </a>
+                    @else
+                        <a class="page-item as" href="{{ urldecode($url) }}">
+                            {{ $page }}
+                        </a>
+                    @endif
+                @endforeach
+            @endif
+        @endforeach
+
+        {{-- Next Page Link --}}
+        @if ($paginator->hasMorePages())
+            <a href="{{ urldecode($paginator->nextPageUrl()) }}" data-page="{{ urldecode($paginator->nextPageUrl()) }}" id="next" class="page-item next">
+                <i class="icon angle-right-icon"></i>
+            </a>
+        @else
+            <a class="page-item next">
+                <i class="icon angle-right-icon"></i>
+            </a>
+        @endif
+    </div>
+@endif
diff --git a/resources/themes/shop/views/products/add-buttons.blade.php b/resources/themes/shop/views/products/add-buttons.blade.php
new file mode 100644
index 000000000..c02bdee5d
--- /dev/null
+++ b/resources/themes/shop/views/products/add-buttons.blade.php
@@ -0,0 +1,24 @@
+@php
+    $showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false;
+
+    $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
+@endphp
+
+<div class="cart-wish-wrap">
+    <form action="{{ route('cart.add', $product->product_id) }}" method="POST">
+        @csrf
+        <input type="hidden" name="product_id" value="{{ $product->product_id }}">
+        <input type="hidden" name="quantity" value="1">
+        <button class="btn btn-lg btn-primary addtocart" {{ $product->isSaleable() ? '' : 'disabled' }}>{{ ($product->type == 'booking') ?  __('shop::app.products.book-now') :  __('shop::app.products.add-to-cart') }}</button>
+    </form>
+
+    @if ($showWishlist)
+        @include('shop::products.wishlist')
+    @endif
+
+    @if ($showCompare)
+        @include('shop::products.compare', [
+            'productId' => $product->id
+        ])
+    @endif
+</div>
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/add-to-cart.blade.php b/resources/themes/shop/views/products/add-to-cart.blade.php
new file mode 100644
index 000000000..6887730ee
--- /dev/null
+++ b/resources/themes/shop/views/products/add-to-cart.blade.php
@@ -0,0 +1,12 @@
+{!! view_render_event('bagisto.shop.products.add_to_cart.before', ['product' => $product]) !!}
+
+@php
+    $width = (core()->getConfigData('catalog.products.storefront.buy_now_button_display') == 1) ? '49' : '95';
+@endphp
+
+<button type="submit" class="btn btn-lg btn-primary addtocart" {{ ! $product->isSaleable() ? 'disabled' : '' }}
+style="width: <?php echo $width.'%';?>;">
+    {{ ($product->type == 'booking') ?  __('shop::app.products.book-now') :  __('shop::app.products.add-to-cart') }}
+</button>
+
+{!! view_render_event('bagisto.shop.products.add_to_cart.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/add-to.blade.php b/resources/themes/shop/views/products/add-to.blade.php
new file mode 100644
index 000000000..88af2a27d
--- /dev/null
+++ b/resources/themes/shop/views/products/add-to.blade.php
@@ -0,0 +1,9 @@
+{!! view_render_event('bagisto.shop.products.add_to.before', ['product' => $product]) !!}
+
+<div class="cart-fav-seg">
+    @include ('shop::products.add-to-cart', ['product' => $product])
+
+    @include('shop::products.wishlist')
+</div>
+
+{!! view_render_event('bagisto.shop.products.add_to.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/buy-now.blade.php b/resources/themes/shop/views/products/buy-now.blade.php
new file mode 100644
index 000000000..74bba5273
--- /dev/null
+++ b/resources/themes/shop/views/products/buy-now.blade.php
@@ -0,0 +1,7 @@
+{!! view_render_event('bagisto.shop.products.buy_now.before', ['product' => $product]) !!}
+
+<button type="submit" class="btn btn-lg btn-primary buynow" {{ ! $product->isSaleable(1) ? 'disabled' : '' }}>
+    {{ __('shop::app.products.buy-now') }}
+</button>
+
+{!! view_render_event('bagisto.shop.products.buy_now.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/compare.blade.php b/resources/themes/shop/views/products/compare.blade.php
new file mode 100644
index 000000000..6e371e981
--- /dev/null
+++ b/resources/themes/shop/views/products/compare.blade.php
@@ -0,0 +1,129 @@
+<compare-component product-id="{{ $productId }}"></compare-component>
+
+@push('scripts')
+
+    <script type="text/x-template" id="compare-component-template">
+        <a
+            class="unset text-right"
+            title="{{  __('shop::app.customer.compare.add-tooltip') }}"
+            @click="addProductToCompare"
+            style="cursor: pointer">
+            <img src="{{ asset('themes/default/assets/images/compare_arrows.png') }}" alt="" />
+        </a>
+    </script>
+
+    <script>
+        Vue.component('compare-component', {
+            props: ['productId'],
+
+            template: '#compare-component-template',
+
+            data: function () {
+                return {
+                    'baseUrl': "{{ url()->to('/') }}",
+                    'customer': '{{ auth()->guard('customer')->user() ? "true" : "false" }}' == "true",
+                }
+            },
+
+            methods: {
+                'addProductToCompare': function () {
+                    if (this.customer == "true" || this.customer == true) {
+                        this.$http.put(
+                            `${this.baseUrl}/comparison`, {
+                                productId: this.productId,
+                            }
+                        ).then(response => {
+                            window.flashMessages = [{
+                                'type': `alert-${response.data.status}`,
+                                'message': response.data.message
+                            }];
+
+                            this.$root.addFlashMessages()
+                        }).catch(error => {
+                            window.flashMessages = [{
+                                'type': `alert-danger`,
+                                'message': "{{ __('shop::app.common.error') }}"
+                            }];
+
+                            this.$root.addFlashMessages()
+                        });
+                    } else {
+                        let updatedItems = [this.productId];
+                        let existingItems = this.getStorageValue('compared_product');
+
+                        if (existingItems) {
+                            if (existingItems.indexOf(this.productId) == -1) {
+                                updatedItems = existingItems.concat(updatedItems);
+
+                                this.setStorageValue('compared_product', updatedItems);
+
+                                window.flashMessages = [{
+                                    'type': `alert-success`,
+                                    'message': "{{ __('shop::app.customer.compare.added') }}"
+                                }];
+
+                                this.$root.addFlashMessages()
+                            } else {
+                                window.flashMessages = [{
+                                    'type': `alert-success`,
+                                    'message': "{{ __('shop::app.customer.compare.already_added') }}"
+                                }];
+
+                                this.$root.addFlashMessages()
+                            }
+                        } else {
+                            this.setStorageValue('compared_product', updatedItems);
+
+                            window.flashMessages = [{
+                                'type': `alert-success`,
+                                'message': "{{ __('shop::app.customer.compare.added') }}"
+                            }];
+
+                                this.$root.addFlashMessages()
+                        }
+                    }
+
+                    this.updateCompareCount();
+                },
+
+                'getStorageValue': function (key) {
+                    let value = window.localStorage.getItem(key);
+
+                    if (value) {
+                        value = JSON.parse(value);
+                    }
+
+                    return value;
+                },
+
+                'setStorageValue': function (key, value) {
+                    window.localStorage.setItem(key, JSON.stringify(value));
+
+                    return true;
+                },
+
+                'updateCompareCount': function () {
+                    if (this.customer == "true" || this.customer == true) {
+                        this.$http.get(`${this.baseUrl}/items-count`)
+                        .then(response => {
+                            $('#compare-items-count').html(response.data.compareProductsCount);
+                        })
+                        .catch(exception => {
+                            window.flashMessages = [{
+                                'type': `alert-error`,
+                                'message': "{{ __('shop::app.common.error') }}"
+                            }];
+
+                            this.$root.addFlashMessages();
+                        });
+                    } else {
+                        let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
+                        comparedItemsCount = comparedItems ? comparedItems.length : 0;
+
+                        $('#compare-items-count').html(comparedItemsCount);
+                    }
+                }
+            }
+        });
+    </script>
+@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/index.blade.php b/resources/themes/shop/views/products/index.blade.php
new file mode 100644
index 000000000..cd950fb94
--- /dev/null
+++ b/resources/themes/shop/views/products/index.blade.php
@@ -0,0 +1,135 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ trim($category->meta_title) != "" ? $category->meta_title : $category->name }}
+@stop
+
+@section('seo')
+    <meta name="description" content="{{ trim($category->meta_description) != "" ? $category->meta_description : \Illuminate\Support\Str::limit(strip_tags($category->description), 120, '') }}"/>
+
+    <meta name="keywords" content="{{ $category->meta_keywords }}"/>
+
+    @if (core()->getConfigData('catalog.rich_snippets.categories.enable'))
+        <script type="application/ld+json">
+            {!! app('Webkul\Product\Helpers\SEO')->getCategoryJsonLd($category) !!}
+        </script>
+    @endif
+@stop
+
+@section('content-wrapper')
+    @inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
+
+    <div class="main">
+        {!! view_render_event('bagisto.shop.products.index.before', ['category' => $category]) !!}
+
+        <div class="category-container">
+
+            @if (in_array($category->display_mode, [null, 'products_only', 'products_and_description']))
+                @include ('shop::products.list.layered-navigation')
+            @endif
+
+            <div class="category-block" @if ($category->display_mode == 'description_only') style="width: 100%" @endif>
+                <div class="hero-image mb-35">
+                    @if (!is_null($category->image))
+                        <img class="logo" src="{{ $category->image_url }}" alt="" />
+                    @endif
+                </div>
+
+                @if (in_array($category->display_mode, [null, 'description_only', 'products_and_description']))
+                    @if ($category->description)
+                        <div class="category-description">
+                            {!! $category->description !!}
+                        </div>
+                    @endif
+                @endif
+
+                @if (in_array($category->display_mode, [null, 'products_only', 'products_and_description']))
+                    <?php $products = $productRepository->getAll($category->id); ?>
+
+                    @include ('shop::products.list.toolbar')
+
+                    @if ($products->count())
+
+                        @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
+
+                        @if ($toolbarHelper->getCurrentMode() == 'grid')
+                            <div class="product-grid-3">
+                                @foreach ($products as $productFlat)
+
+                                    @include ('shop::products.list.card', ['product' => $productFlat])
+
+                                @endforeach
+                            </div>
+                        @else
+                            <div class="product-list">
+                                @foreach ($products as $productFlat)
+
+                                    @include ('shop::products.list.card', ['product' => $productFlat])
+
+                                @endforeach
+                            </div>
+                        @endif
+
+                        {!! view_render_event('bagisto.shop.products.index.pagination.before', ['category' => $category]) !!}
+
+                        <div class="bottom-toolbar">
+                            {{ $products->appends(request()->input())->links() }}
+                        </div>
+
+                        {!! view_render_event('bagisto.shop.products.index.pagination.after', ['category' => $category]) !!}
+
+                    @else
+
+                        <div class="product-list empty">
+                            <h2>{{ __('shop::app.products.whoops') }}</h2>
+
+                            <p>
+                                {{ __('shop::app.products.empty') }}
+                            </p>
+                        </div>
+
+                    @endif
+                @endif
+            </div>
+        </div>
+
+        {!! view_render_event('bagisto.shop.products.index.after', ['category' => $category]) !!}
+    </div>
+@stop
+
+@push('scripts')
+    <script>
+        $(document).ready(function() {
+            $('.responsive-layred-filter').css('display','none');
+            $(".sort-icon, .filter-icon").on('click', function(e){
+                var currentElement = $(e.currentTarget);
+                if (currentElement.hasClass('sort-icon')) {
+                    currentElement.removeClass('sort-icon');
+                    currentElement.addClass('icon-menu-close-adj');
+                    currentElement.next().removeClass();
+                    currentElement.next().addClass('icon filter-icon');
+                    $('.responsive-layred-filter').css('display','none');
+                    $('.pager').css('display','flex');
+                    $('.pager').css('justify-content','space-between');
+                } else if (currentElement.hasClass('filter-icon')) {
+                    currentElement.removeClass('filter-icon');
+                    currentElement.addClass('icon-menu-close-adj');
+                    currentElement.prev().removeClass();
+                    currentElement.prev().addClass('icon sort-icon');
+                    $('.pager').css('display','none');
+                    $('.responsive-layred-filter').css('display','block');
+                    $('.responsive-layred-filter').css('margin-top','10px');
+                } else {
+                    currentElement.removeClass('icon-menu-close-adj');
+                    $('.responsive-layred-filter').css('display','none');
+                    $('.pager').css('display','none');
+                    if ($(this).index() == 0) {
+                        currentElement.addClass('sort-icon');
+                    } else {
+                        currentElement.addClass('filter-icon');
+                    }
+                }
+            });
+        });
+    </script>
+@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/list/card.blade.php b/resources/themes/shop/views/products/list/card.blade.php
new file mode 100644
index 000000000..270b15adf
--- /dev/null
+++ b/resources/themes/shop/views/products/list/card.blade.php
@@ -0,0 +1,38 @@
+{!! view_render_event('bagisto.shop.products.list.card.before', ['product' => $product]) !!}
+
+<div class="product-card">
+
+    @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+
+    <?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
+
+    @if ($product->new)
+        <div class="sticker new">
+            {{ __('shop::app.products.new') }}
+        </div>
+    @endif
+
+    <div class="product-image">
+        <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
+            <img src="{{ $productBaseImage['medium_image_url'] }}" onerror="this.src='{{ asset('vendor/webkul/ui/assets/images/product/meduim-product-placeholder.png') }}'" alt="" height="500"/>
+        </a>
+    </div>
+
+    <div class="product-information">
+
+        <div class="product-name">
+            <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
+                <span>
+                    {{ $product->name }}
+                </span>
+            </a>
+        </div>
+
+        @include ('shop::products.price', ['product' => $product])
+
+        @include('shop::products.add-buttons', ['product' => $product])
+    </div>
+
+</div>
+
+{!! view_render_event('bagisto.shop.products.list.card.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/list/layered-navigation.blade.php b/resources/themes/shop/views/products/list/layered-navigation.blade.php
new file mode 100644
index 000000000..96ebd303c
--- /dev/null
+++ b/resources/themes/shop/views/products/list/layered-navigation.blade.php
@@ -0,0 +1,219 @@
+@inject ('attributeRepository', 'Webkul\Attribute\Repositories\AttributeRepository')
+
+@inject ('productFlatRepository', 'Webkul\Product\Repositories\ProductFlatRepository')
+
+@inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
+
+<?php
+    $filterAttributes = $attributes = [];
+    $maxPrice = 0;
+
+    if (isset($category)) {
+        $filterAttributes = $productFlatRepository->getProductsRelatedFilterableAttributes($category);
+
+        $maxPrice = core()->convertPrice($productFlatRepository->getCategoryProductMaximumPrice($category));
+    }
+
+    if (! count($filterAttributes) > 0) {
+        $filterAttributes = $attributeRepository->getFilterAttributes();
+    }
+?>
+
+<div class="layered-filter-wrapper">
+
+    {!! view_render_event('bagisto.shop.products.list.layered-nagigation.before') !!}
+
+    <layered-navigation></layered-navigation>
+
+    {!! view_render_event('bagisto.shop.products.list.layered-nagigation.after') !!}
+
+</div>
+
+@push('scripts')
+    <script type="text/x-template" id="layered-navigation-template">
+        <div>
+
+            <div class="filter-title">
+                {{ __('shop::app.products.layered-nav-title') }}
+            </div>
+
+            <div class="filter-content">
+
+                <div class="filter-attributes">
+
+                    <filter-attribute-item v-for='(attribute, index) in attributes' :attribute="attribute" :key="index" :index="index" @onFilterAdded="addFilters(attribute.code, $event)" :appliedFilterValues="appliedFilters[attribute.code]">
+                    </filter-attribute-item>
+
+                </div>
+            </div>
+        </div>
+    </script>
+
+    <script type="text/x-template" id="filter-attribute-item-template">
+        <div class="filter-attributes-item" :class="[active ? 'active' : '']">
+
+            <div class="filter-attributes-title" @click="active = !active">
+                @{{ attribute.name ? attribute.name : attribute.admin_name }}
+
+                <div class="pull-right">
+                    <span class="remove-filter-link" v-if="appliedFilters.length" @click.stop="clearFilters()">
+                        {{ __('shop::app.products.remove-filter-link-title') }}
+                    </span>
+
+                    <i class="icon" :class="[active ? 'arrow-up-icon' : 'arrow-down-icon']"></i>
+                </div>
+            </div>
+
+            <div class="filter-attributes-content">
+
+                <ol class="items" v-if="attribute.type != 'price'">
+                    <li class="item" v-for='(option, index) in attribute.options'>
+
+                        <span class="checkbox">
+                            <input type="checkbox" :id="option.id" v-bind:value="option.id" v-model="appliedFilters" @change="addFilter($event)"/>
+                            <label class="checkbox-view" :for="option.id"></label>
+                            @{{ option.label ? option.label : option.admin_name }}
+                        </span>
+
+                    </li>
+                </ol>
+
+                <div class="price-range-wrapper" v-if="attribute.type == 'price'">
+                    <vue-slider
+                        ref="slider"
+                        v-model="sliderConfig.value"
+                        :process-style="sliderConfig.processStyle"
+                        :tooltip-style="sliderConfig.tooltipStyle"
+                        :max="sliderConfig.max"
+                        :lazy="true"
+                        @change="priceRangeUpdated($event)"
+                    ></vue-slider>
+                </div>
+
+            </div>
+
+        </div>
+    </script>
+
+    <script>
+        Vue.component('layered-navigation', {
+
+            template: '#layered-navigation-template',
+
+            data: function() {
+                return {
+                    attributes: @json($filterAttributes),
+
+                    appliedFilters: {}
+                }
+            },
+
+            created: function () {
+                var urlParams = new URLSearchParams(window.location.search);
+
+                var this_this = this;
+
+                urlParams.forEach(function (value, index) {
+                    this_this.appliedFilters[index] = value.split(',');
+                });
+            },
+
+            methods: {
+                addFilters: function (attributeCode, filters) {
+                    if (filters.length) {
+                        this.appliedFilters[attributeCode] = filters;
+                    } else {
+                        delete this.appliedFilters[attributeCode];
+                    }
+
+                    this.applyFilter()
+                },
+
+                applyFilter: function () {
+                    var params = [];
+
+                    for(key in this.appliedFilters) {
+                        if (key != 'page') {
+                            params.push(key + '=' + this.appliedFilters[key].join(','))
+                        }
+                    }
+
+                    window.location.href = "?" + params.join('&');
+                }
+            }
+        });
+
+        Vue.component('filter-attribute-item', {
+
+            template: '#filter-attribute-item-template',
+
+            props: ['index', 'attribute', 'appliedFilterValues'],
+
+            data: function() {
+                let maxPrice  = @json($maxPrice);
+
+                maxPrice = maxPrice ? ((parseInt(maxPrice) !== 0 || maxPrice) ? parseInt(maxPrice) : 500) : 500;
+
+                return {
+                    appliedFilters: [],
+
+                    active: false,
+
+                    sliderConfig: {
+                        value: [
+                            0,
+                            0
+                        ],
+                        max: maxPrice,
+                        processStyle: {
+                            "backgroundColor": "#FF6472"
+                        },
+                        tooltipStyle: {
+                            "backgroundColor": "#FF6472",
+                            "borderColor": "#FF6472"
+                        }
+                    }
+                }
+            },
+
+            created: function () {
+                if (!this.index)
+                    this.active = true;
+
+                if (this.appliedFilterValues && this.appliedFilterValues.length) {
+                    this.appliedFilters = this.appliedFilterValues;
+
+                    if (this.attribute.type == 'price') {
+                        this.sliderConfig.value = this.appliedFilterValues;
+                    }
+
+                    this.active = true;
+                }
+            },
+
+            methods: {
+                addFilter: function (e) {
+                    this.$emit('onFilterAdded', this.appliedFilters)
+                },
+
+                priceRangeUpdated: function (value) {
+                    this.appliedFilters = value;
+
+                    this.$emit('onFilterAdded', this.appliedFilters)
+                },
+
+                clearFilters: function () {
+                    if (this.attribute.type == 'price') {
+                        this.sliderConfig.value = [0, 0];
+                    }
+
+                    this.appliedFilters = [];
+
+                    this.$emit('onFilterAdded', this.appliedFilters)
+                }
+            }
+
+        });
+
+    </script>
+@endpush
diff --git a/resources/themes/shop/views/products/list/toolbar.blade.php b/resources/themes/shop/views/products/list/toolbar.blade.php
new file mode 100644
index 000000000..44042ae84
--- /dev/null
+++ b/resources/themes/shop/views/products/list/toolbar.blade.php
@@ -0,0 +1,83 @@
+@inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
+
+{!! view_render_event('bagisto.shop.products.list.toolbar.before') !!}
+
+<div class="top-toolbar mb-35">
+
+    <div class="page-info">
+        <span>
+            {{ __('shop::app.products.pager-info', ['showing' => $products->firstItem() . '-' . $products->lastItem(), 'total' => $products->total()]) }}
+        </span>
+
+        <span class="sort-filter">
+            <i class="icon sort-icon" id="sort" ></i>
+            <i class="icon filter-icon" id="filter"></i>
+        </span>
+    </div>
+
+    <div class="pager">
+
+        <div class="view-mode">
+            @if ($toolbarHelper->isModeActive('grid'))
+                <span class="grid-view">
+                    <i class="icon grid-view-icon"></i>
+                </span>
+            @else
+                <a href="{{ $toolbarHelper->getModeUrl('grid') }}" class="grid-view" aria-label="Grid">
+                    <i class="icon grid-view-icon"></i>
+                </a>
+            @endif
+
+            @if ($toolbarHelper->isModeActive('list'))
+                <span class="list-view">
+                    <i class="icon list-view-icon"></i>
+                </span>
+            @else
+                <a href="{{ $toolbarHelper->getModeUrl('list') }}" class="list-view" aria-label="list">
+                    <i class="icon list-view-icon"></i>
+                </a>
+            @endif
+        </div>
+
+        <div class="sorter">
+            <label for="sort-by-toolbar">{{ __('shop::app.products.sort-by') }}</label>
+
+            <select onchange="window.location.href = this.value" id="sort-by-toolbar">
+
+                @foreach ($toolbarHelper->getAvailableOrders() as $key => $order)
+
+                    <option value="{{ $toolbarHelper->getOrderUrl($key) }}" {{ $toolbarHelper->isOrderCurrent($key) ? 'selected' : '' }}>
+                        {{ __('shop::app.products.' . $order) }}
+                    </option>
+
+                @endforeach
+
+            </select>
+        </div>
+
+        <div class="limiter">
+            <label for="show-toolbar">{{ __('shop::app.products.show') }}</label>
+
+            <select onchange="window.location.href = this.value" id="show-toolbar">
+
+                @foreach ($toolbarHelper->getAvailableLimits() as $limit)
+
+                    <option value="{{ $toolbarHelper->getLimitUrl($limit) }}" {{ $toolbarHelper->isLimitCurrent($limit) ? 'selected' : '' }}>
+                        {{ $limit }}
+                    </option>
+
+                @endforeach
+
+            </select>
+        </div>
+
+    </div>
+
+</div>
+
+{!! view_render_event('bagisto.shop.products.list.toolbar.after') !!}
+
+
+<div class="responsive-layred-filter mb-20">
+    <layered-navigation></layered-navigation>
+</div>
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/price.blade.php b/resources/themes/shop/views/products/price.blade.php
new file mode 100644
index 000000000..bed2c056d
--- /dev/null
+++ b/resources/themes/shop/views/products/price.blade.php
@@ -0,0 +1,7 @@
+{!! view_render_event('bagisto.shop.products.price.before', ['product' => $product]) !!}
+
+<div class="product-price">
+    {!! $product->getTypeInstance()->getPriceHtml() !!}
+</div>
+
+{!! view_render_event('bagisto.shop.products.price.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/review.blade.php b/resources/themes/shop/views/products/review.blade.php
new file mode 100644
index 000000000..5c9491b1f
--- /dev/null
+++ b/resources/themes/shop/views/products/review.blade.php
@@ -0,0 +1,28 @@
+@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
+
+{!! view_render_event('bagisto.shop.products.review.before', ['product' => $product]) !!}
+
+@if ($total = $reviewHelper->getTotalReviews($product))
+    <div class="product-ratings mb-10">
+        <span class="stars">
+            @for ($i = 1; $i <= 5; $i++)
+              @if($i <= round($reviewHelper->getAverageRating($product)))
+              <span class="icon star-icon"></span>
+              @else
+              <span class="icon star-icon-blank"></span>
+              @endif
+            @endfor
+        </span>
+
+        <div class="total-reviews">
+            {{
+                __('shop::app.products.total-rating', [
+                        'total_rating' => $reviewHelper->getAverageRating($product),
+                        'total_reviews' => $total,
+                    ])
+            }}
+        </div>
+    </div>
+@endif
+
+{!! view_render_event('bagisto.shop.products.review.after', ['product' => $product]) !!}
diff --git a/resources/themes/shop/views/products/reviews/create.blade.php b/resources/themes/shop/views/products/reviews/create.blade.php
new file mode 100644
index 000000000..0c9abb250
--- /dev/null
+++ b/resources/themes/shop/views/products/reviews/create.blade.php
@@ -0,0 +1,118 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.reviews.add-review-page-title') }} - {{ $product->name }}
+@endsection
+
+@section('content-wrapper')
+
+    <section class="review">
+
+        <div class="review-layouter mb-20">
+            <div class="product-info">
+                @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+
+                <?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
+
+                <div class="product-image">
+                    <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
+                        <img src="{{ $productBaseImage['medium_image_url'] }}" alt="" />
+                    </a>
+                </div>
+
+                <div class="product-name mt-20">
+                    <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
+                        <span>{{ $product->name }}</span>
+                    </a>
+                </div>
+
+                @include('shop::products.price')
+
+            </div>
+
+            <div class="review-form">
+                <form method="POST" action="{{ route('shop.reviews.store', $product->product_id ) }}" @submit.prevent="onSubmit">
+                    @csrf
+
+                    <div class="heading mt-10 mb-25">
+                        <span>{{ __('shop::app.reviews.write-review') }}</span>
+                    </div>
+
+                    <div class="control-group" :class="[errors.has('rating') ? 'has-error' : '']">
+                        <label for="title" class="required">
+                            {{ __('admin::app.customers.reviews.rating') }}
+                        </label>
+
+                        <div class="stars">
+                            <span class="star star-5" for="star-5" onclick="calculateRating(id)" id="1"></span>
+                            <span class="star star-4" for="star-4" onclick="calculateRating(id)" id="2"></span>
+                            <span class="star star-3" for="star-3" onclick="calculateRating(id)" id="3"></span>
+                            <span class="star star-2" for="star-2" onclick="calculateRating(id)" id="4"></span>
+                            <span class="star star-1" for="star-1" onclick="calculateRating(id)" id="5"></span>
+                        </div>
+
+                        <input type="hidden" id="rating" name="rating" v-validate="'required'">
+
+                        <div class="control-error" v-if="errors.has('rating')">@{{ errors.first('rating') }}</div>
+                    </div>
+
+                    <div class="control-group" :class="[errors.has('title') ? 'has-error' : '']">
+                        <label for="title" class="required">
+                            {{ __('shop::app.reviews.title') }}
+                        </label>
+                        <input  type="text" class="control" name="title" v-validate="'required'" value="{{ old('title') }}">
+                        <span class="control-error" v-if="errors.has('title')">@{{ errors.first('title') }}</span>
+                    </div>
+
+                    @if (core()->getConfigData('catalog.products.review.guest_review') && ! auth()->guard('customer')->user())
+                        <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
+                            <label for="title" class="required">
+                                {{ __('shop::app.reviews.name') }}
+                            </label>
+                            <input  type="text" class="control" name="name" v-validate="'required'" value="{{ old('name') }}">
+                            <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
+                        </div>
+                    @endif
+
+                    <div class="control-group" :class="[errors.has('comment') ? 'has-error' : '']">
+                        <label for="comment" class="required">
+                            {{ __('admin::app.customers.reviews.comment') }}
+                        </label>
+                        <textarea type="text" class="control" name="comment" v-validate="'required'" value="{{ old('comment') }}">
+                        </textarea>
+                        <span class="control-error" v-if="errors.has('comment')">@{{ errors.first('comment') }}</span>
+                    </div>
+
+                    <button type="submit" class="btn btn-lg btn-primary">
+                        {{ __('shop::app.reviews.submit') }}
+                    </button>
+
+                </form>
+            </div>
+        </div>
+
+    </section>
+
+@endsection
+
+
+@push('scripts')
+
+    <script>
+
+        function calculateRating(id) {
+            var a = document.getElementById(id);
+            document.getElementById("rating").value = id;
+
+            for (let i=1 ; i <= 5 ; i++) {
+                if (id >= i) {
+                    document.getElementById(i).style.color="#242424";
+                } else {
+                    document.getElementById(i).style.color="#d4d4d4";
+                }
+            }
+        }
+
+    </script>
+
+@endpush
diff --git a/resources/themes/shop/views/products/reviews/index.blade.php b/resources/themes/shop/views/products/reviews/index.blade.php
new file mode 100644
index 000000000..074c5d58b
--- /dev/null
+++ b/resources/themes/shop/views/products/reviews/index.blade.php
@@ -0,0 +1,165 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.reviews.product-review-page-title') }} - {{ $product->name }}
+@endsection
+
+@section('content-wrapper')
+
+    <section class="review">
+
+        <div class="review-layouter">
+            @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+
+            @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
+
+            <?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
+
+            <div class="product-info">
+                <div class="product-image">
+                    <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
+                        <img src="{{ $productBaseImage['medium_image_url'] }}" alt="" />
+                    </a>
+                </div>
+
+                <div class="product-name mt-20">
+                    <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
+                        <span>{{ $product->name }}</span>
+                    </a>
+                </div>
+
+                <div class="product-price mt-10">
+                    @if ($product->getTypeInstance()->haveSpecialPrice())
+                        <span class="pro-price">{{ core()->currency($product->getTypeInstance()->getSpecialPrice()) }}</span>
+                    @else
+                        <span class="pro-price">{{ core()->currency($product->getTypeInstance()->getMinimalPrice()) }}</span>
+                    @endif
+                </div>
+            </div>
+
+            <div class="review-form">
+                <div class="heading mt-10">
+                    <span> {{ __('shop::app.reviews.rating-reviews') }} </span>
+
+                    @if (core()->getConfigData('catalog.products.review.guest_review') || auth()->guard('customer')->check())
+                        <a href="{{ route('shop.reviews.create', $product->url_key) }}" class="btn btn-lg btn-primary right">
+                            {{ __('shop::app.products.write-review-btn') }}
+                        </a>
+                    @endif
+                </div>
+
+                <div class="ratings-reviews mt-35">
+                    <div class="left-side">
+                        <span class="rate">
+                            {{ $reviewHelper->getAverageRating($product) }}
+                        </span>
+
+                        <span class="stars">
+                            @for ($i = 1; $i <= 5; $i++)
+
+                              @if($i <= round($reviewHelper->getAverageRating($product)))
+                                <span class="icon star-icon"></span>
+                              @else
+                                <span class="icon star-icon-blank"></span>
+                              @endif
+
+                            @endfor
+                        </span>
+
+                        <div class="total-reviews mt-5">
+                            {{ __('shop::app.reviews.ratingreviews', [
+                                'rating' => $reviewHelper->getAverageRating($product),
+                                'review' => $reviewHelper->getTotalReviews($product)])
+                            }}
+                        </div>
+                    </div>
+
+                    <div class="right-side">
+
+                        @foreach ($reviewHelper->getPercentageRating($product) as $key => $count)
+                            <div class="rater 5star">
+                                <div class="rate-number" id={{ $key }}{{ __('shop::app.reviews.id-star')  }}></div>
+                                <div class="star-name">{{ __('shop::app.reviews.star') }}</div>
+                                <div class="line-bar">
+                                    <div class="line-value" id="{{ $key }}"></div>
+                                </div>
+                                <div class="percentage">
+                                    <span>
+                                        {{ __('shop::app.reviews.percentage', ['percentage' => $count]) }}
+                                    </span>
+                                </div>
+                            </div>
+                            <br/>
+                        @endforeach
+
+                    </div>
+                </div>
+
+                <div class="rating-reviews">
+                    <div class="reviews">
+
+                        @foreach ($reviewHelper->getReviews($product)->paginate(10) as $review)
+                            <div class="review">
+                                <div class="title">
+                                    {{ $review->title }}
+                                </div>
+
+                                <span class="stars">
+                                    @for ($i = 1; $i <= 5; $i++)
+
+                                      @if($i <= $review->rating)
+                                        <span class="icon star-icon"></span>
+                                      @else
+                                        <span class="icon star-icon-blank"></span>
+                                      @endif
+
+                                    @endfor
+                                </span>
+
+                                <div class="message">
+                                    {{ $review->comment }}
+                                </div>
+
+                                <div class="reviewer-details">
+                                    <span class="by">
+                                        {{ __('shop::app.products.by', ['name' => $review->name]) }},
+                                    </span>
+
+                                    <span class="when">
+                                        {{ core()->formatDate($review->created_at, 'F d, Y') }}
+                                    </span>
+                                </div>
+                            </div>
+                        @endforeach
+
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    </section>
+
+@endsection
+
+@push('scripts')
+
+    <script>
+
+        window.onload = (function() {
+            var percentage = {};
+            <?php foreach ($reviewHelper->getPercentageRating($product) as $key => $count) { ?>
+
+                percentage = <?php echo "'$count';"; ?>
+                id = <?php echo "'$key';"; ?>
+                idNumber = id + 'star';
+
+                document.getElementById(id).style.width = percentage + "%";
+                document.getElementById(id).style.height = 4 + "px";
+                document.getElementById(idNumber).innerHTML = id ;
+
+            <?php } ?>
+        })();
+
+    </script>
+
+@endpush
diff --git a/resources/themes/shop/views/products/sharelinks.blade.php b/resources/themes/shop/views/products/sharelinks.blade.php
new file mode 100644
index 000000000..fd0807215
--- /dev/null
+++ b/resources/themes/shop/views/products/sharelinks.blade.php
@@ -0,0 +1 @@
+<span class="icon share-icon"></span>
diff --git a/resources/themes/shop/views/products/view.blade.php b/resources/themes/shop/views/products/view.blade.php
new file mode 100644
index 000000000..0f378be6d
--- /dev/null
+++ b/resources/themes/shop/views/products/view.blade.php
@@ -0,0 +1,291 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ trim($product->meta_title) != "" ? $product->meta_title : $product->name }}
+@stop
+
+@section('seo')
+    <meta name="description" content="{{ trim($product->meta_description) != "" ? $product->meta_description : \Illuminate\Support\Str::limit(strip_tags($product->description), 120, '') }}"/>
+
+    <meta name="keywords" content="{{ $product->meta_keywords }}"/>
+
+    @if (core()->getConfigData('catalog.rich_snippets.products.enable'))
+        <script type="application/ld+json">
+            {{ app('Webkul\Product\Helpers\SEO')->getProductJsonLd($product) }}
+        </script>
+    @endif
+
+    <?php $productBaseImage = app('Webkul\Product\Helpers\ProductImage')->getProductBaseImage($product); ?>
+
+    <meta name="twitter:card" content="summary_large_image" />
+
+    <meta name="twitter:title" content="{{ $product->name }}" />
+
+    <meta name="twitter:description" content="{!! htmlspecialchars(trim(strip_tags($product->description))) !!}" />
+
+    <meta name="twitter:image:alt" content="" />
+
+    <meta name="twitter:image" content="{{ $productBaseImage['medium_image_url'] }}" />
+
+    <meta property="og:type" content="og:product" />
+
+    <meta property="og:title" content="{{ $product->name }}" />
+
+    <meta property="og:image" content="{{ $productBaseImage['medium_image_url'] }}" />
+
+    <meta property="og:description" content="{!! htmlspecialchars(trim(strip_tags($product->description))) !!}" />
+
+    <meta property="og:url" content="{{ route('shop.productOrCategory.index', $product->url_key) }}" />
+@stop
+
+@section('content-wrapper')
+
+    {!! view_render_event('bagisto.shop.products.view.before', ['product' => $product]) !!}
+
+    <section class="product-detail">
+
+        <div class="layouter">
+            <product-view>
+                <div class="form-container">
+                    @csrf()
+
+                    <input type="hidden" name="product_id" value="{{ $product->product_id }}">
+
+                    @include ('shop::products.view.gallery')
+
+                    <div class="details">
+
+                        <div class="product-heading">
+                            <span>{{ $product->name }}</span>
+                        </div>
+
+                        @include ('shop::products.review', ['product' => $product])
+
+                        @include ('shop::products.price', ['product' => $product])
+
+                        @include ('shop::products.view.stock', ['product' => $product])
+
+                        {!! view_render_event('bagisto.shop.products.view.short_description.before', ['product' => $product]) !!}
+
+                        <div class="description">
+                            {!! $product->short_description !!}
+                        </div>
+
+                        {!! view_render_event('bagisto.shop.products.view.short_description.after', ['product' => $product]) !!}
+
+
+                        {!! view_render_event('bagisto.shop.products.view.quantity.before', ['product' => $product]) !!}
+
+                        @if ($product->getTypeInstance()->showQuantityBox())
+                            <quantity-changer></quantity-changer>
+                        @else
+                            <input type="hidden" name="quantity" value="1">
+                        @endif
+
+                        {!! view_render_event('bagisto.shop.products.view.quantity.after', ['product' => $product]) !!}
+
+                        @include ('shop::products.view.configurable-options')
+
+                        @include ('shop::products.view.downloadable')
+
+                        @include ('shop::products.view.grouped-products')
+
+                        @include ('shop::products.view.bundle-options')
+
+                        {!! view_render_event('bagisto.shop.products.view.description.before', ['product' => $product]) !!}
+
+                        <accordian :title="'{{ __('shop::app.products.description') }}'" :active="true">
+                            <div slot="header">
+                                {{ __('shop::app.products.description') }}
+                                <i class="icon expand-icon right"></i>
+                            </div>
+
+                            <div slot="body">
+                                <div class="full-description">
+                                    {!! $product->description !!}
+                                </div>
+                            </div>
+                        </accordian>
+
+                        {!! view_render_event('bagisto.shop.products.view.description.after', ['product' => $product]) !!}
+
+                        @include ('shop::products.view.attributes')
+
+                        @include ('shop::products.view.reviews')
+                    </div>
+                </div>
+            </product-view>
+        </div>
+
+        @include ('shop::products.view.related-products')
+
+        @include ('shop::products.view.up-sells')
+
+    </section>
+
+    {!! view_render_event('bagisto.shop.products.view.after', ['product' => $product]) !!}
+@endsection
+
+@push('scripts')
+
+    <script type="text/x-template" id="product-view-template">
+        <form method="POST" id="product-form" action="{{ route('cart.add', $product->product_id) }}" @click="onSubmit($event)">
+
+            <input type="hidden" name="is_buy_now" v-model="is_buy_now">
+
+            <slot></slot>
+
+        </form>
+    </script>
+
+    <script type="text/x-template" id="quantity-changer-template">
+        <div class="quantity control-group" :class="[errors.has(controlName) ? 'has-error' : '']">
+            <label class="required">{{ __('shop::app.products.quantity') }}</label>
+            <span class="quantity-container">
+                <button type="button" class="decrease" @click="decreaseQty()">-</button>
+
+                <input :name="controlName" class="control" :value="qty" :v-validate="validations" data-vv-as="&quot;{{ __('shop::app.products.quantity') }}&quot;" readonly>
+
+                <button type="button" class="increase" @click="increaseQty()">+</button>
+
+                <span class="control-error" v-if="errors.has(controlName)">@{{ errors.first(controlName) }}</span>
+            </span>
+        </div>
+    </script>
+
+    <script>
+
+        Vue.component('product-view', {
+
+            template: '#product-view-template',
+
+            inject: ['$validator'],
+
+            data: function() {
+                return {
+                    is_buy_now: 0,
+                }
+            },
+
+            methods: {
+                onSubmit: function(e) {
+                    if (e.target.getAttribute('type') != 'submit')
+                        return;
+
+                    e.preventDefault();
+
+                    var this_this = this;
+
+                    this.$validator.validateAll().then(function (result) {
+                        if (result) {
+                            this_this.is_buy_now = e.target.classList.contains('buynow') ? 1 : 0;
+
+                            setTimeout(function() {
+                                document.getElementById('product-form').submit();
+                            }, 0);
+                        }
+                    });
+                }
+            }
+        });
+
+        Vue.component('quantity-changer', {
+            template: '#quantity-changer-template',
+
+            inject: ['$validator'],
+
+            props: {
+                controlName: {
+                    type: String,
+                    default: 'quantity'
+                },
+
+                quantity: {
+                    type: [Number, String],
+                    default: 1
+                },
+
+                minQuantity: {
+                    type: [Number, String],
+                    default: 1
+                },
+
+                validations: {
+                    type: String,
+                    default: 'required|numeric|min_value:1'
+                }
+            },
+
+            data: function() {
+                return {
+                    qty: this.quantity
+                }
+            },
+
+            watch: {
+                quantity: function (val) {
+                    this.qty = val;
+
+                    this.$emit('onQtyUpdated', this.qty)
+                }
+            },
+
+            methods: {
+                decreaseQty: function() {
+                    if (this.qty > this.minQuantity)
+                        this.qty = parseInt(this.qty) - 1;
+
+                    this.$emit('onQtyUpdated', this.qty)
+                },
+
+                increaseQty: function() {
+                    this.qty = parseInt(this.qty) + 1;
+
+                    this.$emit('onQtyUpdated', this.qty)
+                }
+            }
+        });
+
+        $(document).ready(function() {
+            var addTOButton = document.getElementsByClassName('add-to-buttons')[0];
+            document.getElementById('loader').style.display="none";
+            addTOButton.style.display="flex";
+        });
+
+        window.onload = function() {
+            var thumbList = document.getElementsByClassName('thumb-list')[0];
+            var thumbFrame = document.getElementsByClassName('thumb-frame');
+            var productHeroImage = document.getElementsByClassName('product-hero-image')[0];
+
+            if (thumbList && productHeroImage) {
+
+                for(let i=0; i < thumbFrame.length ; i++) {
+                    thumbFrame[i].style.height = (productHeroImage.offsetHeight/4) + "px";
+                    thumbFrame[i].style.width = (productHeroImage.offsetHeight/4)+ "px";
+                }
+
+                if (screen.width > 720) {
+                    thumbList.style.width = (productHeroImage.offsetHeight/4) + "px";
+                    thumbList.style.minWidth = (productHeroImage.offsetHeight/4) + "px";
+                    thumbList.style.height = productHeroImage.offsetHeight + "px";
+                }
+            }
+
+            window.onresize = function() {
+                if (thumbList && productHeroImage) {
+
+                    for(let i=0; i < thumbFrame.length; i++) {
+                        thumbFrame[i].style.height = (productHeroImage.offsetHeight/4) + "px";
+                        thumbFrame[i].style.width = (productHeroImage.offsetHeight/4)+ "px";
+                    }
+
+                    if (screen.width > 720) {
+                        thumbList.style.width = (productHeroImage.offsetHeight/4) + "px";
+                        thumbList.style.minWidth = (productHeroImage.offsetHeight/4) + "px";
+                        thumbList.style.height = productHeroImage.offsetHeight + "px";
+                    }
+                }
+            }
+        };
+    </script>
+@endpush
diff --git a/resources/themes/shop/views/products/view/attributes.blade.php b/resources/themes/shop/views/products/view/attributes.blade.php
new file mode 100644
index 000000000..e64fb55fb
--- /dev/null
+++ b/resources/themes/shop/views/products/view/attributes.blade.php
@@ -0,0 +1,45 @@
+@inject ('productViewHelper', 'Webkul\Product\Helpers\View')
+
+{!! view_render_event('bagisto.shop.products.view.attributes.before', ['product' => $product]) !!}
+
+@if ($customAttributeValues = $productViewHelper->getAdditionalData($product))
+    <accordian :title="'{{ __('shop::app.products.specification') }}'" :active="false">
+        <div slot="header">
+            {{ __('shop::app.products.specification') }}
+            <i class="icon expand-icon right"></i>
+        </div>
+
+        <div slot="body">
+            <table class="full-specifications">
+
+                @foreach ($customAttributeValues as $attribute)
+                    <tr>
+                        @if ($attribute['label'])
+                            <td>{{ $attribute['label'] }}</td>
+                        @else
+                            <td>{{ $attribute['admin_name'] }}</td>
+                        @endif
+                        @if ($attribute['type'] == 'file' && $attribute['value'])
+                            <td>
+                                <a  href="{{ route('shop.product.file.download', [$product->product_id, $attribute['id']])}}">
+                                    <i class="icon sort-down-icon download"></i>
+                                </a>
+                            </td>
+                        @elseif ($attribute['type'] == 'image' && $attribute['value'])
+                            <td>
+                                <a href="{{ route('shop.product.file.download', [$product->product_id, $attribute['id']])}}">
+                                    <img src="{{ Storage::url($attribute['value']) }}" style="height: 20px; width: 20px;" alt=""/>
+                                </a>
+                            </td>
+                        @else
+                            <td>{{ $attribute['value'] }}</td>
+                        @endif
+                    </tr>
+                @endforeach
+
+            </table>
+        </div>
+    </accordian>
+@endif
+
+{!! view_render_event('bagisto.shop.products.view.attributes.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/bundle-options.blade.php b/resources/themes/shop/views/products/view/bundle-options.blade.php
new file mode 100644
index 000000000..12ca3e667
--- /dev/null
+++ b/resources/themes/shop/views/products/view/bundle-options.blade.php
@@ -0,0 +1,236 @@
+@if ($product->type == 'bundle')
+
+    {!! view_render_event('bagisto.shop.products.view.bundle-options.before', ['product' => $product]) !!}
+
+    <bundle-option-list></bundle-option-list>
+
+    {!! view_render_event('bagisto.shop.products.view.bundle-options.after', ['product' => $product]) !!}
+
+    @push('scripts')
+        <script type="text/x-template" id="bundle-option-list-template">
+            <div class="bundle-options-wrapper">
+                <div class="bundle-option-list">
+                    <h3>{{ __('shop::app.products.customize-options') }}</h3>
+
+                    <bundle-option-item
+                        v-for="(option, index) in options"
+                        :option="option"
+                        :key="index"
+                        :index="index"
+                        @onProductSelected="productSelected(option, $event)">
+                    </bundle-option-item>
+                </div>
+
+                <div class="bundle-summary">
+                    <h3>{{ __('shop::app.products.your-customization') }}</h3>
+
+                    <quantity-changer></quantity-changer>
+
+                    <div class="control-group">
+                        <label>{{ __('shop::app.products.total-amount') }}</label>
+
+                        <div class="bundle-price">
+                            @{{ formated_total_price | currency(currency_options) }}
+                        </div>
+                    </div>
+
+                    <ul class="bundle-items">
+                        <li v-for="(option, index) in options">
+                            @{{ option.label }}
+
+                            <div class="selected-products">
+                                <div v-for="(product, index1) in option.products" v-if="product.is_default">
+                                    @{{ product.qty + ' x ' + product.name }}
+                                </div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </script>
+
+        <script type="text/x-template" id="bundle-option-item-template">
+            <div class="bundle-option-item">
+                <div class="control-group" :class="[errors.has('bundle_options[' + option.id + '][]') ? 'has-error' : '']">
+                    <label :class="[option.is_required ? 'required' : '']">@{{ option.label }}</label>
+
+                    <div v-if="option.type == 'select'">
+                        <select class="control" :name="'bundle_options[' + option.id + '][]'" v-model="selected_product" v-validate="option.is_required ? 'required' : ''" :data-vv-as="option.label + '&quot;'">
+                            <option value="">{{ __('shop::app.products.choose-selection') }}</option>
+                            <option v-for="(product, index2) in option.products" :value="product.id">
+                                @{{ product.name + ' + ' + product.price.final_price.formated_price }}
+                            </option>
+                        </select>
+                    </div>
+
+                    <div v-if="option.type == 'radio'">
+                        <span class="radio" v-if="! option.is_required">
+                            <input type="radio" :name="'bundle_options[' + option.id + '][]'" v-model="selected_product" value="0" :id="'bundle_options[' + option.id + '][]'">
+                            <label class="radio-view" :for="'bundle_options[' + option.id + '][]'"></label>
+
+                            {{ __('shop::app.products.none') }}
+                        </span>
+
+                        <span class="radio" v-for="(product, index2) in option.products">
+                            <input type="radio" :name="'bundle_options[' + option.id + '][]'" v-model="selected_product" v-validate="option.is_required ? 'required' : ''" :data-vv-as="'&quot;' + option.label + '&quot;'" :value="product.id" :id="'bundle_options[' + option.id + '][]'">
+                            <label class="radio-view" :for="'bundle_options[' + option.id + '][]'"></label>
+
+                            @{{ product.name }}
+
+                            <span class="price">
+                                + @{{ product.price.final_price.formated_price }}
+                            </span>
+                        </span>
+                    </div>
+
+                    <div v-if="option.type == 'checkbox'">
+                        <span class="checkbox" v-for="(product, index2) in option.products">
+                            <input type="checkbox" :name="'bundle_options[' + option.id + '][]'" :value="product.id" v-model="selected_product" v-validate="option.is_required ? 'required' : ''" :data-vv-as="'&quot;' + option.label + '&quot;'" :id="'bundle_options[' + option.id + '][]'">
+                            <label class="checkbox-view" :for="'bundle_options[' + option.id + '][]'"></label>
+
+                            @{{ product.name }}
+
+                            <span class="price">
+                                + @{{ product.price.final_price.formated_price }}
+                            </span>
+                        </span>
+                    </div>
+
+                    <div v-if="option.type == 'multiselect'">
+                        <select class="control" :name="'bundle_options[' + option.id + '][]'" v-model="selected_product" v-validate="option.is_required ? 'required' : ''" :data-vv-as="'&quot;' + option.label + '&quot;'" multiple>
+                            <option value="0" v-if="! option.is_required">{{ __('shop::app.products.none') }}</option>
+                            <option v-for="(product, index2) in option.products" :value="product.id">
+                                @{{ product.name + ' + ' + product.price.final_price.formated_price }}
+                            </option>
+                        </select>
+                    </div>
+
+                    <span class="control-error" v-if="errors.has('bundle_options[' + option.id + '][]')">
+                        @{{ errors.first('bundle_options[' + option.id + '][]') }}
+                    </span>
+                </div>
+
+                <div v-if="option.type == 'select' || option.type == 'radio'">
+                    <quantity-changer
+                        :control-name="'bundle_option_qty[' + option.id + ']'"
+                        :validations="parseInt(selected_product) ? 'required|numeric|min_value:1' : ''"
+                        :quantity="product_qty"
+                        @onQtyUpdated="qtyUpdated($event)">
+                    </quantity-changer>
+                </div>
+            </div>
+        </script>
+
+        <script>
+            Vue.component('bundle-option-list', {
+
+                template: '#bundle-option-list-template',
+
+                inject: ['$validator'],
+
+                data: function() {
+                    return {
+                        config: @json(app('Webkul\Product\Helpers\BundleOption')->getBundleConfig($product)),
+
+                        options: [],
+
+                        currency_options: @json(core()->getAccountJsSymbols())
+                    }
+                },
+
+                computed: {
+                    formated_total_price: function() {
+                        var total = 0;
+
+                        for (var key in this.options) {
+                            for (var key1 in this.options[key].products) {
+                                if (! this.options[key].products[key1].is_default)
+                                    continue;
+
+                                total += this.options[key].products[key1].qty * this.options[key].products[key1].price.final_price.price;
+                            }
+                        }
+
+                        return total;
+                    }
+                },
+
+                created: function() {
+                    for (var key in this.config.options) {
+                        this.options.push(this.config.options[key])
+                    }
+                },
+
+                methods: {
+                    productSelected: function(option, value) {
+                        var selectedProductIds = Array.isArray(value) ? value : [value];
+
+                        for (var key in option.products) {
+                            option.products[key].is_default = selectedProductIds.indexOf(option.products[key].id) > -1 ? 1 : 0;
+                        }
+                    }
+                }
+            });
+
+            Vue.component('bundle-option-item', {
+                template: '#bundle-option-item-template',
+
+                props: ['index', 'option'],
+
+                inject: ['$validator'],
+
+                data: function() {
+                    return {
+                        selected_product: (this.option.type == 'checkbox' || this.option.type == 'multiselect')  ? [] : null,
+
+                        qty_validations: ''
+                    }
+                },
+
+                computed: {
+                    product_qty: function() {
+                        var self = this;
+                        self.qty = 0;
+
+                        self.option.products.forEach(function(product, key){
+                            if (self.selected_product == product.id)
+                                self.qty =  self.option.products[key].qty;
+                        });
+
+                        return self.qty;
+                    }
+                },
+
+                watch: {
+                    selected_product: function (value) {
+                        this.qty_validations = this.selected_product ? 'required|numeric|min_value:1' : '';
+
+                        this.$emit('onProductSelected', value)
+                    }
+                },
+
+                created: function() {
+                    for (var key1 in this.option.products) {
+                        if (! this.option.products[key1].is_default)
+                            continue;
+
+                        if (this.option.type == 'checkbox' || this.option.type == 'multiselect') {
+                            this.selected_product.push(this.option.products[key1].id)
+                        } else {
+                            this.selected_product = this.option.products[key1].id
+                        }
+                    }
+                },
+
+                methods: {
+                    qtyUpdated: function(qty) {
+                        if (! this.option.products[this.selected_product])
+                            return;
+
+                        this.option.products[this.selected_product].qty = qty;
+                    }
+                }
+            });
+        </script>
+    @endpush
+@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/configurable-options.blade.php b/resources/themes/shop/views/products/view/configurable-options.blade.php
new file mode 100644
index 000000000..970adc256
--- /dev/null
+++ b/resources/themes/shop/views/products/view/configurable-options.blade.php
@@ -0,0 +1,324 @@
+@if (Webkul\Product\Helpers\ProductType::hasVariants($product->type))
+
+    @inject ('configurableOptionHelper', 'Webkul\Product\Helpers\ConfigurableOption')
+
+    {!! view_render_event('bagisto.shop.products.view.configurable-options.before', ['product' => $product]) !!}
+
+    <product-options></product-options>
+
+    {!! view_render_event('bagisto.shop.products.view.configurable-options.after', ['product' => $product]) !!}
+
+    @push('scripts')
+
+        <script type="text/x-template" id="product-options-template">
+            <div class="attributes">
+
+                <input type="hidden" id="selected_configurable_option" name="selected_configurable_option" :value="selectedProductId">
+
+                <div v-for='(attribute, index) in childAttributes' class="attribute control-group" :class="[errors.has('super_attribute[' + attribute.id + ']') ? 'has-error' : '']">
+                    <label class="required">@{{ attribute.label }}</label>
+
+                    <span v-if="! attribute.swatch_type || attribute.swatch_type == '' || attribute.swatch_type == 'dropdown'">
+                        <select
+                            class="control"
+                            v-validate="'required'"
+                            :name="['super_attribute[' + attribute.id + ']']"
+                            :disabled="attribute.disabled"
+                            @change="configure(attribute, $event.target.value)"
+                            :id="['attribute_' + attribute.id]"
+                            :data-vv-as="'&quot;' + attribute.label + '&quot;'">
+
+                            <option v-for='(option, index) in attribute.options' :value="option.id">@{{ option.label }}</option>
+
+                        </select>
+                    </span>
+
+                    <span class="swatch-container" v-else>
+                        <label class="swatch"
+                            v-for='(option, index) in attribute.options'
+                            v-if="option.id"
+                            :data-id="option.id"
+                            :for="['attribute_' + attribute.id + '_option_' + option.id]">
+
+                            <input type="radio"
+                                v-validate="'required'"
+                                :name="['super_attribute[' + attribute.id + ']']"
+                                :id="['attribute_' + attribute.id + '_option_' + option.id]"
+                                :value="option.id"
+                                :data-vv-as="'&quot;' + attribute.label + '&quot;'"
+                                @change="configure(attribute, $event.target.value)"/>
+
+                            <span v-if="attribute.swatch_type == 'color'" :style="{ background: option.swatch_value }"></span>
+
+                            <img v-if="attribute.swatch_type == 'image'" :src="option.swatch_value" alt="" />
+
+                            <span v-if="attribute.swatch_type == 'text'">
+                                @{{ option.label }}
+                            </span>
+
+                        </label>
+
+                        <span v-if="! attribute.options.length" class="no-options">{{ __('shop::app.products.select-above-options') }}</span>
+                    </span>
+
+                    <span class="control-error" v-if="errors.has('super_attribute[' + attribute.id + ']')">
+                        @{{ errors.first('super_attribute[' + attribute.id + ']') }}
+                    </span>
+                </div>
+
+            </div>
+        </script>
+
+        <?php $config = $configurableOptionHelper->getConfigurationConfig($product) ?>
+
+        <script>
+
+            Vue.component('product-options', {
+
+                template: '#product-options-template',
+
+                inject: ['$validator'],
+
+                data: function() {
+                    return {
+                        config: @json($config),
+
+                        childAttributes: [],
+
+                        selectedProductId: '',
+
+                        simpleProduct: null,
+
+                        galleryImages: []
+                    }
+                },
+
+                created: function() {
+                    this.galleryImages = galleryImages.slice(0)
+
+                    var config = @json($config);
+
+                    var childAttributes = this.childAttributes,
+                        attributes = config.attributes.slice(),
+                        index = attributes.length,
+                        attribute;
+
+                    while (index--) {
+                        attribute = attributes[index];
+
+                        attribute.options = [];
+
+                        if (index) {
+                            attribute.disabled = true;
+                        } else {
+                            this.fillSelect(attribute);
+                        }
+
+                        attribute = Object.assign(attribute, {
+                            childAttributes: childAttributes.slice(),
+                            prevAttribute: attributes[index - 1],
+                            nextAttribute: attributes[index + 1]
+                        });
+
+                        childAttributes.unshift(attribute);
+                    }
+                },
+
+                methods: {
+                    configure: function(attribute, value) {
+                        this.simpleProduct = this.getSelectedProductId(attribute, value);
+
+                        if (value) {
+                            attribute.selectedIndex = this.getSelectedIndex(attribute, value);
+
+                            if (attribute.nextAttribute) {
+                                attribute.nextAttribute.disabled = false;
+
+                                this.fillSelect(attribute.nextAttribute);
+
+                                this.resetChildren(attribute.nextAttribute);
+                            } else {
+                                this.selectedProductId = this.simpleProduct;
+                            }
+                        } else {
+                            attribute.selectedIndex = 0;
+
+                            this.resetChildren(attribute);
+
+                            this.clearSelect(attribute.nextAttribute)
+                        }
+
+                        this.reloadPrice();
+                        this.changeProductImages();
+                        this.changeStock(this.simpleProduct);
+                    },
+
+                    getSelectedIndex: function(attribute, value) {
+                        var selectedIndex = 0;
+
+                        attribute.options.forEach(function(option, index) {
+                            if (option.id == value) {
+                                selectedIndex = index;
+                            }
+                        })
+
+                        return selectedIndex;
+                    },
+
+                    getSelectedProductId: function(attribute, value) {
+                        var options = attribute.options,
+                            matchedOptions;
+
+                        matchedOptions = options.filter(function (option) {
+                            return option.id == value;
+                        });
+
+                        if (matchedOptions[0] != undefined && matchedOptions[0].allowedProducts != undefined) {
+                            return matchedOptions[0].allowedProducts[0];
+                        }
+
+                        return undefined;
+                    },
+
+                    fillSelect: function(attribute) {
+                        var options = this.getAttributeOptions(attribute.id),
+                            prevOption,
+                            index = 1,
+                            allowedProducts,
+                            i,
+                            j;
+
+                        this.clearSelect(attribute)
+
+                        attribute.options = [{'id': '', 'label': this.config.chooseText, 'products': []}];
+
+                        if (attribute.prevAttribute) {
+                            prevOption = attribute.prevAttribute.options[attribute.prevAttribute.selectedIndex];
+                        }
+
+                        if (options) {
+                            for (i = 0; i < options.length; i++) {
+                                allowedProducts = [];
+
+                                if (prevOption) {
+                                    for (j = 0; j < options[i].products.length; j++) {
+                                        if (prevOption.allowedProducts && prevOption.allowedProducts.indexOf(options[i].products[j]) > -1) {
+                                            allowedProducts.push(options[i].products[j]);
+                                        }
+                                    }
+                                } else {
+                                    allowedProducts = options[i].products.slice(0);
+                                }
+
+                                if (allowedProducts.length > 0) {
+                                    options[i].allowedProducts = allowedProducts;
+
+                                    attribute.options[index] = options[i];
+
+                                    index++;
+                                }
+                            }
+                        }
+                    },
+
+                    resetChildren: function(attribute) {
+                        if (attribute.childAttributes) {
+                            attribute.childAttributes.forEach(function (set) {
+                                set.selectedIndex = 0;
+                                set.disabled = true;
+                            });
+                        }
+                    },
+
+                    clearSelect: function (attribute) {
+                        if (! attribute)
+                            return;
+
+                        if (! attribute.swatch_type || attribute.swatch_type == '' || attribute.swatch_type == 'dropdown') {
+                            var element = document.getElementById("attribute_" + attribute.id);
+
+                            if (element) {
+                                element.selectedIndex = "0";
+                            }
+                        } else {
+                            var elements = document.getElementsByName('super_attribute[' + attribute.id + ']');
+
+                            var this_this = this;
+
+                            elements.forEach(function(element) {
+                                element.checked = false;
+                            })
+                        }
+                    },
+
+                    getAttributeOptions: function (attributeId) {
+                        var this_this = this,
+                            options;
+
+                        this.config.attributes.forEach(function(attribute, index) {
+                            if (attribute.id == attributeId) {
+                                options = attribute.options;
+                            }
+                        })
+
+                        return options;
+                    },
+
+                    reloadPrice: function () {
+                        var selectedOptionCount = 0;
+
+                        this.childAttributes.forEach(function(attribute) {
+                            if (attribute.selectedIndex) {
+                                selectedOptionCount++;
+                            }
+                        });
+
+                        var priceLabelElement = document.querySelector('.price-label');
+                        var priceElement = document.querySelector('.final-price');
+
+                        if (this.childAttributes.length == selectedOptionCount) {
+                            priceLabelElement.style.display = 'none';
+
+                            priceElement.innerHTML = this.config.variant_prices[this.simpleProduct].final_price.formated_price;
+
+                            eventBus.$emit('configurable-variant-selected-event', this.simpleProduct)
+                        } else {
+                            priceLabelElement.style.display = 'inline-block';
+
+                            priceElement.innerHTML = this.config.regular_price.formated_price;
+
+                            eventBus.$emit('configurable-variant-selected-event', 0)
+                        }
+                    },
+
+                    changeProductImages: function () {
+                        galleryImages.splice(0, galleryImages.length)
+
+                        this.galleryImages.forEach(function(image) {
+                            galleryImages.push(image)
+                        });
+
+                        if (this.simpleProduct) {
+                            this.config.variant_images[this.simpleProduct].forEach(function(image) {
+                                galleryImages.unshift(image)
+                            });
+                        }
+                    },
+
+                    changeStock: function (productId) {
+                        var inStockElement = document.querySelector('.stock-status');
+
+                        if (productId) {
+                            inStockElement.style.display= "block";
+                        } else {
+                            inStockElement.style.display= "none";
+                        }
+                    },
+                }
+
+            });
+
+        </script>
+    @endpush
+
+@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/cross-sells.blade.php b/resources/themes/shop/views/products/view/cross-sells.blade.php
new file mode 100644
index 000000000..f7b3e03b8
--- /dev/null
+++ b/resources/themes/shop/views/products/view/cross-sells.blade.php
@@ -0,0 +1,36 @@
+@foreach ($cart->items as $item)
+    <?php
+        $product = $item->product;
+
+        if ($product->cross_sells()->count()) {
+            $products[] = $product;
+            $products = array_unique($products);
+        }
+    ?>
+@endforeach
+
+@if (isset($products))
+
+    <div class="attached-products-wrapper mt-50">
+
+        <div class="title">
+            {{ __('shop::app.products.cross-sell-title') }}
+             <span class="border-bottom"></span>
+        </div>
+
+        <div class="product-grid-4">
+            @foreach($products as $product)
+
+                @foreach ($product->cross_sells()->paginate(2) as $cross_sell_product)
+
+                    @include ('shop::products.list.card', ['product' => $cross_sell_product])
+
+                @endforeach
+
+            @endforeach
+
+        </div>
+
+    </div>
+
+@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/downloadable.blade.php b/resources/themes/shop/views/products/view/downloadable.blade.php
new file mode 100644
index 000000000..7f41196f7
--- /dev/null
+++ b/resources/themes/shop/views/products/view/downloadable.blade.php
@@ -0,0 +1,50 @@
+@if ($product->type == 'downloadable')
+    {!! view_render_event('bagisto.shop.products.view.downloadable.before', ['product' => $product]) !!}
+
+    <div class="downloadable-container">
+        
+        @if ($product->downloadable_samples->count())
+            <div class="sample-list">
+                <h3>{{ __('shop::app.products.samples') }}</h3>
+
+                <ul>
+                    @foreach ($product->downloadable_samples as $sample)
+                        <li>
+                            <a href="{{ route('shop.downloadable.download_sample', ['type' => 'sample', 'id' => $sample->id]) }}" target="_blank">
+                                {{ $sample->title }}
+                            </a>
+                        </li>
+                    @endforeach
+                </ul>
+            </div>
+        @endif
+
+        @if ($product->downloadable_links->count())
+            <div class="link-list control-group" :class="[errors.has('links[]') ? 'has-error' : '']">
+                <h3>{{ __('shop::app.products.links') }}</h3>
+
+                <ul>
+                    @foreach ($product->downloadable_links as $link)
+                        <li>
+                            <span class="checkbox">
+                                <input type="checkbox" name="links[]" v-validate="'required'" value="{{ $link->id }}" id="{{ $link->id }}" data-vv-as="&quot;{{ __('shop::app.products.links') }}&quot;"/>
+                                <label class="checkbox-view" for="{{ $link->id }}"></label>
+                                {{ $link->title . ' + ' . core()->currency($link->price) }}
+                            </span>
+
+                            @if ($link->sample_file || $link->sample_url)
+                                <a href="{{ route('shop.downloadable.download_sample', ['type' => 'link', 'id' => $link->id]) }}" target="_blank">
+                                    {{ __('shop::app.products.sample') }}
+                                </a>
+                            @endif
+                        </li>
+                    @endforeach
+                </ul>
+
+                <span class="control-error" v-if="errors.has('links[]')">@{{ errors.first('links[]') }}</span>
+            </div>
+        @endif
+    </div>
+
+    {!! view_render_event('bagisto.shop.products.view.downloadable.before', ['product' => $product]) !!}
+@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/gallery.blade.php b/resources/themes/shop/views/products/view/gallery.blade.php
new file mode 100644
index 000000000..7ffa5261b
--- /dev/null
+++ b/resources/themes/shop/views/products/view/gallery.blade.php
@@ -0,0 +1,221 @@
+@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+@inject ('productVideoHelper', 'Webkul\Product\Helpers\ProductVideo')
+@inject ('wishListHelper', 'Webkul\Customer\Helpers\Wishlist')
+
+<?php 
+    $images = $productImageHelper->getGalleryImages($product); 
+
+    $videos = $productVideoHelper->getVideos($product);
+
+    $images = array_merge($images, $videos); 
+?>
+
+
+{!! view_render_event('bagisto.shop.products.view.gallery.before', ['product' => $product]) !!}
+
+<div class="product-image-group">
+
+    <div class="cp-spinner cp-round" id="loader">
+    </div>
+
+    <product-gallery></product-gallery>
+
+    @include ('shop::products.view.product-add')
+
+</div>
+
+{!! view_render_event('bagisto.shop.products.view.gallery.after', ['product' => $product]) !!}
+
+@push('scripts')
+
+    <script type="text/x-template" id="product-gallery-template">
+        <div>
+
+            <ul class="thumb-list">
+                <li class="gallery-control top" @click="moveThumbs('top')" v-if="(thumbs.length > 4) && this.is_move.up">
+                    <span class="overlay"></span>
+                    <i class="icon arrow-up-white-icon"></i>
+                </li>
+
+                <li class="thumb-frame" v-for='(thumb, index) in thumbs' @mouseover="changeImage(thumb)" :class="[thumb.large_image_url == currentLargeImageUrl ? 'active' : '']" id="thumb-frame">
+                    <video v-if="thumb.type == 'video'" width="100%" height="100%" onclick="this.paused ? this.play() : this.pause();">
+                        <source :src="thumb.video_url" type="video/mp4">
+                        {{ __('admin::app.catalog.products.not-support-video') }}
+                    </video>
+
+                    <img v-else  :src="thumb.small_image_url" alt=""/>
+                </li>
+
+                <li class="gallery-control bottom" @click="moveThumbs('bottom')" v-if="(thumbs.length > 4) && this.is_move.down">
+                    <span class="overlay"></span>
+                    <i class="icon arrow-down-white-icon"></i>
+                </li>
+            </ul>
+
+            <div class="product-hero-image" id="product-hero-image">
+                <video :key="currentVideoUrl" v-if="currentType == 'video'" width="100%" height="100%" controls>
+                    <source :src="currentVideoUrl" :data-image="currentOriginalImageUrl"  type="video/mp4">
+                        {{ __('admin::app.catalog.products.not-support-video') }}
+                </video>
+
+                <img v-else :src="currentLargeImageUrl" id="pro-img" :data-image="currentOriginalImageUrl" alt=""/>
+
+                @auth('customer')
+                    @php
+                        $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
+                    @endphp
+
+                    @if ($showWishlist)
+                        <a @if ($wishListHelper->getWishlistProduct($product)) class="add-to-wishlist already" @else class="add-to-wishlist" @endif href="{{ route('customer.wishlist.add', $product->product_id) }}">
+                        </a>
+                    @endif
+                @endauth
+            </div>
+
+        </div>
+    </script>
+
+    <script>
+        var galleryImages = @json($images);
+
+        Vue.component('product-gallery', {
+
+            template: '#product-gallery-template',
+
+            data: function() {
+                return {
+                    images: galleryImages,
+
+                    thumbs: [],
+
+                    currentLargeImageUrl: '',
+
+                    currentOriginalImageUrl: '',
+
+                    currentVideoUrl: '',
+
+                    currentType: '',
+
+                    counter: {
+                        up: 0,
+                        down: 0,
+                    },
+
+                    is_move: {
+                        up: true,
+                        down: true,
+                    }
+                }
+            },
+
+            watch: {
+                'images': function(newVal, oldVal) {
+                    this.changeImage(this.images[0])
+
+                    this.prepareThumbs()
+                }
+            },
+
+            created: function() {
+                this.changeImage(this.images[0])
+
+                this.prepareThumbs()
+            },
+
+            methods: {
+                prepareThumbs: function() {
+                    var this_this = this;
+
+                    this_this.thumbs = [];
+
+                    this.images.forEach(function(image) {
+                        this_this.thumbs.push(image);
+                    });
+                },
+
+                changeImage: function(image) {
+                    this.currentType = image.type;
+
+                    if (image.type == 'video') {
+                        this.currentVideoUrl = image.video_url;
+
+                        this.currentLargeImageUrl = image.large_image_url = image.video_url;
+                    } else {
+                        this.currentLargeImageUrl = image.large_image_url;
+
+                        this.currentOriginalImageUrl = image.original_image_url;
+                    }
+
+                    if ($(window).width() > 580 && image.original_image_url) {
+                        $('img#pro-img').data('zoom-image', image.original_image_url).ezPlus();
+                    }
+                },
+
+                moveThumbs: function(direction) {
+                    let len = this.thumbs.length;
+
+                    if (direction === "top") {
+                        const moveThumb = this.thumbs.splice(len - 1, 1);
+
+                        this.thumbs = [moveThumb[0]].concat((this.thumbs));
+
+                        this.counter.up = this.counter.up+1;
+
+                        this.counter.down = this.counter.down-1;
+
+                    } else {
+                        const moveThumb = this.thumbs.splice(0, 1);
+
+                        this.thumbs = [].concat((this.thumbs), [moveThumb[0]]);
+
+                        this.counter.down = this.counter.down+1;
+
+                        this.counter.up = this.counter.up-1;
+                    }
+
+                    if ((len-4) == this.counter.down) {
+                        this.is_move.down = false;
+                    } else {
+                        this.is_move.down = true;
+                    }
+
+                    if ((len-4) == this.counter.up) {
+                        this.is_move.up = false;
+                    } else {
+                        this.is_move.up = true;
+                    }
+                },
+            }
+        });
+
+    </script>
+
+    <script>
+        $(document).ready(function() {
+            if ($(window).width() > 580) {
+                $('img#pro-img').data('zoom-image', $('img#pro-img').data('image')).ezPlus();
+            }
+
+            var wishlist = " <?php echo $wishListHelper->getWishlistProduct($product);  ?> ";
+
+            $(document).mousemove(function(event) {
+                if ($('.add-to-wishlist').length || wishlist != 0) {
+                    if (event.pageX > $('.add-to-wishlist').offset().left && event.pageX < $('.add-to-wishlist').offset().left+32 && event.pageY > $('.add-to-wishlist').offset().top && event.pageY < $('.add-to-wishlist').offset().top+32) {
+
+                        $(".zoomContainer").addClass("show-wishlist");
+
+                    } else {
+                        $(".zoomContainer").removeClass("show-wishlist");
+                    }
+                };
+
+                if ($("body").hasClass("rtl")) {
+                    $(".zoomWindow").addClass("zoom-image-direction");
+                } else {
+                    $(".zoomWindow").removeClass("zoom-image-direction");
+                }
+            });
+        })
+    </script>
+
+@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/grouped-products.blade.php b/resources/themes/shop/views/products/view/grouped-products.blade.php
new file mode 100644
index 000000000..1f2b36dcc
--- /dev/null
+++ b/resources/themes/shop/views/products/view/grouped-products.blade.php
@@ -0,0 +1,38 @@
+@if ($product->type == 'grouped')
+    {!! view_render_event('bagisto.shop.products.view.grouped_products.before', ['product' => $product]) !!}
+
+    <div class="grouped-product-container">
+        @if ($product->grouped_products->count())
+            <div class="grouped-product-list">
+                <ul>
+                    <li>
+                        <span>{{ __('shop::app.products.name') }}</span>
+                        <span>{{ __('shop::app.products.qty') }}</span>
+                    </li>
+                    @foreach ($product->grouped_products as $groupedProduct)
+                        @if($groupedProduct->associated_product->getTypeInstance()->isSaleable())
+                            <li>
+                                <span class="name">
+                                    {{ $groupedProduct->associated_product->name }}
+
+                                    @include ('shop::products.price', ['product' => $groupedProduct->associated_product])
+                                </span>
+
+                                <span class="qty">
+                                    <quantity-changer
+                                        :control-name="'qty[{{$groupedProduct->associated_product_id}}]'"
+                                        :validations="'required|numeric|min_value:0'"
+                                        quantity="{{ $groupedProduct->qty }}"
+                                        min-quantity="0">
+                                    </quantity-changer>
+                                </span>
+                            </li>
+                        @endif
+                    @endforeach
+                </ul>
+            </div>
+        @endif
+    </div>
+
+    {!! view_render_event('bagisto.shop.products.view.grouped_products.before', ['product' => $product]) !!}
+@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/product-add.blade.php b/resources/themes/shop/views/products/view/product-add.blade.php
new file mode 100644
index 000000000..cb621c137
--- /dev/null
+++ b/resources/themes/shop/views/products/view/product-add.blade.php
@@ -0,0 +1,11 @@
+{!! view_render_event('bagisto.shop.products.view.product-add.before', ['product' => $product]) !!}
+
+<div class="add-to-buttons">
+    @include ('shop::products.add-to-cart', ['product' => $product])
+
+    @if (core()->getConfigData('catalog.products.storefront.buy_now_button_display'))
+        @include ('shop::products.buy-now')                                      
+    @endif
+</div>
+
+{!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/related-products.blade.php b/resources/themes/shop/views/products/view/related-products.blade.php
new file mode 100644
index 000000000..722b4bf05
--- /dev/null
+++ b/resources/themes/shop/views/products/view/related-products.blade.php
@@ -0,0 +1,24 @@
+<?php
+    $relatedProducts = $product->related_products()->get();
+?>
+
+@if ($relatedProducts->count())
+    <div class="attached-products-wrapper">
+
+        <div class="title">
+            {{ __('shop::app.products.related-product-title') }}
+            <span class="border-bottom"></span>
+        </div>
+
+        <div class="product-grid-4">
+
+            @foreach ($relatedProducts as $related_product)
+
+                @include ('shop::products.list.card', ['product' => $related_product])
+
+            @endforeach
+
+        </div>
+
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/reviews.blade.php b/resources/themes/shop/views/products/view/reviews.blade.php
new file mode 100644
index 000000000..fbd627628
--- /dev/null
+++ b/resources/themes/shop/views/products/view/reviews.blade.php
@@ -0,0 +1,98 @@
+@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
+
+{!! view_render_event('bagisto.shop.products.view.reviews.after', ['product' => $product]) !!}
+
+@if ($total = $reviewHelper->getTotalReviews($product))
+    <div class="rating-reviews">
+        <div class="rating-header">
+            {{ __('shop::app.products.reviews-title') }}
+        </div>
+
+        <div class="overall">
+            <div class="review-info">
+
+                <span class="number">
+                    {{ $reviewHelper->getAverageRating($product) }}
+                </span>
+
+                <span class="stars">
+                    @for ($i = 1; $i <= 5; $i++)
+
+                      @if($i <= round($reviewHelper->getAverageRating($product)))
+                        <span class="icon star-icon"></span>
+                      @else
+                        <span class="icon star-icon-blank"></span>
+                      @endif
+
+                    @endfor
+                </span>
+
+                <div class="total-reviews">
+                    {{ __('shop::app.products.total-reviews', ['total' => $total]) }}
+                </div>
+
+            </div>
+
+            @if (core()->getConfigData('catalog.products.review.guest_review') || auth()->guard('customer')->check())
+                <a href="{{ route('shop.reviews.create', $product->url_key) }}" class="btn btn-lg btn-primary">
+                    {{ __('shop::app.products.write-review-btn') }}
+                </a>
+            @endif
+
+        </div>
+
+        <div class="reviews">
+
+            @foreach ($reviewHelper->getReviews($product)->paginate(10) as $review)
+                <div class="review">
+                    <div class="title">
+                        {{ $review->title }}
+                    </div>
+
+                    <span class="stars">
+                        @for ($i = 1; $i <= 5; $i++)
+
+                          @if($i <= $review->rating)
+                            <span class="icon star-icon"></span>
+                          @else
+                            <span class="icon star-icon-blank"></span>
+                          @endif
+
+                        @endfor
+                    </span>
+
+                    <div class="message">
+                        {{ $review->comment }}
+                    </div>
+
+                    <div class="reviewer-details">
+                        <span class="by">
+                            {{ __('shop::app.products.by', ['name' => $review->name]) }},
+                        </span>
+
+                        <span class="when">
+                            {{ core()->formatDate($review->created_at, 'F d, Y') }}
+                        </span>
+                    </div>
+                </div>
+            @endforeach
+
+            <a href="{{ route('shop.reviews.index', $product->url_key) }}" class="view-all">
+                {{ __('shop::app.products.view-all') }}
+            </a>
+
+        </div>
+    </div>
+@else
+    @if (core()->getConfigData('catalog.products.review.guest_review') || auth()->guard('customer')->check())
+        <div class="rating-reviews">
+            <div class="rating-header">
+                <a href="{{ route('shop.reviews.create', $product->url_key) }}" class="btn btn-lg btn-primary">
+                    {{ __('shop::app.products.write-review-btn') }}
+                </a>
+            </div>
+        </div>
+    @endif
+@endif
+
+{!! view_render_event('bagisto.shop.products.view.reviews.after', ['product' => $product]) !!}
diff --git a/resources/themes/shop/views/products/view/stock.blade.php b/resources/themes/shop/views/products/view/stock.blade.php
new file mode 100644
index 000000000..391462011
--- /dev/null
+++ b/resources/themes/shop/views/products/view/stock.blade.php
@@ -0,0 +1,13 @@
+{!! view_render_event('bagisto.shop.products.view.stock.before', ['product' => $product]) !!}
+
+<div class="stock-status {{! $product->haveSufficientQuantity(1) ? '' : 'active' }}">
+    @if ( $product->haveSufficientQuantity(1) === true )
+        {{ __('shop::app.products.in-stock') }}
+    @elseif ( $product->haveSufficientQuantity(1) > 0 )
+        {{ __('shop::app.products.available-for-order') }}
+    @else
+        {{ __('shop::app.products.out-of-stock') }}
+    @endif
+</div>
+
+{!! view_render_event('bagisto.shop.products.view.stock.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/up-sells.blade.php b/resources/themes/shop/views/products/view/up-sells.blade.php
new file mode 100644
index 000000000..0f85e80e2
--- /dev/null
+++ b/resources/themes/shop/views/products/view/up-sells.blade.php
@@ -0,0 +1,28 @@
+{!! view_render_event('bagisto.shop.products.view.up-sells.after', ['product' => $product]) !!}
+
+<?php
+    $productUpSells = $product->up_sells()->get();
+?>
+
+@if ($productUpSells->count())
+    <div class="attached-products-wrapper">
+
+        <div class="title">
+            {{ __('shop::app.products.up-sell-title') }}
+            <span class="border-bottom"></span>
+        </div>
+
+        <div class="product-grid-4">
+
+            @foreach ($productUpSells as $up_sell_product)
+
+                @include ('shop::products.list.card', ['product' => $up_sell_product])
+
+            @endforeach
+
+        </div>
+
+    </div>
+@endif
+
+{!! view_render_event('bagisto.shop.products.view.up-sells.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/wishlist.blade.php b/resources/themes/shop/views/products/wishlist.blade.php
new file mode 100644
index 000000000..a91b33d2c
--- /dev/null
+++ b/resources/themes/shop/views/products/wishlist.blade.php
@@ -0,0 +1,21 @@
+@inject ('wishListHelper', 'Webkul\Customer\Helpers\Wishlist')
+
+@auth('customer')
+    {!! view_render_event('bagisto.shop.products.wishlist.before') !!}
+
+    <a
+        @if ($wishListHelper->getWishlistProduct($product))
+            class="add-to-wishlist already"
+            title="{{ __('shop::app.customer.account.wishlist.remove-wishlist-text') }}"
+        @else
+            class="add-to-wishlist"
+            title="{{ __('shop::app.customer.account.wishlist.add-wishlist-text') }}"
+        @endif
+        id="wishlist-changer"
+        style="margin-right: 15px;"
+        href="{{ route('customer.wishlist.add', $product->product_id) }}">
+        <span class="icon wishlist-icon"></span>
+    </a>
+
+    {!! view_render_event('bagisto.shop.products.wishlist.after') !!}
+@endauth
diff --git a/resources/themes/shop/views/search/search.blade.php b/resources/themes/shop/views/search/search.blade.php
new file mode 100644
index 000000000..1f6543788
--- /dev/null
+++ b/resources/themes/shop/views/search/search.blade.php
@@ -0,0 +1,87 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.search.page-title') }}
+@endsection
+
+@section('content-wrapper')
+    @if (request('image-search'))
+        <image-search-result-component></image-search-result-component>
+    @endif
+
+    @if (! $results)
+        {{  __('shop::app.search.no-results') }}
+    @endif
+
+    @if ($results)
+        <div class="main mb-30" style="min-height: 27vh;">
+            @if ($results->isEmpty())
+                <div class="search-result-status">
+                    <h2>{{ __('shop::app.products.whoops') }}</h2>
+                    <span>{{ __('shop::app.search.no-results') }}</span>
+                </div>
+            @else
+                <div class="search-result-status mb-20">
+                    <span>
+                        <b>{{ $results->total() }} </b>
+
+                        {{ ($results->total() == 1) ? __('shop::app.search.found-result') : __('shop::app.search.found-results') }}
+                    </span>
+                </div>
+
+                <div class="product-grid-4">
+                    @foreach ($results as $productFlat)
+
+                        @include('shop::products.list.card', ['product' => $productFlat->product])
+
+                    @endforeach
+                </div>
+
+                @include('ui::datagrid.pagination')
+            @endif
+        </div>
+    @endif
+@endsection
+
+@push('scripts')
+
+    <script type="text/x-template" id="image-search-result-component-template">
+        <div class="image-search-result">
+            <div class="searched-image">
+                <img :src="searched_image_url" alt=""/>
+            </div>
+
+            <div class="searched-terms">
+                <h3>{{ __('shop::app.search.analysed-keywords') }}</h3>
+
+                <div class="term-list">
+                    <a v-for="term in searched_terms" :href="'{{ route('shop.search.index') }}?term=' + term">
+                        @{{ term }}
+                    </a>
+                </div>
+            </div>
+        </div>
+    </script>
+
+    <script>
+        Vue.component('image-search-result-component', {
+
+            template: '#image-search-result-component-template',
+
+            data: function() {
+                return {
+                    searched_image_url: localStorage.searched_image_url,
+
+                    searched_terms: []
+                }
+            },
+
+            created: function() {
+                if (localStorage.searched_terms && localStorage.searched_terms != '') {
+                    this.searched_terms = localStorage.searched_terms.split('_');
+                }
+            }
+        });
+    </script>
+
+@endpush
\ No newline at end of file

From 98d87387444caf7364d673e2c69b58e6b5c457c3 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Fri, 15 Jan 2021 19:03:39 +0530
Subject: [PATCH 3/7] enhancement #4468 added for velocity theme

---
 .../shop/views/checkout/cart/coupon.blade.php | 119 ----
 .../shop/views/checkout/cart/index.blade.php  | 274 --------
 .../views/checkout/cart/mini-cart.blade.php   | 116 ----
 .../shop/views/checkout/onepage.blade.php     | 613 ------------------
 .../onepage/customer-checkout.blade.php       |  23 -
 .../checkout/onepage/customer-info.blade.php  | 475 --------------
 .../views/checkout/onepage/payment.blade.php  |  51 --
 .../views/checkout/onepage/review.blade.php   | 170 -----
 .../views/checkout/onepage/shipping.blade.php |  48 --
 .../shop/views/checkout/success.blade.php     |  27 -
 .../views/checkout/total/summary.blade.php    |  45 --
 .../themes/shop/views/cms/page.blade.php      |  17 -
 .../account/address/country-state.blade.php   |  74 ---
 .../account/address/create.blade.php          | 124 ----
 .../customers/account/address/edit.blade.php  | 125 ----
 .../customers/account/address/index.blade.php | 112 ----
 .../customers/account/compare/index.blade.php |  29 -
 .../downloadable_products/index.blade.php     |  39 --
 .../views/customers/account/index.blade.php   |   9 -
 .../customers/account/orders/index.blade.php  |  39 --
 .../customers/account/orders/pdf.blade.php    | 324 ---------
 .../customers/account/orders/view.blade.php   | 562 ----------------
 .../account/partials/sidemenu.blade.php       |  62 --
 .../customers/account/profile/edit.blade.php  | 122 ----
 .../customers/account/profile/index.blade.php | 114 ----
 .../customers/account/reviews/index.blade.php |  82 ---
 .../account/reviews/reviews.blade.php         |  52 --
 .../account/wishlist/wishlist.blade.php       |  94 ---
 .../views/customers/session/index.blade.php   |  57 --
 .../signup/forgot-password.blade.php          |  61 --
 .../views/customers/signup/index.blade.php    |  95 ---
 .../customers/signup/reset-password.blade.php |  52 --
 .../emails/admin/forget-password.blade.php    |  38 --
 .../emails/admin/update-password.blade.php    |  25 -
 .../emails/customer/forget-password.blade.php |  34 -
 .../emails/customer/new-customer.blade.php    |  30 -
 .../emails/customer/registration.blade.php    |  32 -
 .../customer/subscription-email.blade.php     |  26 -
 .../emails/customer/update-password.blade.php |  21 -
 .../customer/verification-email.blade.php     |  26 -
 .../shop/views/emails/layouts/logo.blade.php  |   5 -
 .../views/emails/layouts/master.blade.php     |  22 -
 .../emails/sales/new-admin-order.blade.php    | 221 -------
 .../new-inventorysource-shipment.blade.php    | 172 -----
 .../views/emails/sales/new-invoice.blade.php  | 211 ------
 .../emails/sales/new-order-comment.blade.php  |  35 -
 .../views/emails/sales/new-order.blade.php    | 220 -------
 .../views/emails/sales/new-refund.blade.php   | 230 -------
 .../views/emails/sales/new-shipment.blade.php | 174 -----
 .../emails/sales/order-cancel-admin.blade.php | 212 ------
 .../views/emails/sales/order-cancel.blade.php | 212 ------
 resources/themes/shop/views/error.blade.php   |  19 -
 .../themes/shop/views/errors/401.blade.php    |  38 --
 .../themes/shop/views/errors/403.blade.php    |  38 --
 .../themes/shop/views/errors/404.blade.php    |  40 --
 .../themes/shop/views/errors/500.blade.php    |  40 --
 .../themes/shop/views/errors/503.blade.php    |  32 -
 .../guest/compare/compare-products.blade.php  | 342 ----------
 .../shop/views/guest/compare/index.blade.php  |  11 -
 .../shop/views/guest/wishlist/index.blade.php |   3 -
 .../views/home/featured-products.blade.php    |  27 -
 .../themes/shop/views/home/index.blade.php    |  53 --
 .../shop/views/home/new-products.blade.php    |  27 -
 .../shop/views/home/news-updates.blade.php    |  15 -
 .../themes/shop/views/home/slider.blade.php   |   5 -
 resources/themes/shop/views/index.blade.php   |  13 -
 .../views/layouts/footer/footer.blade.php     |  91 ---
 .../shop/views/layouts/header/index.blade.php | 415 ------------
 .../layouts/header/nav-menu/navmenu.blade.php | 138 ----
 .../shop/views/layouts/master.blade.php       | 129 ----
 .../shop/views/partials/pagination.blade.php  |  50 --
 .../shop/views/products/add-buttons.blade.php |  24 -
 .../shop/views/products/add-to-cart.blade.php |  12 -
 .../shop/views/products/add-to.blade.php      |   9 -
 .../shop/views/products/buy-now.blade.php     |   7 -
 .../shop/views/products/compare.blade.php     | 129 ----
 .../shop/views/products/index.blade.php       | 135 ----
 .../shop/views/products/list/card.blade.php   |  38 --
 .../list/layered-navigation.blade.php         | 219 -------
 .../views/products/list/toolbar.blade.php     |  83 ---
 .../shop/views/products/price.blade.php       |   7 -
 .../shop/views/products/review.blade.php      |  28 -
 .../views/products/reviews/create.blade.php   | 118 ----
 .../views/products/reviews/index.blade.php    | 165 -----
 .../shop/views/products/sharelinks.blade.php  |   1 -
 .../themes/shop/views/products/view.blade.php | 291 ---------
 .../views/products/view/attributes.blade.php  |  45 --
 .../products/view/bundle-options.blade.php    | 236 -------
 .../view/configurable-options.blade.php       | 324 ---------
 .../views/products/view/cross-sells.blade.php |  36 -
 .../products/view/downloadable.blade.php      |  50 --
 .../views/products/view/gallery.blade.php     | 221 -------
 .../products/view/grouped-products.blade.php  |  38 --
 .../views/products/view/product-add.blade.php |  11 -
 .../products/view/related-products.blade.php  |  24 -
 .../views/products/view/reviews.blade.php     |  98 ---
 .../shop/views/products/view/stock.blade.php  |  13 -
 .../views/products/view/up-sells.blade.php    |  28 -
 .../shop/views/products/wishlist.blade.php    |  21 -
 .../themes/shop/views/search/search.blade.php |  87 ---
 100 files changed, 10176 deletions(-)
 delete mode 100644 resources/themes/shop/views/checkout/cart/coupon.blade.php
 delete mode 100644 resources/themes/shop/views/checkout/cart/index.blade.php
 delete mode 100644 resources/themes/shop/views/checkout/cart/mini-cart.blade.php
 delete mode 100644 resources/themes/shop/views/checkout/onepage.blade.php
 delete mode 100644 resources/themes/shop/views/checkout/onepage/customer-checkout.blade.php
 delete mode 100644 resources/themes/shop/views/checkout/onepage/customer-info.blade.php
 delete mode 100644 resources/themes/shop/views/checkout/onepage/payment.blade.php
 delete mode 100644 resources/themes/shop/views/checkout/onepage/review.blade.php
 delete mode 100644 resources/themes/shop/views/checkout/onepage/shipping.blade.php
 delete mode 100644 resources/themes/shop/views/checkout/success.blade.php
 delete mode 100644 resources/themes/shop/views/checkout/total/summary.blade.php
 delete mode 100644 resources/themes/shop/views/cms/page.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/address/country-state.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/address/create.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/address/edit.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/address/index.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/compare/index.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/downloadable_products/index.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/index.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/orders/index.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/orders/pdf.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/orders/view.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/partials/sidemenu.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/profile/edit.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/profile/index.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/reviews/index.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/reviews/reviews.blade.php
 delete mode 100644 resources/themes/shop/views/customers/account/wishlist/wishlist.blade.php
 delete mode 100644 resources/themes/shop/views/customers/session/index.blade.php
 delete mode 100644 resources/themes/shop/views/customers/signup/forgot-password.blade.php
 delete mode 100644 resources/themes/shop/views/customers/signup/index.blade.php
 delete mode 100644 resources/themes/shop/views/customers/signup/reset-password.blade.php
 delete mode 100644 resources/themes/shop/views/emails/admin/forget-password.blade.php
 delete mode 100644 resources/themes/shop/views/emails/admin/update-password.blade.php
 delete mode 100644 resources/themes/shop/views/emails/customer/forget-password.blade.php
 delete mode 100644 resources/themes/shop/views/emails/customer/new-customer.blade.php
 delete mode 100644 resources/themes/shop/views/emails/customer/registration.blade.php
 delete mode 100644 resources/themes/shop/views/emails/customer/subscription-email.blade.php
 delete mode 100644 resources/themes/shop/views/emails/customer/update-password.blade.php
 delete mode 100644 resources/themes/shop/views/emails/customer/verification-email.blade.php
 delete mode 100644 resources/themes/shop/views/emails/layouts/logo.blade.php
 delete mode 100644 resources/themes/shop/views/emails/layouts/master.blade.php
 delete mode 100644 resources/themes/shop/views/emails/sales/new-admin-order.blade.php
 delete mode 100644 resources/themes/shop/views/emails/sales/new-inventorysource-shipment.blade.php
 delete mode 100644 resources/themes/shop/views/emails/sales/new-invoice.blade.php
 delete mode 100644 resources/themes/shop/views/emails/sales/new-order-comment.blade.php
 delete mode 100644 resources/themes/shop/views/emails/sales/new-order.blade.php
 delete mode 100644 resources/themes/shop/views/emails/sales/new-refund.blade.php
 delete mode 100644 resources/themes/shop/views/emails/sales/new-shipment.blade.php
 delete mode 100644 resources/themes/shop/views/emails/sales/order-cancel-admin.blade.php
 delete mode 100644 resources/themes/shop/views/emails/sales/order-cancel.blade.php
 delete mode 100644 resources/themes/shop/views/error.blade.php
 delete mode 100644 resources/themes/shop/views/errors/401.blade.php
 delete mode 100644 resources/themes/shop/views/errors/403.blade.php
 delete mode 100644 resources/themes/shop/views/errors/404.blade.php
 delete mode 100644 resources/themes/shop/views/errors/500.blade.php
 delete mode 100644 resources/themes/shop/views/errors/503.blade.php
 delete mode 100644 resources/themes/shop/views/guest/compare/compare-products.blade.php
 delete mode 100644 resources/themes/shop/views/guest/compare/index.blade.php
 delete mode 100644 resources/themes/shop/views/guest/wishlist/index.blade.php
 delete mode 100644 resources/themes/shop/views/home/featured-products.blade.php
 delete mode 100644 resources/themes/shop/views/home/index.blade.php
 delete mode 100644 resources/themes/shop/views/home/new-products.blade.php
 delete mode 100644 resources/themes/shop/views/home/news-updates.blade.php
 delete mode 100644 resources/themes/shop/views/home/slider.blade.php
 delete mode 100644 resources/themes/shop/views/index.blade.php
 delete mode 100644 resources/themes/shop/views/layouts/footer/footer.blade.php
 delete mode 100644 resources/themes/shop/views/layouts/header/index.blade.php
 delete mode 100644 resources/themes/shop/views/layouts/header/nav-menu/navmenu.blade.php
 delete mode 100644 resources/themes/shop/views/layouts/master.blade.php
 delete mode 100644 resources/themes/shop/views/partials/pagination.blade.php
 delete mode 100644 resources/themes/shop/views/products/add-buttons.blade.php
 delete mode 100644 resources/themes/shop/views/products/add-to-cart.blade.php
 delete mode 100644 resources/themes/shop/views/products/add-to.blade.php
 delete mode 100644 resources/themes/shop/views/products/buy-now.blade.php
 delete mode 100644 resources/themes/shop/views/products/compare.blade.php
 delete mode 100644 resources/themes/shop/views/products/index.blade.php
 delete mode 100644 resources/themes/shop/views/products/list/card.blade.php
 delete mode 100644 resources/themes/shop/views/products/list/layered-navigation.blade.php
 delete mode 100644 resources/themes/shop/views/products/list/toolbar.blade.php
 delete mode 100644 resources/themes/shop/views/products/price.blade.php
 delete mode 100644 resources/themes/shop/views/products/review.blade.php
 delete mode 100644 resources/themes/shop/views/products/reviews/create.blade.php
 delete mode 100644 resources/themes/shop/views/products/reviews/index.blade.php
 delete mode 100644 resources/themes/shop/views/products/sharelinks.blade.php
 delete mode 100644 resources/themes/shop/views/products/view.blade.php
 delete mode 100644 resources/themes/shop/views/products/view/attributes.blade.php
 delete mode 100644 resources/themes/shop/views/products/view/bundle-options.blade.php
 delete mode 100644 resources/themes/shop/views/products/view/configurable-options.blade.php
 delete mode 100644 resources/themes/shop/views/products/view/cross-sells.blade.php
 delete mode 100644 resources/themes/shop/views/products/view/downloadable.blade.php
 delete mode 100644 resources/themes/shop/views/products/view/gallery.blade.php
 delete mode 100644 resources/themes/shop/views/products/view/grouped-products.blade.php
 delete mode 100644 resources/themes/shop/views/products/view/product-add.blade.php
 delete mode 100644 resources/themes/shop/views/products/view/related-products.blade.php
 delete mode 100644 resources/themes/shop/views/products/view/reviews.blade.php
 delete mode 100644 resources/themes/shop/views/products/view/stock.blade.php
 delete mode 100644 resources/themes/shop/views/products/view/up-sells.blade.php
 delete mode 100644 resources/themes/shop/views/products/wishlist.blade.php
 delete mode 100644 resources/themes/shop/views/search/search.blade.php

diff --git a/resources/themes/shop/views/checkout/cart/coupon.blade.php b/resources/themes/shop/views/checkout/cart/coupon.blade.php
deleted file mode 100644
index 090740935..000000000
--- a/resources/themes/shop/views/checkout/cart/coupon.blade.php
+++ /dev/null
@@ -1,119 +0,0 @@
-@if ($cart)
-    <script type="text/x-template" id="coupon-component-template">
-        <div class="coupon-container">    
-            <div class="discount-control">
-                <form class="coupon-form" method="post" @submit.prevent="applyCoupon">
-                    <div class="control-group" :class="[error_message ? 'has-error' : '']">
-                        <input type="text" class="control" v-model="coupon_code" name="code" placeholder="{{ __('shop::app.checkout.onepage.enter-coupon-code') }}">
-
-                        <div class="control-error">@{{ error_message }}</div>
-                    </div>
-
-                    <button class="btn btn-lg btn-black" :disabled="disable_button">{{ __('shop::app.checkout.onepage.apply-coupon') }}</button>
-                </form>
-            </div>
-
-            <div class="applied-coupon-details" v-if="applied_coupon">
-                <label>{{ __('shop::app.checkout.total.coupon-applied') }}</label>
-
-                <label class="right" style="display: inline-flex; align-items: center;">
-                    <b>@{{ applied_coupon }}</b>
-
-                    <span class="icon cross-icon" title="{{ __('shop::app.checkout.total.remove-coupon') }}" v-on:click="removeCoupon"></span>
-                </label>
-            </div>
-        </div>
-    </script>
-
-    <script>
-        Vue.component('coupon-component', {
-            template: '#coupon-component-template',
-
-            inject: ['$validator'],
-
-            data: function() {
-                return {
-                    coupon_code: '',
-
-                    applied_coupon: "{{ $cart->coupon_code }}",
-
-                    error_message: '',
-
-                    route_name: "{{ request()->route()->getName() }}",
-
-                    disable_button: false
-                }
-            },
-            
-            methods: {
-                applyCoupon: function() {
-                    var self = this;
-
-                    if (! self.coupon_code.length)
-                        return;
-
-                    self.error_message = null;
-
-                    self.disable_button = true;
-
-                    axios.post('{{ route('shop.checkout.cart.coupon.apply') }}', {code: self.coupon_code})
-                        .then(function(response) {
-                            if (response.data.success) {
-                                self.$emit('onApplyCoupon');
-
-                                self.applied_coupon = self.coupon_code;
-
-                                self.coupon_code = '';
-
-                                window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}];
-
-                                self.$root.addFlashMessages();
-                                
-                                self.redirectIfCartPage();
-                            } else {
-                                self.error_message = response.data.message;
-                            }
-
-                            self.disable_button = false;
-                        })
-                        .catch(function(error) {
-                            self.error_message = error.response.data.message;
-
-                            self.disable_button = false;
-                        });
-                },
-
-                removeCoupon: function () {
-                    var self = this;
-
-                    axios.delete('{{ route('shop.checkout.coupon.remove.coupon') }}')
-                        .then(function(response) {
-                            self.$emit('onRemoveCoupon')
-
-                            self.applied_coupon = '';
-
-                            window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}];
-
-                            self.$root.addFlashMessages();
-
-                            self.redirectIfCartPage();
-                        })
-                        .catch(function(error) {
-                            window.flashMessages = [{'type': 'alert-error', 'message': error.response.data.message}];
-
-                            self.$root.addFlashMessages();
-                        });
-                },
-
-                redirectIfCartPage: function() {
-                    if (this.route_name != 'shop.checkout.cart.index')
-                        return;
-
-                    setTimeout(function() {
-                        window.location.reload();
-                    }, 700);
-                }
-            }
-        });
-    </script>
-@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/cart/index.blade.php b/resources/themes/shop/views/checkout/cart/index.blade.php
deleted file mode 100644
index d44caa83c..000000000
--- a/resources/themes/shop/views/checkout/cart/index.blade.php
+++ /dev/null
@@ -1,274 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.checkout.cart.title') }}
-@stop
-
-@section('content-wrapper')
-    @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
-    <section class="cart">
-        @if ($cart)
-            <div class="title">
-                {{ __('shop::app.checkout.cart.title') }}
-            </div>
-
-            <div class="cart-content">
-                <div class="left-side">
-                    <form action="{{ route('shop.checkout.cart.update') }}" method="POST" @submit.prevent="onSubmit">
-
-                        <div class="cart-item-list" style="margin-top: 0">
-                            @csrf
-                            @foreach ($cart->items as $key => $item)
-                                @php
-                                    $productBaseImage = $item->product->getTypeInstance()->getBaseImage($item);
-
-                                    if (is_null ($item->product->url_key)) {
-                                        if (! is_null($item->product->parent)) {
-                                            $url_key = $item->product->parent->url_key;
-                                        }
-                                    } else {
-                                        $url_key = $item->product->url_key;
-                                    }
-                                @endphp
-
-                                <div class="item mt-5">
-                                    <div class="item-image" style="margin-right: 15px;">
-                                        <a href="{{ route('shop.productOrCategory.index', $url_key) }}"><img src="{{ $productBaseImage['medium_image_url'] }}" alt="" /></a>
-                                    </div>
-
-                                    <div class="item-details">
-
-                                        {!! view_render_event('bagisto.shop.checkout.cart.item.name.before', ['item' => $item]) !!}
-
-                                        <div class="item-title">
-                                            <a href="{{ route('shop.productOrCategory.index', $url_key) }}">
-                                                {{ $item->product->name }}
-                                            </a>
-                                        </div>
-
-                                        {!! view_render_event('bagisto.shop.checkout.cart.item.name.after', ['item' => $item]) !!}
-
-
-                                        {!! view_render_event('bagisto.shop.checkout.cart.item.price.before', ['item' => $item]) !!}
-
-                                        <div class="price">
-                                            {{ core()->currency($item->base_price) }}
-                                        </div>
-
-                                        {!! view_render_event('bagisto.shop.checkout.cart.item.price.after', ['item' => $item]) !!}
-
-
-                                        {!! view_render_event('bagisto.shop.checkout.cart.item.options.before', ['item' => $item]) !!}
-
-                                        @if (isset($item->additional['attributes']))
-                                            <div class="item-options">
-
-                                                @foreach ($item->additional['attributes'] as $attribute)
-                                                    <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                                @endforeach
-
-                                            </div>
-                                        @endif
-
-                                        {!! view_render_event('bagisto.shop.checkout.cart.item.options.after', ['item' => $item]) !!}
-
-
-                                        {!! view_render_event('bagisto.shop.checkout.cart.item.quantity.before', ['item' => $item]) !!}
-
-                                        <div class="misc">
-                                            @if ($item->product->getTypeInstance()->showQuantityBox() === true)
-                                                <quantity-changer
-                                                    :control-name="'qty[{{$item->id}}]'"
-                                                    quantity="{{$item->quantity}}">
-                                                </quantity-changer>
-                                            @endif
-
-                                            <span class="remove">
-                                                <a href="{{ route('shop.checkout.cart.remove', $item->id) }}" onclick="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')">{{ __('shop::app.checkout.cart.remove-link') }}</a></span>
-
-                                            @auth('customer')
-                                                    @php
-                                                        $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
-                                                    @endphp
-
-                                                    @if ($showWishlist)
-                                                        <span class="towishlist">
-                                                            @if ($item->parent_id != 'null' ||$item->parent_id != null)
-                                                                <a href="{{ route('shop.movetowishlist', $item->id) }}" onclick="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')">{{ __('shop::app.checkout.cart.move-to-wishlist') }}</a>
-                                                            @else
-                                                                <a href="{{ route('shop.movetowishlist', $item->child->id) }}" onclick="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')">{{ __('shop::app.checkout.cart.move-to-wishlist') }}</a>
-                                                            @endif
-                                                        </span>
-                                                    @endif
-                                            @endauth
-                                        </div>
-
-                                        {!! view_render_event('bagisto.shop.checkout.cart.item.quantity.after', ['item' => $item]) !!}
-
-                                        @if (! cart()->isItemHaveQuantity($item))
-                                            <div class="error-message mt-15">
-                                                * {{ __('shop::app.checkout.cart.quantity-error') }}
-                                            </div>
-                                        @endif
-                                    </div>
-
-                                </div>
-                            @endforeach
-                        </div>
-
-                        {!! view_render_event('bagisto.shop.checkout.cart.controls.after', ['cart' => $cart]) !!}
-
-                        <div class="misc-controls">
-                            <a href="{{ route('shop.home.index') }}" class="link">{{ __('shop::app.checkout.cart.continue-shopping') }}</a>
-
-                            <div>
-                                @if ($cart->hasProductsWithQuantityBox())
-                                <button type="submit" class="btn btn-lg btn-primary" id="update_cart_button">
-                                    {{ __('shop::app.checkout.cart.update-cart') }}
-                                </button>
-                                @endif
-
-                                @if (! cart()->hasError())
-                                    @php
-                                        $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
-                                    @endphp
-
-                                    <proceed-to-checkout
-                                        href="{{ route('shop.checkout.onepage.index') }}"
-                                        add-class="btn btn-lg btn-primary"
-                                        text="{{ __('shop::app.checkout.cart.proceed-to-checkout') }}"
-                                        is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}"
-                                        minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) }}">
-                                    </proceed-to-checkout>
-                                @endif
-                            </div>
-                        </div>
-
-                        {!! view_render_event('bagisto.shop.checkout.cart.controls.after', ['cart' => $cart]) !!}
-                    </form>
-                </div>
-
-                <div class="right-side">
-                    {!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!}
-
-                    @include('shop::checkout.total.summary', ['cart' => $cart])
-
-                    <coupon-component></coupon-component>
-
-                    {!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!}
-                </div>
-            </div>
-
-            @include ('shop::products.view.cross-sells')
-
-        @else
-
-            <div class="title">
-                {{ __('shop::app.checkout.cart.title') }}
-            </div>
-
-            <div class="cart-content">
-                <p>
-                    {{ __('shop::app.checkout.cart.empty') }}
-                </p>
-
-                <p style="display: inline-block;">
-                    <a style="display: inline-block;" href="{{ route('shop.home.index') }}" class="btn btn-lg btn-primary">{{ __('shop::app.checkout.cart.continue-shopping') }}</a>
-                </p>
-            </div>
-
-        @endif
-    </section>
-
-@endsection
-
-@push('scripts')
-    @include('shop::checkout.cart.coupon')
-
-    <script type="text/x-template" id="quantity-changer-template">
-        <div class="quantity control-group" :class="[errors.has(controlName) ? 'has-error' : '']">
-            <div class="wrap">
-                <label>{{ __('shop::app.products.quantity') }}</label>
-
-                <button type="button" class="decrease" @click="decreaseQty()">-</button>
-
-                <input :name="controlName" class="control" :value="qty" v-validate="'required|numeric|min_value:1'" data-vv-as="&quot;{{ __('shop::app.products.quantity') }}&quot;" readonly>
-
-                <button type="button" class="increase" @click="increaseQty()">+</button>
-
-                <span class="control-error" v-if="errors.has(controlName)">@{{ errors.first(controlName) }}</span>
-            </div>
-        </div>
-    </script>
-
-    <script>
-        Vue.component('quantity-changer', {
-            template: '#quantity-changer-template',
-
-            inject: ['$validator'],
-
-            props: {
-                controlName: {
-                    type: String,
-                    default: 'quantity'
-                },
-
-                quantity: {
-                    type: [Number, String],
-                    default: 1
-                }
-            },
-
-            data: function() {
-                return {
-                    qty: this.quantity
-                }
-            },
-
-            watch: {
-                quantity: function (val) {
-                    this.qty = val;
-
-                    this.$emit('onQtyUpdated', this.qty)
-                }
-            },
-
-            methods: {
-                decreaseQty: function() {
-                    if (this.qty > 1)
-                        this.qty = parseInt(this.qty) - 1;
-
-                    this.$emit('onQtyUpdated', this.qty)
-                },
-
-                increaseQty: function() {
-                    this.qty = parseInt(this.qty) + 1;
-
-                    this.$emit('onQtyUpdated', this.qty)
-                }
-            }
-        });
-
-        function removeLink(message) {
-            if (!confirm(message))
-            event.preventDefault();
-        }
-
-        function updateCartQunatity(operation, index) {
-            var quantity = document.getElementById('cart-quantity'+index).value;
-
-            if (operation == 'add') {
-                quantity = parseInt(quantity) + 1;
-            } else if (operation == 'remove') {
-                if (quantity > 1) {
-                    quantity = parseInt(quantity) - 1;
-                } else {
-                    alert('{{ __('shop::app.products.less-quantity') }}');
-                }
-            }
-            document.getElementById('cart-quantity'+index).value = quantity;
-            event.preventDefault();
-        }
-    </script>
-@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/cart/mini-cart.blade.php b/resources/themes/shop/views/checkout/cart/mini-cart.blade.php
deleted file mode 100644
index 4477af9b0..000000000
--- a/resources/themes/shop/views/checkout/cart/mini-cart.blade.php
+++ /dev/null
@@ -1,116 +0,0 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
-<?php $cart = cart()->getCart(); ?>
-
-@if ($cart)
-    <?php $items = $cart->items; ?>
-
-    <div class="dropdown-toggle">
-        <a class="cart-link" href="{{ route('shop.checkout.cart.index') }}">
-            <span class="icon cart-icon"></span>
-        </a>
-
-        <span class="name">
-            {{ __('shop::app.header.cart') }}
-            <span class="count"> ({{ $cart->items->count() }})</span>
-        </span>
-
-        <i class="icon arrow-down-icon"></i>
-    </div>
-
-    <div class="dropdown-list" style="display: none; top: 52px; right: 0px;">
-        <div class="dropdown-container">
-            <div class="dropdown-cart">
-                <div class="dropdown-header">
-                    <p class="heading">
-                        {{ __('shop::app.checkout.cart.cart-subtotal') }} -
-
-                        {!! view_render_event('bagisto.shop.checkout.cart-mini.subtotal.before', ['cart' => $cart]) !!}
-
-                        <b>{{ core()->currency($cart->base_sub_total) }}</b>
-
-                        {!! view_render_event('bagisto.shop.checkout.cart-mini.subtotal.after', ['cart' => $cart]) !!}
-                    </p>
-                </div>
-
-                <div class="dropdown-content">
-                    @foreach ($items as $item)
-
-                        <div class="item">
-                            <div class="item-image" >
-                                @php
-                                    $images = $item->product->getTypeInstance()->getBaseImage($item);
-                                @endphp
-                                <img src="{{ $images['small_image_url'] }}"  alt=""/>
-                            </div>
-
-                            <div class="item-details">
-                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.name.before', ['item' => $item]) !!}
-
-                                <div class="item-name">{{ $item->name }}</div>
-
-                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.name.after', ['item' => $item]) !!}
-
-
-                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.options.before', ['item' => $item]) !!}
-
-                                @if (isset($item->additional['attributes']))
-                                    <div class="item-options">
-
-                                        @foreach ($item->additional['attributes'] as $attribute)
-                                            <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                        @endforeach
-
-                                    </div>
-                                @endif
-
-                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.options.after', ['item' => $item]) !!}
-
-
-                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.price.before', ['item' => $item]) !!}
-
-                                <div class="item-price"><b>{{ core()->currency($item->base_total) }}</b></div>
-
-                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.price.after', ['item' => $item]) !!}
-
-
-                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.quantity.before', ['item' => $item]) !!}
-
-                                <div class="item-qty">Quantity - {{ $item->quantity }}</div>
-
-                                {!! view_render_event('bagisto.shop.checkout.cart-mini.item.quantity.after', ['item' => $item]) !!}
-                            </div>
-                        </div>
-
-                    @endforeach
-                </div>
-
-                <div class="dropdown-footer">
-                    <a href="{{ route('shop.checkout.cart.index') }}">{{ __('shop::app.minicart.view-cart') }}</a>
-
-                    @php
-                        $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
-                    @endphp
-
-                    <proceed-to-checkout
-                        href="{{ route('shop.checkout.onepage.index') }}"
-                        add-class="btn btn-primary btn-lg"
-                        text="{{ __('shop::app.minicart.checkout') }}"
-                        is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}"
-                        minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) }}"
-                        style="color: white;">
-                    </proceed-to-checkout>
-                </div>
-            </div>
-        </div>
-    </div>
-
-@else
-
-    <div class="dropdown-toggle" style="pointer-events: none;">
-        <div style="display: inline-block; cursor: pointer;">
-            <span class="icon cart-icon"></span>
-            <span class="name">{{ __('shop::app.minicart.cart') }}<span class="count"> ({{ __('shop::app.minicart.zero') }}) </span></span>
-        </div>
-    </div>
-@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/onepage.blade.php b/resources/themes/shop/views/checkout/onepage.blade.php
deleted file mode 100644
index d18263480..000000000
--- a/resources/themes/shop/views/checkout/onepage.blade.php
+++ /dev/null
@@ -1,613 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.checkout.onepage.title') }}
-@stop
-
-@section('content-wrapper')
-    <checkout></checkout>
-@endsection
-
-@push('scripts')
-    @include('shop::checkout.cart.coupon')
-
-    <script type="text/x-template" id="checkout-template">
-        <div id="checkout" class="checkout-process">
-            <div class="col-main">
-                <ul class="checkout-steps">
-                    <li class="active" :class="[completed_step >= 0 ? 'active' : '', completed_step > 0 ? 'completed' : '']" @click="navigateToStep(1)">
-                        <div class="decorator address-info"></div>
-                        <span>{{ __('shop::app.checkout.onepage.information') }}</span>
-                    </li>
-
-                    <div class="line mb-25"></div>
-
-                    @if ($cart->haveStockableItems())
-                        <li :class="[current_step == 2 || completed_step > 1 ? 'active' : '', completed_step > 1 ? 'completed' : '']" @click="navigateToStep(2)">
-                            <div class="decorator shipping"></div>
-                            <span>{{ __('shop::app.checkout.onepage.shipping') }}</span>
-                        </li>
-
-                        <div class="line mb-25"></div>
-                    @endif
-
-                    <li :class="[current_step == 3 || completed_step > 2 ? 'active' : '', completed_step > 2 ? 'completed' : '']" @click="navigateToStep(3)">
-                        <div class="decorator payment"></div>
-                        <span>{{ __('shop::app.checkout.onepage.payment') }}</span>
-                    </li>
-
-                    <div class="line mb-25"></div>
-
-                    <li :class="[current_step == 4 ? 'active' : '']">
-                        <div class="decorator review"></div>
-                        <span>{{ __('shop::app.checkout.onepage.review') }}</span>
-                    </li>
-                </ul>
-
-                <div class="step-content information" v-show="current_step == 1" id="address-section">
-                    @include('shop::checkout.onepage.customer-info')
-
-                    <div class="button-group">
-                        <button type="button" class="btn btn-lg btn-primary" @click="validateForm('address-form')" :disabled="disable_button" id="checkout-address-continue-button">
-                            {{ __('shop::app.checkout.onepage.continue') }}
-                        </button>
-                    </div>
-                </div>
-
-                <div class="step-content shipping" v-show="current_step == 2" id="shipping-section">
-                    <shipping-section v-if="current_step == 2" @onShippingMethodSelected="shippingMethodSelected($event)"></shipping-section>
-
-                    <div class="button-group">
-                        <button type="button" class="btn btn-lg btn-primary" @click="validateForm('shipping-form')" :disabled="disable_button" id="checkout-shipping-continue-button">
-                            {{ __('shop::app.checkout.onepage.continue') }}
-                        </button>
-
-                    </div>
-                </div>
-
-                <div class="step-content payment" v-show="current_step == 3" id="payment-section">
-                    <payment-section v-if="current_step == 3" @onPaymentMethodSelected="paymentMethodSelected($event)"></payment-section>
-
-                    <div class="button-group">
-                        <button type="button" class="btn btn-lg btn-primary" @click="validateForm('payment-form')" :disabled="disable_button" id="checkout-payment-continue-button">
-                            {{ __('shop::app.checkout.onepage.continue') }}
-                        </button>
-                    </div>
-                </div>
-
-                <div class="step-content review" v-show="current_step == 4" id="summary-section">
-                    <review-section v-if="current_step == 4" :key="reviewComponentKey">
-                        <div slot="summary-section">
-                            <summary-section :key="summeryComponentKey"></summary-section>
-
-                            <coupon-component
-                                @onApplyCoupon="getOrderSummary"
-                                @onRemoveCoupon="getOrderSummary">
-                            </coupon-component>
-                        </div>
-                    </review-section>
-
-                    <div class="button-group">
-                        <button type="button" class="btn btn-lg btn-primary" @click="placeOrder()" :disabled="disable_button" id="checkout-place-order-button" v-if="selected_payment_method.method != 'paypal_smart_button'">
-                            {{ __('shop::app.checkout.onepage.place-order') }}
-                        </button>
-
-                        <div class="paypal-button-container"></div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-right" v-show="current_step != 4">
-                <summary-section :key="summeryComponentKey"></summary-section>
-            </div>
-        </div>
-    </script>
-
-    <script>
-        var shippingHtml = '';
-        var paymentHtml = '';
-        var reviewHtml = '';
-        var summaryHtml = '';
-        var customerAddress = '';
-        var shippingMethods = '';
-        var paymentMethods = '';
-
-        @auth('customer')
-            @if(auth('customer')->user()->addresses)
-                customerAddress = @json(auth('customer')->user()->addresses);
-                customerAddress.email = "{{ auth('customer')->user()->email }}";
-                customerAddress.first_name = "{{ auth('customer')->user()->first_name }}";
-                customerAddress.last_name = "{{ auth('customer')->user()->last_name }}";
-            @endif
-        @endauth
-
-        Vue.component('checkout', {
-            template: '#checkout-template',
-            inject: ['$validator'],
-
-            data: function() {
-                return {
-                    step_numbers: {
-                        'information': 1,
-                        'shipping': 2,
-                        'payment': 3,
-                        'review': 4
-                    },
-
-                    current_step: 1,
-
-                    completed_step: 0,
-
-                    address: {
-                        billing: {
-                            address1: [''],
-
-                            use_for_shipping: true,
-                        },
-
-                        shipping: {
-                            address1: ['']
-                        },
-                    },
-
-                    selected_shipping_method: '',
-
-                    selected_payment_method: '',
-
-                    disable_button: false,
-
-                    new_shipping_address: false,
-
-                    new_billing_address: false,
-
-                    allAddress: {},
-
-                    countryStates: @json(core()->groupedStatesByCountries()),
-
-                    country: @json(core()->countries()),
-
-                    summeryComponentKey: 0,
-
-                    reviewComponentKey: 0,
-
-                    is_customer_exist: 0
-                }
-            },
-
-            created: function() {
-                this.getOrderSummary();
-
-                if(! customerAddress) {
-                    this.new_shipping_address = true;
-                    this.new_billing_address = true;
-                } else {
-                    this.address.billing.first_name = this.address.shipping.first_name = customerAddress.first_name;
-                    this.address.billing.last_name = this.address.shipping.last_name = customerAddress.last_name;
-                    this.address.billing.email = this.address.shipping.email = customerAddress.email;
-
-                    if (customerAddress.length < 1) {
-                        this.new_shipping_address = true;
-                        this.new_billing_address = true;
-                    } else {
-                        this.allAddress = customerAddress;
-
-                        for (var country in this.country) {
-                            for (var code in this.allAddress) {
-                                if (this.allAddress[code].country) {
-                                    if (this.allAddress[code].country == this.country[country].code) {
-                                        this.allAddress[code]['country'] = this.country[country].name;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-
-            methods: {
-                navigateToStep: function(step) {
-                    if (step <= this.completed_step) {
-                        this.current_step = step
-                        this.completed_step = step - 1;
-                    }
-                },
-
-                haveStates: function(addressType) {
-                    if (this.countryStates[this.address[addressType].country] && this.countryStates[this.address[addressType].country].length)
-                        return true;
-
-                    return false;
-                },
-
-                validateForm: async function(scope) {
-                    var this_this = this;
-
-                    await this.$validator.validateAll(scope).then(function (result) {
-                        if (result) {
-                            if (scope == 'address-form') {
-                                this_this.saveAddress();
-                            } else if (scope == 'shipping-form') {
-                                this_this.saveShipping();
-                            } else if (scope == 'payment-form') {
-                                this_this.savePayment();
-                            }
-                        }
-                    });
-                },
-
-                isCustomerExist: function() {
-                    this.$validator.attach({ name: "email", rules: "required|email" });
-
-                    var this_this = this;
-
-                    this.$validator.validate('email', this.address.billing.email)
-                        .then(function(isValid) {
-                            if (! isValid)
-                                return;
-
-                            this_this.$http.post("{{ route('customer.checkout.exist') }}", {email: this_this.address.billing.email})
-                                .then(function(response) {
-                                    this_this.is_customer_exist = response.data ? 1 : 0;
-                                })
-                                .catch(function (error) {})
-
-                        })
-                },
-
-                loginCustomer: function() {
-                    var this_this = this;
-
-                    this_this.$http.post("{{ route('customer.checkout.login') }}", {
-                            email: this_this.address.billing.email,
-                            password: this_this.address.billing.password
-                        })
-                        .then(function(response) {
-                            if (response.data.success) {
-                                window.location.href = "{{ route('shop.checkout.onepage.index') }}";
-                            } else {
-                                window.flashMessages = [{'type': 'alert-error', 'message': response.data.error }];
-
-                                this_this.$root.addFlashMessages()
-                            }
-                        })
-                        .catch(function (error) {})
-                },
-
-                getOrderSummary () {
-                    var this_this = this;
-
-                    this.$http.get("{{ route('shop.checkout.summary') }}")
-                        .then(function(response) {
-                            summaryHtml = Vue.compile(response.data.html)
-
-                            this_this.summeryComponentKey++;
-                            //this_this.reviewComponentKey++;
-                        })
-                        .catch(function (error) {})
-                },
-
-                saveAddress: async function() {
-                    var this_this = this;
-
-                    this.disable_button = true;
-
-                    if (this.allAddress.length > 0) {
-                        let address = this.allAddress.forEach(address => {
-                            if (address.id == this.address.billing.address_id) {
-                                this.address.billing.address1 = [address.address1];
-                            }
-
-                            if (address.id == this.address.shipping.address_id) {
-                                this.address.shipping.address1 = [address.address1];
-                            }
-                        });
-                    }
-
-                    this.$http.post("{{ route('shop.checkout.save-address') }}", this.address)
-                        .then(function(response) {
-                            this_this.disable_button = false;
-
-                            if (this_this.step_numbers[response.data.jump_to_section] == 2)
-                                shippingHtml = Vue.compile(response.data.html)
-                            else
-                                paymentHtml = Vue.compile(response.data.html)
-
-                            this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] - 1;
-                            this_this.current_step = this_this.step_numbers[response.data.jump_to_section];
-
-                            shippingMethods = response.data.shippingMethods;
-                            paymentMethods  = response.data.paymentMethods;
-
-                            this_this.getOrderSummary();
-                        })
-                        .catch(function (error) {
-                            this_this.disable_button = false;
-
-                            this_this.handleErrorResponse(error.response, 'address-form')
-                        })
-                },
-
-                saveShipping: async function() {
-                    var this_this = this;
-
-                    this.disable_button = true;
-
-                    this.$http.post("{{ route('shop.checkout.save-shipping') }}", {'shipping_method': this.selected_shipping_method})
-                        .then(function(response) {
-                            this_this.disable_button = false;
-
-                            paymentHtml = Vue.compile(response.data.html)
-                            this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] - 1;
-                            this_this.current_step = this_this.step_numbers[response.data.jump_to_section];
-
-                            paymentMethods = response.data.paymentMethods;
-
-                            this_this.getOrderSummary();
-                        })
-                        .catch(function (error) {
-                            this_this.disable_button = false;
-
-                            this_this.handleErrorResponse(error.response, 'shipping-form')
-                        })
-                },
-
-                savePayment: async function() {
-                    var this_this = this;
-
-                    this.disable_button = true;
-
-                    this.$http.post("{{ route('shop.checkout.save-payment') }}", {'payment': this.selected_payment_method})
-                    .then(function(response) {
-                        this_this.disable_button = false;
-
-                        reviewHtml = Vue.compile(response.data.html)
-                        this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] - 1;
-                        this_this.current_step = this_this.step_numbers[response.data.jump_to_section];
-
-                        this_this.getOrderSummary();
-                    })
-                    .catch(function (error) {
-                        this_this.disable_button = false;
-
-                        this_this.handleErrorResponse(error.response, 'payment-form')
-                    });
-                },
-
-                placeOrder: async function() {
-                    var this_this = this;
-
-                    this.disable_button = true;
-
-                    this.$http.post("{{ route('shop.checkout.save-order') }}", {'_token': "{{ csrf_token() }}"})
-                    .then(function(response) {
-                        if (response.data.success) {
-                            if (response.data.redirect_url) {
-                                window.location.href = response.data.redirect_url;
-                            } else {
-                                window.location.href = "{{ route('shop.checkout.success') }}";
-                            }
-                        }
-                    })
-                    .catch(function (error) {
-                        this_this.disable_button = true;
-
-                        window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('shop::app.common.error') }}" }];
-
-                        this_this.$root.addFlashMessages()
-                    })
-                },
-
-                handleErrorResponse: function(response, scope) {
-                    if (response.status == 422) {
-                        serverErrors = response.data.errors;
-                        this.$root.addServerErrors(scope)
-                    } else if (response.status == 403) {
-                        if (response.data.redirect_url) {
-                            window.location.href = response.data.redirect_url;
-                        }
-                    }
-                },
-
-                shippingMethodSelected: function(shippingMethod) {
-                    this.selected_shipping_method = shippingMethod;
-                },
-
-                paymentMethodSelected: function(paymentMethod) {
-                    this.selected_payment_method = paymentMethod;
-                },
-
-                newBillingAddress: function() {
-                    this.new_billing_address = true;
-                    this.address.billing.address_id = null;
-                },
-
-                newShippingAddress: function() {
-                    this.new_shipping_address = true;
-                    this.address.shipping.address_id = null;
-                },
-
-                backToSavedBillingAddress: function() {
-                    this.new_billing_address = false;
-                },
-
-                backToSavedShippingAddress: function() {
-                    this.new_shipping_address = false;
-                },
-            }
-        })
-
-        var shippingTemplateRenderFns = [];
-
-        Vue.component('shipping-section', {
-            inject: ['$validator'],
-
-            data: function() {
-                return {
-                    templateRender: null,
-
-                    selected_shipping_method: '',
-
-                    first_iteration : true,
-                }
-            },
-
-            staticRenderFns: shippingTemplateRenderFns,
-
-            mounted: function() {
-                for (method in shippingMethods) {
-                    if (this.first_iteration) {
-                        for (rate in shippingMethods[method]['rates']) {
-                            this.selected_shipping_method = shippingMethods[method]['rates'][rate]['method'];
-                            this.first_iteration = false;
-                            this.methodSelected();
-                        }
-                    }
-                }
-
-                this.templateRender = shippingHtml.render;
-                for (var i in shippingHtml.staticRenderFns) {
-                    shippingTemplateRenderFns.push(shippingHtml.staticRenderFns[i]);
-                }
-
-                eventBus.$emit('after-checkout-shipping-section-added');
-            },
-
-            render: function(h) {
-                return h('div', [
-                    (this.templateRender ?
-                        this.templateRender() :
-                        '')
-                    ]);
-            },
-
-            methods: {
-                methodSelected: function() {
-                    this.$emit('onShippingMethodSelected', this.selected_shipping_method)
-
-                    eventBus.$emit('after-shipping-method-selected', this.selected_shipping_method);
-                }
-            }
-        })
-
-        var paymentTemplateRenderFns = [];
-
-        Vue.component('payment-section', {
-            inject: ['$validator'],
-
-            data: function() {
-                return {
-                    templateRender: null,
-
-                    payment: {
-                        method: ""
-                    },
-
-                    first_iteration : true,
-                }
-            },
-
-            staticRenderFns: paymentTemplateRenderFns,
-
-            mounted: function() {
-                for (method in paymentMethods) {
-                    if (this.first_iteration) {
-                        this.payment.method = paymentMethods[method]['method'];
-                        this.first_iteration = false;
-                        this.methodSelected();
-                    }
-                }
-
-                this.templateRender = paymentHtml.render;
-                for (var i in paymentHtml.staticRenderFns) {
-                    paymentTemplateRenderFns.push(paymentHtml.staticRenderFns[i]);
-                }
-
-                eventBus.$emit('after-checkout-payment-section-added');
-            },
-
-            render: function(h) {
-                return h('div', [
-                    (this.templateRender ?
-                        this.templateRender() :
-                        '')
-                    ]);
-            },
-
-            methods: {
-                methodSelected: function() {
-                    this.$emit('onPaymentMethodSelected', this.payment)
-
-                    eventBus.$emit('after-payment-method-selected', this.payment);
-                }
-            }
-        })
-
-        var reviewTemplateRenderFns = [];
-
-        Vue.component('review-section', {
-            data: function() {
-                return {
-                    templateRender: null,
-
-                    error_message: ''
-                }
-            },
-
-            staticRenderFns: reviewTemplateRenderFns,
-
-            render: function(h) {
-                return h('div', [
-                    (this.templateRender ?
-                        this.templateRender() :
-                        '')
-                    ]);
-            },
-
-            mounted: function() {
-                this.templateRender = reviewHtml.render;
-
-                for (var i in reviewHtml.staticRenderFns) {
-                    // reviewTemplateRenderFns.push(reviewHtml.staticRenderFns[i]);
-                    reviewTemplateRenderFns[i] = reviewHtml.staticRenderFns[i];
-                }
-
-                this.$forceUpdate();
-            }
-        });
-
-
-        var summaryTemplateRenderFns = [];
-
-        Vue.component('summary-section', {
-            inject: ['$validator'],
-
-            data: function() {
-                return {
-                    templateRender: null
-                }
-            },
-
-            staticRenderFns: summaryTemplateRenderFns,
-
-            mounted: function() {
-                this.templateRender = summaryHtml.render;
-
-                for (var i in summaryHtml.staticRenderFns) {
-                    // summaryTemplateRenderFns.push(summaryHtml.staticRenderFns[i]);
-                    summaryTemplateRenderFns[i] = summaryHtml.staticRenderFns[i];
-                }
-
-                this.$forceUpdate();
-            },
-
-            render: function(h) {
-                return h('div', [
-                    (this.templateRender ?
-                        this.templateRender() :
-                        '')
-                    ]);
-            }
-        })
-    </script>
-
-@endpush
diff --git a/resources/themes/shop/views/checkout/onepage/customer-checkout.blade.php b/resources/themes/shop/views/checkout/onepage/customer-checkout.blade.php
deleted file mode 100644
index 4ad841c6e..000000000
--- a/resources/themes/shop/views/checkout/onepage/customer-checkout.blade.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<div v-if="is_customer_exist">
-    <div class="control-group" id="password">
-        <label for="password">{{ __('shop::app.checkout.onepage.password') }}</label>
-
-        <input type="password" class="control" id="password" name="password" v-model="address.billing.password"/>
-    </div>
-
-    <div class="control-group" id="login-and-forgot-btn">
-        <div class="forgot-password-link"  style="float: right;margin-right: 503px; margin-top: 11px;">
-            <a href="{{ route('customer.forgot-password.create') }}">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
-
-            <div class="mt-10">
-                @if (Cookie::has('enable-resend') && Cookie::get('enable-resend') == true)
-                    <a href="{{ route('customer.resend.verification-email', Cookie::get('email-for-resend')) }}">{{ __('shop::app.customer.login-form.resend-verification') }}</a>
-                @endif
-            </div>
-        </div>
-
-        <button type='button' id="" class="btn btn-primary btn-lg btn-login" @click="loginCustomer">
-            {{ __('shop::app.customer.login-form.button_title') }}
-        </button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/onepage/customer-info.blade.php b/resources/themes/shop/views/checkout/onepage/customer-info.blade.php
deleted file mode 100644
index 40fbcba67..000000000
--- a/resources/themes/shop/views/checkout/onepage/customer-info.blade.php
+++ /dev/null
@@ -1,475 +0,0 @@
-<form data-vv-scope="address-form">
-
-    <div class="form-container" v-if="!this.new_billing_address">
-        <div class="form-header mb-30">
-            <span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.billing-address') }}</span>
-
-            <a class="btn btn-lg btn-primary" @click = newBillingAddress()>
-                {{ __('shop::app.checkout.onepage.new-address') }}
-            </a>
-        </div>
-        <div class="address-holder">
-            <div class="address-card" v-for='(addresses, index) in this.allAddress'>
-                <div class="checkout-address-content" style="display: flex; flex-direction: row; justify-content: space-between; width: 100%;">
-                    <label class="radio-container" style="float: right; width: 10%;">
-                        <input type="radio" v-validate="'required'" id="billing[address_id]" name="billing[address_id]" :value="addresses.id" v-model="address.billing.address_id" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.billing-address') }}&quot;">
-                        <span class="checkmark"></span>
-                    </label>
-
-                    <ul class="address-card-list" style="float: right; width: 85%;">
-                        <li class="mb-5" v-if="addresses.company_name != ''">
-                            @{{ addresses.company_name }}
-                        </li>
-
-                        <li class="mb-10">
-                            <b>@{{ allAddress.first_name }} @{{ allAddress.last_name }},</b>
-                        </li>
-
-                        <li class="mb-5">
-                            @{{ addresses.address1 }},
-                        </li>
-
-                        <li class="mb-5">
-                            @{{ addresses.city }},
-                        </li>
-
-                        <li class="mb-5">
-                            @{{ addresses.state }},
-                        </li>
-
-                        <li class="mb-15">
-                            @{{ addresses.country }}  @{{ addresses.postcode }}
-                        </li>
-
-                        <li>
-                            <b>{{ __('shop::app.customer.account.address.index.contact') }}</b> : @{{ addresses.phone }}
-                        </li>
-                    </ul>
-                </div>
-            </div>
-            <div id="message"></div>
-            <div class="control-group" :class="[errors.has('address-form.billing[address_id]') ? 'has-error' : '']">
-                <span class="control-error" v-if="errors.has('address-form.billing[address_id]')">
-                    @{{ errors.first('address-form.billing[address_id]') }}
-                </span>
-            </div>
-        </div>
-
-        @if ($cart->haveStockableItems())
-            <div class="control-group mt-5">
-                <span class="checkbox">
-                    <input type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" v-model="address.billing.use_for_shipping"/>
-                        <label class="checkbox-view" for="billing[use_for_shipping]"></label>
-                        {{ __('shop::app.checkout.onepage.use_for_shipping') }}
-                </span>
-            </div>
-        @endif
-    </div>
-
-    <div class="form-container" v-if="this.new_billing_address">
-
-        <div class="form-header">
-            <h1>{{ __('shop::app.checkout.onepage.billing-address') }}</h1>
-
-            @auth('customer')
-                @if(count(auth('customer')->user()->addresses))
-                    <a class="btn btn-lg btn-primary" @click = backToSavedBillingAddress()>
-                        {{ __('shop::app.checkout.onepage.back') }}
-                    </a>
-                @endif
-            @endauth
-        </div>
-
-        <div class="control-group" :class="[errors.has('address-form.billing[email]') ? 'has-error' : '']">
-            <label for="billing[email]" class="required">
-                {{ __('shop::app.checkout.onepage.email') }}
-            </label>
-
-            <input type="text" v-validate="'required|email'" class="control" id="billing[email]" name="billing[email]" v-model="address.billing.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;" @blur="isCustomerExist"/>
-
-            <span class="control-error" v-if="errors.has('address-form.billing[email]')">
-                @{{ errors.first('address-form.billing[email]') }}
-            </span>
-        </div>
-
-        {{--  for customer login checkout   --}}
-        @if (! auth()->guard('customer')->check())
-            @include('shop::checkout.onepage.customer-checkout')
-        @endif
-
-        <div class="control-group" :class="[errors.has('address-form.billing[company_name]') ? 'has-error' : '']">
-            <label for="billing[company_name]">
-                {{ __('shop::app.checkout.onepage.company-name') }}
-            </label>
-
-            <input type="text" class="control" id="billing[company_name]" name="billing[company_name]" v-model="address.billing.company_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.company-name') }}&quot;"/>
-
-            <span class="control-error" v-if="errors.has('address-form.billing[company_name]')">
-                @{{ errors.first('address-form.billing[company_name]') }}
-            </span>
-        </div>
-
-        <div class="control-group" :class="[errors.has('address-form.billing[first_name]') ? 'has-error' : '']">
-            <label for="billing[first_name]" class="required">
-                {{ __('shop::app.checkout.onepage.first-name') }}
-            </label>
-
-            <input type="text" v-validate="'required'" class="control" id="billing[first_name]" name="billing[first_name]" v-model="address.billing.first_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;"/>
-
-            <span class="control-error" v-if="errors.has('address-form.billing[first_name]')">
-                @{{ errors.first('address-form.billing[first_name]') }}
-            </span>
-        </div>
-
-        <div class="control-group" :class="[errors.has('address-form.billing[last_name]') ? 'has-error' : '']">
-            <label for="billing[last_name]" class="required">
-                {{ __('shop::app.checkout.onepage.last-name') }}
-            </label>
-
-            <input type="text" v-validate="'required'" class="control" id="billing[last_name]" name="billing[last_name]" v-model="address.billing.last_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;"/>
-
-            <span class="control-error" v-if="errors.has('address-form.billing[last_name]')">
-                @{{ errors.first('address-form.billing[last_name]') }}
-            </span>
-        </div>
-
-        <div class="control-group" :class="[errors.has('address-form.billing[address1][]') ? 'has-error' : '']">
-            <label for="billing_address_0" class="required">
-                {{ __('shop::app.checkout.onepage.address1') }}
-            </label>
-
-            <input type="text" v-validate="'required'" class="control" id="billing_address_0" name="billing[address1][]" v-model="address.billing.address1[0]" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
-
-            <span class="control-error" v-if="errors.has('address-form.billing[address1][]')">
-                @{{ errors.first('address-form.billing[address1][]') }}
-            </span>
-        </div>
-
-        @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
-            <div class="control-group" style="margin-top: -25px;">
-                @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
-                    <input type="text" class="control" name="billing[address1][{{ $i }}]" id="billing_address_{{ $i }}" v-model="address.billing.address1[{{$i}}]">
-                @endfor
-            </div>
-        @endif
-
-        <div class="control-group" :class="[errors.has('address-form.billing[city]') ? 'has-error' : '']">
-            <label for="billing[city]" class="required">
-                {{ __('shop::app.checkout.onepage.city') }}
-            </label>
-
-            <input type="text" v-validate="'required'" class="control" id="billing[city]" name="billing[city]" v-model="address.billing.city" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;"/>
-
-            <span class="control-error" v-if="errors.has('address-form.billing[city]')">
-                @{{ errors.first('address-form.billing[city]') }}
-            </span>
-        </div>
-
-        <div class="control-group" :class="[errors.has('address-form.billing[country]') ? 'has-error' : '']">
-            <label for="billing[country]" class="required">
-                {{ __('shop::app.checkout.onepage.country') }}
-            </label>
-
-            <select type="text" v-validate="'required'" class="control" id="billing[country]" name="billing[country]" v-model="address.billing.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
-                <option value=""></option>
-
-                @foreach (core()->countries() as $country)
-
-                    <option value="{{ $country->code }}">{{ $country->name }}</option>
-
-                @endforeach
-            </select>
-
-            <span class="control-error" v-if="errors.has('address-form.billing[country]')">
-                @{{ errors.first('address-form.billing[country]') }}
-            </span>
-        </div>
-
-        <div class="control-group" :class="[errors.has('address-form.billing[state]') ? 'has-error' : '']">
-            <label for="billing[state]" class="required">
-                {{ __('shop::app.checkout.onepage.state') }}
-            </label>
-
-            <input type="text" v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="address.billing.state" v-if="!haveStates('billing')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;"/>
-
-            <select v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="address.billing.state" v-if="haveStates('billing')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
-
-                <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
-
-                <option v-for='(state, index) in countryStates[address.billing.country]' :value="state.code">
-                    @{{ state.default_name }}
-                </option>
-
-            </select>
-
-            <span class="control-error" v-if="errors.has('address-form.billing[state]')">
-                @{{ errors.first('address-form.billing[state]') }}
-            </span>
-        </div>
-
-        <div class="control-group" :class="[errors.has('address-form.billing[postcode]') ? 'has-error' : '']">
-            <label for="billing[postcode]" class="required">
-                {{ __('shop::app.checkout.onepage.postcode') }}
-            </label>
-
-            <input type="text" v-validate="'required'" class="control" id="billing[postcode]" name="billing[postcode]" v-model="address.billing.postcode" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;"/>
-
-            <span class="control-error" v-if="errors.has('address-form.billing[postcode]')">
-                @{{ errors.first('address-form.billing[postcode]') }}
-            </span>
-        </div>
-
-        <div class="control-group" :class="[errors.has('address-form.billing[phone]') ? 'has-error' : '']">
-            <label for="billing[phone]" class="required">
-                {{ __('shop::app.checkout.onepage.phone') }}
-            </label>
-
-            <input type="text" v-validate="'required'" class="control" id="billing[phone]" name="billing[phone]" v-model="address.billing.phone" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;"/>
-
-            <span class="control-error" v-if="errors.has('address-form.billing[phone]')">
-                @{{ errors.first('address-form.billing[phone]') }}
-            </span>
-        </div>
-
-        @if ($cart->haveStockableItems())
-            <div class="control-group">
-                <span class="checkbox">
-                    <input type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" v-model="address.billing.use_for_shipping"/>
-                    <label class="checkbox-view" for="billing[use_for_shipping]"></label>
-                    {{ __('shop::app.checkout.onepage.use_for_shipping') }}
-                </span>
-            </div>
-        @endif
-
-        @auth('customer')
-            <div class="control-group">
-                <span class="checkbox">
-                    <input type="checkbox" id="billing[save_as_address]" name="billing[save_as_address]" v-model="address.billing.save_as_address"/>
-                    <label class="checkbox-view" for="billing[save_as_address]"></label>
-                    {{ __('shop::app.checkout.onepage.save_as_address') }}
-                </span>
-            </div>
-        @endauth
-
-    </div>
-
-    @if ($cart->haveStockableItems())
-        <div class="form-container" v-if="!address.billing.use_for_shipping && !this.new_shipping_address">
-            <div class="form-header mb-30">
-                <span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.shipping-address') }}</span>
-
-                <a class="btn btn-lg btn-primary" @click=newShippingAddress()>
-                    {{ __('shop::app.checkout.onepage.new-address') }}
-                </a>
-            </div>
-
-            <div class="address-holder">
-                <div class="address-card" v-for='(addresses, index) in this.allAddress'>
-                    <div class="checkout-address-content" style="display: flex; flex-direction: row; justify-content: space-between; width: 100%;">
-                        <label class="radio-container" style="float: right; width: 10%;">
-                            <input v-validate="'required'" type="radio" id="shipping[address_id]" name="shipping[address_id]" v-model="address.shipping.address_id" :value="addresses.id"
-                            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-address') }}&quot;">
-                            <span class="checkmark"></span>
-                        </label>
-
-                        <ul class="address-card-list" style="float: right; width: 85%;">
-                            <li class="mb-5" v-if="addresses.company_name != ''">
-                                @{{ addresses.company_name }}
-                            </li>
-
-                            <li class="mb-10">
-                                <b>@{{ addresses.first_name }} @{{ addresses.last_name }},</b>
-                            </li>
-
-                            <li class="mb-5">
-                                @{{ addresses.address1 }},
-                            </li>
-
-                            <li class="mb-5">
-                                @{{ addresses.city }},
-                            </li>
-
-                            <li class="mb-5">
-                                @{{ addresses.state }},
-                            </li>
-
-                            <li class="mb-15">
-                                @{{ addresses.country }} @{{ addresses.postcode }}
-                            </li>
-
-                            <li>
-                                <b>{{ __('shop::app.customer.account.address.index.contact') }}</b> : @{{ addresses.phone }}
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-
-                <div class="control-group" :class="[errors.has('address-form.shipping[address_id]') ? 'has-error' : '']">
-                    <span class="control-error" v-if="errors.has('address-form.shipping[address_id]')">
-                        @{{ errors.first('address-form.shipping[address_id]') }}
-                    </span>
-                </div>
-
-            </div>
-        </div>
-
-        <div class="form-container" v-if="!address.billing.use_for_shipping && this.new_shipping_address">
-
-            <div class="form-header">
-                <h1>{{ __('shop::app.checkout.onepage.shipping-address') }}</h1>
-                @auth('customer')
-                    @if(count(auth('customer')->user()->addresses))
-                        <a class="btn btn-lg btn-primary" @click = backToSavedShippingAddress()>
-                            {{ __('shop::app.checkout.onepage.back') }}
-                        </a>
-                    @endif
-                @endauth
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[first_name]') ? 'has-error' : '']">
-                <label for="shipping[first_name]" class="required">
-                    {{ __('shop::app.checkout.onepage.first-name') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[first_name]" name="shipping[first_name]" v-model="address.shipping.first_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[first_name]')">
-                    @{{ errors.first('address-form.shipping[first_name]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[last_name]') ? 'has-error' : '']">
-                <label for="shipping[last_name]" class="required">
-                    {{ __('shop::app.checkout.onepage.last-name') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[last_name]" name="shipping[last_name]" v-model="address.shipping.last_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[last_name]')">
-                    @{{ errors.first('address-form.shipping[last_name]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[email]') ? 'has-error' : '']">
-                <label for="shipping[email]" class="required">
-                    {{ __('shop::app.checkout.onepage.email') }}
-                </label>
-
-                <input type="text" v-validate="'required|email'" class="control" id="shipping[email]" name="shipping[email]" v-model="address.shipping.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[email]')">
-                    @{{ errors.first('address-form.shipping[email]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[address1][]') ? 'has-error' : '']">
-                <label for="shipping_address_0" class="required">
-                    {{ __('shop::app.checkout.onepage.address1') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping_address_0" name="shipping[address1][]" v-model="address.shipping.address1[0]" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[address1][]')">
-                    @{{ errors.first('address-form.shipping[address1][]') }}
-                </span>
-            </div>
-
-            @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
-                <div class="control-group" style="margin-top: -25px;">
-                    @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
-                        <input type="text" class="control" name="shipping[address1][{{ $i }}]" id="shipping_address_{{ $i }}" v-model="address.shipping.address1[{{$i}}]">
-                    @endfor
-                </div>
-            @endif
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[city]') ? 'has-error' : '']">
-                <label for="shipping[city]" class="required">
-                    {{ __('shop::app.checkout.onepage.city') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[city]" name="shipping[city]" v-model="address.shipping.city" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[city]')">
-                    @{{ errors.first('address-form.shipping[city]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[country]') ? 'has-error' : '']">
-                <label for="shipping[country]" class="required">
-                    {{ __('shop::app.checkout.onepage.country') }}
-                </label>
-
-                <select type="text" v-validate="'required'" class="control" id="shipping[country]" name="shipping[country]" v-model="address.shipping.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
-                    <option value=""></option>
-
-                    @foreach (core()->countries() as $country)
-                        <option value="{{ $country->code }}">{{ $country->name }}</option>
-                    @endforeach
-                </select>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[country]')">
-                    @{{ errors.first('address-form.shipping[country]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[state]') ? 'has-error' : '']">
-                <label for="shipping[state]" class="required">
-                    {{ __('shop::app.checkout.onepage.state') }}
-                </label>
-
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state" v-if="!haveStates('shipping')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;"/>
-
-                <select v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state" v-if="haveStates('shipping')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
-
-                    <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
-
-                    <option v-for='(state, index) in countryStates[address.shipping.country]' :value="state.code">
-                        @{{ state.default_name }}
-                    </option>
-
-                </select>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[state]')">
-                    @{{ errors.first('address-form.shipping[state]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[postcode]') ? 'has-error' : '']">
-                <label for="shipping[postcode]" class="required">
-                    {{ __('shop::app.checkout.onepage.postcode') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[postcode]" name="shipping[postcode]" v-model="address.shipping.postcode" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[postcode]')">
-                    @{{ errors.first('address-form.shipping[postcode]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[phone]') ? 'has-error' : '']">
-                <label for="shipping[phone]" class="required">
-                    {{ __('shop::app.checkout.onepage.phone') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[phone]" name="shipping[phone]" v-model="address.shipping.phone" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[phone]')">
-                    @{{ errors.first('address-form.shipping[phone]') }}
-                </span>
-            </div>
-
-            @auth('customer')
-                <div class="control-group">
-                    <span class="checkbox">
-                        <input type="checkbox" id="shipping[save_as_address]" name="shipping[save_as_address]" v-model="address.shipping.save_as_address"/>
-                        <label class="checkbox-view" for="shipping[save_as_address]"></label>
-                        {{ __('shop::app.checkout.onepage.save_as_address') }}
-                    </span>
-                </div>
-            @endauth
-
-        </div>
-    @endif
-
-</form>
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/onepage/payment.blade.php b/resources/themes/shop/views/checkout/onepage/payment.blade.php
deleted file mode 100644
index 487d31c7e..000000000
--- a/resources/themes/shop/views/checkout/onepage/payment.blade.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<form data-vv-scope="payment-form">
-    <div class="form-container">
-        <div class="form-header mb-30">
-            <span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.payment-methods') }}</span>
-        </div>
-
-        <div class="payment-methods">
-
-            <div class="control-group" :class="[errors.has('payment-form.payment[method]') ? 'has-error' : '']">
-
-                @foreach ($paymentMethods as $payment)
-
-                    {!! view_render_event('bagisto.shop.checkout.payment-method.before', ['payment' => $payment]) !!}
-
-                    <div class="checkout-method-group mb-20">
-                        <div class="line-one">
-                            <label class="radio-container">
-                                <input v-validate="'required'" type="radio" id="{{ $payment['method'] }}" name="payment[method]" value="{{ $payment['method'] }}" v-model="payment.method" @change="methodSelected()" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.payment-method') }}&quot;">
-                                <span class="checkmark"></span>
-                            </label>
-                            <span class="payment-method method-label">
-                                <b>{{ $payment['method_title'] }}</b>
-                            </span>
-                        </div>
-
-                        <div class="line-two mt-5">
-                            <span class="method-summary">{{ __($payment['description']) }}</span>
-                        </div>
-
-                        <?php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($payment['method']); ?>
-
-                        @if (! empty($additionalDetails))
-                            <div class="instructions" v-show="payment.method == '{{$payment['method']}}'">
-                                <label>{{ $additionalDetails['title'] }}</label>
-                                <p>{{ $additionalDetails['value'] }}</p>
-                            </div>
-                        @endif
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.checkout.payment-method.after', ['payment' => $payment]) !!}
-
-                @endforeach
-
-                <span class="control-error" v-if="errors.has('payment-form.payment[method]')">
-                    @{{ errors.first('payment-form.payment[method]') }}
-                </span>
-
-            </div>
-        </div>
-    </div>
-</form>
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/onepage/review.blade.php b/resources/themes/shop/views/checkout/onepage/review.blade.php
deleted file mode 100644
index 223514041..000000000
--- a/resources/themes/shop/views/checkout/onepage/review.blade.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<div class="form-container">
-    <div class="form-header mb-30">
-        <span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.summary') }}</span>
-    </div>
-
-    <div class="address-summary">
-        @if ($billingAddress = $cart->billing_address)
-            <div class="billing-address">
-                <div class="card-title mb-20">
-                    <b>{{ __('shop::app.checkout.onepage.billing-address') }}</b>
-                </div>
-
-                <div class="card-content">
-                    <ul>
-                        <li class="mb-10">
-                            {{ $billingAddress->company_name ?? '' }}
-                        </li>
-                        <li class="mb-10">
-                            <b>{{ $billingAddress->first_name }} {{ $billingAddress->last_name }}</b>
-                        </li>
-                        <li class="mb-10">
-                            {{ $billingAddress->address1 }},<br/> {{ $billingAddress->state }}
-                        </li>
-                        <li class="mb-10">
-                            {{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }}
-                        </li>
-
-                        <span class="horizontal-rule mb-15 mt-15"></span>
-
-                        <li class="mb-10">
-                            {{ __('shop::app.checkout.onepage.contact') }} : {{ $billingAddress->phone }}
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        @endif
-
-        @if ($cart->haveStockableItems() && $shippingAddress = $cart->shipping_address)
-            <div class="shipping-address">
-                <div class="card-title mb-20">
-                    <b>{{ __('shop::app.checkout.onepage.shipping-address') }}</b>
-                </div>
-
-                <div class="card-content">
-                    <ul>
-                        <li class="mb-10">
-                            {{ $shippingAddress->company_name ?? '' }}
-                        </li>
-                        <li class="mb-10">
-                            <b>{{ $shippingAddress->first_name }} {{ $shippingAddress->last_name }}</b>
-                        </li>
-                        <li class="mb-10">
-                            {{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
-                        </li>
-                        <li class="mb-10">
-                            {{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}
-                        </li>
-
-                        <span class="horizontal-rule mb-15 mt-15"></span>
-
-                        <li class="mb-10">
-                            {{ __('shop::app.checkout.onepage.contact') }} : {{ $shippingAddress->phone }}
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        @endif
-
-    </div>
-
-    @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
-    <div class="cart-item-list mt-20">
-        @foreach ($cart->items as $item)
-            @php
-                $productBaseImage = $item->product->getTypeInstance()->getBaseImage($item);
-            @endphp
-
-            <div class="item mb-5" style="margin-bottom: 5px;">
-                <div class="item-image">
-                    <img src="{{ $productBaseImage['medium_image_url'] }}"  alt=""/>
-                </div>
-
-                <div class="item-details">
-
-                    {!! view_render_event('bagisto.shop.checkout.name.before', ['item' => $item]) !!}
-
-                    <div class="item-title">
-                        {{ $item->product->name }}
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.checkout.name.after', ['item' => $item]) !!}
-                    {!! view_render_event('bagisto.shop.checkout.price.before', ['item' => $item]) !!}
-
-                    <div class="row">
-                        <span class="title">
-                            {{ __('shop::app.checkout.onepage.price') }}
-                        </span>
-                        <span class="value">
-                            {{ core()->currency($item->base_price) }}
-                        </span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.checkout.price.after', ['item' => $item]) !!}
-                    {!! view_render_event('bagisto.shop.checkout.quantity.before', ['item' => $item]) !!}
-
-                    <div class="row">
-                        <span class="title">
-                            {{ __('shop::app.checkout.onepage.quantity') }}
-                        </span>
-                        <span class="value">
-                            {{ $item->quantity }}
-                        </span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.checkout.quantity.after', ['item' => $item]) !!}
-
-                    {!! view_render_event('bagisto.shop.checkout.options.before', ['item' => $item]) !!}
-
-                    @if (isset($item->additional['attributes']))
-                        <div class="item-options">
-
-                            @foreach ($item->additional['attributes'] as $attribute)
-                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                            @endforeach
-
-                        </div>
-                    @endif
-
-                    {!! view_render_event('bagisto.shop.checkout.options.after', ['item' => $item]) !!}
-                </div>
-            </div>
-        @endforeach
-    </div>
-
-    <div class="order-description mt-20">
-        <div class="pull-left" style="width: 60%; float: left;">
-            @if ($cart->haveStockableItems())
-                <div class="shipping">
-                    <div class="decorator">
-                        <i class="icon shipping-icon"></i>
-                    </div>
-
-                    <div class="text">
-                        {{ core()->currency($cart->selected_shipping_rate->base_price) }}
-
-                        <div class="info">
-                            {{ $cart->selected_shipping_rate->method_title }}
-                        </div>
-                    </div>
-                </div>
-            @endif
-
-            <div class="payment">
-                <div class="decorator">
-                    <i class="icon payment-icon"></i>
-                </div>
-
-                <div class="text">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $cart->payment->method . '.title') }}
-                </div>
-            </div>
-
-        </div>
-
-        <div class="pull-right" style="width: 40%; float: left;">
-            <slot name="summary-section"></slot>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/onepage/shipping.blade.php b/resources/themes/shop/views/checkout/onepage/shipping.blade.php
deleted file mode 100644
index e1a6dbab8..000000000
--- a/resources/themes/shop/views/checkout/onepage/shipping.blade.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<form data-vv-scope="shipping-form">
-    <div class="form-container">
-        <div class="form-header mb-30">
-            <span class="checkout-step-heading">{{ __('shop::app.checkout.onepage.shipping-method') }}</span>
-        </div>
-
-        <div class="shipping-methods">
-
-            <div class="control-group" :class="[errors.has('shipping-form.shipping_method') ? 'has-error' : '']">
-
-                @foreach ($shippingRateGroups as $rateGroup)
-                    {!! view_render_event('bagisto.shop.checkout.shipping-method.before', ['rateGroup' => $rateGroup]) !!}
-
-                    <span class="carrier-title" id="carrier-title" style="font-size:18px; font-weight: bold;">
-                        {{ $rateGroup['carrier_title'] }}
-                    </span>
-
-                    @foreach ($rateGroup['rates'] as $rate)
-                        <div class="checkout-method-group mb-20">
-                            <div class="line-one">
-                                <label class="radio-container">
-                                    <input v-validate="'required'" type="radio" id="{{ $rate->method }}" name="shipping_method" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-method') }}&quot;" value="{{ $rate->method }}" v-model="selected_shipping_method" @change="methodSelected()">
-                                    <span class="checkmark"></span>
-                                </label>
-                                {{-- <label class="radio-view" for="{{ $rate->method }}"></label> --}}
-                                <b class="ship-rate method-label">{{ core()->currency($rate->base_price) }}</b>
-                            </div>
-
-                            <div class="line-two mt-5">
-                                <div class="method-summary">
-                                    <b>{{ $rate->method_title }}</b> - {{ __($rate->method_description) }}
-                                </div>
-                            </div>
-                        </div>
-
-                    @endforeach
-
-                    {!! view_render_event('bagisto.shop.checkout.shipping-method.after', ['rateGroup' => $rateGroup]) !!}
-
-                @endforeach
-
-                <span class="control-error" v-if="errors.has('shipping-form.shipping_method')">
-                    @{{ errors.first('shipping-form.shipping_method') }}
-                </span>
-            </div>
-        </div>
-    </div>
-</form>
\ No newline at end of file
diff --git a/resources/themes/shop/views/checkout/success.blade.php b/resources/themes/shop/views/checkout/success.blade.php
deleted file mode 100644
index c403360ad..000000000
--- a/resources/themes/shop/views/checkout/success.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.checkout.success.title') }}
-@stop
-
-@section('content-wrapper')
-
-    <div class="order-success-content" style="min-height: 300px;">
-        <h1>{{ __('shop::app.checkout.success.thanks') }}</h1>
-
-        <p>{{ __('shop::app.checkout.success.order-id-info', ['order_id' => $order->increment_id]) }}</p>
-
-        <p>{{ __('shop::app.checkout.success.info') }}</p>
-
-        {{ view_render_event('bagisto.shop.checkout.continue-shopping.before', ['order' => $order]) }}
-
-        <div class="misc-controls">
-            <a style="display: inline-block" href="{{ route('shop.home.index') }}" class="btn btn-lg btn-primary">
-                {{ __('shop::app.checkout.cart.continue-shopping') }}
-            </a>
-        </div>
-        
-        {{ view_render_event('bagisto.shop.checkout.continue-shopping.after', ['order' => $order]) }}
-        
-    </div>
-@endsection
diff --git a/resources/themes/shop/views/checkout/total/summary.blade.php b/resources/themes/shop/views/checkout/total/summary.blade.php
deleted file mode 100644
index 76a6b238b..000000000
--- a/resources/themes/shop/views/checkout/total/summary.blade.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<div class="order-summary">
-    <h3>{{ __('shop::app.checkout.total.order-summary') }}</h3>
-
-    <div class="item-detail">
-        <label>
-            {{ intval($cart->items_qty) }}
-            {{ __('shop::app.checkout.total.sub-total') }}
-            {{ __('shop::app.checkout.total.price') }}
-        </label>
-        <label class="right">{{ core()->currency($cart->base_sub_total) }}</label>
-    </div>
-
-    @if ($cart->selected_shipping_rate)
-        <div class="item-detail">
-            <label>{{ __('shop::app.checkout.total.delivery-charges') }}</label>
-            <label class="right">{{ core()->currency($cart->selected_shipping_rate->base_price) }}</label>
-        </div>
-    @endif
-
-    @if ($cart->base_tax_total)
-        @foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($cart, true) as $taxRate => $baseTaxAmount )
-        <div class="item-detail">
-            <label id="taxrate-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ __('shop::app.checkout.total.tax') }} {{ $taxRate }} %</label>
-            <label class="right" id="basetaxamount-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ core()->currency($baseTaxAmount) }}</label>
-        </div>
-        @endforeach
-    @endif
-
-    <div class="item-detail" id="discount-detail" @if ($cart->base_discount_amount && $cart->base_discount_amount > 0) style="display: block;" @else style="display: none;" @endif>
-        <label>
-            {{ __('shop::app.checkout.total.disc-amount') }}
-        </label>
-        <label class="right">
-            -{{ core()->currency($cart->base_discount_amount) }}
-        </label>
-    </div>
-
-
-    <div class="payable-amount" id="grand-total-detail">
-        <label>{{ __('shop::app.checkout.total.grand-total') }}</label>
-        <label class="right" id="grand-total-amount-detail">
-            {{ core()->currency($cart->base_grand_total) }}
-        </label>
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/themes/shop/views/cms/page.blade.php b/resources/themes/shop/views/cms/page.blade.php
deleted file mode 100644
index fe29692bd..000000000
--- a/resources/themes/shop/views/cms/page.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ $page->page_title }}
-@endsection
-
-@section('seo')
-    <meta name="title" content="{{ $page->meta_title }}" />
-
-    <meta name="description" content="{{ $page->meta_description }}" />
-
-    <meta name="keywords" content="{{ $page->meta_keywords }}" />
-@endsection
-
-@section('content-wrapper')
-    {!! DbView::make($page)->field('html_content')->render() !!}
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/address/country-state.blade.php b/resources/themes/shop/views/customers/account/address/country-state.blade.php
deleted file mode 100644
index ba1bfb6c1..000000000
--- a/resources/themes/shop/views/customers/account/address/country-state.blade.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<country-state></country-state>
-
-@push('scripts')
-
-    <script type="text/x-template" id="country-state-template">
-        <div>
-            <div class="control-group" :class="[errors.has('country') ? 'has-error' : '']">
-                <label for="country" class="required">
-                    {{ __('shop::app.customer.account.address.create.country') }}
-                </label>
-
-                <select type="text" v-validate="'required'" class="control" id="country" name="country" v-model="country" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.country') }}&quot;">
-                    <option value=""></option>
-                    @foreach (core()->countries() as $country)
-                        <option {{ $country->code === $defaultCountry ? 'selected' : '' }}  value="{{ $country->code }}">{{ $country->name }}</option>
-                    @endforeach
-                </select>
-
-                <span class="control-error" v-if="errors.has('country')">
-                    @{{ errors.first('country') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('state') ? 'has-error' : '']">
-                <label for="state" class="required">
-                    {{ __('shop::app.customer.account.address.create.state') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="state" name="state" v-model="state" v-if="!haveStates()" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.state') }}&quot;"/>
-                <select v-validate="'required'" class="control" id="state" name="state" v-model="state" v-if="haveStates()" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.state') }}&quot;">
-
-                    <option value="">{{ __('shop::app.customer.account.address.create.select-state') }}</option>
-
-                    <option v-for='(state, index) in countryStates[country]' :value="state.code">
-                        @{{ state.default_name }}
-                    </option>
-
-                </select>
-
-                <span class="control-error" v-if="errors.has('state')">
-                    @{{ errors.first('state') }}
-                </span>
-            </div>
-        </div>
-    </script>
-
-    <script>
-        Vue.component('country-state', {
-
-            template: '#country-state-template',
-
-            inject: ['$validator'],
-
-            data() {
-                return {
-                    country: "{{ $countryCode ?? $defaultCountry }}",
-
-                    state: "{{ $stateCode }}",
-
-                    countryStates: @json(core()->groupedStatesByCountries())
-                }
-            },
-
-            methods: {
-                haveStates() {
-                    if (this.countryStates[this.country] && this.countryStates[this.country].length)
-                        return true;
-
-                    return false;
-                },
-            }
-        });
-    </script>
-@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/address/create.blade.php b/resources/themes/shop/views/customers/account/address/create.blade.php
deleted file mode 100644
index f7ecf22ef..000000000
--- a/resources/themes/shop/views/customers/account/address/create.blade.php
+++ /dev/null
@@ -1,124 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.customer.account.address.create.page-title') }}
-@endsection
-
-@section('content-wrapper')
-
-    <div class="account-content">
-
-        @include('shop::customers.account.partials.sidemenu')
-
-        <div class="account-layout">
-            <div class="account-head mb-15">
-                <span class="back-icon"><a href="{{ route('customer.address.index') }}"><i class="icon icon-menu-back"></i></a></span>
-                <span class="account-heading">{{ __('shop::app.customer.account.address.create.title') }}</span>
-                <span></span>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.address.create.before') !!}
-
-            <form id="customer-address-form" method="post" action="{{ route('customer.address.store') }}" @submit.prevent="onSubmit">
-
-                <div class="account-table-content">
-                    @csrf
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.before') !!}
-
-                    <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
-                        <label for="company_name">{{ __('shop::app.customer.account.address.create.company_name') }}</label>
-                        <input value="{{ old('company_name') }}" type="text" class="control" name="company_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.company_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.company_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
-                        <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
-                        <input value="{{ old('first_name') }}" type="text" class="control" name="first_name" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.first_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
-                        <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
-                        <input value="{{ old('last_name') }}" type="text" class="control" name="last_name" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.last_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
-                        <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}
-                            <span class="help-note">{{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
-                        </label>
-                        <input type="text" class="control" name="vat_id" value="{{ old('vat_id') }}"
-                        v-validate="''" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
-                        <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.vat_id.after') !!}
-
-                    <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
-                        <label for="address1" class="required">{{ __('shop::app.customer.account.address.create.street-address') }}</label>
-                        <input type="text" class="control" name="address1[]" value="{{ old('address1') }}" id="address1" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
-                        <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
-                    </div>
-
-                    @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
-                        <div class="control-group" style="margin-top: -25px;">
-                            @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
-                                <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}">
-                            @endfor
-                        </div>
-                    @endif
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.street-address.after') !!}
-
-                    @include ('shop::customers.account.address.country-state', ['countryCode' => old('country'), 'stateCode' => old('state')])
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.country-state.after') !!}
-
-                    <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
-                        <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
-                        <input value="{{ old('city') }}" type="text" class="control" name="city" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
-                        <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.city.after') !!}
-
-                    <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
-                        <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
-                        <input value="{{ old('postcode') }}" type="text" class="control" name="postcode" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
-                        <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.postcode.after') !!}
-
-                    <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
-                        <label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
-                        <input value="{{ old('phone') }}" type="text" class="control" name="phone" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
-                        <span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.after') !!}
-
-                    <div class="button-group">
-                        <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.account.address.create.submit') }}">
-                        {{-- <button class="btn btn-primary btn-lg" type="submit">
-                            {{ __('shop::app.customer.account.address.edit.submit') }}
-                        </button> --}}
-                    </div>
-
-                </div>
-
-            </form>
-
-            {!! view_render_event('bagisto.shop.customers.account.address.create.after') !!}
-
-        </div>
-    </div>
-
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/address/edit.blade.php b/resources/themes/shop/views/customers/account/address/edit.blade.php
deleted file mode 100644
index aa7bcbd34..000000000
--- a/resources/themes/shop/views/customers/account/address/edit.blade.php
+++ /dev/null
@@ -1,125 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.customer.account.address.edit.page-title') }}
-@endsection
-
-@section('content-wrapper')
-
-    <div class="account-content">
-        @include('shop::customers.account.partials.sidemenu')
-
-        <div class="account-layout">
-
-            <div class="account-head mb-15">
-                <span class="back-icon"><a href="{{ route('customer.address.index') }}"><i class="icon icon-menu-back"></i></a></span>
-                <span class="account-heading">{{ __('shop::app.customer.account.address.edit.title') }}</span>
-                <span></span>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.address.edit.before', ['address' => $address]) !!}
-
-            <form id="customer-address-form" method="post" action="{{ route('customer.address.update', $address->id) }}" @submit.prevent="onSubmit">
-
-                <div class="account-table-content">
-                    @method('PUT')
-                    @csrf
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.before', ['address' => $address]) !!}
-
-                    <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
-                        <label for="company_name">{{ __('shop::app.customer.account.address.edit.company_name') }}</label>
-                        <input type="text" value="{{ old('company_name') ?: $address->company_name }}"  class="control" name="company_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.edit.company_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.company_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
-                        <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
-                        <input type="text" class="control" name="first_name" v-validate="'required'" value="{{ old('first_name') ?: $address->first_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.first_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
-                        <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
-                        <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ old('last_name') ?: $address->last_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.last_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
-                        <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}
-                            <span class="help-note">{{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
-                        </label>
-                        <input type="text" class="control" name="vat_id" value="{{ old('vat_id') ?: $address->vat_id }}"
-                        v-validate="''" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
-                        <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.vat_id.after') !!}
-
-                    <?php $addresses = explode(PHP_EOL, $address->address1); ?>
-
-                    <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
-                        <label for="address_0" class="required">{{ __('shop::app.customer.account.address.edit.street-address') }}</label>
-                        <input type="text" class="control" name="address1[]" id="address_0" v-validate="'required'" value="{{ isset($addresses[0]) ? $addresses[0] : '' }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
-                        <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
-                    </div>
-
-                    @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
-                        <div class="control-group" style="margin-top: -25px;">
-                            @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
-                                <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}" value="{{ isset($addresses[$i]) ? $addresses[$i] : '' }}">
-                            @endfor
-                        </div>
-                    @endif
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.street-addres.after') !!}
-
-                    @include ('shop::customers.account.address.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state])
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.country-state.after') !!}
-
-                    <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
-                        <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
-                        <input type="text" class="control" name="city" v-validate="'required|regex:^[a-zA-Z \-]*$'" value="{{ old('city') ?: $address->city }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
-                        <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.create.after') !!}
-
-                    <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
-                        <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
-                        <input type="text" class="control" name="postcode" v-validate="'required'" value="{{ old('postcode') ?: $address->postcode }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
-                        <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.postcode.after') !!}
-
-                    <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
-                        <label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
-                        <input type="text" class="control" name="phone" v-validate="'required'" value="{{ old('phone') ?: $address->phone }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
-                        <span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.after', ['address' => $address]) !!}
-
-                    <div class="button-group">
-                        <button class="btn btn-primary btn-lg" type="submit">
-                            {{ __('shop::app.customer.account.address.create.submit') }}
-                        </button>
-                    </div>
-                </div>
-
-            </form>
-
-            {!! view_render_event('bagisto.shop.customers.account.address.edit.after', ['address' => $address]) !!}
-
-        </div>
-    </div>
-
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/address/index.blade.php b/resources/themes/shop/views/customers/account/address/index.blade.php
deleted file mode 100644
index b099f377b..000000000
--- a/resources/themes/shop/views/customers/account/address/index.blade.php
+++ /dev/null
@@ -1,112 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.customer.account.address.index.page-title') }}
-@endsection
-
-@section('content-wrapper')
-
-    <div class="account-content">
-
-        @include('shop::customers.account.partials.sidemenu')
-
-        <div class="account-layout">
-
-            <div class="account-head">
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
-                <span
-                    class="account-heading">{{ __('shop::app.customer.account.address.index.title') }}</span>
-
-                @if (! $addresses->isEmpty())
-                    <span class="account-action">
-                    <a href="{{ route('customer.address.create') }}">{{ __('shop::app.customer.account.address.index.add') }}</a>
-                </span>
-                @else
-                    <span></span>
-                @endif
-                <div class="horizontal-rule"></div>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.address.list.before', ['addresses' => $addresses]) !!}
-
-            <div class="account-table-content">
-                @if ($addresses->isEmpty())
-                    <div>{{ __('shop::app.customer.account.address.index.empty') }}</div>
-                    <br/>
-                    <a href="{{ route('customer.address.create') }}">{{ __('shop::app.customer.account.address.index.add') }}</a>
-                @else
-                    <div class="address-holder">
-                        @foreach ($addresses as $address)
-                            <div class="address-card">
-                                <div class="details">
-                                    <span
-                                        class="bold">{{ auth()->guard('customer')->user()->name }}</span>
-                                    <ul class="address-card-list">
-                                        <li class="mt-5">
-                                            {{ $address->company_name }}
-                                        </li>
-
-                                        <li class="mt-5">
-                                            {{ $address->first_name }}
-                                        </li>
-
-                                        <li class="mt-5">
-                                            {{ $address->last_name }}
-                                        </li>
-
-                                        <li class="mt-5">
-                                            {{ $address->address1 }},
-                                        </li>
-
-                                        <li class="mt-5">
-                                            {{ $address->city }}
-                                        </li>
-
-                                        <li class="mt-5">
-                                            {{ $address->state }}
-                                        </li>
-
-                                        <li class="mt-5">
-                                            {{ core()->country_name($address->country) }} {{ $address->postcode }}
-                                        </li>
-
-                                        <li class="mt-10">
-                                            {{ __('shop::app.customer.account.address.index.contact') }}
-                                            : {{ $address->phone }}
-                                        </li>
-                                    </ul>
-
-                                    <div class="control-links mt-20">
-                                    <span>
-                                        <a href="{{ route('customer.address.edit', $address->id) }}">
-                                            {{ __('shop::app.customer.account.address.index.edit') }}
-                                        </a>
-                                    </span>
-
-                                        <span>
-                                        <a href="{{ route('address.delete', $address->id) }}"
-                                           onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
-                                            {{ __('shop::app.customer.account.address.index.delete') }}
-                                        </a>
-                                    </span>
-                                    </div>
-                                </div>
-                            </div>
-                        @endforeach
-                    </div>
-                @endif
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.address.list.after', ['addresses' => $addresses]) !!}
-        </div>
-    </div>
-@endsection
-
-@push('scripts')
-    <script>
-        function deleteAddress(message) {
-            if (!confirm(message))
-                event.preventDefault();
-        }
-    </script>
-@endpush
diff --git a/resources/themes/shop/views/customers/account/compare/index.blade.php b/resources/themes/shop/views/customers/account/compare/index.blade.php
deleted file mode 100644
index 7b6de5e66..000000000
--- a/resources/themes/shop/views/customers/account/compare/index.blade.php
+++ /dev/null
@@ -1,29 +0,0 @@
-@extends('shop::layouts.master')
-
-@include('shop::guest.compare.compare-products')
-
-@section('page_title')
-    {{ __('shop::app.customer.compare.compare_similar_items') }}
-@endsection
-
-@section('content-wrapper')
-
-    <div class="account-content">
-        @include('shop::customers.account.partials.sidemenu')
-
-        <div class="account-layout">
-            {!! view_render_event('bagisto.shop.customers.account.comparison.list.before') !!}
-
-            <div class="account-items-list">
-                <div class="account-table-content">
-                    <compare-product></compare-product>
-                </div>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.comparison.list.after') !!}
-
-        </div>
-
-    </div>
-
-@endsection
diff --git a/resources/themes/shop/views/customers/account/downloadable_products/index.blade.php b/resources/themes/shop/views/customers/account/downloadable_products/index.blade.php
deleted file mode 100644
index 583ebe97e..000000000
--- a/resources/themes/shop/views/customers/account/downloadable_products/index.blade.php
+++ /dev/null
@@ -1,39 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.customer.account.downloadable_products.title') }}
-@endsection
-
-@section('content-wrapper')
-
-    <div class="account-content">
-        @include('shop::customers.account.partials.sidemenu')
-
-        <div class="account-layout">
-
-            <div class="account-head mb-10">
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
-                <span class="account-heading">
-                    {{ __('shop::app.customer.account.downloadable_products.title') }}
-                </span>
-
-                <div class="horizontal-rule"></div>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.downloadable_products.list.before') !!}
-
-            <div class="account-items-list">
-                <div class="account-table-content">
-
-                    {!! app('Webkul\Shop\DataGrids\DownloadableProductDataGrid')->render() !!}
-
-                </div>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.downloadable_products.list.after') !!}
-
-        </div>
-
-    </div>
-
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/index.blade.php b/resources/themes/shop/views/customers/account/index.blade.php
deleted file mode 100644
index 4097e93df..000000000
--- a/resources/themes/shop/views/customers/account/index.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('content-wrapper')
-    <div class="account-content">
-        @include('shop::customers.account.partials.sidemenu')
-        <h1>Account Index Page</h1>
-    </div>
-    
-@endsection
diff --git a/resources/themes/shop/views/customers/account/orders/index.blade.php b/resources/themes/shop/views/customers/account/orders/index.blade.php
deleted file mode 100644
index 6c53d4602..000000000
--- a/resources/themes/shop/views/customers/account/orders/index.blade.php
+++ /dev/null
@@ -1,39 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.customer.account.order.index.page-title') }}
-@endsection
-
-@section('content-wrapper')
-
-    <div class="account-content">
-        @include('shop::customers.account.partials.sidemenu')
-
-        <div class="account-layout">
-
-            <div class="account-head mb-10">
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
-                <span class="account-heading">
-                    {{ __('shop::app.customer.account.order.index.title') }}
-                </span>
-
-                <div class="horizontal-rule"></div>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.orders.list.before') !!}
-
-            <div class="account-items-list">
-                <div class="account-table-content">
-
-                    {!! app('Webkul\Shop\DataGrids\OrderDataGrid')->render() !!}
-
-                </div>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.orders.list.after') !!}
-
-        </div>
-
-    </div>
-
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/orders/pdf.blade.php b/resources/themes/shop/views/customers/account/orders/pdf.blade.php
deleted file mode 100644
index 1826d8fe9..000000000
--- a/resources/themes/shop/views/customers/account/orders/pdf.blade.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-    <head>
-        <meta http-equiv="Cache-control" content="no-cache">
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-        <style type="text/css">
-            * {
-                font-family: DejaVu Sans;
-            }
-
-            body, th, td, h5 {
-                font-size: 12px;
-                color: #000;
-            }
-
-            .container {
-                padding: 20px;
-                display: block;
-            }
-
-            .invoice-summary {
-                margin-bottom: 20px;
-            }
-
-            .table {
-                margin-top: 20px;
-            }
-
-            .table table {
-                width: 100%;
-                border-collapse: collapse;
-                text-align: left;
-                table-layout: fixed;
-            }
-
-            .table thead th {
-                font-weight: 700;
-                border-top: solid 1px #d3d3d3;
-                border-bottom: solid 1px #d3d3d3;
-                border-left: solid 1px #d3d3d3;
-                padding: 5px 10px;
-                background: #F4F4F4;
-            }
-
-            .table thead th:last-child {
-                border-right: solid 1px #d3d3d3;
-            }
-
-            .table tbody td {
-                padding: 5px 10px;
-                border-bottom: solid 1px #d3d3d3;
-                border-left: solid 1px #d3d3d3;
-                color: #3A3A3A;
-                vertical-align: middle;
-            }
-
-            .table tbody td p {
-                margin: 0;
-            }
-
-            .table tbody td:last-child {
-                border-right: solid 1px #d3d3d3;
-            }
-
-           .sale-summary {
-                margin-top: 40px;
-                float: right;
-            }
-
-            .sale-summary tr td {
-                padding: 3px 5px;
-            }
-
-            .sale-summary tr.bold {
-                font-weight: 700;
-            }
-
-            .label {
-                color: #000;
-                font-weight: bold;
-            }
-
-            .logo {
-                height: 70px;
-                width: 70px;
-            }
-
-            .merchant-details {
-                margin-bottom: 5px;
-            }
-
-            .merchant-details-title {
-                font-weight: bold;
-            }
-
-            .text-center {
-                text-align: center;
-            }
-        </style>
-    </head>
-
-    <body style="background-image: none;background-color: #fff;">
-        <div class="container">
-
-            <div class="header">
-                <div class="row">
-                    <div class="col-12">
-                        <h1 class="text-center">{{ __('admin::app.sales.invoices.invoice') }}</h1>
-                    </div>
-                </div>
-                @if (core()->getConfigData('sales.orderSettings.invoice_slip_design.logo'))
-                    <div class="image">
-                        <img class="logo" src="{{ Storage::url(core()->getConfigData('sales.orderSettings.invoice_slip_design.logo')) }}" alt=""/>
-                    </div>
-                @endif
-                <div class="merchant-details">
-                    <div><span class="merchant-details-title">{{ core()->getConfigData('sales.shipping.origin.store_name') ? core()->getConfigData('sales.shipping.origin.store_name') : '' }}</span></div>
-                    <div>{{ core()->getConfigData('sales.shipping.origin.address1') ? core()->getConfigData('sales.shipping.origin.address1') : '' }}</div>
-                    <div>
-                        <span>{{ core()->getConfigData('sales.shipping.origin.zipcode') ? core()->getConfigData('sales.shipping.origin.zipcode') : '' }}</span>
-                        <span>{{ core()->getConfigData('sales.shipping.origin.city') ? core()->getConfigData('sales.shipping.origin.city') : '' }}</span></div>
-                    <div>{{ core()->getConfigData('sales.shipping.origin.state') ? core()->getConfigData('sales.shipping.origin.state') : '' }}</div>
-                    <div>{{ core()->getConfigData('sales.shipping.origin.country') ?  core()->country_name(core()->getConfigData('sales.shipping.origin.country')) : '' }}</div>
-                </div>
-                <div class="merchant-details">
-                    @if (core()->getConfigData('sales.shipping.origin.contact'))
-                        <div><span class="merchant-details-title">{{ __('admin::app.admin.system.contact-number') }}:</span> {{ core()->getConfigData('sales.shipping.origin.contact') }}</div>
-                    @endif
-                    @if (core()->getConfigData('sales.shipping.origin.vat_number'))
-                        <div><span class="merchant-details-title">{{ __('admin::app.admin.system.vat-number') }}:</span> {{ core()->getConfigData('sales.shipping.origin.vat_number') }}</div>
-                    @endif
-                    @if (core()->getConfigData('sales.shipping.origin.bank_details'))
-                        <div><span class="merchant-details-title">{{ __('admin::app.admin.system.bank-details') }}:</span> {{ core()->getConfigData('sales.shipping.origin.bank_details') }}</div>
-                    @endif
-                </div>
-            </div>
-
-            <div class="invoice-summary">
-
-                <div class="row">
-                    <span class="label">{{ __('shop::app.customer.account.order.view.invoice-id') }} -</span>
-                    <span class="value">#{{ $invoice->id }}</span>
-                </div>
-
-                <div class="row">
-                    <span class="label">{{ __('shop::app.customer.account.order.view.order-id') }} -</span>
-                    <span class="value">#{{ $invoice->order->increment_id }}</span>
-                </div>
-
-                <div class="row">
-                    <span class="label">{{ __('shop::app.customer.account.order.view.order-date') }} -</span>
-                    <span class="value">{{ core()->formatDate($invoice->order->created_at, 'd-m-Y') }}</span>
-                </div>
-
-                <div class="table address">
-                    <table>
-                        <thead>
-                            <tr>
-                                <th style="width: 50%">{{ __('shop::app.customer.account.order.view.bill-to') }}</th>
-                                @if ($invoice->order->shipping_address)
-                                    <th>{{ __('shop::app.customer.account.order.view.ship-to') }}</th>
-                                @endif
-                            </tr>
-                        </thead>
-
-                        <tbody>
-                            <tr>
-                                <td>
-                                    <p>{{ $invoice->order->billing_address->company_name ?? '' }}</p>
-                                    <p>{{ $invoice->order->billing_address->name }}</p>
-                                    <p>{{ $invoice->order->billing_address->address1 }}</p>
-                                    <p>{{ $invoice->order->billing_address->city }}</p>
-                                    <p>{{ $invoice->order->billing_address->state }}</p>
-                                    <p>
-                                        {{ core()->country_name($invoice->order->billing_address->country) }}
-                                        {{ $invoice->order->billing_address->postcode }}
-                                    </p>
-                                    {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->billing_address->phone }}
-                                </td>
-
-                                @if ($invoice->order->shipping_address)
-                                    <td>
-                                        <p>{{ $invoice->order->shipping_address->company_name ?? '' }}</p>
-                                        <p>{{ $invoice->order->shipping_address->name }}</p>
-                                        <p>{{ $invoice->order->shipping_address->address1 }}</p>
-                                        <p>{{ $invoice->order->shipping_address->city }}</p>
-                                        <p>{{ $invoice->order->shipping_address->state }}</p>
-                                        <p>{{ core()->country_name($invoice->order->shipping_address->country) }} {{ $invoice->order->shipping_address->postcode }}</p>
-                                        {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->shipping_address->phone }}
-                                    </td>
-                                @endif
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-
-                <div class="table payment-shipment">
-                    <table>
-                        <thead>
-                            <tr>
-                                <th style="width: 50%">{{ __('shop::app.customer.account.order.view.payment-method') }}</th>
-
-                                @if ($invoice->order->shipping_address)
-                                    <th>{{ __('shop::app.customer.account.order.view.shipping-method') }}</th>
-                                @endif
-                            </tr>
-                        </thead>
-
-                        <tbody>
-                            <tr>
-                                <td>
-                                    {{ core()->getConfigData('sales.paymentmethods.' . $invoice->order->payment->method . '.title') }}
-
-                                    @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($invoice->order->payment->method); @endphp
-
-                                    @if (! empty($additionalDetails))
-                                        <div>
-                                            <label class="label">{{ $additionalDetails['title'] }}:</label>
-                                            <p class="value">{{ $additionalDetails['value'] }}</p>
-                                        </div>
-                                    @endif
-                                </td>
-
-                                @if ($invoice->order->shipping_address)
-                                    <td>
-                                        {{ $invoice->order->shipping_title }}
-                                    </td>
-                                @endif
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-
-                <div class="table items">
-                    <table>
-                        <thead>
-                            <tr>
-                                <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                                <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                                <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
-                                <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                                <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
-                                <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
-                                <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
-                            </tr>
-                        </thead>
-
-                        <tbody>
-
-                            @foreach ($invoice->items as $item)
-                                <tr>
-                                    <td>{{ $item->child ? $item->child->sku : $item->sku }}</td>
-
-                                    <td>
-                                        {{ $item->name }}
-
-                                        @if (isset($item->additional['attributes']))
-                                            <div class="item-options">
-
-                                                @foreach ($item->additional['attributes'] as $attribute)
-                                                    <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                                @endforeach
-
-                                            </div>
-                                        @endif
-                                    </td>
-
-                                    <td>{{ core()->formatPrice($item->price, $invoice->order->order_currency_code) }}</td>
-
-                                    <td>{{ $item->qty }}</td>
-
-                                    <td>{{ core()->formatPrice($item->total, $invoice->order->order_currency_code) }}</td>
-
-                                    <td>{{ core()->formatPrice($item->tax_amount, $invoice->order->order_currency_code) }}</td>
-
-                                    <td>{{ core()->formatPrice(($item->total + $item->tax_amount), $invoice->order->order_currency_code) }}</td>
-                                </tr>
-                            @endforeach
-
-                        </tbody>
-                    </table>
-                </div>
-
-
-                <table class="sale-summary">
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
-                        <td>-</td>
-                        <td>{{ core()->formatPrice($invoice->sub_total, $invoice->order->order_currency_code) }}</td>
-                    </tr>
-
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
-                        <td>-</td>
-                        <td>{{ core()->formatPrice($invoice->shipping_amount, $invoice->order->order_currency_code) }}</td>
-                    </tr>
-
-                    @if ($invoice->base_discount_amount > 0)
-                        <tr>
-                            <td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
-                            <td>-</td>
-                            <td>{{ core()->formatPrice($invoice->discount_amount, $invoice->order_currency_code) }}</td>
-                        </tr>
-                    @endif
-
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
-                        <td>-</td>
-                        <td>{{ core()->formatPrice($invoice->tax_amount, $invoice->order->order_currency_code) }}</td>
-                    </tr>
-
-                    <tr class="bold">
-                        <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
-                        <td>-</td>
-                        <td>{{ core()->formatPrice($invoice->grand_total, $invoice->order->order_currency_code) }}</td>
-                    </tr>
-                </table>
-
-            </div>
-
-        </div>
-    </body>
-</html>
diff --git a/resources/themes/shop/views/customers/account/orders/view.blade.php b/resources/themes/shop/views/customers/account/orders/view.blade.php
deleted file mode 100644
index 78d34d5d1..000000000
--- a/resources/themes/shop/views/customers/account/orders/view.blade.php
+++ /dev/null
@@ -1,562 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
-@endsection
-
-@section('content-wrapper')
-
-    <div class="account-content">
-        @include('shop::customers.account.partials.sidemenu')
-
-        <div class="account-layout">
-
-            <div class="account-head">
-                <span class="back-icon"><a href="{{ route('customer.orders.index') }}"><i class="icon icon-menu-back"></i></a></span>
-
-                <span class="account-heading">
-                    {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
-                </span>
-                <span></span>
-
-
-                @if ($order->canCancel())
-                    <a href="{{ route('customer.orders.cancel', $order->id) }}" class="btn btn-lg btn-primary" v-alert:message="'{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}'" style="float: right;">
-                        {{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
-                    </a>
-                @endif
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.orders.view.before', ['order' => $order]) !!}
-
-            <div class="sale-container">
-
-                <tabs>
-                    <tab name="{{ __('shop::app.customer.account.order.view.info') }}" :selected="true">
-
-                        <div class="sale-section">
-                            <div class="section-content">
-                                <div class="row">
-                                    <span class="title">
-                                        {{ __('shop::app.customer.account.order.view.placed-on') }}
-                                    </span>
-
-                                    <span class="value">
-                                        {{ core()->formatDate($order->created_at, 'd M Y') }}
-                                    </span>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="sale-section">
-                            <div class="secton-title">
-                                <span>{{ __('shop::app.customer.account.order.view.products-ordered') }}</span>
-                            </div>
-
-                            <div class="section-content">
-                                <div class="table">
-                                    <table>
-                                        <thead>
-                                            <tr>
-                                                <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.item-status') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.tax-percent') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
-                                            </tr>
-                                        </thead>
-
-                                        <tbody>
-
-                                            @foreach ($order->items as $item)
-                                                <tr>
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
-                                                        {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
-                                                    </td>
-
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
-                                                        {{ $item->name }}
-
-                                                        @if (isset($item->additional['attributes']))
-                                                            <div class="item-options">
-
-                                                                @foreach ($item->additional['attributes'] as $attribute)
-                                                                    <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                                                @endforeach
-
-                                                            </div>
-                                                        @endif
-                                                    </td>
-
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">
-                                                        {{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                                                    </td>
-
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.item-status') }}">
-                                                        <span class="qty-row">
-                                                            {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }}
-                                                        </span>
-
-                                                        <span class="qty-row">
-                                                            {{ $item->qty_invoiced ? __('shop::app.customer.account.order.view.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }}
-                                                        </span>
-
-                                                        <span class="qty-row">
-                                                            {{ $item->qty_shipped ? __('shop::app.customer.account.order.view.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }}
-                                                        </span>
-
-                                                        <span class="qty-row">
-                                                            {{ $item->qty_refunded ? __('shop::app.customer.account.order.view.item-refunded', ['qty_refunded' => $item->qty_refunded]) : '' }}
-                                                        </span>
-
-                                                        <span class="qty-row">
-                                                            {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }}
-                                                        </span>
-                                                    </td>
-
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">
-                                                        {{ core()->formatPrice($item->total, $order->order_currency_code) }}
-                                                    </td>
-
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.tax-percent') }}">
-                                                        {{ number_format($item->tax_percent, 2) }}%
-                                                    </td>
-
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">
-                                                        {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}
-                                                    </td>
-
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">
-                                                        {{ core()->formatPrice($item->total + $item->tax_amount - $item->discount_amount, $order->order_currency_code) }}
-                                                    </td>
-                                                </tr>
-                                            @endforeach
-                                        </tbody>
-
-                                    </table>
-                                </div>
-
-                                <div class="totals">
-                                    <table class="sale-summary">
-                                        <tbody>
-                                            <tr>
-                                                <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
-                                                <td>-</td>
-                                                <td>{{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}</td>
-                                            </tr>
-
-                                            @if ($order->haveStockableItems())
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}</td>
-                                                </tr>
-                                            @endif
-
-                                            @if ($order->base_discount_amount > 0)
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.discount') }}
-                                                        @if ($order->coupon_code)
-                                                            ({{ $order->coupon_code }})
-                                                        @endif
-                                                    </td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
-                                                </tr>
-                                            @endif
-
-                                            <tr class="border">
-                                                <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
-                                                <td>-</td>
-                                                <td>{{ core()->formatPrice($order->tax_amount, $order->order_currency_code) }}</td>
-                                            </tr>
-
-                                            <tr class="bold">
-                                                <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
-                                                <td>-</td>
-                                                <td>{{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}</td>
-                                            </tr>
-
-                                            <tr class="bold">
-                                                <td>{{ __('shop::app.customer.account.order.view.total-paid') }}</td>
-                                                <td>-</td>
-                                                <td>{{ core()->formatPrice($order->grand_total_invoiced, $order->order_currency_code) }}</td>
-                                            </tr>
-
-                                            <tr class="bold">
-                                                <td>{{ __('shop::app.customer.account.order.view.total-refunded') }}</td>
-                                                <td>-</td>
-                                                <td>{{ core()->formatPrice($order->grand_total_refunded, $order->order_currency_code) }}</td>
-                                            </tr>
-
-                                            <tr class="bold">
-                                                <td>{{ __('shop::app.customer.account.order.view.total-due') }}</td>
-                                                
-                                                <td>-</td>
-
-                                                @if($order->status !== 'canceled')
-                                                    <td>{{ core()->formatPrice($order->total_due, $order->order_currency_code) }}</td>
-                                                @else
-                                                    <td>{{ core()->formatPrice(0.00, $order->order_currency_code) }}</td>
-                                                @endif
-                                            </tr>
-                                        <tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </tab>
-
-                    @if ($order->invoices->count())
-                        <tab name="{{ __('shop::app.customer.account.order.view.invoices') }}">
-
-                            @foreach ($order->invoices as $invoice)
-
-                                <div class="sale-section">
-                                    <div class="secton-title">
-                                        <span>{{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->id]) }}</span>
-
-                                        <a href="{{ route('customer.orders.print', $invoice->id) }}" class="pull-right">
-                                            {{ __('shop::app.customer.account.order.view.print') }}
-                                        </a>
-                                    </div>
-
-                                    <div class="section-content">
-                                        <div class="table">
-                                            <table>
-                                                <thead>
-                                                    <tr>
-                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
-                                                    </tr>
-                                                </thead>
-
-                                                <tbody>
-
-                                                    @foreach ($invoice->items as $item)
-                                                        <tr>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
-                                                                {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
-                                                                {{ $item->name }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">
-                                                                {{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">
-                                                                {{ $item->qty }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">
-                                                                {{ core()->formatPrice($item->total, $order->order_currency_code) }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">
-                                                                {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">
-                                                                {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}
-                                                            </td>
-                                                        </tr>
-                                                    @endforeach
-                                                </tbody>
-                                            </table>
-                                        </div>
-
-                                        <div class="totals">
-                                            <table class="sale-summary">
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($invoice->sub_total, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($invoice->shipping_amount, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                @if ($order->base_discount_amount > 0)
-                                                    <tr>
-                                                        <td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
-                                                        <td>-</td>
-                                                        <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
-                                                    </tr>
-                                                @endif
-
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($invoice->tax_amount, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                <tr class="bold">
-                                                    <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($invoice->grand_total, $order->order_currency_code) }}</td>
-                                                </tr>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            @endforeach
-
-                        </tab>
-                    @endif
-
-                    @if ($order->shipments->count())
-                        <tab name="{{ __('shop::app.customer.account.order.view.shipments') }}">
-
-                            @foreach ($order->shipments as $shipment)
-
-                                <div class="sale-section">
-                                    <div class="section-content">
-                                        <div class="row">
-                                            <span class="title">
-                                                {{ __('shop::app.customer.account.order.view.tracking-number') }}
-                                            </span>
-
-                                            <span class="value">
-                                                {{  $shipment->track_number }}
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="sale-section">
-                                    <div class="secton-title">
-                                        <span>{{ __('shop::app.customer.account.order.view.individual-shipment', ['shipment_id' => $shipment->id]) }}</span>
-                                    </div>
-
-                                    <div class="section-content">
-
-                                        <div class="table">
-                                            <table>
-                                                <thead>
-                                                    <tr>
-                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                                                    </tr>
-                                                </thead>
-
-                                                <tbody>
-
-                                                    @foreach ($shipment->items as $item)
-
-                                                        <tr>
-                                                            <td data-value="{{  __('shop::app.customer.account.order.view.SKU') }}">{{ $item->sku }}</td>
-                                                            <td data-value="{{  __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
-                                                            <td data-value="{{  __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
-                                                        </tr>
-
-                                                    @endforeach
-
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            @endforeach
-
-                        </tab>
-                    @endif
-
-                    @if ($order->refunds->count())
-                        <tab name="{{ __('shop::app.customer.account.order.view.refunds') }}">
-
-                            @foreach ($order->refunds as $refund)
-
-                                <div class="sale-section">
-                                    <div class="secton-title">
-                                        <span>{{ __('shop::app.customer.account.order.view.individual-refund', ['refund_id' => $refund->id]) }}</span>
-                                    </div>
-
-                                    <div class="section-content">
-                                        <div class="table">
-                                            <table>
-                                                <thead>
-                                                    <tr>
-                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
-                                                    </tr>
-                                                </thead>
-
-                                                <tbody>
-
-                                                    @foreach ($refund->items as $item)
-                                                        <tr>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">{{ $item->child ? $item->child->sku : $item->sku }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">{{ core()->formatPrice($item->total, $order->order_currency_code) }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">{{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}</td>
-                                                        </tr>
-                                                    @endforeach
-
-                                                    @if (! $refund->items->count())
-                                                        <tr>
-                                                            <td class="empty" colspan="7">{{ __('shop::app.common.no-result-found') }}</td>
-                                                        <tr>
-                                                    @endif
-                                                </tbody>
-                                            </table>
-                                        </div>
-
-                                        <div class="totals">
-                                            <table class="sale-summary">
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($refund->sub_total, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                @if ($refund->shipping_amount > 0)
-                                                    <tr>
-                                                        <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
-                                                        <td>-</td>
-                                                        <td>{{ core()->formatPrice($refund->shipping_amount, $order->order_currency_code) }}</td>
-                                                    </tr>
-                                                @endif
-
-                                                @if ($refund->discount_amount > 0)
-                                                    <tr>
-                                                        <td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
-                                                        <td>-</td>
-                                                        <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
-                                                    </tr>
-                                                @endif
-
-                                                @if ($refund->tax_amount > 0)
-                                                    <tr>
-                                                        <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
-                                                        <td>-</td>
-                                                        <td>{{ core()->formatPrice($refund->tax_amount, $order->order_currency_code) }}</td>
-                                                    </tr>
-                                                @endif
-
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.adjustment-refund') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($refund->adjustment_refund, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.adjustment-fee') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($refund->adjustment_fee, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                <tr class="bold">
-                                                    <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($refund->grand_total, $order->order_currency_code) }}</td>
-                                                </tr>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            @endforeach
-
-                        </tab>
-                    @endif
-                </tabs>
-
-                <div class="sale-section">
-                    <div class="section-content" style="border-bottom: 0">
-                        <div class="order-box-container">
-                            <div class="box">
-                                <div class="box-title">
-                                    {{ __('shop::app.customer.account.order.view.billing-address') }}
-                                </div>
-
-                                <div class="box-content">
-                                    @include ('admin::sales.address', ['address' => $order->billing_address])
-
-                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
-                                </div>
-                            </div>
-
-                            @if ($order->shipping_address)
-                                <div class="box">
-                                    <div class="box-title">
-                                        {{ __('shop::app.customer.account.order.view.shipping-address') }}
-                                    </div>
-
-                                    <div class="box-content">
-                                        @include ('admin::sales.address', ['address' => $order->shipping_address])
-
-                                        {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-address.after', ['order' => $order]) !!}
-                                    </div>
-                                </div>
-
-                                <div class="box">
-                                    <div class="box-title">
-                                        {{ __('shop::app.customer.account.order.view.shipping-method') }}
-                                    </div>
-
-                                    <div class="box-content">
-                                        {{ $order->shipping_title }}
-
-                                        {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-method.after', ['order' => $order]) !!}
-                                    </div>
-                                </div>
-                            @endif
-
-                            <div class="box">
-                                <div class="box-title">
-                                    {{ __('shop::app.customer.account.order.view.payment-method') }}
-                                </div>
-
-                                <div class="box-content">
-                                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-
-                                    @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
-
-                                    @if (! empty($additionalDetails))
-                                        <div class="instructions">
-                                            <label>{{ $additionalDetails['title'] }}</label>
-                                            <p>{{ $additionalDetails['value'] }}</p>
-                                        </div>
-                                    @endif
-
-                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.payment-method.after', ['order' => $order]) !!}
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.orders.view.after', ['order' => $order]) !!}
-
-        </div>
-
-    </div>
-
-@endsection
diff --git a/resources/themes/shop/views/customers/account/partials/sidemenu.blade.php b/resources/themes/shop/views/customers/account/partials/sidemenu.blade.php
deleted file mode 100644
index df0d6ad1f..000000000
--- a/resources/themes/shop/views/customers/account/partials/sidemenu.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="sidebar">
-    @foreach ($menu->items as $menuItem)
-        <div class="menu-block">
-            <div class="menu-block-title">
-                {{ trans($menuItem['name']) }}
-
-                <i class="icon icon-arrow-down right" id="down-icon"></i>
-            </div>
-
-            <div class="menu-block-content">
-                <ul class="menubar">
-                    @php
-                        $showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false;
-
-                        $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
-                    @endphp
-
-                    @if (! $showCompare)
-                        @php
-                            unset($menuItem['children']['compare']);
-                        @endphp
-                    @endif
-
-                    @if (! $showWishlist)
-                        @php
-                            unset($menuItem['children']['wishlist']);
-                        @endphp
-                    @endif
-
-                    @foreach ($menuItem['children'] as $subMenuItem)
-                        <li class="menu-item {{ $menu->getActive($subMenuItem) }}">
-                            <a href="{{ $subMenuItem['url'] }}">
-                                {{ trans($subMenuItem['name']) }}
-                            </a>
-
-                            <i class="icon angle-right-icon"></i>
-                        </li>
-                    @endforeach
-                </ul>
-            </div>
-        </div>
-    @endforeach
-</div>
-
-@push('scripts')
-<script>
-    $(document).ready(function() {
-        $(".icon.icon-arrow-down.right").on('click', function(e){
-            var currentElement = $(e.currentTarget);
-            if (currentElement.hasClass('icon-arrow-down')) {
-                $(this).parents('.menu-block').find('.menubar').show();
-                currentElement.removeClass('icon-arrow-down');
-                currentElement.addClass('icon-arrow-up');
-            } else {
-                $(this).parents('.menu-block').find('.menubar').hide();
-                currentElement.removeClass('icon-arrow-up');
-                currentElement.addClass('icon-arrow-down');
-            }
-        });
-    });
-</script>
-@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/profile/edit.blade.php b/resources/themes/shop/views/customers/account/profile/edit.blade.php
deleted file mode 100644
index db57418cf..000000000
--- a/resources/themes/shop/views/customers/account/profile/edit.blade.php
+++ /dev/null
@@ -1,122 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.customer.account.profile.edit-profile.page-title') }}
-@endsection
-
-@section('content-wrapper')
-    <div class="account-content">
-
-        @include('shop::customers.account.partials.sidemenu')
-
-        <div class="account-layout">
-
-            <div class="account-head mb-10">
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
-
-                <span class="account-heading">{{ __('shop::app.customer.account.profile.edit-profile.title') }}</span>
-
-                <span></span>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.profile.edit.before', ['customer' => $customer]) !!}
-
-            <form method="post" action="{{ route('customer.profile.store') }}" @submit.prevent="onSubmit">
-
-                <div class="edit-form">
-                    @csrf
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.before', ['customer' => $customer]) !!}
-
-                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
-                        <label for="first_name" class="required">{{ __('shop::app.customer.account.profile.fname') }}</label>
-
-                        <input type="text" class="control" name="first_name" value="{{ old('first_name') ?? $customer->first_name }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.fname') }}&quot;">
-                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.first_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
-                        <label for="last_name" class="required">{{ __('shop::app.customer.account.profile.lname') }}</label>
-
-                        <input type="text" class="control" name="last_name" value="{{ old('last_name') ?? $customer->last_name }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.lname') }}&quot;">
-                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.last_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('gender') ? 'has-error' : '']">
-                        <label for="email" class="required">{{ __('shop::app.customer.account.profile.gender') }}</label>
-
-                        <select name="gender" class="control" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.gender') }}&quot;">
-                            <option value=""  @if ($customer->gender == "") selected @endif></option>
-                            <option value="Other"  @if ($customer->gender == "Other") selected @endif>{{ __('shop::app.customer.account.profile.other') }}</option>
-                            <option value="Male"  @if ($customer->gender == "Male") selected @endif>{{ __('shop::app.customer.account.profile.male') }}</option>
-                            <option value="Female" @if ($customer->gender == "Female") selected @endif>{{ __('shop::app.customer.account.profile.female') }}</option>
-                        </select>
-                        <span class="control-error" v-if="errors.has('gender')">@{{ errors.first('gender') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.gender.after') !!}
-
-                    <div class="control-group"  :class="[errors.has('date_of_birth') ? 'has-error' : '']">
-                        <label for="date_of_birth">{{ __('shop::app.customer.account.profile.dob') }}</label>
-                        <input type="date" class="control" name="date_of_birth" value="{{ old('date_of_birth') ?? $customer->date_of_birth }}" v-validate="" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.dob') }}&quot;">
-                        <span class="control-error" v-if="errors.has('date_of_birth')">@{{ errors.first('date_of_birth') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.date_of_birth.after') !!}
-
-                    <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
-                        <label for="email" class="required">{{ __('shop::app.customer.account.profile.email') }}</label>
-                        <input type="email" class="control" name="email" value="{{ old('email') ?? $customer->email }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.email') }}&quot;">
-                        <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.email.after') !!}
-
-                    <div class="control-group" :class="[errors.has('oldpassword') ? 'has-error' : '']">
-                        <label for="password">{{ __('shop::app.customer.account.profile.opassword') }}</label>
-                        <input type="password" class="control" name="oldpassword" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.opassword') }}&quot;" v-validate="'min:6'">
-                        <span class="control-error" v-if="errors.has('oldpassword')">@{{ errors.first('oldpassword') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.oldpassword.after') !!}
-
-                    <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
-                        <label for="password">{{ __('shop::app.customer.account.profile.password') }}</label>
-
-                        <input type="password" id="password" class="control" name="password" ref="password" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.password') }}&quot;" v-validate="'min:6'">
-                        <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.password.after') !!}
-
-                    <div class="control-group" :class="[errors.has('password_confirmation') ? 'has-error' : '']">
-                        <label for="password">{{ __('shop::app.customer.account.profile.cpassword') }}</label>
-
-                        <input type="password" id="password_confirmation" class="control" name="password_confirmation" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.cpassword') }}&quot;" v-validate="'min:6|confirmed:password'">
-                        <span class="control-error" v-if="errors.has('password_confirmation')">@{{ errors.first('password_confirmation') }}</span>
-                    </div>
-
-                    <div class="control-group">
-                        <input type="checkbox" id="checkbox2" name="subscribed_to_news_letter" value="{{ $customer->subscribed_to_news_letter }}" {{ $customer->subscribed_to_news_letter ? 'checked' : ''}}>
-                        <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.after', ['customer' => $customer]) !!}
-
-                    <div class="button-group">
-                        <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.account.profile.submit') }}">
-                    </div>
-                </div>
-
-            </form>
-
-            {!! view_render_event('bagisto.shop.customers.account.profile.edit.after', ['customer' => $customer]) !!}
-
-        </div>
-
-    </div>
-@endsection
diff --git a/resources/themes/shop/views/customers/account/profile/index.blade.php b/resources/themes/shop/views/customers/account/profile/index.blade.php
deleted file mode 100644
index 6ad256cd7..000000000
--- a/resources/themes/shop/views/customers/account/profile/index.blade.php
+++ /dev/null
@@ -1,114 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.customer.account.profile.index.title') }}
-@endsection
-
-@section('content-wrapper')
-
-<div class="account-content">
-
-    @include('shop::customers.account.partials.sidemenu')
-
-    <div class="account-layout">
-
-        <div class="account-head">
-
-            <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
-
-            <span class="account-heading">{{ __('shop::app.customer.account.profile.index.title') }}</span>
-
-            <span class="account-action">
-                <a href="{{ route('customer.profile.edit') }}">{{ __('shop::app.customer.account.profile.index.edit') }}</a>
-            </span>
-
-            <div class="horizontal-rule"></div>
-        </div>
-
-         {!! view_render_event('bagisto.shop.customers.account.profile.view.before', ['customer' => $customer]) !!}
-
-        <div class="account-table-content" style="width: 50%;">
-            <table style="color: #5E5E5E;">
-                <tbody>
-                    {!! view_render_event(
-                    'bagisto.shop.customers.account.profile.view.table.before', ['customer' => $customer])
-                    !!}
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.profile.fname') }}</td>
-                        <td>{{ $customer->first_name }}</td>
-                    </tr>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.first_name.after', ['customer' => $customer]) !!}
-
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.profile.lname') }}</td>
-                        <td>{{ $customer->last_name }}</td>
-                    </tr>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.last_name.after', ['customer' => $customer]) !!}
-
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.profile.gender') }}</td>
-                        <td>{{ __($customer->gender) }}</td>
-                    </tr>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.gender.after', ['customer' => $customer]) !!}
-
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.profile.dob') }}</td>
-                        <td>{{ $customer->date_of_birth }}</td>
-                    </tr>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.date_of_birth.after', ['customer' => $customer]) !!}
-
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.profile.email') }}</td>
-                        <td>{{ $customer->email }}</td>
-                    </tr>
-                    {!! view_render_event(
-                    'bagisto.shop.customers.account.profile.view.table.after', ['customer' => $customer])
-                    !!}
-
-                    {{-- @if ($customer->subscribed_to_news_letter == 1)
-                        <tr>
-                            <td> {{ __('shop::app.footer.subscribe-newsletter') }}</td>
-                            <td>
-                                <a class="btn btn-sm btn-primary" href="{{ route('shop.unsubscribe', $customer->email) }}">{{ __('shop::app.subscription.unsubscribe') }} </a>
-                            </td>
-                        </tr>
-                    @endif --}}
-                </tbody>
-            </table>
-
-
-            <button type="submit" @click="showModal('deleteProfile')" class="btn btn-lg btn-primary mt-10">
-                {{ __('shop::app.customer.account.address.index.delete') }}
-            </button>
-
-            <form method="POST" action="{{ route('customer.profile.destroy') }}" @submit.prevent="onSubmit">
-                @csrf
-
-                <modal id="deleteProfile" :is-open="modalIds.deleteProfile">
-                    <h3 slot="header">{{ __('shop::app.customer.account.address.index.enter-password') }}</h3>
-
-                    <div slot="body">
-                        <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
-                            <label for="password" class="required">{{ __('admin::app.users.users.password') }}</label>
-                            <input type="password" v-validate="'required|min:6|max:18'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.users.password') }}&quot;"/>
-                            <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
-                        </div>
-
-                        <div class="page-action">
-                            <button type="submit"  class="btn btn-lg btn-primary mt-10">
-                            {{ __('shop::app.customer.account.address.index.delete') }}
-                            </button>
-                        </div>
-                    </div>
-                </modal>
-            </form>
-        </div>
-
-        {!! view_render_event('bagisto.shop.customers.account.profile.view.after', ['customer' => $customer]) !!}
-    </div>
-</div>
-@endsection
diff --git a/resources/themes/shop/views/customers/account/reviews/index.blade.php b/resources/themes/shop/views/customers/account/reviews/index.blade.php
deleted file mode 100644
index 28683a5c4..000000000
--- a/resources/themes/shop/views/customers/account/reviews/index.blade.php
+++ /dev/null
@@ -1,82 +0,0 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.customer.account.review.index.page-title') }}
-@endsection
-
-@section('content-wrapper')
-    <div class="account-content">
-        @include('shop::customers.account.partials.sidemenu')
-
-        <div class="account-layout">
-
-            <div class="account-head">
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
-
-                <span class="account-heading">{{ __('shop::app.customer.account.review.index.title') }}</span>
-
-                @if (count($reviews) > 1)
-                    <div class="account-action">
-                        <a href="{{ route('customer.review.deleteall') }}">{{ __('shop::app.customer.account.wishlist.deleteall') }}</a>
-                    </div>
-                @endif
-
-                <span></span>
-                <div class="horizontal-rule"></div>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.reviews.list.before', ['reviews' => $reviews]) !!}
-
-            <div class="account-items-list">
-                @if (! $reviews->isEmpty())
-                    @foreach ($reviews as $review)
-                        <div class="account-item-card mt-15 mb-15">
-                            <div class="media-info">
-                                <?php $image = $productImageHelper->getProductBaseImage($review->product); ?>
-                                <a href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}" title="{{ $review->product->name }}">
-                                    <img class="media" src="{{ $image['small_image_url'] }}" alt=""/>
-                                </a>
-
-                                <div class="info">
-                                    <div class="product-name">
-                                        <a href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}" title="{{ $review->product->name }}">
-                                            {{$review->product->name}}
-                                        </a>
-                                    </div>
-
-                                    <div class="stars mt-10">
-                                        @for($i=0 ; $i < $review->rating ; $i++)
-                                            <span class="icon star-icon"></span>
-                                        @endfor
-                                    </div>
-
-                                    <div class="mt-10">
-                                        {{ $review->comment }}
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="operations">
-                                <a class="mb-50" href="{{ route('customer.review.delete', $review->id) }}"><span class="icon trash-icon"></span></a>
-                            </div>
-                        </div>
-                        <div class="horizontal-rule mb-10 mt-10"></div>
-                    @endforeach
-
-                    <div class="bottom-toolbar">
-                        {{ $reviews->links()  }}
-                    </div>
-                @else
-                    <div class="empty mt-15">
-                        {{ __('customer::app.reviews.empty') }}
-                    </div>
-                @endif
-
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.reviews.list.after', ['reviews' => $reviews]) !!}
-        </div>
-    </div>
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/reviews/reviews.blade.php b/resources/themes/shop/views/customers/account/reviews/reviews.blade.php
deleted file mode 100644
index a86d410e1..000000000
--- a/resources/themes/shop/views/customers/account/reviews/reviews.blade.php
+++ /dev/null
@@ -1,52 +0,0 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.customer.account.review.view.page-title') }}
-@endsection
-
-@section('content-wrapper')
-    <div class="account-content">
-        @include('shop::customers.account.partials.sidemenu')
-
-        <div class="account-layout">
-            <div class="account-head">
-                <span class="account-heading">Reviews</span>
-                <div class="horizontal-rule"></div>
-            </div>
-
-            <div class="account-items-list">
-                @if (count($reviews))
-                    @foreach ($reviews as $review)
-                    <div class="account-item-card mt-15 mb-15">
-                        <div class="media-info">
-                            <?php $image = $productImageHelper->getGalleryImages($review->product); ?>
-                            <img class="media" src="{{ $image[0]['small_image_url'] }}" alt="" />
-
-                            <div class="info mt-20">
-                                <div class="product-name">{{$review->product->name}}</div>
-
-                                <div>
-                                    @for($i=0;$i<$review->rating;$i++)
-                                        <span class="icon star-icon"></span>
-                                    @endfor
-                                </div>
-
-                                <div>
-                                    {{ $review->comment }}
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="horizontal-rule mb-10 mt-10"></div>
-                    @endforeach
-                @else
-                    <div class="empty">
-                        {{ __('customer::app.reviews.empty') }}
-                    </div>
-                @endif
-            </div>
-        </div>
-    </div>
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/account/wishlist/wishlist.blade.php b/resources/themes/shop/views/customers/account/wishlist/wishlist.blade.php
deleted file mode 100644
index 2ca3bd5a3..000000000
--- a/resources/themes/shop/views/customers/account/wishlist/wishlist.blade.php
+++ /dev/null
@@ -1,94 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.customer.account.wishlist.page-title') }}
-@endsection
-
-@section('content-wrapper')
-    <div class="account-content">
-        @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
-        @include('shop::customers.account.partials.sidemenu')
-
-        @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
-
-        <div class="account-layout">
-
-            <div class="account-head mb-15">
-                <span class="account-heading">{{ __('shop::app.customer.account.wishlist.title') }}</span>
-
-                @if (count($items))
-                    <div class="account-action">
-                        <a href="{{ route('customer.wishlist.removeall') }}">{{ __('shop::app.customer.account.wishlist.deleteall') }}</a>
-                    </div>
-                @endif
-
-                <div class="horizontal-rule"></div>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.wishlist.list.before', ['wishlist' => $items]) !!}
-
-            <div class="account-items-list">
-
-                @if ($items->count())
-                    @foreach ($items as $item)
-                        <div class="account-item-card mt-15 mb-15">
-                            <div class="media-info">
-                                @php
-                                    $image = $item->product->getTypeInstance()->getBaseImage($item);
-                                @endphp
-
-                                <img class="media" src="{{ $image['small_image_url'] }}" alt="" />
-
-                                <div class="info">
-                                    <div class="product-name">
-                                        {{ $item->product->name }}
-
-                                        @if (isset($item->additional['attributes']))
-                                            <div class="item-options">
-
-                                                @foreach ($item->additional['attributes'] as $attribute)
-                                                    <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                                @endforeach
-
-                                            </div>
-                                        @endif
-                                    </div>
-
-                                    <span class="stars" style="display: inline">
-                                        @for ($i = 1; $i <= $reviewHelper->getAverageRating($item->product); $i++)
-                                            <span class="icon star-icon"></span>
-                                        @endfor
-                                    </span>
-                                </div>
-                            </div>
-
-                            <div class="operations">
-                                <a class="mb-50" href="{{ route('customer.wishlist.remove', $item->id) }}">
-                                    <span class="icon trash-icon"></span>
-                                </a>
-
-                                <a href="{{ route('customer.wishlist.move', $item->id) }}" class="btn btn-primary btn-md">
-                                    {{ __('shop::app.customer.account.wishlist.move-to-cart') }}
-                                </a>
-                            </div>
-                        </div>
-
-                        <div class="horizontal-rule mb-10 mt-10"></div>
-                    @endforeach
-
-                    <div class="bottom-toolbar">
-                        {{ $items->links()  }}
-                    </div>
-                @else
-                    <div class="empty">
-                        {{ __('customer::app.wishlist.empty') }}
-                    </div>
-                @endif
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.wishlist.list.after', ['wishlist' => $items]) !!}
-
-        </div>
-    </div>
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/session/index.blade.php b/resources/themes/shop/views/customers/session/index.blade.php
deleted file mode 100644
index 38bdbc9b1..000000000
--- a/resources/themes/shop/views/customers/session/index.blade.php
+++ /dev/null
@@ -1,57 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.customer.login-form.page-title') }}
-@endsection
-
-@section('content-wrapper')
-
-    <div class="auth-content">
-        <div class="sign-up-text">
-            {{ __('shop::app.customer.login-text.no_account') }} - <a href="{{ route('customer.register.index') }}">{{ __('shop::app.customer.login-text.title') }}</a>
-        </div>
-
-        {!! view_render_event('bagisto.shop.customers.login.before') !!}
-
-        <form method="POST" action="{{ route('customer.session.create') }}" @submit.prevent="onSubmit">
-            {{ csrf_field() }}
-            <div class="login-form">
-                <div class="login-text">{{ __('shop::app.customer.login-form.title') }}</div>
-
-                {!! view_render_event('bagisto.shop.customers.login_form_controls.before') !!}
-
-                <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
-                    <label for="email" class="required">{{ __('shop::app.customer.login-form.email') }}</label>
-                    <input type="text" class="control" name="email" v-validate="'required|email'" value="{{ old('email') }}" data-vv-as="&quot;{{ __('shop::app.customer.login-form.email') }}&quot;">
-                    <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
-                </div>
-
-                <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
-                    <label for="password" class="required">{{ __('shop::app.customer.login-form.password') }}</label>
-                    <input type="password" v-validate="'required|min:6'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.sessions.password') }}&quot;" value=""/>
-                    <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
-                </div>
-
-                {!! view_render_event('bagisto.shop.customers.login_form_controls.after') !!}
-
-                <div class="forgot-password-link">
-                    <a href="{{ route('customer.forgot-password.create') }}">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
-
-                    <div class="mt-10">
-                        @if (Cookie::has('enable-resend'))
-                            @if (Cookie::get('enable-resend') == true)
-                                <a href="{{ route('customer.resend.verification-email', Cookie::get('email-for-resend')) }}">{{ __('shop::app.customer.login-form.resend-verification') }}</a>
-                            @endif
-                        @endif
-                    </div>
-                </div>
-
-                <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.login-form.button_title') }}">
-            </div>
-        </form>
-
-        {!! view_render_event('bagisto.shop.customers.login.after') !!}
-    </div>
-
-@stop
-
diff --git a/resources/themes/shop/views/customers/signup/forgot-password.blade.php b/resources/themes/shop/views/customers/signup/forgot-password.blade.php
deleted file mode 100644
index f21a32a6e..000000000
--- a/resources/themes/shop/views/customers/signup/forgot-password.blade.php
+++ /dev/null
@@ -1,61 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
- {{ __('shop::app.customer.forgot-password.page_title') }}
-@stop
-
-@push('css')
-    <style>
-        .button-group {
-            margin-bottom: 25px;
-        }
-        .primary-back-icon {
-            vertical-align: middle;
-        }
-    </style>
-@endpush
-
-@section('content-wrapper')
-
-<div class="auth-content">
-
-    {!! view_render_event('bagisto.shop.customers.forget_password.before') !!}
-
-    <form method="post" action="{{ route('customer.forgot-password.store') }}" @submit.prevent="onSubmit">
-
-        {{ csrf_field() }}
-
-        <div class="login-form">
-
-            <div class="login-text">{{ __('shop::app.customer.forgot-password.title') }}</div>
-
-            {!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!}
-
-            <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
-                <label for="email">{{ __('shop::app.customer.forgot-password.email') }}</label>
-                <input type="email" class="control" name="email" v-validate="'required|email'">
-                <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!}
-
-            <div class="button-group">
-                <button type="submit" class="btn btn-lg btn-primary">
-                    {{ __('shop::app.customer.forgot-password.submit') }}
-                </button>
-            </div>
-
-            <div class="control-group" style="margin-bottom: 0px;">
-                <a href="{{ route('customer.session.index') }}">
-                    <i class="icon primary-back-icon"></i>
-                    {{ __('shop::app.customer.reset-password.back-link-title') }}
-                </a>
-            </div>
-
-        </div>
-    </form>
-
-    {!! view_render_event('bagisto.shop.customers.forget_password.before') !!}
-
-</div>
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/customers/signup/index.blade.php b/resources/themes/shop/views/customers/signup/index.blade.php
deleted file mode 100644
index 9f1598a08..000000000
--- a/resources/themes/shop/views/customers/signup/index.blade.php
+++ /dev/null
@@ -1,95 +0,0 @@
-@extends('shop::layouts.master')
-@section('page_title')
-    {{ __('shop::app.customer.signup-form.page-title') }}
-@endsection
-@section('content-wrapper')
-
-<div class="auth-content">
-
-    <div class="sign-up-text">
-        {{ __('shop::app.customer.signup-text.account_exists') }} - <a href="{{ route('customer.session.index') }}">{{ __('shop::app.customer.signup-text.title') }}</a>
-    </div>
-
-    {!! view_render_event('bagisto.shop.customers.signup.before') !!}
-
-    <form method="post" action="{{ route('customer.register.create') }}" @submit.prevent="onSubmit">
-
-        {{ csrf_field() }}
-
-        <div class="login-form">
-            <div class="login-text">{{ __('shop::app.customer.signup-form.title') }}</div>
-
-            {!! view_render_event('bagisto.shop.customers.signup_form_controls.before') !!}
-
-            <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
-                <label for="first_name" class="required">{{ __('shop::app.customer.signup-form.firstname') }}</label>
-                <input type="text" class="control" name="first_name" v-validate="'required'" value="{{ old('first_name') }}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.firstname') }}&quot;">
-                <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.signup_form_controls.firstname.after') !!}
-
-            <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
-                <label for="last_name" class="required">{{ __('shop::app.customer.signup-form.lastname') }}</label>
-                <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ old('last_name') }}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.lastname') }}&quot;">
-                <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.signup_form_controls.lastname.after') !!}
-
-            <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
-                <label for="email" class="required">{{ __('shop::app.customer.signup-form.email') }}</label>
-                <input type="email" class="control" name="email" v-validate="'required|email'" value="{{ old('email') }}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.email') }}&quot;">
-                <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.signup_form_controls.email.after') !!}
-
-            <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
-                <label for="password" class="required">{{ __('shop::app.customer.signup-form.password') }}</label>
-                <input type="password" class="control" name="password" v-validate="'required|min:6'" ref="password" value="{{ old('password') }}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.password') }}&quot;">
-                <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.signup_form_controls.password.after') !!}
-
-            <div class="control-group" :class="[errors.has('password_confirmation') ? 'has-error' : '']">
-                <label for="password_confirmation" class="required">{{ __('shop::app.customer.signup-form.confirm_pass') }}</label>
-                <input type="password" class="control" name="password_confirmation"  v-validate="'required|min:6|confirmed:password'" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.confirm_pass') }}&quot;">
-                <span class="control-error" v-if="errors.has('password_confirmation')">@{{ errors.first('password_confirmation') }}</span>
-            </div>
-
-            {{-- <div class="signup-confirm" :class="[errors.has('agreement') ? 'has-error' : '']">
-                <span class="checkbox">
-                    <input type="checkbox" id="checkbox2" name="agreement" v-validate="'required'">
-                    <label class="checkbox-view" for="checkbox2"></label>
-                    <span>{{ __('shop::app.customer.signup-form.agree') }}
-                        <a href="">{{ __('shop::app.customer.signup-form.terms') }}</a> & <a href="">{{ __('shop::app.customer.signup-form.conditions') }}</a> {{ __('shop::app.customer.signup-form.using') }}.
-                    </span>
-                </span>
-                <span class="control-error" v-if="errors.has('agreement')">@{{ errors.first('agreement') }}</span>
-            </div> --}}
-
-            {{-- <span class="checkbox">
-                <input type="checkbox" id="checkbox1" name="checkbox[]">
-                <label class="checkbox-view" for="checkbox1"></label>
-                Checkbox Value 1
-            </span> --}}
-
-            <div class="control-group">
-                <input type="checkbox" id="checkbox2" name="is_subscribed">
-                <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.signup_form_controls.after') !!}
-
-            <button class="btn btn-primary btn-lg" type="submit">
-                {{ __('shop::app.customer.signup-form.button_title') }}
-            </button>
-
-        </div>
-    </form>
-
-    {!! view_render_event('bagisto.shop.customers.signup.after') !!}
-</div>
-@endsection
diff --git a/resources/themes/shop/views/customers/signup/reset-password.blade.php b/resources/themes/shop/views/customers/signup/reset-password.blade.php
deleted file mode 100644
index feb0962ad..000000000
--- a/resources/themes/shop/views/customers/signup/reset-password.blade.php
+++ /dev/null
@@ -1,52 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
- {{ __('shop::app.customer.reset-password.title') }}
-@endsection
-
-@section('content-wrapper')
-
-<div class="auth-content">
-
-    {!! view_render_event('bagisto.shop.customers.reset_password.before') !!}
-
-    <form method="post" action="{{ route('customer.reset-password.store') }}" >
-
-        {{ csrf_field() }}
-
-        <div class="login-form">
-
-            <div class="login-text">{{ __('shop::app.customer.reset-password.title') }}</div>
-
-            <input type="hidden" name="token" value="{{ old('token') ?: $token }}">
-
-            {!! view_render_event('bagisto.shop.customers.reset_password_form_controls.before') !!}
-
-            <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
-                <label for="email">{{ __('shop::app.customer.reset-password.email') }}</label>
-                <input type="text" v-validate="'required|email'" class="control" id="email" name="email" value="{{ old('email') }}"/>
-                <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
-                <label for="password">{{ __('shop::app.customer.reset-password.password') }}</label>
-                <input type="password" class="control" name="password" v-validate="'required|min:6'" ref="password">
-                <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('confirm_password') ? 'has-error' : '']">
-                <label for="confirm_password">{{ __('shop::app.customer.reset-password.confirm-password') }}</label>
-                <input type="password" class="control" name="password_confirmation"  v-validate="'required|min:6|confirmed:password'">
-                <span class="control-error" v-if="errors.has('confirm_password')">@{{ errors.first('confirm_password') }}</span>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.reset_password_form_controls.before') !!}
-
-            <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.reset-password.submit-btn-title') }}">
-
-        </div>
-    </form>
-
-    {!! view_render_event('bagisto.shop.customers.reset_password.before') !!}
-</div>
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/admin/forget-password.blade.php b/resources/themes/shop/views/emails/admin/forget-password.blade.php
deleted file mode 100644
index 4e312d436..000000000
--- a/resources/themes/shop/views/emails/admin/forget-password.blade.php
+++ /dev/null
@@ -1,38 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
-                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
-            @else
-                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
-            @endif
-        </a>
-    </div>
-
-    <div style="padding: 30px;">
-        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.forget-password.dear', ['name' => $user_name]) }},
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.forget-password.info') }}
-            </p>
-
-            <p style="text-align: center;padding: 20px 0;">
-                <a href="{{ route('admin.reset-password.create', $token) }}" style="padding: 10px 20px;background: #0041FF;color: #ffffff;text-transform: uppercase;text-decoration: none; font-size: 16px">
-                    {{ __('shop::app.mail.forget-password.reset-password') }}
-                </a>
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.forget-password.final-summary') }}
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.forget-password.thanks') }}
-            </p>
-
-        </div>
-    </div>
-@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/admin/update-password.blade.php b/resources/themes/shop/views/emails/admin/update-password.blade.php
deleted file mode 100644
index f1759daed..000000000
--- a/resources/themes/shop/views/emails/admin/update-password.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
-                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
-            @else
-                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
-            @endif
-        </a>
-    </div>
-
-    <div style="padding: 30px;">
-        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-            {{ __('shop::app.mail.update-password.dear', ['name' => $user->name]) }},
-        </p>
-
-        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-            {{ __('shop::app.mail.update-password.info') }}
-        </p>
-
-        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-            {{ __('shop::app.mail.update-password.thanks') }}
-        </p>
-    </div>
-@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/customer/forget-password.blade.php b/resources/themes/shop/views/emails/customer/forget-password.blade.php
deleted file mode 100644
index 685346631..000000000
--- a/resources/themes/shop/views/emails/customer/forget-password.blade.php
+++ /dev/null
@@ -1,34 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @include ('shop::emails.layouts.logo')
-        </a>
-    </div>
-
-    <div style="padding: 30px;">
-        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.forget-password.dear', ['name' => $user_name]) }},
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.forget-password.info') }}
-            </p>
-
-            <p style="text-align: center;padding: 20px 0;">
-                <a href="{{ route('customer.reset-password.create', $token) }}" style="padding: 10px 20px;background: #0041FF;color: #ffffff;text-transform: uppercase;text-decoration: none; font-size: 16px">
-                    {{ __('shop::app.mail.forget-password.reset-password') }}
-                </a>
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.forget-password.final-summary') }}
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.forget-password.thanks') }}
-            </p>
-
-        </div>
-    </div>
-@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/customer/new-customer.blade.php b/resources/themes/shop/views/emails/customer/new-customer.blade.php
deleted file mode 100644
index 8fcbfd931..000000000
--- a/resources/themes/shop/views/emails/customer/new-customer.blade.php
+++ /dev/null
@@ -1,30 +0,0 @@
-@component('shop::emails.layouts.master')
-
-    <div>
-        <div style="text-align: center;">
-            <a href="{{ config('app.url') }}">
-                @include ('shop::emails.layouts.logo')
-            </a>
-        </div>
-
-        <div  style="font-size:16px; color:#242424; font-weight:600; margin-top: 60px; margin-bottom: 15px">
-            {{ __('shop::app.mail.customer.new.dear', ['customer_name' => $customer['name']]) }},
-
-        </div>
-
-        <div>
-            {!! __('shop::app.mail.customer.new.summary') !!}
-
-        </div>
-
-        <div>
-            <b> {!! __('shop::app.mail.customer.new.username-email') !!} </b> - {{ $customer['email'] }} <br>
-            <b> {!! __('shop::app.mail.customer.new.password') !!} </b> - {{ $password}}
-        </div>
-
-        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-            {{ __('shop::app.mail.customer.new.thanks') }}
-        </p>
-    </div>
-
-@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/customer/registration.blade.php b/resources/themes/shop/views/emails/customer/registration.blade.php
deleted file mode 100644
index 384fd29e7..000000000
--- a/resources/themes/shop/views/emails/customer/registration.blade.php
+++ /dev/null
@@ -1,32 +0,0 @@
-@component('shop::emails.layouts.master')
-
-    <div>
-        <div style="text-align: center;">
-            <a href="{{ config('app.url') }}">
-                @include ('shop::emails.layouts.logo')
-            </a>
-        </div>
-
-
-        <div style="padding: 30px;">
-            <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
-                <p style="font-weight: bold;font-size: 20px;color: #242424;line-height: 24px;">
-                    {{ __('shop::app.mail.customer.registration.dear', ['customer_name' => $data['first_name']. ' ' .$data['last_name']]) }},
-                </p>
-
-                <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                    {!! __('shop::app.mail.customer.registration.greeting') !!}
-                </p>
-            </div>
-
-            <div style="font-size: 16px;color: #5E5E5E;line-height: 30px;margin-bottom: 20px !important;">
-                {{ __('shop::app.mail.customer.registration.summary') }}
-            </div>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.customer.registration.thanks') }}
-            </p>
-        </div>
-    </div>
-
-@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/customer/subscription-email.blade.php b/resources/themes/shop/views/emails/customer/subscription-email.blade.php
deleted file mode 100644
index b7be2a8d2..000000000
--- a/resources/themes/shop/views/emails/customer/subscription-email.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-@component('shop::emails.layouts.master')
-
-    <div>
-        <div style="text-align: center;">
-            <a href="{{ config('app.url') }}">
-                @include ('shop::emails.layouts.logo')
-            </a>
-        </div>
-
-        <div  style="font-size:16px; color:#242424; font-weight:600; margin-top: 60px; margin-bottom: 15px">
-            {!! __('shop::app.mail.customer.subscription.greeting') !!}
-        </div>
-
-        <div>
-            {!! __('shop::app.mail.customer.subscription.summary') !!}
-        </div>
-
-        <div  style="margin-top: 40px; text-align: center">
-            <a href="{{ route('shop.unsubscribe', $data['token']) }}" style="font-size: 16px;
-            color: #FFFFFF; text-align: center; background: #0031F0; padding: 10px 100px;text-decoration: none;">
-                {!! __('shop::app.mail.customer.subscription.unsubscribe') !!}
-            </a>
-        </div>
-    </div>
-
-@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/customer/update-password.blade.php b/resources/themes/shop/views/emails/customer/update-password.blade.php
deleted file mode 100644
index 4d616875f..000000000
--- a/resources/themes/shop/views/emails/customer/update-password.blade.php
+++ /dev/null
@@ -1,21 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @include ('shop::emails.layouts.logo')
-        </a>
-    </div>
-
-    <div style="padding: 30px;">
-        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-            {{ __('shop::app.mail.update-password.dear', ['name' => $user->name]) }},
-        </p>
-
-        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-            {{ __('shop::app.mail.update-password.info') }}
-        </p>
-
-        <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-            {{ __('shop::app.mail.update-password.thanks') }}
-        </p>
-    </div>
-@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/customer/verification-email.blade.php b/resources/themes/shop/views/emails/customer/verification-email.blade.php
deleted file mode 100644
index fda82f400..000000000
--- a/resources/themes/shop/views/emails/customer/verification-email.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-@component('shop::emails.layouts.master')
-
-    <div>
-        <div style="text-align: center;">
-            <a href="{{ config('app.url') }}">
-                @include ('shop::emails.layouts.logo')
-            </a>
-        </div>
-
-        <div  style="font-size:16px; color:#242424; font-weight:600; margin-top: 60px; margin-bottom: 15px">
-                {!! __('shop::app.mail.customer.verification.heading') !!}
-        </div>
-
-        <div>
-            {!! __('shop::app.mail.customer.verification.summary') !!}
-        </div>
-
-        <div  style="margin-top: 40px; text-align: center">
-            <a href="{{ route('customer.verify', $data['token']) }}" style="font-size: 16px;
-            color: #FFFFFF; text-align: center; background: #0031F0; padding: 10px 100px;text-decoration: none;">
-                {!! __('shop::app.mail.customer.verification.verify') !!}
-            </a>
-        </div>
-    </div>
-
-@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/layouts/logo.blade.php b/resources/themes/shop/views/emails/layouts/logo.blade.php
deleted file mode 100644
index 20ed0570d..000000000
--- a/resources/themes/shop/views/emails/layouts/logo.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@if ($logo = core()->getCurrentChannel()->logo_url)
-    <img src="{{ $logo }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
-@else
-    <img src="{{ bagisto_asset('images/logo.svg') }}" alt="">
-@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/layouts/master.blade.php b/resources/themes/shop/views/emails/layouts/master.blade.php
deleted file mode 100644
index 9451f8cf1..000000000
--- a/resources/themes/shop/views/emails/layouts/master.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="https://fonts.googleapis.com/css?family=Montserrat:400,500" rel="stylesheet" type="text/css">
-    </head>
-
-    <body style="font-family: montserrat, sans-serif;">
-        <div style="max-width: 1000px; margin-left: auto; margin-right: auto;">
-            <div style="text-align: center;">
-                {{ $header ?? '' }}
-            </div>
-
-            <div>
-                {{ $slot }}
-
-                {{ $subcopy ?? '' }}
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/resources/themes/shop/views/emails/sales/new-admin-order.blade.php b/resources/themes/shop/views/emails/sales/new-admin-order.blade.php
deleted file mode 100644
index 6009ab0d8..000000000
--- a/resources/themes/shop/views/emails/sales/new-admin-order.blade.php
+++ /dev/null
@@ -1,221 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
-                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
-            @else
-                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
-            @endif
-        </a>
-    </div>
-
-    <div style="padding: 30px;">
-        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
-            <span style="font-weight: bold;">
-                {{ __('shop::app.mail.order.heading') }}
-            </span> <br>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-            {{ __('shop::app.mail.order.dear-admin', ['admin_name' => config('mail.from.name')]) }},
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!! __('shop::app.mail.order.greeting-admin', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
-                    'created_at' => $order->created_at
-                    ])
-                !!}
-            </p>
-        </div>
-
-        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
-            {{ __('shop::app.mail.order.summary') }}
-        </div>
-
-        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.shipping-address') }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
-                </div>
-
-                <div style="font-size: 16px;color: #242424; font-weight: bold">
-                    {{ __('shop::app.mail.order.shipping') }}
-                </div>
-
-                <div style="font-size: 16px;color: #242424;">
-                    {{ $order->shipping_title }}
-                </div>
-            </div>
-
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.billing-address') }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424; font-weight: bold">
-                    {{ __('shop::app.mail.order.payment') }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-                </div>
-
-                @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
-
-                @if (! empty($additionalDetails))
-                    <div style="font-size: 16px; color: #242424;">
-                        <div>{{ $additionalDetails['title'] }}</div>
-                        <div>{{ $additionalDetails['value'] }}</div>
-                    </div>
-                @endif
-            </div>
-        </div>
-
-        <div class="section-content">
-            <div class="table mb-20">
-                <table style="overflow-x: auto; border-collapse: collapse;
-                border-spacing: 0;width: 100%">
-                    <thead>
-                        <tr style="background-color: #f2f2f2">
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                        </tr>
-                    </thead>
-
-                    <tbody>
-                        @foreach ($order->items as $item)
-                            <tr>
-                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">
-                                    {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
-                                </td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
-                                    {{ $item->name }}
-
-                                    @if (isset($item->additional['attributes']))
-                                        <div class="item-options">
-
-                                            @foreach ($item->additional['attributes'] as $attribute)
-                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                            @endforeach
-
-                                        </div>
-                                    @endif
-                                </td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">
-                                    {{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                                </td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">
-                                    {{ $item->qty_ordered }}
-                                </td>
-                            </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
-            <div>
-                <span>{{ __('shop::app.mail.order.subtotal') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatBasePrice($order->base_sub_total) }}
-                </span>
-            </div>
-
-            <div>
-                <span>{{ __('shop::app.mail.order.shipping-handling') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatBasePrice($order->base_shipping_amount) }}
-                </span>
-            </div>
-
-            @foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($order, true) as $taxRate => $baseTaxAmount )
-            <div>
-                <span id="taxrate-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ __('shop::app.mail.order.tax') }} {{ $taxRate }} %</span>
-                <span id="basetaxamount-{{ core()->taxRateAsIdentifier($taxRate) }}" style="float: right;">
-                    {{ core()->formatBasePrice($baseTaxAmount) }}
-                </span>
-            </div>
-            @endforeach
-
-            @if ($order->discount_amount > 0)
-                <div>
-                    <span>{{ __('shop::app.mail.order.discount') }}</span>
-                    <span style="float: right;">
-                        {{ core()->formatBasePrice($order->base_discount_amount) }}
-                    </span>
-                </div>
-            @endif
-
-            <div style="font-weight: bold">
-                <span>{{ __('shop::app.mail.order.grand-total') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatBasePrice($order->base_grand_total) }}
-                </span>
-            </div>
-        </div>
-
-        <div style="width: 100%;margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!!
-                    __('shop::app.mail.order.help', [
-                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.admin.address') . '">' . config('mail.admin.address') . '</a>'
-                        ])
-                !!}
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.thanks') }}
-            </p>
-        </div>
-    </div>
-@endcomponent
diff --git a/resources/themes/shop/views/emails/sales/new-inventorysource-shipment.blade.php b/resources/themes/shop/views/emails/sales/new-inventorysource-shipment.blade.php
deleted file mode 100644
index 487d297ca..000000000
--- a/resources/themes/shop/views/emails/sales/new-inventorysource-shipment.blade.php
+++ /dev/null
@@ -1,172 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
-                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
-            @else
-                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
-            @endif
-        </a>
-    </div>
-
-    <?php $order = $shipment->order; ?>
-    <?php $inventory = $shipment->inventory_source; ?>
-
-    <div style="padding: 30px;">
-        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
-            <span style="font-weight: bold;">
-                {{ __('shop::app.mail.shipment.inventory-heading', ['order_id' => $order->increment_id, 'shipment_id' => $shipment->id]) }}
-            </span> <br>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.dear', ['customer_name' => $inventory->name]) }},
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!! __('shop::app.mail.shipment.greeting', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
-                    'created_at' => $order->created_at
-                    ])
-                !!}
-            </p>
-        </div>
-
-
-
-        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.shipping-address') }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
-                </div>
-
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.shipping') }}
-                </div>
-
-                <div style="font-size: 16px;color: #242424;">
-                    <div style="font-weight: bold;">
-                        {{ $order->shipping_title }}
-                    </div>
-
-                    <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
-                    </div>
-
-                    <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
-                    </div>
-                </div>
-            </div>
-
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.billing-address') }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-                </div>
-
-                <div style="font-weight: bold; font-size: 16px; color: #242424;">
-                    {{ __('shop::app.mail.order.payment') }}
-                </div>
-
-                <div style="font-weight: bold; font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-                </div>
-            </div>
-        </div>
-
-        <div class="section-content">
-            <div class="table mb-20">
-                <table style="overflow-x: auto; border-collapse: collapse;
-                border-spacing: 0;width: 100%">
-                    <thead>
-                        <tr style="background-color: #f2f2f2">
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                        </tr>
-                    </thead>
-
-                    <tbody>
-                        @foreach ($shipment->items as $item)
-                            <tr>
-                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">{{ $item->sku }}</td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
-                                    {{ $item->name }}
-
-                                    @if (isset($item->additional['attributes']))
-                                        <div class="item-options">
-
-                                            @foreach ($item->additional['attributes'] as $attribute)
-                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                            @endforeach
-
-                                        </div>
-                                    @endif
-                                </td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">{{ $item->qty }}</td>
-                            </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        {{-- <div style="margin-top: 20px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block;width: 100%">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!!
-                    __('shop::app.mail.order.help', [
-                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
-                        ])
-                !!}
-            </p>
-        </div> --}}
-    </div>
-@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/sales/new-invoice.blade.php b/resources/themes/shop/views/emails/sales/new-invoice.blade.php
deleted file mode 100644
index 6a1b71ce5..000000000
--- a/resources/themes/shop/views/emails/sales/new-invoice.blade.php
+++ /dev/null
@@ -1,211 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @include ('shop::emails.layouts.logo')
-        </a>
-    </div>
-
-    <?php $order = $invoice->order; ?>
-
-    <div style="padding: 30px;">
-        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
-            <span style="font-weight: bold;">
-                {{ __('shop::app.mail.invoice.heading', ['order_id' => $order->increment_id, 'invoice_id' => $invoice->id]) }}
-            </span> <br>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!! __('shop::app.mail.order.greeting', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
-                    'created_at' => $order->created_at
-                    ])
-                !!}
-            </p>
-        </div>
-
-        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
-            {{ __('shop::app.mail.invoice.summary') }}
-        </div>
-
-        <div
-            style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
-            @if ($order->shipping_address)
-                <div style="line-height: 25px;">
-                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                        {{ __('shop::app.mail.order.shipping-address') }}
-                    </div>
-
-                    <div>
-                        {{ $order->shipping_address->company_name ?? '' }}
-                    </div>
-
-                    <div>
-                        {{ $order->shipping_address->name }}
-                    </div>
-
-                    <div>
-                        {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
-                    </div>
-
-                    <div>
-                        {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
-                    </div>
-
-                    <div>---</div>
-
-                    <div style="margin-bottom: 40px;">
-                        {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
-                    </div>
-
-                    <div style="font-size: 16px;color: #242424;">
-                        {{ __('shop::app.mail.order.shipping') }}
-                    </div>
-
-                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                        {{ $order->shipping_title }}
-                    </div>
-                </div>
-            @endif
-
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.billing-address') }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424;">
-                    {{ __('shop::app.mail.order.payment') }}
-                </div>
-
-                <div style="font-weight: bold;font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-                </div>
-            </div>
-        </div>
-
-        <div class="section-content">
-            <div class="table mb-20">
-                <table style="overflow-x: auto; border-collapse: collapse;
-                border-spacing: 0;width: 100%">
-                    <thead>
-                    <tr style="background-color: #f2f2f2">
-                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
-                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                    </tr>
-                    </thead>
-
-                    <tbody>
-                    @foreach ($invoice->items as $item)
-                        <tr>
-                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}"
-                                style="text-align: left;padding: 8px">
-                                {{ $item->name }}
-
-                                @if (isset($item->additional['attributes']))
-                                    <div class="item-options">
-
-                                        @foreach ($item->additional['attributes'] as $attribute)
-                                            <b>{{ $attribute['attribute_name'] }}
-                                                : </b>{{ $attribute['option_label'] }}</br>
-                                        @endforeach
-
-                                    </div>
-                                @endif
-                            </td>
-
-                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}"
-                                style="text-align: left;padding: 8px">{{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                            </td>
-
-                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}"
-                                style="text-align: left;padding: 8px">{{ $item->qty }}</td>
-                        </tr>
-
-                    @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
-            <div>
-                <span>{{ __('shop::app.mail.order.subtotal') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatPrice($invoice->sub_total, $invoice->order_currency_code) }}
-                </span>
-            </div>
-
-            @if ($order->shipping_address)
-                <div>
-                    <span>{{ __('shop::app.mail.order.shipping-handling') }}</span>
-                    <span style="float: right;">
-                        {{ core()->formatPrice($invoice->shipping_amount, $invoice->order_currency_code) }}
-                    </span>
-                </div>
-            @endif
-
-            <div>
-                <span>{{ __('shop::app.mail.order.tax') }}</span>
-                <span id="taxamount" style="float: right;">
-                    {{ core()->formatPrice($invoice->tax_amount, $order->order_currency_code) }}
-                </span>
-            </div>
-
-            @if ($invoice->discount_amount > 0)
-                <div>
-                    <span>{{ __('shop::app.mail.order.discount') }}</span>
-                    <span style="float: right;">
-                        {{ core()->formatPrice($invoice->discount_amount, $invoice->order_currency_code) }}
-                    </span>
-                </div>
-            @endif
-
-            <div style="font-weight: bold">
-                <span>{{ __('shop::app.mail.order.grand-total') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatPrice($invoice->grand_total, $invoice->order_currency_code) }}
-                </span>
-            </div>
-        </div>
-
-        <div
-            style="margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block;width: 100%">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!!
-                    __('shop::app.mail.order.help', [
-                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
-                        ])
-                !!}
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.thanks') }}
-            </p>
-        </div>
-    </div>
-@endcomponent
diff --git a/resources/themes/shop/views/emails/sales/new-order-comment.blade.php b/resources/themes/shop/views/emails/sales/new-order-comment.blade.php
deleted file mode 100644
index 0d8c19672..000000000
--- a/resources/themes/shop/views/emails/sales/new-order-comment.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @include ('shop::emails.layouts.logo')
-        </a>
-    </div>
-
-    <div style="padding: 30px;">
-        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.comment.dear', ['customer_name' => $comment->order->customer_full_name]) }},
-            </p>
-        </div>
-
-        <div style="line-height: 30px;margin-bottom: 20px !important;">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;font-style: italic;">
-                {{ $comment->comment }}
-            </p>
-        </div>
-
-        <div style="margin-top: 20px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!!
-                    __('shop::app.mail.order.comment.help', [
-                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
-                        ])
-                !!}
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.comment.thanks') }}
-            </p>
-        </div>
-    </div>
-@endcomponent
diff --git a/resources/themes/shop/views/emails/sales/new-order.blade.php b/resources/themes/shop/views/emails/sales/new-order.blade.php
deleted file mode 100644
index 2db328e2b..000000000
--- a/resources/themes/shop/views/emails/sales/new-order.blade.php
+++ /dev/null
@@ -1,220 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @include ('shop::emails.layouts.logo')
-        </a>
-    </div>
-
-    <div style="padding: 30px;">
-        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
-            <span style="font-weight: bold;">
-                {{ __('shop::app.mail.order.heading') }}
-            </span> <br>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!! __('shop::app.mail.order.greeting', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
-                    'created_at' => $order->created_at
-                    ])
-                !!}
-            </p>
-        </div>
-
-        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
-            {{ __('shop::app.mail.order.summary') }}
-        </div>
-
-        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
-            @if ($order->shipping_address)
-                <div style="line-height: 25px;">
-                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                        {{ __('shop::app.mail.order.shipping-address') }}
-                    </div>
-
-                    <div>
-                        {{ $order->shipping_address->company_name ?? '' }}
-                    </div>
-
-                    <div>
-                        {{ $order->shipping_address->name }}
-                    </div>
-
-                    <div>
-                        {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
-                    </div>
-
-                    <div>
-                        {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
-                    </div>
-
-                    <div>---</div>
-
-                    <div style="margin-bottom: 40px;">
-                        {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
-                    </div>
-
-                    <div style="font-size: 16px;color: #242424;">
-                        {{ __('shop::app.mail.order.shipping') }}
-                    </div>
-
-                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                        {{ $order->shipping_title }}
-                    </div>
-                </div>
-            @endif
-
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.billing-address') }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424;">
-                    {{ __('shop::app.mail.order.payment') }}
-                </div>
-
-                <div style="font-weight: bold; font-size: 16px; color: #242424; margin-bottom: 20px;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-                </div>
-
-                @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
-
-                @if (! empty($additionalDetails))
-                    <div style="font-size: 16px; color: #242424;">
-                        <div>{{ $additionalDetails['title'] }}</div>
-                        <div>{{ $additionalDetails['value'] }}</div>
-                    </div>
-                @endif
-            </div>
-        </div>
-
-        <div class="section-content">
-            <div class="table mb-20">
-                <table style="overflow-x: auto; border-collapse: collapse;
-                border-spacing: 0;width: 100%">
-                    <thead>
-                        <tr style="background-color: #f2f2f2">
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                        </tr>
-                    </thead>
-
-                    <tbody>
-                        @foreach ($order->items as $item)
-                            <tr>
-                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">{{ $item->getTypeInstance()->getOrderedItem($item)->sku }}</td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
-                                    {{ $item->name }}
-
-                                    @if (isset($item->additional['attributes']))
-                                        <div class="item-options">
-
-                                            @foreach ($item->additional['attributes'] as $attribute)
-                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                            @endforeach
-
-                                        </div>
-                                    @endif
-                                </td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">{{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                                </td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">{{ $item->qty_ordered }}</td>
-                            </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
-            <div>
-                <span>{{ __('shop::app.mail.order.subtotal') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}
-                </span>
-            </div>
-
-            @if ($order->shipping_address)
-                <div>
-                    <span>{{ __('shop::app.mail.order.shipping-handling') }}</span>
-                    <span style="float: right;">
-                        {{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}
-                    </span>
-                </div>
-            @endif
-
-            @foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($order, false) as $taxRate => $taxAmount )
-                <div>
-                    <span id="taxrate-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ __('shop::app.mail.order.tax') }} {{ $taxRate }} %</span>
-                    <span id="taxamount-{{ core()->taxRateAsIdentifier($taxRate) }}" style="float: right;">
-                        {{ core()->formatPrice($taxAmount, $order->order_currency_code) }}
-                    </span>
-                </div>
-            @endforeach
-
-            @if ($order->discount_amount > 0)
-                <div>
-                    <span>{{ __('shop::app.mail.order.discount') }}</span>
-                    <span style="float: right;">
-                        {{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}
-                    </span>
-                </div>
-            @endif
-
-            <div style="font-weight: bold">
-                <span>{{ __('shop::app.mail.order.grand-total') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}
-                </span>
-            </div>
-        </div>
-
-        <div style="margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.final-summary') }}
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!!
-                    __('shop::app.mail.order.help', [
-                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
-                        ])
-                !!}
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.thanks') }}
-            </p>
-        </div>
-    </div>
-@endcomponent
diff --git a/resources/themes/shop/views/emails/sales/new-refund.blade.php b/resources/themes/shop/views/emails/sales/new-refund.blade.php
deleted file mode 100644
index 993108341..000000000
--- a/resources/themes/shop/views/emails/sales/new-refund.blade.php
+++ /dev/null
@@ -1,230 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @include ('shop::emails.layouts.logo')
-        </a>
-    </div>
-
-    <?php $order = $refund->order; ?>
-
-    <div style="padding: 30px;">
-        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
-            <span style="font-weight: bold;">
-                {{ __('shop::app.mail.refund.heading', ['order_id' => $order->increment_id, 'refund_id' => $refund->id]) }}
-            </span> <br>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!! __('shop::app.mail.order.greeting', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
-                    'created_at' => $order->created_at
-                    ])
-                !!}
-            </p>
-        </div>
-
-        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
-            {{ __('shop::app.mail.refund.summary') }}
-        </div>
-
-        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
-            @if ($order->shipping_address)
-                <div style="line-height: 25px;">
-                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                        {{ __('shop::app.mail.order.shipping-address') }}
-                    </div>
-
-                    <div>
-                        {{ $order->shipping_address->company_name ?? '' }}
-                    </div>
-
-                    <div>
-                        {{ $order->shipping_address->name }}
-                    </div>
-
-                    <div>
-                        {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
-                    </div>
-
-                    <div>
-                        {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
-                    </div>
-
-                    <div>---</div>
-
-                    <div style="margin-bottom: 40px;">
-                        {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
-                    </div>
-
-                    <div style="font-size: 16px;color: #242424;">
-                        {{ __('shop::app.mail.order.shipping') }}
-                    </div>
-
-                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                        {{ $order->shipping_title }}
-                    </div>
-                </div>
-            @endif
-
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.billing-address') }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424;">
-                    {{ __('shop::app.mail.order.payment') }}
-                </div>
-
-                <div style="font-weight: bold;font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-                </div>
-            </div>
-        </div>
-
-        <div class="section-content">
-            <div class="table mb-20">
-                <table style="overflow-x: auto; border-collapse: collapse;
-                border-spacing: 0;width: 100%">
-                    <thead>
-                        <tr style="background-color: #f2f2f2">
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                        </tr>
-                    </thead>
-
-                    <tbody>
-                        @foreach ($refund->items as $item)
-                            <tr>
-                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
-                                    {{ $item->name }}
-
-                                    @if (isset($item->additional['attributes']))
-                                        <div class="item-options">
-
-                                            @foreach ($item->additional['attributes'] as $attribute)
-                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                            @endforeach
-
-                                        </div>
-                                    @endif
-                                </td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">
-                                    {{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                                </td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">
-                                    {{ $item->qty }}
-                                </td>
-                            </tr>
-
-                        @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
-            <div>
-                <span>{{ __('shop::app.mail.order.subtotal') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatPrice($refund->sub_total, $refund->order_currency_code) }}
-                </span>
-            </div>
-
-            @if ($order->shipping_address)
-                <div>
-                    <span>{{ __('shop::app.mail.order.shipping-handling') }}</span>
-                    <span style="float: right;">
-                        {{ core()->formatPrice($refund->shipping_amount, $refund->order_currency_code) }}
-                    </span>
-                </div>
-            @endif
-
-            @if ($refund->tax_amount > 0)
-                @foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($refund, false) as $taxRate => $taxAmount)
-                <div>
-                    <span>{{ __('shop::app.mail.order.tax') }}</span>
-                    <span style="float: right;">
-                        {{ core()->formatPrice($refund->tax_amount, $refund->order_currency_code) }}
-                    </span>
-                </div>
-                @endforeach
-            @endif
-
-            @if ($refund->discount_amount > 0)
-                <div>
-                    <span>{{ __('shop::app.mail.order.discount') }}</span>
-                    <span style="float: right;">
-                        {{ core()->formatPrice($refund->discount_amount, $refund->order_currency_code) }}
-                    </span>
-                </div>
-            @endif
-
-            @if ($refund->adjustment_refund > 0)
-                <div>
-                    <span>{{ __('shop::app.mail.refund.adjustment-refund') }}</span>
-                    <span style="float: right;">
-                        {{ core()->formatPrice($refund->adjustment_refund, $refund->order_currency_code) }}
-                    </span>
-                </div>
-            @endif
-
-            @if ($refund->adjustment_fee > 0)
-                <div>
-                    <span>{{ __('shop::app.mail.refund.adjustment-fee') }}</span>
-                    <span style="float: right;">
-                        {{ core()->formatPrice($refund->adjustment_fee, $refund->order_currency_code) }}
-                    </span>
-                </div>
-            @endif
-
-            <div style="font-weight: bold">
-                <span>{{ __('shop::app.mail.order.grand-total') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatPrice($refund->grand_total, $refund->order_currency_code) }}
-                </span>
-            </div>
-        </div>
-
-        <div style="margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block;width: 100%">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!!
-                    __('shop::app.mail.order.help', [
-                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
-                        ])
-                !!}
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.thanks') }}
-            </p>
-        </div>
-    </div>
-@endcomponent
diff --git a/resources/themes/shop/views/emails/sales/new-shipment.blade.php b/resources/themes/shop/views/emails/sales/new-shipment.blade.php
deleted file mode 100644
index 10d93391d..000000000
--- a/resources/themes/shop/views/emails/sales/new-shipment.blade.php
+++ /dev/null
@@ -1,174 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @include ('shop::emails.layouts.logo')
-        </a>
-    </div>
-
-    <?php $order = $shipment->order; ?>
-
-    <div style="padding: 30px;">
-        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
-            <span style="font-weight: bold;">
-                {{ __('shop::app.mail.shipment.heading', ['order_id' => $order->increment_id, 'shipment_id' => $shipment->id]) }}
-            </span> <br>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.dear', ['customer_name' => $order->customer_full_name]) }},
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!! __('shop::app.mail.order.greeting', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
-                    'created_at' => $order->created_at
-                    ])
-                !!}
-            </p>
-        </div>
-
-        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
-            {{ __('shop::app.mail.shipment.summary') }}
-        </div>
-
-        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.shipping-address') }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
-                </div>
-
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.shipping') }}
-                </div>
-
-                <div style="font-size: 16px;color: #242424;">
-                    <div style="font-weight: bold;">
-                        {{ $order->shipping_title }}
-                    </div>
-
-                    <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
-                    </div>
-
-                    <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
-                    </div>
-                </div>
-            </div>
-
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.billing-address') }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-                </div>
-
-                <div style="font-weight: bold; font-size: 16px; color: #242424;">
-                    {{ __('shop::app.mail.order.payment') }}
-                </div>
-
-                <div style="font-weight: bold; font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-                </div>
-            </div>
-        </div>
-
-        <div class="section-content">
-            <div class="table mb-20">
-                <table style="overflow-x: auto; border-collapse: collapse;
-                border-spacing: 0;width: 100%">
-                    <thead>
-                        <tr style="background-color: #f2f2f2">
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
-                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                        </tr>
-                    </thead>
-
-                    <tbody>
-                        @foreach ($shipment->items as $item)
-                            <tr>
-                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">{{ $item->sku }}</td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
-                                    {{ $item->name }}
-
-                                    @if (isset($item->additional['attributes']))
-                                        <div class="item-options">
-
-                                            @foreach ($item->additional['attributes'] as $attribute)
-                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                            @endforeach
-
-                                        </div>
-                                    @endif
-                                </td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
-
-                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">{{ $item->qty }}</td>
-                            </tr>
-
-                        @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div style="margin-top: 20px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block;width: 100%">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!!
-                    __('shop::app.mail.order.help', [
-                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
-                        ])
-                !!}
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.thanks') }}
-            </p>
-        </div>
-    </div>
-@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/sales/order-cancel-admin.blade.php b/resources/themes/shop/views/emails/sales/order-cancel-admin.blade.php
deleted file mode 100644
index b768036de..000000000
--- a/resources/themes/shop/views/emails/sales/order-cancel-admin.blade.php
+++ /dev/null
@@ -1,212 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
-                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
-            @else
-                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
-            @endif
-        </a>
-    </div>
-
-    <div style="padding: 30px;">
-        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
-            <span style="font-weight: bold;">
-                {{ __('shop::app.mail.order.cancel.heading') }}
-            </span> <br>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.cancel.dear', ['customer_name' => config('mail.from.name')]) }},
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!! __('shop::app.mail.order.cancel.greeting', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
-                    'created_at' => $order->created_at
-                    ])
-                !!}
-            </p>
-        </div>
-
-        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
-            {{ __('shop::app.mail.order.cancel.summary') }}
-        </div>
-
-        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.cancel.shipping-address') }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->shipping_address->phone }}
-                </div>
-
-                <div style="font-size: 16px;color: #242424; font-weight: bold">
-                    {{ __('shop::app.mail.order.cancel.shipping') }}
-                </div>
-
-                <div style="font-size: 16px;color: #242424;">
-                    {{ $order->shipping_title }}
-                </div>
-            </div>
-
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.cancel.billing-address') }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->billing_address->phone }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424; font-weight: bold">
-                    {{ __('shop::app.mail.order.cancel.payment') }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-                </div>
-            </div>
-        </div>
-
-        <div class="section-content">
-            <div class="table mb-20">
-                <table style="overflow-x: auto; border-collapse: collapse;
-                border-spacing: 0;width: 100%">
-                    <thead>
-                    <tr style="background-color: #f2f2f2">
-                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
-                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                    </tr>
-                    </thead>
-
-                    <tbody>
-                    @foreach ($order->items as $item)
-                        <tr>
-                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">
-                                {{ $item->child ? $item->child->sku : $item->sku }}
-                            </td>
-
-                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
-                                {{ $item->name }}
-
-                                @if (isset($item->additional['attributes']))
-                                    <div class="item-options">
-
-                                        @foreach ($item->additional['attributes'] as $attribute)
-                                            <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                        @endforeach
-
-                                    </div>
-                                @endif
-                            </td>
-
-                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">
-                                {{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                            </td>
-
-                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">
-                                {{ $item->qty_canceled }}
-                            </td>
-                        </tr>
-                    @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
-            <div>
-                <span>{{ __('shop::app.mail.order.cancel.subtotal') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}
-                </span>
-            </div>
-
-            <div>
-                <span>{{ __('shop::app.mail.order.cancel.shipping-handling') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}
-                </span>
-            </div>
-
-            @foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($order, false) as $taxRate => $taxAmount )
-                <div>
-                    <span id="taxrate-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ __('shop::app.mail.order.cancel.tax') }} {{ $taxRate }} %</span>
-                    <span id="taxamount-{{ core()->taxRateAsIdentifier($taxRate) }}" style="float: right;">
-                    {{ core()->formatPrice($taxAmount, $order->order_currency_code) }}
-                </span>
-                </div>
-            @endforeach
-
-            @if ($order->discount_amount > 0)
-                <div>
-                    <span>{{ __('shop::app.mail.order.cancel.discount') }}</span>
-                    <span style="float: right;">
-                        {{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}
-                    </span>
-                </div>
-            @endif
-
-            <div style="font-weight: bold">
-                <span>{{ __('shop::app.mail.order.cancel.grand-total') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}
-                </span>
-            </div>
-        </div>
-
-        <div style="margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!!
-                    __('shop::app.mail.order.cancel.help', [
-                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
-                        ])
-                !!}
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.cancel.thanks') }}
-            </p>
-        </div>
-    </div>
-@endcomponent
\ No newline at end of file
diff --git a/resources/themes/shop/views/emails/sales/order-cancel.blade.php b/resources/themes/shop/views/emails/sales/order-cancel.blade.php
deleted file mode 100644
index 494c2747c..000000000
--- a/resources/themes/shop/views/emails/sales/order-cancel.blade.php
+++ /dev/null
@@ -1,212 +0,0 @@
-@component('shop::emails.layouts.master')
-    <div style="text-align: center;">
-        <a href="{{ config('app.url') }}">
-            @include ('shop::emails.layouts.logo')
-        </a>
-    </div>
-
-    <div style="padding: 30px;">
-        <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
-            <span style="font-weight: bold;">
-                {{ __('shop::app.mail.order.cancel.heading') }}
-            </span> <br>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.cancel.dear', ['customer_name' => $order->customer_full_name]) }},
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!! __('shop::app.mail.order.cancel.greeting', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
-                    'created_at' => $order->created_at
-                    ])
-                !!}
-            </p>
-        </div>
-
-        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
-            {{ __('shop::app.mail.order.cancel.summary') }}
-        </div>
-
-        <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.cancel.shipping-address') }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->shipping_address->phone }}
-                </div>
-
-                <div style="font-size: 16px;color: #242424; font-weight: bold">
-                    {{ __('shop::app.mail.order.cancel.shipping') }}
-                </div>
-
-                <div style="font-size: 16px;color: #242424;">
-                    {{ $order->shipping_title }}
-                </div>
-            </div>
-
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.cancel.billing-address') }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->billing_address->phone }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424; font-weight: bold">
-                    {{ __('shop::app.mail.order.cancel.payment') }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-                </div>
-            </div>
-        </div>
-
-        <div class="section-content">
-            <div class="table mb-20">
-                <table style="overflow-x: auto; border-collapse: collapse;
-                border-spacing: 0;width: 100%">
-                    <thead>
-                    <tr style="background-color: #f2f2f2">
-                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
-                        <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                    </tr>
-                    </thead>
-
-                    <tbody>
-                    @foreach ($order->items as $item)
-                        <tr>
-                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">
-                                {{ $item->child ? $item->child->sku : $item->sku }}
-                            </td>
-
-                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
-                                {{ $item->name }}
-
-                                @if (isset($item->additional['attributes']))
-                                    <div class="item-options">
-
-                                        @foreach ($item->additional['attributes'] as $attribute)
-                                            <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                        @endforeach
-
-                                    </div>
-                                @endif
-                            </td>
-
-                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">
-                                {{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                            </td>
-
-                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">
-                                {{ $item->qty_canceled }}
-                            </td>
-                        </tr>
-                    @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
-            <div>
-                <span>{{ __('shop::app.mail.order.cancel.subtotal') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}
-                </span>
-            </div>
-
-            <div>
-                <span>{{ __('shop::app.mail.order.cancel.shipping-handling') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}
-                </span>
-            </div>
-
-            @foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($order, false) as $taxRate => $taxAmount )
-                <div>
-                    <span id="taxrate-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ __('shop::app.mail.order.cancel.tax') }} {{ $taxRate }} %</span>
-                    <span id="taxamount-{{ core()->taxRateAsIdentifier($taxRate) }}" style="float: right;">
-                    {{ core()->formatPrice($taxAmount, $order->order_currency_code) }}
-                </span>
-                </div>
-            @endforeach
-
-            @if ($order->discount_amount > 0)
-                <div>
-                    <span>{{ __('shop::app.mail.order.cancel.discount') }}</span>
-                    <span style="float: right;">
-                        {{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}
-                    </span>
-                </div>
-            @endif
-
-            <div style="font-weight: bold">
-                <span>{{ __('shop::app.mail.order.cancel.grand-total') }}</span>
-                <span style="float: right;">
-                    {{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}
-                </span>
-            </div>
-        </div>
-
-        <div style="margin-top: 65px;font-size: 16px;color: #5E5E5E;line-height: 24px;display: inline-block">
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.cancel.final-summary') }}
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {!!
-                    __('shop::app.mail.order.cancel.help', [
-                        'support_email' => '<a style="color:#0041FF" href="mailto:' . config('mail.from.address') . '">' . config('mail.from.address'). '</a>'
-                        ])
-                !!}
-            </p>
-
-            <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
-                {{ __('shop::app.mail.order.cancel.thanks') }}
-            </p>
-        </div>
-    </div>
-@endcomponent
diff --git a/resources/themes/shop/views/error.blade.php b/resources/themes/shop/views/error.blade.php
deleted file mode 100644
index d78938fdb..000000000
--- a/resources/themes/shop/views/error.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-@extends('shop::layouts.master')
-@section('content-wrapper')
-    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
-        <div class="wrapper" style="display: flex; height: 100vh; width: 80vw;
-    justify-content: space-between; align-items: center;">
-            <div class="error-box">
-                <div class="error-title">404</div>
-                <div class="error-messgae">Page Not Found</div>
-                <div class="error-description"></div>
-                <a href="url()->to('/')">GO TO HOME</a>
-                {{-- pass the content dynamically --}}
-                Show the exception here or error message here.
-            </div>
-
-        <div class="error-graphic" style="height: 236px; width: 255px; border: 1px solid red; background-image: url('.{{ asset('images.error') }}.')">
-        </div>
-        </div>
-    </div>
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/errors/401.blade.php b/resources/themes/shop/views/errors/401.blade.php
deleted file mode 100644
index f12e056c3..000000000
--- a/resources/themes/shop/views/errors/401.blade.php
+++ /dev/null
@@ -1,38 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('admin::app.error.401.page-title') }}
-@stop
-
-@section('content-wrapper')
-
-    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
-
-        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
-            justify-content: start; align-items: center;">
-
-            <div class="error-box"  style="width: 50%">
-
-                <div class="error-title" style="font-size: 100px;color: #5E5E5E">  {{ __('admin::app.error.401.name') }}  </div>
-
-                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E; margin-top: 40px;">
-                    {{ __('admin::app.error.401.title') }}
-                </div>
-
-                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">
-                    {{ __('admin::app.error.401.message') }}
-                </div>
-
-                <a href="{{ route('shop.home.index') }}">
-                    {{ __('admin::app.error.go-to-home') }}
-                </a>
-
-            </div>
-
-            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
-
-        </div>
-
-    </div>
-
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/errors/403.blade.php b/resources/themes/shop/views/errors/403.blade.php
deleted file mode 100644
index 6d61554d5..000000000
--- a/resources/themes/shop/views/errors/403.blade.php
+++ /dev/null
@@ -1,38 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('admin::app.error.403.page-title') }}
-@stop
-
-@section('content-wrapper')
-
-    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
-
-        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
-            justify-content: start; align-items: center;">
-
-            <div class="error-box"  style="width: 50%">
-
-                <div class="error-title" style="font-size: 100px;color: #5E5E5E">  {{ __('admin::app.error.403.name') }}  </div>
-
-                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E; margin-top: 40px">
-                    {{ __('admin::app.error.403.title') }}
-                </div>
-
-                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">
-                    {{ __('admin::app.error.403.message') }}
-                </div>
-
-                <a href="{{ route('shop.home.index') }}">
-                    {{ __('admin::app.error.go-to-home') }}
-                </a>
-
-            </div>
-
-            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
-
-        </div>
-
-    </div>
-
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/errors/404.blade.php b/resources/themes/shop/views/errors/404.blade.php
deleted file mode 100644
index 6f34dee9c..000000000
--- a/resources/themes/shop/views/errors/404.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('admin::app.error.404.page-title') }}
-@stop
-
-@section('content-wrapper')
-
-    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
-
-        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
-            justify-content: start; align-items: center;">
-
-            <div class="error-box"  style="width: 50%">
-
-                <div class="error-title" style="font-size: 100px;color: #5E5E5E">
-                    {{ __('admin::app.error.404.name') }}
-                </div>
-
-                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E; margin-top: 40px">
-                    {{ __('admin::app.error.404.title') }}
-                </div>
-
-                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">
-                    {{ __('admin::app.error.404.message') }}
-                </div>
-
-                <a href="{{ route('shop.home.index') }}">
-                    {{ __('admin::app.error.go-to-home') }}
-                </a>
-
-            </div>
-
-            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
-
-        </div>
-
-    </div>
-
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/errors/500.blade.php b/resources/themes/shop/views/errors/500.blade.php
deleted file mode 100644
index 2ae0f5a41..000000000
--- a/resources/themes/shop/views/errors/500.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('admin::app.error.500.page-title') }}
-@stop
-
-@section('content-wrapper')
-
-    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
-
-        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
-            justify-content: start; align-items: center;">
-
-            <div class="error-box"  style="width: 50%">
-
-                <div class="error-title" style="font-size: 100px;color: #5E5E5E">
-                    {{ __('admin::app.error.500.name') }}
-                </div>
-
-                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E; margin-top: 40px">
-                    {{ __('admin::app.error.500.title') }}
-                </div>
-
-                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">
-                    {{ __('admin::app.error.500.message') }}
-                </div>
-
-                <a href="{{ route('shop.home.index') }}">
-                    {{ __('admin::app.error.go-to-home') }}
-                </a>
-
-            </div>
-
-            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
-
-        </div>
-
-    </div>
-
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/errors/503.blade.php b/resources/themes/shop/views/errors/503.blade.php
deleted file mode 100644
index 40d93e596..000000000
--- a/resources/themes/shop/views/errors/503.blade.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Document</title>
-</head>
-<body>
-    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
-
-        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
-            justify-content: start; align-items: center;">
-
-            <div class="error-box"  style="width: 50%">
-
-                <div class="error-title" style="font-size: 100px;color: #5E5E5E">
-                    {{ __('admin::app.error.in-maitainace') }}
-                </div>
-
-                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E">
-                    {{ core()->getCurrentChannel()->maintenance_mode_text ?: __('admin::app.error.right-back') }}
-                </div>
-            </div>
-
-            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
-
-        </div>
-
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/resources/themes/shop/views/guest/compare/compare-products.blade.php b/resources/themes/shop/views/guest/compare/compare-products.blade.php
deleted file mode 100644
index b6f65a053..000000000
--- a/resources/themes/shop/views/guest/compare/compare-products.blade.php
+++ /dev/null
@@ -1,342 +0,0 @@
-@php
-    $attributeRepository = app('\Webkul\Attribute\Repositories\AttributeFamilyRepository');
-    $comparableAttributes = $attributeRepository->getComparableAttributesBelongsToFamily();
-
-    $locale = request()->get('locale') ?: app()->getLocale();
-
-    $attributeOptionTranslations = DB::table('attribute_option_translations')->where('locale', $locale)->get()->toJson();
-@endphp
-
-@push('scripts')
-    <script type="text/x-template" id="compare-product-template">
-        <section class="comparison-component">
-            <h1>
-                {{ __('shop::app.customer.compare.compare_similar_items') }}
-            </h1>
-
-            <button
-                v-if="products.length > 0"
-                class="btn btn-primary btn-md {{ core()->getCurrentLocale()->direction == 'rtl' ? 'pull-left' : 'pull-right' }}"
-                @click="removeProductCompare('all')">
-                {{ __('shop::app.customer.account.wishlist.deleteall') }}
-            </button>
-
-            {!! view_render_event('bagisto.shop.customers.account.compare.view.before') !!}
-
-            <table class="compare-products">
-                <template v-if="isProductListLoaded && products.length > 0">
-                    @php
-                        $comparableAttributes = $comparableAttributes->toArray();
-
-                        array_splice($comparableAttributes, 1, 0, [[
-                            'code' => 'product_image',
-                            'admin_name' => __('velocity::app.customer.compare.product_image'),
-                        ]]);
-
-                        array_splice($comparableAttributes, 2, 0, [[
-                            'code' => 'addToCartHtml',
-                            'admin_name' => __('velocity::app.customer.compare.actions'),
-                        ]]);
-                    @endphp
-
-                    @foreach ($comparableAttributes as $attribute)
-                        <tr>
-                            <td>
-                                <span class="fs16">{{ $attribute['admin_name'] }}</span>
-                            </td>
-
-                            <td :key="`title-${index}`" v-for="(product, index) in products">
-                                @switch ($attribute['code'])
-                                    @case('name')
-                                        <a :href="`${baseUrl}/${product.url_key}`" class="unset remove-decoration active-hover">
-                                            <h3 class="fw6 fs18 mt-0" v-text="product['{{ $attribute['code'] }}']"></h3>
-                                        </a>
-                                        @break
-
-                                    @case('product_image')
-                                        <a :href="`${baseUrl}/${product.url_key}`" class="unset">
-                                            <img
-                                                class="image-wrapper"
-                                                :src="product['{{ $attribute['code'] }}']"
-                                                :onerror="`this.src='${baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" alt="" />
-                                        </a>
-                                        @break
-
-                                    @case('price')
-                                        <span v-html="product['priceHTML']"></span>
-                                        @break
-
-                                    @case('addToCartHtml')
-                                        <div class="action">
-                                            <div v-html="product.defaultAddToCart"></div>
-
-                                            <span class="icon white-cross-sm-icon remove-product" @click="removeProductCompare(product.id)"></span>
-                                        </div>
-                                        @break
-
-                                    @case('color')
-                                        <span v-html="product.color_label" class="fs16"></span>
-                                        @break
-
-                                    @case('size')
-                                        <span v-html="product.size_label" class="fs16"></span>
-                                        @break
-
-                                    @case('description')
-                                        <span v-html="product.description" class="desc"></span>
-                                        @break
-
-                                    @default
-                                        @switch ($attribute['type'])
-                                            @case('boolean')
-                                                <span
-                                                    v-text="product.product['{{ $attribute['code'] }}']
-                                                            ? '{{ __('velocity::app.shop.general.yes') }}'
-                                                            : '{{ __('velocity::app.shop.general.no') }}'"
-                                                ></span>
-                                                @break;
-
-                                            @case('checkbox')
-                                                <span v-if="product.product['{{ $attribute['code'] }}']" v-html="getAttributeOptions(product['{{ $attribute['code'] }}'] ? product : product.product['{{ $attribute['code'] }}'] ? product.product : null, '{{ $attribute['code'] }}', 'multiple')" class="fs16"></span>
-                                                <span v-else class="fs16">__</span>
-                                                @break;
-
-                                            @case('select')
-                                                <span v-if="product.product['{{ $attribute['code'] }}']" v-html="getAttributeOptions(product['{{ $attribute['code'] }}'] ? product : product.product['{{ $attribute['code'] }}'] ? product.product : null, '{{ $attribute['code'] }}', 'single')" class="fs16"></span>
-                                                <span v-else class="fs16">__</span>
-                                                @break;
-
-                                            @case ('file')
-                                            @case ('image')
-                                                <a :href="`${baseUrl}/${product.url_key}`" class="unset">
-                                                    <img
-                                                        class="image-wrapper"
-                                                        :src="'storage/' + product.product['{{ $attribute['code'] }}']"
-                                                        :onerror="`this.src='${baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" alt="" />
-                                                </a>
-                                                @break;
-                                            @default
-                                                <span v-html="product['{{ $attribute['code'] }}'] ? product['{{ $attribute['code'] }}'] : product.product['{{ $attribute['code'] }}'] ? product.product['{{ $attribute['code'] }}'] : '__'" class="fs16"></span>
-                                                @break;
-                                        @endswitch
-
-                                        @break
-
-                                @endswitch
-                            </td>
-                        </tr>
-                    @endforeach
-                </template>
-
-                <span v-else-if="isProductListLoaded && products.length == 0">
-                    {{ __('shop::app.customer.compare.empty-text') }}
-                </span>
-            </table>
-
-            {!! view_render_event('bagisto.shop.customers.account.compare.view.after') !!}
-        </section>
-    </script>
-
-    <script>
-        Vue.component('compare-product', {
-            template: '#compare-product-template',
-
-            data: function () {
-                return {
-                    'products': [],
-                    'isProductListLoaded': false,
-                    'baseUrl': "{{ url()->to('/') }}",
-                    'attributeOptions': JSON.parse(@json($attributeOptionTranslations)),
-                    'isCustomer': '{{ auth()->guard('customer')->user() ? "true" : "false" }}' == "true",
-                }
-            },
-
-            mounted: function () {
-                this.getComparedProducts();
-            },
-
-            methods: {
-                'getComparedProducts': function () {
-                    let items = '';
-                    let url = `${this.baseUrl}/${this.isCustomer ? 'comparison' : 'detailed-products'}`;
-
-                    let data = {
-                        params: {'data': true}
-                    }
-
-                    if (! this.isCustomer) {
-                        items = this.getStorageValue('compared_product');
-                        items = items ? items.join('&') : '';
-
-                        data = {
-                            params: {
-                                items
-                            }
-                        };
-                    }
-
-                    if (this.isCustomer || (! this.isCustomer && items != "")) {
-                        this.$http.get(url, data)
-                        .then(response => {
-                            this.isProductListLoaded = true;
-
-                            if (response.data.products.length > 2) {
-                                $('.comparison-component').css('overflow-x', 'scroll');
-                            }
-
-                            this.products = response.data.products;
-                        })
-                        .catch(error => {
-                            this.isProductListLoaded = true;
-                            console.log("{{ __('shop::app.common.error') }}");
-                        });
-                    } else {
-                        this.isProductListLoaded = true;
-                    }
-
-                },
-
-                'removeProductCompare': function (productId) {
-                    if (this.isCustomer) {
-                        this.$http.delete(`${this.baseUrl}/comparison?productId=${productId}`)
-                        .then(response => {
-                            if (productId == 'all') {
-                                this.$set(this, 'products', this.products.filter(product => false));
-                            } else {
-                                this.$set(this, 'products', this.products.filter(product => product.id != productId));
-                            }
-
-                            window.flashMessages = [{'type': 'alert-success', 'message': response.data.message }];
-
-                            this.$root.addFlashMessages();
-                        })
-                        .catch(error => {
-                            console.log("{{ __('shop::app.common.error') }}");
-                        });
-                    } else {
-                        let existingItems = this.getStorageValue('compared_product');
-
-                        if (productId == "all") {
-                            updatedItems = [];
-                            this.$set(this, 'products', []);
-                            window.flashMessages = [{'type': 'alert-success', 'message': '{{ __('shop::app.customer.compare.removed-all') }}' }];
-                        } else {
-                            updatedItems = existingItems.filter(item => item != productId);
-                            this.$set(this, 'products', this.products.filter(product => product.id != productId));
-                            window.flashMessages = [{'type': 'alert-success', 'message': '{{ __('shop::app.customer.compare.removed') }}' }];
-                        }
-
-                        this.setStorageValue('compared_product', updatedItems);
-
-                        this.$root.addFlashMessages();
-                    }
-
-                    this.updateCompareCount();
-                },
-
-                'getDynamicHTML': function (input) {
-                    var _staticRenderFns;
-                    const { render, staticRenderFns } = Vue.compile(input);
-
-                    if (this.$options.staticRenderFns.length > 0) {
-                        _staticRenderFns = this.$options.staticRenderFns;
-                    } else {
-                        _staticRenderFns = this.$options.staticRenderFns = staticRenderFns;
-                    }
-
-                    try {
-                        var output = render.call(this, this.$createElement);
-                    } catch (exception) {
-                        console.log(this.__('error.something_went_wrong'));
-                    }
-
-                    this.$options.staticRenderFns = _staticRenderFns;
-
-                    return output;
-                },
-
-                'isMobile': function () {
-                    if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
-                    return true
-                    } else {
-                    return false
-                    }
-                },
-
-                'getStorageValue': function (key) {
-                    let value = window.localStorage.getItem(key);
-
-                    if (value) {
-                        value = JSON.parse(value);
-                    }
-
-                    return value;
-                },
-
-                'setStorageValue': function (key, value) {
-                    window.localStorage.setItem(key, JSON.stringify(value));
-
-                    return true;
-                },
-
-                'getAttributeOptions': function (productDetails, attributeValues, type) {
-                    var attributeOptions = '__';
-
-                    if (productDetails && attributeValues) {
-                        var attributeItems;
-
-                        if (type == "multiple") {
-                            attributeItems = productDetails[attributeValues].split(',');
-                        } else if (type == "single") {
-                            attributeItems = productDetails[attributeValues];
-                        }
-
-                        attributeOptions = this.attributeOptions.filter(option => {
-                            if (type == "multiple") {
-                                if (attributeItems.indexOf(option.attribute_option_id.toString()) > -1) {
-                                    return true;
-                                }
-                            } else if (type == "single") {
-                                if (attributeItems == option.attribute_option_id.toString()) {
-                                    return true;
-                                }
-                            }
-
-                            return false;
-                        });
-
-                        attributeOptions = attributeOptions.map(option => {
-                            return option.label;
-                        });
-
-                        attributeOptions = attributeOptions.join(', ');
-                    }
-
-                    return attributeOptions;
-                },
-
-                'updateCompareCount': function () {
-                    if (this.isCustomer == "true" || this.isCustomer == true) {
-                        this.$http.get(`${this.baseUrl}/items-count`)
-                        .then(response => {
-                            $('#compare-items-count').html(response.data.compareProductsCount);
-                        })
-                        .catch(exception => {
-                            window.flashMessages = [{
-                                'type': `alert-error`,
-                                'message': "{{ __('shop::app.common.error') }}"
-                            }];
-
-                            this.$root.addFlashMessages();
-                        });
-                    } else {
-                        let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
-                        comparedItemsCount = comparedItems ? comparedItems.length : 0;
-
-                        $('#compare-items-count').html(comparedItemsCount);
-                    }
-                }
-            }
-        });
-    </script>
-@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/guest/compare/index.blade.php b/resources/themes/shop/views/guest/compare/index.blade.php
deleted file mode 100644
index 08cd183db..000000000
--- a/resources/themes/shop/views/guest/compare/index.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-@extends('shop::layouts.master')
-
-@include('shop::guest.compare.compare-products')
-
-@section('page_title')
-    {{ __('shop::app.customer.compare.compare_similar_items') }}
-@endsection
-
-@section('content-wrapper')
-    <compare-product></compare-product>
-@endsection
\ No newline at end of file
diff --git a/resources/themes/shop/views/guest/wishlist/index.blade.php b/resources/themes/shop/views/guest/wishlist/index.blade.php
deleted file mode 100644
index be3b6a35b..000000000
--- a/resources/themes/shop/views/guest/wishlist/index.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<script>
-    window.location.href = window.location.href.replace('/guest-wishlist', '');
-</script>
\ No newline at end of file
diff --git a/resources/themes/shop/views/home/featured-products.blade.php b/resources/themes/shop/views/home/featured-products.blade.php
deleted file mode 100644
index 654a02043..000000000
--- a/resources/themes/shop/views/home/featured-products.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-@if (count(app('Webkul\Product\Repositories\ProductRepository')->getFeaturedProducts()))
-    <section class="featured-products">
-
-        <div class="featured-heading">
-            {{ __('shop::app.home.featured-products') }}<br/>
-
-            <span class="featured-seperator" style="color: #d7dfe2;">_____</span>
-        </div>
-
-        <div class="featured-grid product-grid-4">
-
-            @foreach (app('Webkul\Product\Repositories\ProductRepository')->getFeaturedProducts() as $productFlat)
-
-                @if (core()->getConfigData('catalog.products.homepage.out_of_stock_items'))
-                    @include ('shop::products.list.card', ['product' => $productFlat])
-                @else
-                    @if ($productFlat->isSaleable())
-                        @include ('shop::products.list.card', ['product' => $productFlat])
-                    @endif
-                @endif
-
-            @endforeach
-
-        </div>
-
-    </section>
-@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/home/index.blade.php b/resources/themes/shop/views/home/index.blade.php
deleted file mode 100644
index b3021bcf3..000000000
--- a/resources/themes/shop/views/home/index.blade.php
+++ /dev/null
@@ -1,53 +0,0 @@
-@extends('shop::layouts.master')
-
-@php
-    $channel = core()->getCurrentChannel();
-
-    $homeSEO = $channel->home_seo;
-
-    if (isset($homeSEO)) {
-        $homeSEO = json_decode($channel->home_seo);
-
-        $metaTitle = $homeSEO->meta_title;
-
-        $metaDescription = $homeSEO->meta_description;
-
-        $metaKeywords = $homeSEO->meta_keywords;
-    }
-@endphp
-
-@section('page_title')
-    {{ isset($metaTitle) ? $metaTitle : "" }}
-@endsection
-
-@section('head')
-
-    @if (isset($homeSEO))
-        @isset($metaTitle)
-            <meta name="title" content="{{ $metaTitle }}" />
-        @endisset
-
-        @isset($metaDescription)
-            <meta name="description" content="{{ $metaDescription }}" />
-        @endisset
-
-        @isset($metaKeywords)
-            <meta name="keywords" content="{{ $metaKeywords }}" />
-        @endisset
-    @endif
-@endsection
-
-@section('content-wrapper')
-    {!! view_render_event('bagisto.shop.home.content.before') !!}
-
-    @if (! is_null($channel->home_page_content))
-        {!! DbView::make($channel)->field('home_page_content')->with(['sliderData' => $sliderData])->render() !!}
-    @else
-        @include('shop::home.slider', ['sliderData' => $sliderData])
-        @include('shop::home.featured-products')
-        @include('shop::home.new-products')
-    @endif
-
-    {{ view_render_event('bagisto.shop.home.content.after') }}
-
-@endsection
diff --git a/resources/themes/shop/views/home/new-products.blade.php b/resources/themes/shop/views/home/new-products.blade.php
deleted file mode 100644
index 5a31b168c..000000000
--- a/resources/themes/shop/views/home/new-products.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-@if (count(app('Webkul\Product\Repositories\ProductRepository')->getNewProducts()))
-    <section class="featured-products">
-
-        <div class="featured-heading">
-            {{ __('shop::app.home.new-products') }}<br/>
-
-            <span class="featured-seperator" style="color: #d7dfe2;">_____</span>
-        </div>
-
-        <div class="product-grid-4">
-
-            @foreach (app('Webkul\Product\Repositories\ProductRepository')->getNewProducts() as $productFlat)
-
-                @if (core()->getConfigData('catalog.products.homepage.out_of_stock_items'))
-                    @include ('shop::products.list.card', ['product' => $productFlat])
-                @else
-                    @if ($productFlat->isSaleable())
-                        @include ('shop::products.list.card', ['product' => $productFlat])
-                    @endif
-                @endif
-
-            @endforeach
-
-        </div>
-
-    </section>
-@endif
diff --git a/resources/themes/shop/views/home/news-updates.blade.php b/resources/themes/shop/views/home/news-updates.blade.php
deleted file mode 100644
index 4cb478208..000000000
--- a/resources/themes/shop/views/home/news-updates.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<section class="news-update">
-    <div class="news-update-grid">
-        <div class="block1">
-            <img src="vendor/webkul/shop/assets/images/1.png" alt="" />
-        </div>
-        <div class="block2">
-            <div class="sub-block1">
-                <img src="vendor/webkul/shop/assets/images/2.png" alt="" />
-            </div>
-            <div class="sub-block2">
-                <img src="vendor/webkul/shop/assets/images/3.png" alt="" />
-            </div>
-        </div>
-    </div>
-</section>
diff --git a/resources/themes/shop/views/home/slider.blade.php b/resources/themes/shop/views/home/slider.blade.php
deleted file mode 100644
index abdbf9452..000000000
--- a/resources/themes/shop/views/home/slider.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@if (count($sliderData))
-    <section class="slider-block" style="height: 500px">
-        <image-slider :slides='@json($sliderData)' public_path="{{ url()->to('/') }}"></image-slider>
-    </section>
-@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/index.blade.php b/resources/themes/shop/views/index.blade.php
deleted file mode 100644
index 5d0687bbe..000000000
--- a/resources/themes/shop/views/index.blade.php
+++ /dev/null
@@ -1,13 +0,0 @@
-@inject('rateHelper' , 'Webkul\Shipping\Helper\Rate')
-<div>
-    @foreach ($rateHelper->collectRates() as $key=>$count)
-        <div class="shipping-method">
-            <input type="radio" name="price"> ${{ core()->currency($count) }}  <span> {{ $key }} </span>
-        </div>
-    @endforeach
-</div>
-<style>
-    span {
-        margin-left: 10px;
-    }
-</style>
\ No newline at end of file
diff --git a/resources/themes/shop/views/layouts/footer/footer.blade.php b/resources/themes/shop/views/layouts/footer/footer.blade.php
deleted file mode 100644
index 493d12e3f..000000000
--- a/resources/themes/shop/views/layouts/footer/footer.blade.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<div class="footer">
-    <div class="footer-content">
-        <div class="footer-list-container">
-
-            <?php
-                $categories = [];
-
-                foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category){
-                    if ($category->slug)
-                        array_push($categories, $category);
-                }
-            ?>
-
-            @if (count($categories))
-                <div class="list-container">
-                    <span class="list-heading">Categories</span>
-
-                    <ul class="list-group">
-                        @foreach ($categories as $key => $category)
-                            <li>
-                                <a href="{{ route('shop.productOrCategory.index', $category->slug) }}">{{ $category->name }}</a>
-                            </li>
-                        @endforeach
-                    </ul>
-                </div>
-            @endif
-
-            {!! DbView::make(core()->getCurrentChannel())->field('footer_content')->render() !!}
-
-            <div class="list-container">
-                @if(core()->getConfigData('customer.settings.newsletter.subscription'))
-                    <label class="list-heading" for="subscribe-field">{{ __('shop::app.footer.subscribe-newsletter') }}</label>
-                    <div class="form-container">
-                        <form action="{{ route('shop.subscribe') }}">
-                            <div class="control-group" :class="[errors.has('subscriber_email') ? 'has-error' : '']">
-                                <input type="email" id="subscribe-field" class="control subscribe-field" name="subscriber_email" placeholder="Email Address" required><br/>
-
-                                <button class="btn btn-md btn-primary">{{ __('shop::app.subscription.subscribe') }}</button>
-                            </div>
-                        </form>
-                    </div>
-                @endif
-
-                <?php
-                    $term = request()->input('term');
-
-                    if (! is_null($term)) {
-                        $serachQuery = 'term='.request()->input('term');
-                    }
-                ?>
-
-                <label class="list-heading" for="locale-switcher">{{ __('shop::app.footer.locale') }}</label>
-                <div class="form-container">
-                    <div class="control-group">
-                        <select class="control locale-switcher" id="locale-switcher" onchange="window.location.href = this.value" @if (count(core()->getCurrentChannel()->locales) == 1) disabled="disabled" @endif>
-
-                            @foreach (core()->getCurrentChannel()->locales as $locale)
-                                @if (isset($serachQuery))
-                                    <option value="?{{ $serachQuery }}&locale={{ $locale->code }}" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>{{ $locale->name }}</option>
-                                @else
-                                    <option value="?locale={{ $locale->code }}" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>{{ $locale->name }}</option>
-                                @endif
-                            @endforeach
-
-                        </select>
-                    </div>
-                </div>
-
-                <div class="currency">
-                    <label class="list-heading" for="currency-switcher">{{ __('shop::app.footer.currency') }}</label>
-                    <div class="form-container">
-                        <div class="control-group">
-                            <select class="control locale-switcher" id="currency-switcher" onchange="window.location.href = this.value">
-
-                                @foreach (core()->getCurrentChannel()->currencies as $currency)
-                                    @if (isset($serachQuery))
-                                        <option value="?{{ $serachQuery }}&currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
-                                    @else
-                                        <option value="?currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
-                                    @endif
-                                @endforeach
-
-                            </select>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/resources/themes/shop/views/layouts/header/index.blade.php b/resources/themes/shop/views/layouts/header/index.blade.php
deleted file mode 100644
index 771d88d22..000000000
--- a/resources/themes/shop/views/layouts/header/index.blade.php
+++ /dev/null
@@ -1,415 +0,0 @@
-<?php
-    $term = request()->input('term');
-    $image_search = request()->input('image-search');
-
-    if (! is_null($term)) {
-        $serachQuery = 'term='.request()->input('term');
-    }
-?>
-
-<div class="header" id="header">
-    <div class="header-top">
-        <div class="left-content">
-            <ul class="logo-container">
-                <li>
-                    <a href="{{ route('shop.home.index') }}" aria-label="Logo">
-                        @if ($logo = core()->getCurrentChannel()->logo_url)
-                            <img class="logo" src="{{ $logo }}" alt="" />
-                        @else
-                            <img class="logo" src="{{ bagisto_asset('images/logo.svg') }}" alt="" />
-                        @endif
-                    </a>
-                </li>
-            </ul>
-
-            <ul class="search-container">
-                <li class="search-group">
-                    <form role="search" action="{{ route('shop.search.index') }}" method="GET" style="display: inherit;">
-                        <label for="search-bar" style="position: absolute; z-index: -1;">Search</label>
-                        <input
-                            required
-                            name="term"
-                            type="search"
-                            value="{{ ! $image_search ? $term : '' }}"
-                            class="search-field"
-                            id="search-bar"
-                            placeholder="{{ __('shop::app.header.search-text') }}"
-                        >
-
-                        <image-search-component></image-search-component>
-
-                        <div class="search-icon-wrapper">
-
-                            <button class="" class="background: none;" aria-label="Search">
-                                <i class="icon icon-search"></i>
-                            </button>
-                        </div>
-                    </form>
-                </li>
-            </ul>
-        </div>
-
-        <div class="right-content">
-
-            <span class="search-box"><span class="icon icon-search" id="search"></span></span>
-
-            <ul class="right-content-menu">
-
-                {!! view_render_event('bagisto.shop.layout.header.comppare-item.before') !!}
-
-                @php
-                    $showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false
-                @endphp
-
-                @if ($showCompare)
-                    <li class="compare-dropdown-container">
-                        <a
-                            @auth('customer')
-                                href="{{ route('velocity.customer.product.compare') }}"
-                            @endauth
-
-                            @guest('customer')
-                                href="{{ route('velocity.product.compare') }}"
-                            @endguest
-                            style="color: #242424;"
-                            >
-
-                            <i class="icon compare-icon"></i>
-                            <span class="name">
-                                {{ __('shop::app.customer.compare.text') }}
-                                <span class="count">(<span id="compare-items-count"></span>)<span class="count">
-                            </span>
-                        </a>
-                    </li>
-                @endif
-
-                {!! view_render_event('bagisto.shop.layout.header.compare-item.after') !!}
-
-                {!! view_render_event('bagisto.shop.layout.header.currency-item.before') !!}
-
-                @if (core()->getCurrentChannel()->currencies->count() > 1)
-                    <li class="currency-switcher">
-                        <span class="dropdown-toggle">
-                            {{ core()->getCurrentCurrencyCode() }}
-
-                            <i class="icon arrow-down-icon"></i>
-                        </span>
-
-                        <ul class="dropdown-list currency">
-                            @foreach (core()->getCurrentChannel()->currencies as $currency)
-                                <li>
-                                    @if (isset($serachQuery))
-                                        <a href="?{{ $serachQuery }}&currency={{ $currency->code }}">{{ $currency->code }}</a>
-                                    @else
-                                        <a href="?currency={{ $currency->code }}">{{ $currency->code }}</a>
-                                    @endif
-                                </li>
-                            @endforeach
-                        </ul>
-                    </li>
-                @endif
-
-                {!! view_render_event('bagisto.shop.layout.header.currency-item.after') !!}
-
-
-                {!! view_render_event('bagisto.shop.layout.header.account-item.before') !!}
-
-                <li>
-                    <span class="dropdown-toggle">
-                        <i class="icon account-icon"></i>
-
-                        <span class="name">{{ __('shop::app.header.account') }}</span>
-
-                        <i class="icon arrow-down-icon"></i>
-                    </span>
-
-                    @guest('customer')
-                        <ul class="dropdown-list account guest">
-                            <li>
-                                <div>
-                                    <label style="color: #9e9e9e; font-weight: 700; text-transform: uppercase; font-size: 15px;">
-                                        {{ __('shop::app.header.title') }}
-                                    </label>
-                                </div>
-
-                                <div style="margin-top: 5px;">
-                                    <span style="font-size: 12px;">{{ __('shop::app.header.dropdown-text') }}</span>
-                                </div>
-
-                                <div style="margin-top: 15px;">
-                                    <a class="btn btn-primary btn-md" href="{{ route('customer.session.index') }}" style="color: #ffffff">
-                                        {{ __('shop::app.header.sign-in') }}
-                                    </a>
-
-                                    <a class="btn btn-primary btn-md" href="{{ route('customer.register.index') }}" style="float: right; color: #ffffff">
-                                        {{ __('shop::app.header.sign-up') }}
-                                    </a>
-                                </div>
-                            </li>
-                        </ul>
-                    @endguest
-
-                    @auth('customer')
-                        @php
-                           $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
-                        @endphp
-
-                        <ul class="dropdown-list account customer">
-                            <li>
-                                <div>
-                                    <label style="color: #9e9e9e; font-weight: 700; text-transform: uppercase; font-size: 15px;">
-                                        {{ auth()->guard('customer')->user()->first_name }}
-                                    </label>
-                                </div>
-
-                                <ul>
-                                    <li>
-                                        <a href="{{ route('customer.profile.index') }}">{{ __('shop::app.header.profile') }}</a>
-                                    </li>
-
-                                    @if ($showWishlist)
-                                        <li>
-                                            <a href="{{ route('customer.wishlist.index') }}">{{ __('shop::app.header.wishlist') }}</a>
-                                        </li>
-                                    @endif
-
-                                    <li>
-                                        <a href="{{ route('shop.checkout.cart.index') }}">{{ __('shop::app.header.cart') }}</a>
-                                    </li>
-
-                                    <li>
-                                        <a href="{{ route('customer.session.destroy') }}">{{ __('shop::app.header.logout') }}</a>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    @endauth
-                </li>
-
-                {!! view_render_event('bagisto.shop.layout.header.account-item.after') !!}
-
-
-                {!! view_render_event('bagisto.shop.layout.header.cart-item.before') !!}
-
-                <li class="cart-dropdown-container">
-
-                    @include('shop::checkout.cart.mini-cart')
-
-                </li>
-
-                {!! view_render_event('bagisto.shop.layout.header.cart-item.after') !!}
-
-            </ul>
-
-            <span class="menu-box" ><span class="icon icon-menu" id="hammenu"></span>
-        </div>
-    </div>
-
-    <div class="header-bottom" id="header-bottom">
-        @include('shop::layouts.header.nav-menu.navmenu')
-    </div>
-
-    <div class="search-responsive mt-10" id="search-responsive">
-        <form role="search" action="{{ route('shop.search.index') }}" method="GET" style="display: inherit;">
-            <div class="search-content">
-                <button style="background: none; border: none; padding: 0px;">
-                    <i class="icon icon-search"></i>
-                </button>
-
-                <image-search-component></image-search-component>
-
-                <input type="search" name="term" class="search">
-                <i class="icon icon-menu-back right"></i>
-            </div>
-        </form>
-    </div>
-</div>
-
-@push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/@tensorflow/tfjs" defer></script>
-    <script src="https://cdn.jsdelivr.net/npm/@tensorflow-models/mobilenet" defer></script>
-
-    <script type="text/x-template" id="image-search-component-template">
-        <div v-if="image_search_status">
-            <label class="image-search-container" :for="'image-search-container-' + _uid">
-                <i class="icon camera-icon"></i>
-
-                <input type="file" :id="'image-search-container-' + _uid" ref="image_search_input" v-on:change="uploadImage()"/>
-
-                <img :id="'uploaded-image-url-' +  + _uid" :src="uploaded_image_url" alt="" width="20" height="20" />
-            </label>
-        </div>
-    </script>
-
-    <script>
-
-        Vue.component('image-search-component', {
-
-            template: '#image-search-component-template',
-
-            data: function() {
-                return {
-                    uploaded_image_url: '',
-                    image_search_status: "{{core()->getConfigData('general.content.shop.image_search') == '1' ? 'true' : 'false'}}" == 'true'
-                }
-            },
-
-            methods: {
-                uploadImage: function() {
-                    var imageInput = this.$refs.image_search_input;
-
-                    if (imageInput.files && imageInput.files[0]) {
-                        if (imageInput.files[0].type.includes('image/')) {
-                            var self = this;
-
-                            if (imageInput.files[0].size <= 2000000) { 
-                                self.$root.showLoader();
-
-                                var formData = new FormData();
-
-                                formData.append('image', imageInput.files[0]);
-
-                                axios.post("{{ route('shop.image.search.upload') }}", formData, {headers: {'Content-Type': 'multipart/form-data'}})
-                                    .then(function(response) {
-                                        self.uploaded_image_url = response.data;
-
-                                        var net;
-
-                                        async function app() {
-                                            var analysedResult = [];
-
-                                            var queryString = '';
-
-                                            net = await mobilenet.load();
-
-                                            const imgElement = document.getElementById('uploaded-image-url-' +  + self._uid);
-
-                                            try {
-                                                const result = await net.classify(imgElement);
-
-                                                result.forEach(function(value) {
-                                                    queryString = value.className.split(',');
-
-                                                    if (queryString.length > 1) {
-                                                        analysedResult = analysedResult.concat(queryString)
-                                                    } else {
-                                                        analysedResult.push(queryString[0])
-                                                    }
-                                                });
-                                            } catch (error) {
-                                                self.$root.hideLoader();
-
-                                                window.flashMessages = [
-                                                    {
-                                                        'type': 'alert-error',
-                                                        'message': "{{ __('shop::app.common.error') }}"
-                                                    }
-                                                ];
-
-                                                self.$root.addFlashMessages();
-                                            };
-
-                                            localStorage.searched_image_url = self.uploaded_image_url;
-
-                                            queryString = localStorage.searched_terms = analysedResult.join('_');
-
-                                            self.$root.hideLoader();
-
-                                            window.location.href = "{{ route('shop.search.index') }}" + '?term=' + queryString + '&image-search=1';
-                                        }
-
-                                        app();
-                                    })
-                                    .catch(function(error) {
-                                        self.$root.hideLoader();
-
-                                        window.flashMessages = [
-                                            {
-                                                'type': 'alert-error',
-                                                'message': "{{ __('shop::app.common.error') }}"
-                                            }
-                                        ];
-
-                                        self.$root.addFlashMessages();
-                                    });
-                            } else {
-
-                                imageInput.value = '';
-
-                                        window.flashMessages = [
-                                            {
-                                                'type': 'alert-error',
-                                                'message': "{{ __('shop::app.common.image-upload-limit') }}"
-                                            }
-                                        ];
-
-                                self.$root.addFlashMessages();
-                                
-                            }        
-                        } else {
-                            imageInput.value = '';
-
-                            alert('Only images (.jpeg, .jpg, .png, ..) are allowed.');
-                        }
-                    }
-                }
-            }
-        });
-
-    </script>
-
-    <script>
-        $(document).ready(function() {
-
-            $('body').delegate('#search, .icon-menu-close, .icon.icon-menu', 'click', function(e) {
-                toggleDropdown(e);
-            });
-
-            @auth('customer')
-                @php
-                    $compareCount = app('Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository')
-                        ->count([
-                            'customer_id' => auth()->guard('customer')->user()->id,
-                        ]);
-                @endphp
-
-                let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
-                $('#compare-items-count').html({{ $compareCount }});
-            @endauth
-
-            @guest('customer')
-                let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
-                $('#compare-items-count').html(comparedItems ? comparedItems.length : 0);
-            @endguest
-
-            function toggleDropdown(e) {
-                var currentElement = $(e.currentTarget);
-
-                if (currentElement.hasClass('icon-search')) {
-                    currentElement.removeClass('icon-search');
-                    currentElement.addClass('icon-menu-close');
-                    $('#hammenu').removeClass('icon-menu-close');
-                    $('#hammenu').addClass('icon-menu');
-                    $("#search-responsive").css("display", "block");
-                    $("#header-bottom").css("display", "none");
-                } else if (currentElement.hasClass('icon-menu')) {
-                    currentElement.removeClass('icon-menu');
-                    currentElement.addClass('icon-menu-close');
-                    $('#search').removeClass('icon-menu-close');
-                    $('#search').addClass('icon-search');
-                    $("#search-responsive").css("display", "none");
-                    $("#header-bottom").css("display", "block");
-                } else {
-                    currentElement.removeClass('icon-menu-close');
-                    $("#search-responsive").css("display", "none");
-                    $("#header-bottom").css("display", "none");
-                    if (currentElement.attr("id") == 'search') {
-                        currentElement.addClass('icon-search');
-                    } else {
-                        currentElement.addClass('icon-menu');
-                    }
-                }
-            }
-        });
-    </script>
-@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/layouts/header/nav-menu/navmenu.blade.php b/resources/themes/shop/views/layouts/header/nav-menu/navmenu.blade.php
deleted file mode 100644
index 0e9e3085a..000000000
--- a/resources/themes/shop/views/layouts/header/nav-menu/navmenu.blade.php
+++ /dev/null
@@ -1,138 +0,0 @@
-{!! view_render_event('bagisto.shop.layout.header.category.before') !!}
-
-<?php
-
-$categories = [];
-
-foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category) {
-    if ($category->slug) {
-        array_push($categories, $category);
-    }
-}
-
-?>
-
-<category-nav categories='@json($categories)' url="{{url()->to('/')}}"></category-nav>
-
-{!! view_render_event('bagisto.shop.layout.header.category.after') !!}
-
-
-@push('scripts')
-
-
-<script type="text/x-template" id="category-nav-template">
-
-    <ul class="nav">
-        <category-item
-            v-for="(item, index) in items"
-            :key="index"
-            :url="url"
-            :item="item"
-            :parent="index">
-        </category-item>
-    </ul>
-
-</script>
-
-<script>
-    Vue.component('category-nav', {
-
-        template: '#category-nav-template',
-
-        props: {
-            categories: {
-                type: [Array, String, Object],
-                required: false,
-                default: (function () {
-                    return [];
-                })
-            },
-
-            url: String
-        },
-
-        data: function(){
-            return {
-                items_count:0
-            };
-        },
-
-        computed: {
-            items: function() {
-                return JSON.parse(this.categories)
-            }
-        },
-    });
-</script>
-
-<script type="text/x-template" id="category-item-template">
-    <li>
-        <a :href="url+'/'+this.item['translations'][0].url_path">
-            @{{ name }}&emsp;
-            <i class="icon dropdown-right-icon" v-if="haveChildren && item.parent_id != null"></i>
-        </a>
-
-        <i :class="[show ? 'icon icon-arrow-down mt-15' : 'icon dropdown-right-icon left mt-15']"
-        v-if="haveChildren"  @click="showOrHide"></i>
-
-        <ul v-if="haveChildren && show">
-            <category-item
-                v-for="(child, index) in item.children"
-                :key="index"
-                :url="url"
-                :item="child">
-            </category-item>
-        </ul>
-    </li>
-</script>
-
-<script>
-    Vue.component('category-item', {
-
-        template: '#category-item-template',
-
-        props: {
-            item:  Object,
-            url: String,
-        },
-
-        data: function() {
-            return {
-                items_count:0,
-                show: false,
-            };
-        },
-
-        mounted: function() {
-            if(window.innerWidth > 770){
-                this.show = true;
-            }
-        },
-
-        computed: {
-            haveChildren: function() {
-                return this.item.children.length ? true : false;
-            },
-
-            name: function() {
-                if (this.item.translations && this.item.translations.length) {
-                    this.item.translations.forEach(function(translation) {
-                        if (translation.locale == document.documentElement.lang)
-                            return translation.name;
-                    });
-                }
-
-                return this.item.name;
-            }
-        },
-
-        methods: {
-            showOrHide: function() {
-                this.show = !this.show;
-            }
-        }
-    });
-</script>
-
-
-@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/layouts/master.blade.php b/resources/themes/shop/views/layouts/master.blade.php
deleted file mode 100644
index 83f6c798b..000000000
--- a/resources/themes/shop/views/layouts/master.blade.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ app()->getLocale() }}">
-
-<head>
-
-    <title>@yield('page_title')</title>
-
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="csrf-token" content="{{ csrf_token() }}">
-    <meta http-equiv="content-language" content="{{ app()->getLocale() }}">
-    <link rel="stylesheet" href="{{ asset('vendor/webkul/ui/assets/css/ui.css') }}">
-
-    <link rel="stylesheet" href="{{ bagisto_asset('css/shop.css') }}">
-
-    @if ($favicon = core()->getCurrentChannel()->favicon_url)
-        <link rel="icon" sizes="16x16" href="{{ $favicon }}" />
-    @else
-        <link rel="icon" sizes="16x16" href="{{ bagisto_asset('images/favicon.ico') }}" />
-    @endif
-
-    @yield('head')
-
-    @section('seo')
-        @if (! request()->is('/'))
-            <meta name="description" content="{{ core()->getCurrentChannel()->description }}"/>
-        @endif
-    @show
-
-    @stack('css')
-
-    {!! view_render_event('bagisto.shop.layout.head') !!}
-
-    <style>
-        {!! core()->getConfigData('general.content.custom_scripts.custom_css') !!}
-    </style>
-
-</head>
-
-
-<body @if (core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl') class="rtl" @endif style="scroll-behavior: smooth;">
-
-    {!! view_render_event('bagisto.shop.layout.body.before') !!}
-
-    <div id="app">
-        <flash-wrapper ref='flashes'></flash-wrapper>
-
-        <div class="main-container-wrapper">
-
-            {!! view_render_event('bagisto.shop.layout.header.before') !!}
-
-            @include('shop::layouts.header.index')
-
-            {!! view_render_event('bagisto.shop.layout.header.after') !!}
-
-            @yield('slider')
-
-            <main class="content-container">
-
-                {!! view_render_event('bagisto.shop.layout.content.before') !!}
-
-                @yield('content-wrapper')
-
-                {!! view_render_event('bagisto.shop.layout.content.after') !!}
-
-            </main>
-
-        </div>
-
-        {!! view_render_event('bagisto.shop.layout.footer.before') !!}
-
-        @include('shop::layouts.footer.footer')
-
-        {!! view_render_event('bagisto.shop.layout.footer.after') !!}
-
-        @if (core()->getConfigData('general.content.footer.footer_toggle'))
-            <div class="footer">
-                <p style="text-align: center;">
-                    @if (core()->getConfigData('general.content.footer.footer_content'))
-                        {{ core()->getConfigData('general.content.footer.footer_content') }}
-                    @else
-                        {!! trans('admin::app.footer.copy-right') !!}
-                    @endif
-                </p>
-            </div>
-        @endif
-
-        <overlay-loader :is-open="show_loader"></overlay-loader>
-    </div>
-
-    <script type="text/javascript">
-        window.flashMessages = [];
-
-        @if ($success = session('success'))
-            window.flashMessages = [{'type': 'alert-success', 'message': "{{ $success }}" }];
-        @elseif ($warning = session('warning'))
-            window.flashMessages = [{'type': 'alert-warning', 'message': "{{ $warning }}" }];
-        @elseif ($error = session('error'))
-            window.flashMessages = [{'type': 'alert-error', 'message': "{{ $error }}" }];
-        @elseif ($info = session('info'))
-            window.flashMessages = [{'type': 'alert-info', 'message': "{{ $info }}" }];
-        @endif
-
-        window.serverErrors = [];
-
-        @if (isset($errors))
-            @if (count($errors))
-                window.serverErrors = @json($errors->getMessages());
-            @endif
-        @endif
-    </script>
-
-    <script type="text/javascript" src="{{ bagisto_asset('js/shop.js') }}"></script>
-    <script type="text/javascript" src="{{ asset('vendor/webkul/ui/assets/js/ui.js') }}"></script>
-
-    @stack('scripts')
-
-    {!! view_render_event('bagisto.shop.layout.body.after') !!}
-
-    <div class="modal-overlay"></div>
-
-    <script>
-        {!! core()->getConfigData('general.content.custom_scripts.custom_javascript') !!}
-    </script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/resources/themes/shop/views/partials/pagination.blade.php b/resources/themes/shop/views/partials/pagination.blade.php
deleted file mode 100644
index 7350ddb24..000000000
--- a/resources/themes/shop/views/partials/pagination.blade.php
+++ /dev/null
@@ -1,50 +0,0 @@
-@if ($paginator->hasPages())
-    <div class="pagination shop mt-50">
-        {{-- Previous Page Link --}}
-        @if ($paginator->onFirstPage())
-            <a class="page-item previous">
-                <i class="icon angle-left-icon"></i>
-            </a>
-        @else
-            <a data-page="{{ urldecode($paginator->previousPageUrl()) }}" href="{{ urldecode($paginator->previousPageUrl()) }}" id="previous" class="page-item previous">
-                <i class="icon angle-left-icon"></i>
-            </a>
-        @endif
-
-        {{-- Pagination Elements --}}
-        @foreach ($elements as $element)
-            {{-- "Three Dots" Separator --}}
-            @if (is_string($element))
-                <a class="page-item disabled" aria-disabled="true">
-                    {{ $element }}
-                </a>
-            @endif
-
-            {{-- Array Of Links --}}
-            @if (is_array($element))
-                @foreach ($element as $page => $url)
-                    @if ($page == $paginator->currentPage())
-                        <a class="page-item active">
-                            {{ $page }}
-                        </a>
-                    @else
-                        <a class="page-item as" href="{{ urldecode($url) }}">
-                            {{ $page }}
-                        </a>
-                    @endif
-                @endforeach
-            @endif
-        @endforeach
-
-        {{-- Next Page Link --}}
-        @if ($paginator->hasMorePages())
-            <a href="{{ urldecode($paginator->nextPageUrl()) }}" data-page="{{ urldecode($paginator->nextPageUrl()) }}" id="next" class="page-item next">
-                <i class="icon angle-right-icon"></i>
-            </a>
-        @else
-            <a class="page-item next">
-                <i class="icon angle-right-icon"></i>
-            </a>
-        @endif
-    </div>
-@endif
diff --git a/resources/themes/shop/views/products/add-buttons.blade.php b/resources/themes/shop/views/products/add-buttons.blade.php
deleted file mode 100644
index c02bdee5d..000000000
--- a/resources/themes/shop/views/products/add-buttons.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@php
-    $showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false;
-
-    $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
-@endphp
-
-<div class="cart-wish-wrap">
-    <form action="{{ route('cart.add', $product->product_id) }}" method="POST">
-        @csrf
-        <input type="hidden" name="product_id" value="{{ $product->product_id }}">
-        <input type="hidden" name="quantity" value="1">
-        <button class="btn btn-lg btn-primary addtocart" {{ $product->isSaleable() ? '' : 'disabled' }}>{{ ($product->type == 'booking') ?  __('shop::app.products.book-now') :  __('shop::app.products.add-to-cart') }}</button>
-    </form>
-
-    @if ($showWishlist)
-        @include('shop::products.wishlist')
-    @endif
-
-    @if ($showCompare)
-        @include('shop::products.compare', [
-            'productId' => $product->id
-        ])
-    @endif
-</div>
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/add-to-cart.blade.php b/resources/themes/shop/views/products/add-to-cart.blade.php
deleted file mode 100644
index 6887730ee..000000000
--- a/resources/themes/shop/views/products/add-to-cart.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-{!! view_render_event('bagisto.shop.products.add_to_cart.before', ['product' => $product]) !!}
-
-@php
-    $width = (core()->getConfigData('catalog.products.storefront.buy_now_button_display') == 1) ? '49' : '95';
-@endphp
-
-<button type="submit" class="btn btn-lg btn-primary addtocart" {{ ! $product->isSaleable() ? 'disabled' : '' }}
-style="width: <?php echo $width.'%';?>;">
-    {{ ($product->type == 'booking') ?  __('shop::app.products.book-now') :  __('shop::app.products.add-to-cart') }}
-</button>
-
-{!! view_render_event('bagisto.shop.products.add_to_cart.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/add-to.blade.php b/resources/themes/shop/views/products/add-to.blade.php
deleted file mode 100644
index 88af2a27d..000000000
--- a/resources/themes/shop/views/products/add-to.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-{!! view_render_event('bagisto.shop.products.add_to.before', ['product' => $product]) !!}
-
-<div class="cart-fav-seg">
-    @include ('shop::products.add-to-cart', ['product' => $product])
-
-    @include('shop::products.wishlist')
-</div>
-
-{!! view_render_event('bagisto.shop.products.add_to.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/buy-now.blade.php b/resources/themes/shop/views/products/buy-now.blade.php
deleted file mode 100644
index 74bba5273..000000000
--- a/resources/themes/shop/views/products/buy-now.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-{!! view_render_event('bagisto.shop.products.buy_now.before', ['product' => $product]) !!}
-
-<button type="submit" class="btn btn-lg btn-primary buynow" {{ ! $product->isSaleable(1) ? 'disabled' : '' }}>
-    {{ __('shop::app.products.buy-now') }}
-</button>
-
-{!! view_render_event('bagisto.shop.products.buy_now.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/compare.blade.php b/resources/themes/shop/views/products/compare.blade.php
deleted file mode 100644
index 6e371e981..000000000
--- a/resources/themes/shop/views/products/compare.blade.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<compare-component product-id="{{ $productId }}"></compare-component>
-
-@push('scripts')
-
-    <script type="text/x-template" id="compare-component-template">
-        <a
-            class="unset text-right"
-            title="{{  __('shop::app.customer.compare.add-tooltip') }}"
-            @click="addProductToCompare"
-            style="cursor: pointer">
-            <img src="{{ asset('themes/default/assets/images/compare_arrows.png') }}" alt="" />
-        </a>
-    </script>
-
-    <script>
-        Vue.component('compare-component', {
-            props: ['productId'],
-
-            template: '#compare-component-template',
-
-            data: function () {
-                return {
-                    'baseUrl': "{{ url()->to('/') }}",
-                    'customer': '{{ auth()->guard('customer')->user() ? "true" : "false" }}' == "true",
-                }
-            },
-
-            methods: {
-                'addProductToCompare': function () {
-                    if (this.customer == "true" || this.customer == true) {
-                        this.$http.put(
-                            `${this.baseUrl}/comparison`, {
-                                productId: this.productId,
-                            }
-                        ).then(response => {
-                            window.flashMessages = [{
-                                'type': `alert-${response.data.status}`,
-                                'message': response.data.message
-                            }];
-
-                            this.$root.addFlashMessages()
-                        }).catch(error => {
-                            window.flashMessages = [{
-                                'type': `alert-danger`,
-                                'message': "{{ __('shop::app.common.error') }}"
-                            }];
-
-                            this.$root.addFlashMessages()
-                        });
-                    } else {
-                        let updatedItems = [this.productId];
-                        let existingItems = this.getStorageValue('compared_product');
-
-                        if (existingItems) {
-                            if (existingItems.indexOf(this.productId) == -1) {
-                                updatedItems = existingItems.concat(updatedItems);
-
-                                this.setStorageValue('compared_product', updatedItems);
-
-                                window.flashMessages = [{
-                                    'type': `alert-success`,
-                                    'message': "{{ __('shop::app.customer.compare.added') }}"
-                                }];
-
-                                this.$root.addFlashMessages()
-                            } else {
-                                window.flashMessages = [{
-                                    'type': `alert-success`,
-                                    'message': "{{ __('shop::app.customer.compare.already_added') }}"
-                                }];
-
-                                this.$root.addFlashMessages()
-                            }
-                        } else {
-                            this.setStorageValue('compared_product', updatedItems);
-
-                            window.flashMessages = [{
-                                'type': `alert-success`,
-                                'message': "{{ __('shop::app.customer.compare.added') }}"
-                            }];
-
-                                this.$root.addFlashMessages()
-                        }
-                    }
-
-                    this.updateCompareCount();
-                },
-
-                'getStorageValue': function (key) {
-                    let value = window.localStorage.getItem(key);
-
-                    if (value) {
-                        value = JSON.parse(value);
-                    }
-
-                    return value;
-                },
-
-                'setStorageValue': function (key, value) {
-                    window.localStorage.setItem(key, JSON.stringify(value));
-
-                    return true;
-                },
-
-                'updateCompareCount': function () {
-                    if (this.customer == "true" || this.customer == true) {
-                        this.$http.get(`${this.baseUrl}/items-count`)
-                        .then(response => {
-                            $('#compare-items-count').html(response.data.compareProductsCount);
-                        })
-                        .catch(exception => {
-                            window.flashMessages = [{
-                                'type': `alert-error`,
-                                'message': "{{ __('shop::app.common.error') }}"
-                            }];
-
-                            this.$root.addFlashMessages();
-                        });
-                    } else {
-                        let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
-                        comparedItemsCount = comparedItems ? comparedItems.length : 0;
-
-                        $('#compare-items-count').html(comparedItemsCount);
-                    }
-                }
-            }
-        });
-    </script>
-@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/index.blade.php b/resources/themes/shop/views/products/index.blade.php
deleted file mode 100644
index cd950fb94..000000000
--- a/resources/themes/shop/views/products/index.blade.php
+++ /dev/null
@@ -1,135 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ trim($category->meta_title) != "" ? $category->meta_title : $category->name }}
-@stop
-
-@section('seo')
-    <meta name="description" content="{{ trim($category->meta_description) != "" ? $category->meta_description : \Illuminate\Support\Str::limit(strip_tags($category->description), 120, '') }}"/>
-
-    <meta name="keywords" content="{{ $category->meta_keywords }}"/>
-
-    @if (core()->getConfigData('catalog.rich_snippets.categories.enable'))
-        <script type="application/ld+json">
-            {!! app('Webkul\Product\Helpers\SEO')->getCategoryJsonLd($category) !!}
-        </script>
-    @endif
-@stop
-
-@section('content-wrapper')
-    @inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
-
-    <div class="main">
-        {!! view_render_event('bagisto.shop.products.index.before', ['category' => $category]) !!}
-
-        <div class="category-container">
-
-            @if (in_array($category->display_mode, [null, 'products_only', 'products_and_description']))
-                @include ('shop::products.list.layered-navigation')
-            @endif
-
-            <div class="category-block" @if ($category->display_mode == 'description_only') style="width: 100%" @endif>
-                <div class="hero-image mb-35">
-                    @if (!is_null($category->image))
-                        <img class="logo" src="{{ $category->image_url }}" alt="" />
-                    @endif
-                </div>
-
-                @if (in_array($category->display_mode, [null, 'description_only', 'products_and_description']))
-                    @if ($category->description)
-                        <div class="category-description">
-                            {!! $category->description !!}
-                        </div>
-                    @endif
-                @endif
-
-                @if (in_array($category->display_mode, [null, 'products_only', 'products_and_description']))
-                    <?php $products = $productRepository->getAll($category->id); ?>
-
-                    @include ('shop::products.list.toolbar')
-
-                    @if ($products->count())
-
-                        @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
-
-                        @if ($toolbarHelper->getCurrentMode() == 'grid')
-                            <div class="product-grid-3">
-                                @foreach ($products as $productFlat)
-
-                                    @include ('shop::products.list.card', ['product' => $productFlat])
-
-                                @endforeach
-                            </div>
-                        @else
-                            <div class="product-list">
-                                @foreach ($products as $productFlat)
-
-                                    @include ('shop::products.list.card', ['product' => $productFlat])
-
-                                @endforeach
-                            </div>
-                        @endif
-
-                        {!! view_render_event('bagisto.shop.products.index.pagination.before', ['category' => $category]) !!}
-
-                        <div class="bottom-toolbar">
-                            {{ $products->appends(request()->input())->links() }}
-                        </div>
-
-                        {!! view_render_event('bagisto.shop.products.index.pagination.after', ['category' => $category]) !!}
-
-                    @else
-
-                        <div class="product-list empty">
-                            <h2>{{ __('shop::app.products.whoops') }}</h2>
-
-                            <p>
-                                {{ __('shop::app.products.empty') }}
-                            </p>
-                        </div>
-
-                    @endif
-                @endif
-            </div>
-        </div>
-
-        {!! view_render_event('bagisto.shop.products.index.after', ['category' => $category]) !!}
-    </div>
-@stop
-
-@push('scripts')
-    <script>
-        $(document).ready(function() {
-            $('.responsive-layred-filter').css('display','none');
-            $(".sort-icon, .filter-icon").on('click', function(e){
-                var currentElement = $(e.currentTarget);
-                if (currentElement.hasClass('sort-icon')) {
-                    currentElement.removeClass('sort-icon');
-                    currentElement.addClass('icon-menu-close-adj');
-                    currentElement.next().removeClass();
-                    currentElement.next().addClass('icon filter-icon');
-                    $('.responsive-layred-filter').css('display','none');
-                    $('.pager').css('display','flex');
-                    $('.pager').css('justify-content','space-between');
-                } else if (currentElement.hasClass('filter-icon')) {
-                    currentElement.removeClass('filter-icon');
-                    currentElement.addClass('icon-menu-close-adj');
-                    currentElement.prev().removeClass();
-                    currentElement.prev().addClass('icon sort-icon');
-                    $('.pager').css('display','none');
-                    $('.responsive-layred-filter').css('display','block');
-                    $('.responsive-layred-filter').css('margin-top','10px');
-                } else {
-                    currentElement.removeClass('icon-menu-close-adj');
-                    $('.responsive-layred-filter').css('display','none');
-                    $('.pager').css('display','none');
-                    if ($(this).index() == 0) {
-                        currentElement.addClass('sort-icon');
-                    } else {
-                        currentElement.addClass('filter-icon');
-                    }
-                }
-            });
-        });
-    </script>
-@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/list/card.blade.php b/resources/themes/shop/views/products/list/card.blade.php
deleted file mode 100644
index 270b15adf..000000000
--- a/resources/themes/shop/views/products/list/card.blade.php
+++ /dev/null
@@ -1,38 +0,0 @@
-{!! view_render_event('bagisto.shop.products.list.card.before', ['product' => $product]) !!}
-
-<div class="product-card">
-
-    @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
-    <?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
-
-    @if ($product->new)
-        <div class="sticker new">
-            {{ __('shop::app.products.new') }}
-        </div>
-    @endif
-
-    <div class="product-image">
-        <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
-            <img src="{{ $productBaseImage['medium_image_url'] }}" onerror="this.src='{{ asset('vendor/webkul/ui/assets/images/product/meduim-product-placeholder.png') }}'" alt="" height="500"/>
-        </a>
-    </div>
-
-    <div class="product-information">
-
-        <div class="product-name">
-            <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
-                <span>
-                    {{ $product->name }}
-                </span>
-            </a>
-        </div>
-
-        @include ('shop::products.price', ['product' => $product])
-
-        @include('shop::products.add-buttons', ['product' => $product])
-    </div>
-
-</div>
-
-{!! view_render_event('bagisto.shop.products.list.card.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/list/layered-navigation.blade.php b/resources/themes/shop/views/products/list/layered-navigation.blade.php
deleted file mode 100644
index 96ebd303c..000000000
--- a/resources/themes/shop/views/products/list/layered-navigation.blade.php
+++ /dev/null
@@ -1,219 +0,0 @@
-@inject ('attributeRepository', 'Webkul\Attribute\Repositories\AttributeRepository')
-
-@inject ('productFlatRepository', 'Webkul\Product\Repositories\ProductFlatRepository')
-
-@inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
-
-<?php
-    $filterAttributes = $attributes = [];
-    $maxPrice = 0;
-
-    if (isset($category)) {
-        $filterAttributes = $productFlatRepository->getProductsRelatedFilterableAttributes($category);
-
-        $maxPrice = core()->convertPrice($productFlatRepository->getCategoryProductMaximumPrice($category));
-    }
-
-    if (! count($filterAttributes) > 0) {
-        $filterAttributes = $attributeRepository->getFilterAttributes();
-    }
-?>
-
-<div class="layered-filter-wrapper">
-
-    {!! view_render_event('bagisto.shop.products.list.layered-nagigation.before') !!}
-
-    <layered-navigation></layered-navigation>
-
-    {!! view_render_event('bagisto.shop.products.list.layered-nagigation.after') !!}
-
-</div>
-
-@push('scripts')
-    <script type="text/x-template" id="layered-navigation-template">
-        <div>
-
-            <div class="filter-title">
-                {{ __('shop::app.products.layered-nav-title') }}
-            </div>
-
-            <div class="filter-content">
-
-                <div class="filter-attributes">
-
-                    <filter-attribute-item v-for='(attribute, index) in attributes' :attribute="attribute" :key="index" :index="index" @onFilterAdded="addFilters(attribute.code, $event)" :appliedFilterValues="appliedFilters[attribute.code]">
-                    </filter-attribute-item>
-
-                </div>
-            </div>
-        </div>
-    </script>
-
-    <script type="text/x-template" id="filter-attribute-item-template">
-        <div class="filter-attributes-item" :class="[active ? 'active' : '']">
-
-            <div class="filter-attributes-title" @click="active = !active">
-                @{{ attribute.name ? attribute.name : attribute.admin_name }}
-
-                <div class="pull-right">
-                    <span class="remove-filter-link" v-if="appliedFilters.length" @click.stop="clearFilters()">
-                        {{ __('shop::app.products.remove-filter-link-title') }}
-                    </span>
-
-                    <i class="icon" :class="[active ? 'arrow-up-icon' : 'arrow-down-icon']"></i>
-                </div>
-            </div>
-
-            <div class="filter-attributes-content">
-
-                <ol class="items" v-if="attribute.type != 'price'">
-                    <li class="item" v-for='(option, index) in attribute.options'>
-
-                        <span class="checkbox">
-                            <input type="checkbox" :id="option.id" v-bind:value="option.id" v-model="appliedFilters" @change="addFilter($event)"/>
-                            <label class="checkbox-view" :for="option.id"></label>
-                            @{{ option.label ? option.label : option.admin_name }}
-                        </span>
-
-                    </li>
-                </ol>
-
-                <div class="price-range-wrapper" v-if="attribute.type == 'price'">
-                    <vue-slider
-                        ref="slider"
-                        v-model="sliderConfig.value"
-                        :process-style="sliderConfig.processStyle"
-                        :tooltip-style="sliderConfig.tooltipStyle"
-                        :max="sliderConfig.max"
-                        :lazy="true"
-                        @change="priceRangeUpdated($event)"
-                    ></vue-slider>
-                </div>
-
-            </div>
-
-        </div>
-    </script>
-
-    <script>
-        Vue.component('layered-navigation', {
-
-            template: '#layered-navigation-template',
-
-            data: function() {
-                return {
-                    attributes: @json($filterAttributes),
-
-                    appliedFilters: {}
-                }
-            },
-
-            created: function () {
-                var urlParams = new URLSearchParams(window.location.search);
-
-                var this_this = this;
-
-                urlParams.forEach(function (value, index) {
-                    this_this.appliedFilters[index] = value.split(',');
-                });
-            },
-
-            methods: {
-                addFilters: function (attributeCode, filters) {
-                    if (filters.length) {
-                        this.appliedFilters[attributeCode] = filters;
-                    } else {
-                        delete this.appliedFilters[attributeCode];
-                    }
-
-                    this.applyFilter()
-                },
-
-                applyFilter: function () {
-                    var params = [];
-
-                    for(key in this.appliedFilters) {
-                        if (key != 'page') {
-                            params.push(key + '=' + this.appliedFilters[key].join(','))
-                        }
-                    }
-
-                    window.location.href = "?" + params.join('&');
-                }
-            }
-        });
-
-        Vue.component('filter-attribute-item', {
-
-            template: '#filter-attribute-item-template',
-
-            props: ['index', 'attribute', 'appliedFilterValues'],
-
-            data: function() {
-                let maxPrice  = @json($maxPrice);
-
-                maxPrice = maxPrice ? ((parseInt(maxPrice) !== 0 || maxPrice) ? parseInt(maxPrice) : 500) : 500;
-
-                return {
-                    appliedFilters: [],
-
-                    active: false,
-
-                    sliderConfig: {
-                        value: [
-                            0,
-                            0
-                        ],
-                        max: maxPrice,
-                        processStyle: {
-                            "backgroundColor": "#FF6472"
-                        },
-                        tooltipStyle: {
-                            "backgroundColor": "#FF6472",
-                            "borderColor": "#FF6472"
-                        }
-                    }
-                }
-            },
-
-            created: function () {
-                if (!this.index)
-                    this.active = true;
-
-                if (this.appliedFilterValues && this.appliedFilterValues.length) {
-                    this.appliedFilters = this.appliedFilterValues;
-
-                    if (this.attribute.type == 'price') {
-                        this.sliderConfig.value = this.appliedFilterValues;
-                    }
-
-                    this.active = true;
-                }
-            },
-
-            methods: {
-                addFilter: function (e) {
-                    this.$emit('onFilterAdded', this.appliedFilters)
-                },
-
-                priceRangeUpdated: function (value) {
-                    this.appliedFilters = value;
-
-                    this.$emit('onFilterAdded', this.appliedFilters)
-                },
-
-                clearFilters: function () {
-                    if (this.attribute.type == 'price') {
-                        this.sliderConfig.value = [0, 0];
-                    }
-
-                    this.appliedFilters = [];
-
-                    this.$emit('onFilterAdded', this.appliedFilters)
-                }
-            }
-
-        });
-
-    </script>
-@endpush
diff --git a/resources/themes/shop/views/products/list/toolbar.blade.php b/resources/themes/shop/views/products/list/toolbar.blade.php
deleted file mode 100644
index 44042ae84..000000000
--- a/resources/themes/shop/views/products/list/toolbar.blade.php
+++ /dev/null
@@ -1,83 +0,0 @@
-@inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
-
-{!! view_render_event('bagisto.shop.products.list.toolbar.before') !!}
-
-<div class="top-toolbar mb-35">
-
-    <div class="page-info">
-        <span>
-            {{ __('shop::app.products.pager-info', ['showing' => $products->firstItem() . '-' . $products->lastItem(), 'total' => $products->total()]) }}
-        </span>
-
-        <span class="sort-filter">
-            <i class="icon sort-icon" id="sort" ></i>
-            <i class="icon filter-icon" id="filter"></i>
-        </span>
-    </div>
-
-    <div class="pager">
-
-        <div class="view-mode">
-            @if ($toolbarHelper->isModeActive('grid'))
-                <span class="grid-view">
-                    <i class="icon grid-view-icon"></i>
-                </span>
-            @else
-                <a href="{{ $toolbarHelper->getModeUrl('grid') }}" class="grid-view" aria-label="Grid">
-                    <i class="icon grid-view-icon"></i>
-                </a>
-            @endif
-
-            @if ($toolbarHelper->isModeActive('list'))
-                <span class="list-view">
-                    <i class="icon list-view-icon"></i>
-                </span>
-            @else
-                <a href="{{ $toolbarHelper->getModeUrl('list') }}" class="list-view" aria-label="list">
-                    <i class="icon list-view-icon"></i>
-                </a>
-            @endif
-        </div>
-
-        <div class="sorter">
-            <label for="sort-by-toolbar">{{ __('shop::app.products.sort-by') }}</label>
-
-            <select onchange="window.location.href = this.value" id="sort-by-toolbar">
-
-                @foreach ($toolbarHelper->getAvailableOrders() as $key => $order)
-
-                    <option value="{{ $toolbarHelper->getOrderUrl($key) }}" {{ $toolbarHelper->isOrderCurrent($key) ? 'selected' : '' }}>
-                        {{ __('shop::app.products.' . $order) }}
-                    </option>
-
-                @endforeach
-
-            </select>
-        </div>
-
-        <div class="limiter">
-            <label for="show-toolbar">{{ __('shop::app.products.show') }}</label>
-
-            <select onchange="window.location.href = this.value" id="show-toolbar">
-
-                @foreach ($toolbarHelper->getAvailableLimits() as $limit)
-
-                    <option value="{{ $toolbarHelper->getLimitUrl($limit) }}" {{ $toolbarHelper->isLimitCurrent($limit) ? 'selected' : '' }}>
-                        {{ $limit }}
-                    </option>
-
-                @endforeach
-
-            </select>
-        </div>
-
-    </div>
-
-</div>
-
-{!! view_render_event('bagisto.shop.products.list.toolbar.after') !!}
-
-
-<div class="responsive-layred-filter mb-20">
-    <layered-navigation></layered-navigation>
-</div>
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/price.blade.php b/resources/themes/shop/views/products/price.blade.php
deleted file mode 100644
index bed2c056d..000000000
--- a/resources/themes/shop/views/products/price.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-{!! view_render_event('bagisto.shop.products.price.before', ['product' => $product]) !!}
-
-<div class="product-price">
-    {!! $product->getTypeInstance()->getPriceHtml() !!}
-</div>
-
-{!! view_render_event('bagisto.shop.products.price.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/review.blade.php b/resources/themes/shop/views/products/review.blade.php
deleted file mode 100644
index 5c9491b1f..000000000
--- a/resources/themes/shop/views/products/review.blade.php
+++ /dev/null
@@ -1,28 +0,0 @@
-@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
-
-{!! view_render_event('bagisto.shop.products.review.before', ['product' => $product]) !!}
-
-@if ($total = $reviewHelper->getTotalReviews($product))
-    <div class="product-ratings mb-10">
-        <span class="stars">
-            @for ($i = 1; $i <= 5; $i++)
-              @if($i <= round($reviewHelper->getAverageRating($product)))
-              <span class="icon star-icon"></span>
-              @else
-              <span class="icon star-icon-blank"></span>
-              @endif
-            @endfor
-        </span>
-
-        <div class="total-reviews">
-            {{
-                __('shop::app.products.total-rating', [
-                        'total_rating' => $reviewHelper->getAverageRating($product),
-                        'total_reviews' => $total,
-                    ])
-            }}
-        </div>
-    </div>
-@endif
-
-{!! view_render_event('bagisto.shop.products.review.after', ['product' => $product]) !!}
diff --git a/resources/themes/shop/views/products/reviews/create.blade.php b/resources/themes/shop/views/products/reviews/create.blade.php
deleted file mode 100644
index 0c9abb250..000000000
--- a/resources/themes/shop/views/products/reviews/create.blade.php
+++ /dev/null
@@ -1,118 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.reviews.add-review-page-title') }} - {{ $product->name }}
-@endsection
-
-@section('content-wrapper')
-
-    <section class="review">
-
-        <div class="review-layouter mb-20">
-            <div class="product-info">
-                @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
-                <?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
-
-                <div class="product-image">
-                    <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
-                        <img src="{{ $productBaseImage['medium_image_url'] }}" alt="" />
-                    </a>
-                </div>
-
-                <div class="product-name mt-20">
-                    <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
-                        <span>{{ $product->name }}</span>
-                    </a>
-                </div>
-
-                @include('shop::products.price')
-
-            </div>
-
-            <div class="review-form">
-                <form method="POST" action="{{ route('shop.reviews.store', $product->product_id ) }}" @submit.prevent="onSubmit">
-                    @csrf
-
-                    <div class="heading mt-10 mb-25">
-                        <span>{{ __('shop::app.reviews.write-review') }}</span>
-                    </div>
-
-                    <div class="control-group" :class="[errors.has('rating') ? 'has-error' : '']">
-                        <label for="title" class="required">
-                            {{ __('admin::app.customers.reviews.rating') }}
-                        </label>
-
-                        <div class="stars">
-                            <span class="star star-5" for="star-5" onclick="calculateRating(id)" id="1"></span>
-                            <span class="star star-4" for="star-4" onclick="calculateRating(id)" id="2"></span>
-                            <span class="star star-3" for="star-3" onclick="calculateRating(id)" id="3"></span>
-                            <span class="star star-2" for="star-2" onclick="calculateRating(id)" id="4"></span>
-                            <span class="star star-1" for="star-1" onclick="calculateRating(id)" id="5"></span>
-                        </div>
-
-                        <input type="hidden" id="rating" name="rating" v-validate="'required'">
-
-                        <div class="control-error" v-if="errors.has('rating')">@{{ errors.first('rating') }}</div>
-                    </div>
-
-                    <div class="control-group" :class="[errors.has('title') ? 'has-error' : '']">
-                        <label for="title" class="required">
-                            {{ __('shop::app.reviews.title') }}
-                        </label>
-                        <input  type="text" class="control" name="title" v-validate="'required'" value="{{ old('title') }}">
-                        <span class="control-error" v-if="errors.has('title')">@{{ errors.first('title') }}</span>
-                    </div>
-
-                    @if (core()->getConfigData('catalog.products.review.guest_review') && ! auth()->guard('customer')->user())
-                        <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
-                            <label for="title" class="required">
-                                {{ __('shop::app.reviews.name') }}
-                            </label>
-                            <input  type="text" class="control" name="name" v-validate="'required'" value="{{ old('name') }}">
-                            <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
-                        </div>
-                    @endif
-
-                    <div class="control-group" :class="[errors.has('comment') ? 'has-error' : '']">
-                        <label for="comment" class="required">
-                            {{ __('admin::app.customers.reviews.comment') }}
-                        </label>
-                        <textarea type="text" class="control" name="comment" v-validate="'required'" value="{{ old('comment') }}">
-                        </textarea>
-                        <span class="control-error" v-if="errors.has('comment')">@{{ errors.first('comment') }}</span>
-                    </div>
-
-                    <button type="submit" class="btn btn-lg btn-primary">
-                        {{ __('shop::app.reviews.submit') }}
-                    </button>
-
-                </form>
-            </div>
-        </div>
-
-    </section>
-
-@endsection
-
-
-@push('scripts')
-
-    <script>
-
-        function calculateRating(id) {
-            var a = document.getElementById(id);
-            document.getElementById("rating").value = id;
-
-            for (let i=1 ; i <= 5 ; i++) {
-                if (id >= i) {
-                    document.getElementById(i).style.color="#242424";
-                } else {
-                    document.getElementById(i).style.color="#d4d4d4";
-                }
-            }
-        }
-
-    </script>
-
-@endpush
diff --git a/resources/themes/shop/views/products/reviews/index.blade.php b/resources/themes/shop/views/products/reviews/index.blade.php
deleted file mode 100644
index 074c5d58b..000000000
--- a/resources/themes/shop/views/products/reviews/index.blade.php
+++ /dev/null
@@ -1,165 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.reviews.product-review-page-title') }} - {{ $product->name }}
-@endsection
-
-@section('content-wrapper')
-
-    <section class="review">
-
-        <div class="review-layouter">
-            @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
-            @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
-
-            <?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
-
-            <div class="product-info">
-                <div class="product-image">
-                    <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
-                        <img src="{{ $productBaseImage['medium_image_url'] }}" alt="" />
-                    </a>
-                </div>
-
-                <div class="product-name mt-20">
-                    <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
-                        <span>{{ $product->name }}</span>
-                    </a>
-                </div>
-
-                <div class="product-price mt-10">
-                    @if ($product->getTypeInstance()->haveSpecialPrice())
-                        <span class="pro-price">{{ core()->currency($product->getTypeInstance()->getSpecialPrice()) }}</span>
-                    @else
-                        <span class="pro-price">{{ core()->currency($product->getTypeInstance()->getMinimalPrice()) }}</span>
-                    @endif
-                </div>
-            </div>
-
-            <div class="review-form">
-                <div class="heading mt-10">
-                    <span> {{ __('shop::app.reviews.rating-reviews') }} </span>
-
-                    @if (core()->getConfigData('catalog.products.review.guest_review') || auth()->guard('customer')->check())
-                        <a href="{{ route('shop.reviews.create', $product->url_key) }}" class="btn btn-lg btn-primary right">
-                            {{ __('shop::app.products.write-review-btn') }}
-                        </a>
-                    @endif
-                </div>
-
-                <div class="ratings-reviews mt-35">
-                    <div class="left-side">
-                        <span class="rate">
-                            {{ $reviewHelper->getAverageRating($product) }}
-                        </span>
-
-                        <span class="stars">
-                            @for ($i = 1; $i <= 5; $i++)
-
-                              @if($i <= round($reviewHelper->getAverageRating($product)))
-                                <span class="icon star-icon"></span>
-                              @else
-                                <span class="icon star-icon-blank"></span>
-                              @endif
-
-                            @endfor
-                        </span>
-
-                        <div class="total-reviews mt-5">
-                            {{ __('shop::app.reviews.ratingreviews', [
-                                'rating' => $reviewHelper->getAverageRating($product),
-                                'review' => $reviewHelper->getTotalReviews($product)])
-                            }}
-                        </div>
-                    </div>
-
-                    <div class="right-side">
-
-                        @foreach ($reviewHelper->getPercentageRating($product) as $key => $count)
-                            <div class="rater 5star">
-                                <div class="rate-number" id={{ $key }}{{ __('shop::app.reviews.id-star')  }}></div>
-                                <div class="star-name">{{ __('shop::app.reviews.star') }}</div>
-                                <div class="line-bar">
-                                    <div class="line-value" id="{{ $key }}"></div>
-                                </div>
-                                <div class="percentage">
-                                    <span>
-                                        {{ __('shop::app.reviews.percentage', ['percentage' => $count]) }}
-                                    </span>
-                                </div>
-                            </div>
-                            <br/>
-                        @endforeach
-
-                    </div>
-                </div>
-
-                <div class="rating-reviews">
-                    <div class="reviews">
-
-                        @foreach ($reviewHelper->getReviews($product)->paginate(10) as $review)
-                            <div class="review">
-                                <div class="title">
-                                    {{ $review->title }}
-                                </div>
-
-                                <span class="stars">
-                                    @for ($i = 1; $i <= 5; $i++)
-
-                                      @if($i <= $review->rating)
-                                        <span class="icon star-icon"></span>
-                                      @else
-                                        <span class="icon star-icon-blank"></span>
-                                      @endif
-
-                                    @endfor
-                                </span>
-
-                                <div class="message">
-                                    {{ $review->comment }}
-                                </div>
-
-                                <div class="reviewer-details">
-                                    <span class="by">
-                                        {{ __('shop::app.products.by', ['name' => $review->name]) }},
-                                    </span>
-
-                                    <span class="when">
-                                        {{ core()->formatDate($review->created_at, 'F d, Y') }}
-                                    </span>
-                                </div>
-                            </div>
-                        @endforeach
-
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </section>
-
-@endsection
-
-@push('scripts')
-
-    <script>
-
-        window.onload = (function() {
-            var percentage = {};
-            <?php foreach ($reviewHelper->getPercentageRating($product) as $key => $count) { ?>
-
-                percentage = <?php echo "'$count';"; ?>
-                id = <?php echo "'$key';"; ?>
-                idNumber = id + 'star';
-
-                document.getElementById(id).style.width = percentage + "%";
-                document.getElementById(id).style.height = 4 + "px";
-                document.getElementById(idNumber).innerHTML = id ;
-
-            <?php } ?>
-        })();
-
-    </script>
-
-@endpush
diff --git a/resources/themes/shop/views/products/sharelinks.blade.php b/resources/themes/shop/views/products/sharelinks.blade.php
deleted file mode 100644
index fd0807215..000000000
--- a/resources/themes/shop/views/products/sharelinks.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-<span class="icon share-icon"></span>
diff --git a/resources/themes/shop/views/products/view.blade.php b/resources/themes/shop/views/products/view.blade.php
deleted file mode 100644
index 0f378be6d..000000000
--- a/resources/themes/shop/views/products/view.blade.php
+++ /dev/null
@@ -1,291 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ trim($product->meta_title) != "" ? $product->meta_title : $product->name }}
-@stop
-
-@section('seo')
-    <meta name="description" content="{{ trim($product->meta_description) != "" ? $product->meta_description : \Illuminate\Support\Str::limit(strip_tags($product->description), 120, '') }}"/>
-
-    <meta name="keywords" content="{{ $product->meta_keywords }}"/>
-
-    @if (core()->getConfigData('catalog.rich_snippets.products.enable'))
-        <script type="application/ld+json">
-            {{ app('Webkul\Product\Helpers\SEO')->getProductJsonLd($product) }}
-        </script>
-    @endif
-
-    <?php $productBaseImage = app('Webkul\Product\Helpers\ProductImage')->getProductBaseImage($product); ?>
-
-    <meta name="twitter:card" content="summary_large_image" />
-
-    <meta name="twitter:title" content="{{ $product->name }}" />
-
-    <meta name="twitter:description" content="{!! htmlspecialchars(trim(strip_tags($product->description))) !!}" />
-
-    <meta name="twitter:image:alt" content="" />
-
-    <meta name="twitter:image" content="{{ $productBaseImage['medium_image_url'] }}" />
-
-    <meta property="og:type" content="og:product" />
-
-    <meta property="og:title" content="{{ $product->name }}" />
-
-    <meta property="og:image" content="{{ $productBaseImage['medium_image_url'] }}" />
-
-    <meta property="og:description" content="{!! htmlspecialchars(trim(strip_tags($product->description))) !!}" />
-
-    <meta property="og:url" content="{{ route('shop.productOrCategory.index', $product->url_key) }}" />
-@stop
-
-@section('content-wrapper')
-
-    {!! view_render_event('bagisto.shop.products.view.before', ['product' => $product]) !!}
-
-    <section class="product-detail">
-
-        <div class="layouter">
-            <product-view>
-                <div class="form-container">
-                    @csrf()
-
-                    <input type="hidden" name="product_id" value="{{ $product->product_id }}">
-
-                    @include ('shop::products.view.gallery')
-
-                    <div class="details">
-
-                        <div class="product-heading">
-                            <span>{{ $product->name }}</span>
-                        </div>
-
-                        @include ('shop::products.review', ['product' => $product])
-
-                        @include ('shop::products.price', ['product' => $product])
-
-                        @include ('shop::products.view.stock', ['product' => $product])
-
-                        {!! view_render_event('bagisto.shop.products.view.short_description.before', ['product' => $product]) !!}
-
-                        <div class="description">
-                            {!! $product->short_description !!}
-                        </div>
-
-                        {!! view_render_event('bagisto.shop.products.view.short_description.after', ['product' => $product]) !!}
-
-
-                        {!! view_render_event('bagisto.shop.products.view.quantity.before', ['product' => $product]) !!}
-
-                        @if ($product->getTypeInstance()->showQuantityBox())
-                            <quantity-changer></quantity-changer>
-                        @else
-                            <input type="hidden" name="quantity" value="1">
-                        @endif
-
-                        {!! view_render_event('bagisto.shop.products.view.quantity.after', ['product' => $product]) !!}
-
-                        @include ('shop::products.view.configurable-options')
-
-                        @include ('shop::products.view.downloadable')
-
-                        @include ('shop::products.view.grouped-products')
-
-                        @include ('shop::products.view.bundle-options')
-
-                        {!! view_render_event('bagisto.shop.products.view.description.before', ['product' => $product]) !!}
-
-                        <accordian :title="'{{ __('shop::app.products.description') }}'" :active="true">
-                            <div slot="header">
-                                {{ __('shop::app.products.description') }}
-                                <i class="icon expand-icon right"></i>
-                            </div>
-
-                            <div slot="body">
-                                <div class="full-description">
-                                    {!! $product->description !!}
-                                </div>
-                            </div>
-                        </accordian>
-
-                        {!! view_render_event('bagisto.shop.products.view.description.after', ['product' => $product]) !!}
-
-                        @include ('shop::products.view.attributes')
-
-                        @include ('shop::products.view.reviews')
-                    </div>
-                </div>
-            </product-view>
-        </div>
-
-        @include ('shop::products.view.related-products')
-
-        @include ('shop::products.view.up-sells')
-
-    </section>
-
-    {!! view_render_event('bagisto.shop.products.view.after', ['product' => $product]) !!}
-@endsection
-
-@push('scripts')
-
-    <script type="text/x-template" id="product-view-template">
-        <form method="POST" id="product-form" action="{{ route('cart.add', $product->product_id) }}" @click="onSubmit($event)">
-
-            <input type="hidden" name="is_buy_now" v-model="is_buy_now">
-
-            <slot></slot>
-
-        </form>
-    </script>
-
-    <script type="text/x-template" id="quantity-changer-template">
-        <div class="quantity control-group" :class="[errors.has(controlName) ? 'has-error' : '']">
-            <label class="required">{{ __('shop::app.products.quantity') }}</label>
-            <span class="quantity-container">
-                <button type="button" class="decrease" @click="decreaseQty()">-</button>
-
-                <input :name="controlName" class="control" :value="qty" :v-validate="validations" data-vv-as="&quot;{{ __('shop::app.products.quantity') }}&quot;" readonly>
-
-                <button type="button" class="increase" @click="increaseQty()">+</button>
-
-                <span class="control-error" v-if="errors.has(controlName)">@{{ errors.first(controlName) }}</span>
-            </span>
-        </div>
-    </script>
-
-    <script>
-
-        Vue.component('product-view', {
-
-            template: '#product-view-template',
-
-            inject: ['$validator'],
-
-            data: function() {
-                return {
-                    is_buy_now: 0,
-                }
-            },
-
-            methods: {
-                onSubmit: function(e) {
-                    if (e.target.getAttribute('type') != 'submit')
-                        return;
-
-                    e.preventDefault();
-
-                    var this_this = this;
-
-                    this.$validator.validateAll().then(function (result) {
-                        if (result) {
-                            this_this.is_buy_now = e.target.classList.contains('buynow') ? 1 : 0;
-
-                            setTimeout(function() {
-                                document.getElementById('product-form').submit();
-                            }, 0);
-                        }
-                    });
-                }
-            }
-        });
-
-        Vue.component('quantity-changer', {
-            template: '#quantity-changer-template',
-
-            inject: ['$validator'],
-
-            props: {
-                controlName: {
-                    type: String,
-                    default: 'quantity'
-                },
-
-                quantity: {
-                    type: [Number, String],
-                    default: 1
-                },
-
-                minQuantity: {
-                    type: [Number, String],
-                    default: 1
-                },
-
-                validations: {
-                    type: String,
-                    default: 'required|numeric|min_value:1'
-                }
-            },
-
-            data: function() {
-                return {
-                    qty: this.quantity
-                }
-            },
-
-            watch: {
-                quantity: function (val) {
-                    this.qty = val;
-
-                    this.$emit('onQtyUpdated', this.qty)
-                }
-            },
-
-            methods: {
-                decreaseQty: function() {
-                    if (this.qty > this.minQuantity)
-                        this.qty = parseInt(this.qty) - 1;
-
-                    this.$emit('onQtyUpdated', this.qty)
-                },
-
-                increaseQty: function() {
-                    this.qty = parseInt(this.qty) + 1;
-
-                    this.$emit('onQtyUpdated', this.qty)
-                }
-            }
-        });
-
-        $(document).ready(function() {
-            var addTOButton = document.getElementsByClassName('add-to-buttons')[0];
-            document.getElementById('loader').style.display="none";
-            addTOButton.style.display="flex";
-        });
-
-        window.onload = function() {
-            var thumbList = document.getElementsByClassName('thumb-list')[0];
-            var thumbFrame = document.getElementsByClassName('thumb-frame');
-            var productHeroImage = document.getElementsByClassName('product-hero-image')[0];
-
-            if (thumbList && productHeroImage) {
-
-                for(let i=0; i < thumbFrame.length ; i++) {
-                    thumbFrame[i].style.height = (productHeroImage.offsetHeight/4) + "px";
-                    thumbFrame[i].style.width = (productHeroImage.offsetHeight/4)+ "px";
-                }
-
-                if (screen.width > 720) {
-                    thumbList.style.width = (productHeroImage.offsetHeight/4) + "px";
-                    thumbList.style.minWidth = (productHeroImage.offsetHeight/4) + "px";
-                    thumbList.style.height = productHeroImage.offsetHeight + "px";
-                }
-            }
-
-            window.onresize = function() {
-                if (thumbList && productHeroImage) {
-
-                    for(let i=0; i < thumbFrame.length; i++) {
-                        thumbFrame[i].style.height = (productHeroImage.offsetHeight/4) + "px";
-                        thumbFrame[i].style.width = (productHeroImage.offsetHeight/4)+ "px";
-                    }
-
-                    if (screen.width > 720) {
-                        thumbList.style.width = (productHeroImage.offsetHeight/4) + "px";
-                        thumbList.style.minWidth = (productHeroImage.offsetHeight/4) + "px";
-                        thumbList.style.height = productHeroImage.offsetHeight + "px";
-                    }
-                }
-            }
-        };
-    </script>
-@endpush
diff --git a/resources/themes/shop/views/products/view/attributes.blade.php b/resources/themes/shop/views/products/view/attributes.blade.php
deleted file mode 100644
index e64fb55fb..000000000
--- a/resources/themes/shop/views/products/view/attributes.blade.php
+++ /dev/null
@@ -1,45 +0,0 @@
-@inject ('productViewHelper', 'Webkul\Product\Helpers\View')
-
-{!! view_render_event('bagisto.shop.products.view.attributes.before', ['product' => $product]) !!}
-
-@if ($customAttributeValues = $productViewHelper->getAdditionalData($product))
-    <accordian :title="'{{ __('shop::app.products.specification') }}'" :active="false">
-        <div slot="header">
-            {{ __('shop::app.products.specification') }}
-            <i class="icon expand-icon right"></i>
-        </div>
-
-        <div slot="body">
-            <table class="full-specifications">
-
-                @foreach ($customAttributeValues as $attribute)
-                    <tr>
-                        @if ($attribute['label'])
-                            <td>{{ $attribute['label'] }}</td>
-                        @else
-                            <td>{{ $attribute['admin_name'] }}</td>
-                        @endif
-                        @if ($attribute['type'] == 'file' && $attribute['value'])
-                            <td>
-                                <a  href="{{ route('shop.product.file.download', [$product->product_id, $attribute['id']])}}">
-                                    <i class="icon sort-down-icon download"></i>
-                                </a>
-                            </td>
-                        @elseif ($attribute['type'] == 'image' && $attribute['value'])
-                            <td>
-                                <a href="{{ route('shop.product.file.download', [$product->product_id, $attribute['id']])}}">
-                                    <img src="{{ Storage::url($attribute['value']) }}" style="height: 20px; width: 20px;" alt=""/>
-                                </a>
-                            </td>
-                        @else
-                            <td>{{ $attribute['value'] }}</td>
-                        @endif
-                    </tr>
-                @endforeach
-
-            </table>
-        </div>
-    </accordian>
-@endif
-
-{!! view_render_event('bagisto.shop.products.view.attributes.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/bundle-options.blade.php b/resources/themes/shop/views/products/view/bundle-options.blade.php
deleted file mode 100644
index 12ca3e667..000000000
--- a/resources/themes/shop/views/products/view/bundle-options.blade.php
+++ /dev/null
@@ -1,236 +0,0 @@
-@if ($product->type == 'bundle')
-
-    {!! view_render_event('bagisto.shop.products.view.bundle-options.before', ['product' => $product]) !!}
-
-    <bundle-option-list></bundle-option-list>
-
-    {!! view_render_event('bagisto.shop.products.view.bundle-options.after', ['product' => $product]) !!}
-
-    @push('scripts')
-        <script type="text/x-template" id="bundle-option-list-template">
-            <div class="bundle-options-wrapper">
-                <div class="bundle-option-list">
-                    <h3>{{ __('shop::app.products.customize-options') }}</h3>
-
-                    <bundle-option-item
-                        v-for="(option, index) in options"
-                        :option="option"
-                        :key="index"
-                        :index="index"
-                        @onProductSelected="productSelected(option, $event)">
-                    </bundle-option-item>
-                </div>
-
-                <div class="bundle-summary">
-                    <h3>{{ __('shop::app.products.your-customization') }}</h3>
-
-                    <quantity-changer></quantity-changer>
-
-                    <div class="control-group">
-                        <label>{{ __('shop::app.products.total-amount') }}</label>
-
-                        <div class="bundle-price">
-                            @{{ formated_total_price | currency(currency_options) }}
-                        </div>
-                    </div>
-
-                    <ul class="bundle-items">
-                        <li v-for="(option, index) in options">
-                            @{{ option.label }}
-
-                            <div class="selected-products">
-                                <div v-for="(product, index1) in option.products" v-if="product.is_default">
-                                    @{{ product.qty + ' x ' + product.name }}
-                                </div>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </script>
-
-        <script type="text/x-template" id="bundle-option-item-template">
-            <div class="bundle-option-item">
-                <div class="control-group" :class="[errors.has('bundle_options[' + option.id + '][]') ? 'has-error' : '']">
-                    <label :class="[option.is_required ? 'required' : '']">@{{ option.label }}</label>
-
-                    <div v-if="option.type == 'select'">
-                        <select class="control" :name="'bundle_options[' + option.id + '][]'" v-model="selected_product" v-validate="option.is_required ? 'required' : ''" :data-vv-as="option.label + '&quot;'">
-                            <option value="">{{ __('shop::app.products.choose-selection') }}</option>
-                            <option v-for="(product, index2) in option.products" :value="product.id">
-                                @{{ product.name + ' + ' + product.price.final_price.formated_price }}
-                            </option>
-                        </select>
-                    </div>
-
-                    <div v-if="option.type == 'radio'">
-                        <span class="radio" v-if="! option.is_required">
-                            <input type="radio" :name="'bundle_options[' + option.id + '][]'" v-model="selected_product" value="0" :id="'bundle_options[' + option.id + '][]'">
-                            <label class="radio-view" :for="'bundle_options[' + option.id + '][]'"></label>
-
-                            {{ __('shop::app.products.none') }}
-                        </span>
-
-                        <span class="radio" v-for="(product, index2) in option.products">
-                            <input type="radio" :name="'bundle_options[' + option.id + '][]'" v-model="selected_product" v-validate="option.is_required ? 'required' : ''" :data-vv-as="'&quot;' + option.label + '&quot;'" :value="product.id" :id="'bundle_options[' + option.id + '][]'">
-                            <label class="radio-view" :for="'bundle_options[' + option.id + '][]'"></label>
-
-                            @{{ product.name }}
-
-                            <span class="price">
-                                + @{{ product.price.final_price.formated_price }}
-                            </span>
-                        </span>
-                    </div>
-
-                    <div v-if="option.type == 'checkbox'">
-                        <span class="checkbox" v-for="(product, index2) in option.products">
-                            <input type="checkbox" :name="'bundle_options[' + option.id + '][]'" :value="product.id" v-model="selected_product" v-validate="option.is_required ? 'required' : ''" :data-vv-as="'&quot;' + option.label + '&quot;'" :id="'bundle_options[' + option.id + '][]'">
-                            <label class="checkbox-view" :for="'bundle_options[' + option.id + '][]'"></label>
-
-                            @{{ product.name }}
-
-                            <span class="price">
-                                + @{{ product.price.final_price.formated_price }}
-                            </span>
-                        </span>
-                    </div>
-
-                    <div v-if="option.type == 'multiselect'">
-                        <select class="control" :name="'bundle_options[' + option.id + '][]'" v-model="selected_product" v-validate="option.is_required ? 'required' : ''" :data-vv-as="'&quot;' + option.label + '&quot;'" multiple>
-                            <option value="0" v-if="! option.is_required">{{ __('shop::app.products.none') }}</option>
-                            <option v-for="(product, index2) in option.products" :value="product.id">
-                                @{{ product.name + ' + ' + product.price.final_price.formated_price }}
-                            </option>
-                        </select>
-                    </div>
-
-                    <span class="control-error" v-if="errors.has('bundle_options[' + option.id + '][]')">
-                        @{{ errors.first('bundle_options[' + option.id + '][]') }}
-                    </span>
-                </div>
-
-                <div v-if="option.type == 'select' || option.type == 'radio'">
-                    <quantity-changer
-                        :control-name="'bundle_option_qty[' + option.id + ']'"
-                        :validations="parseInt(selected_product) ? 'required|numeric|min_value:1' : ''"
-                        :quantity="product_qty"
-                        @onQtyUpdated="qtyUpdated($event)">
-                    </quantity-changer>
-                </div>
-            </div>
-        </script>
-
-        <script>
-            Vue.component('bundle-option-list', {
-
-                template: '#bundle-option-list-template',
-
-                inject: ['$validator'],
-
-                data: function() {
-                    return {
-                        config: @json(app('Webkul\Product\Helpers\BundleOption')->getBundleConfig($product)),
-
-                        options: [],
-
-                        currency_options: @json(core()->getAccountJsSymbols())
-                    }
-                },
-
-                computed: {
-                    formated_total_price: function() {
-                        var total = 0;
-
-                        for (var key in this.options) {
-                            for (var key1 in this.options[key].products) {
-                                if (! this.options[key].products[key1].is_default)
-                                    continue;
-
-                                total += this.options[key].products[key1].qty * this.options[key].products[key1].price.final_price.price;
-                            }
-                        }
-
-                        return total;
-                    }
-                },
-
-                created: function() {
-                    for (var key in this.config.options) {
-                        this.options.push(this.config.options[key])
-                    }
-                },
-
-                methods: {
-                    productSelected: function(option, value) {
-                        var selectedProductIds = Array.isArray(value) ? value : [value];
-
-                        for (var key in option.products) {
-                            option.products[key].is_default = selectedProductIds.indexOf(option.products[key].id) > -1 ? 1 : 0;
-                        }
-                    }
-                }
-            });
-
-            Vue.component('bundle-option-item', {
-                template: '#bundle-option-item-template',
-
-                props: ['index', 'option'],
-
-                inject: ['$validator'],
-
-                data: function() {
-                    return {
-                        selected_product: (this.option.type == 'checkbox' || this.option.type == 'multiselect')  ? [] : null,
-
-                        qty_validations: ''
-                    }
-                },
-
-                computed: {
-                    product_qty: function() {
-                        var self = this;
-                        self.qty = 0;
-
-                        self.option.products.forEach(function(product, key){
-                            if (self.selected_product == product.id)
-                                self.qty =  self.option.products[key].qty;
-                        });
-
-                        return self.qty;
-                    }
-                },
-
-                watch: {
-                    selected_product: function (value) {
-                        this.qty_validations = this.selected_product ? 'required|numeric|min_value:1' : '';
-
-                        this.$emit('onProductSelected', value)
-                    }
-                },
-
-                created: function() {
-                    for (var key1 in this.option.products) {
-                        if (! this.option.products[key1].is_default)
-                            continue;
-
-                        if (this.option.type == 'checkbox' || this.option.type == 'multiselect') {
-                            this.selected_product.push(this.option.products[key1].id)
-                        } else {
-                            this.selected_product = this.option.products[key1].id
-                        }
-                    }
-                },
-
-                methods: {
-                    qtyUpdated: function(qty) {
-                        if (! this.option.products[this.selected_product])
-                            return;
-
-                        this.option.products[this.selected_product].qty = qty;
-                    }
-                }
-            });
-        </script>
-    @endpush
-@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/configurable-options.blade.php b/resources/themes/shop/views/products/view/configurable-options.blade.php
deleted file mode 100644
index 970adc256..000000000
--- a/resources/themes/shop/views/products/view/configurable-options.blade.php
+++ /dev/null
@@ -1,324 +0,0 @@
-@if (Webkul\Product\Helpers\ProductType::hasVariants($product->type))
-
-    @inject ('configurableOptionHelper', 'Webkul\Product\Helpers\ConfigurableOption')
-
-    {!! view_render_event('bagisto.shop.products.view.configurable-options.before', ['product' => $product]) !!}
-
-    <product-options></product-options>
-
-    {!! view_render_event('bagisto.shop.products.view.configurable-options.after', ['product' => $product]) !!}
-
-    @push('scripts')
-
-        <script type="text/x-template" id="product-options-template">
-            <div class="attributes">
-
-                <input type="hidden" id="selected_configurable_option" name="selected_configurable_option" :value="selectedProductId">
-
-                <div v-for='(attribute, index) in childAttributes' class="attribute control-group" :class="[errors.has('super_attribute[' + attribute.id + ']') ? 'has-error' : '']">
-                    <label class="required">@{{ attribute.label }}</label>
-
-                    <span v-if="! attribute.swatch_type || attribute.swatch_type == '' || attribute.swatch_type == 'dropdown'">
-                        <select
-                            class="control"
-                            v-validate="'required'"
-                            :name="['super_attribute[' + attribute.id + ']']"
-                            :disabled="attribute.disabled"
-                            @change="configure(attribute, $event.target.value)"
-                            :id="['attribute_' + attribute.id]"
-                            :data-vv-as="'&quot;' + attribute.label + '&quot;'">
-
-                            <option v-for='(option, index) in attribute.options' :value="option.id">@{{ option.label }}</option>
-
-                        </select>
-                    </span>
-
-                    <span class="swatch-container" v-else>
-                        <label class="swatch"
-                            v-for='(option, index) in attribute.options'
-                            v-if="option.id"
-                            :data-id="option.id"
-                            :for="['attribute_' + attribute.id + '_option_' + option.id]">
-
-                            <input type="radio"
-                                v-validate="'required'"
-                                :name="['super_attribute[' + attribute.id + ']']"
-                                :id="['attribute_' + attribute.id + '_option_' + option.id]"
-                                :value="option.id"
-                                :data-vv-as="'&quot;' + attribute.label + '&quot;'"
-                                @change="configure(attribute, $event.target.value)"/>
-
-                            <span v-if="attribute.swatch_type == 'color'" :style="{ background: option.swatch_value }"></span>
-
-                            <img v-if="attribute.swatch_type == 'image'" :src="option.swatch_value" alt="" />
-
-                            <span v-if="attribute.swatch_type == 'text'">
-                                @{{ option.label }}
-                            </span>
-
-                        </label>
-
-                        <span v-if="! attribute.options.length" class="no-options">{{ __('shop::app.products.select-above-options') }}</span>
-                    </span>
-
-                    <span class="control-error" v-if="errors.has('super_attribute[' + attribute.id + ']')">
-                        @{{ errors.first('super_attribute[' + attribute.id + ']') }}
-                    </span>
-                </div>
-
-            </div>
-        </script>
-
-        <?php $config = $configurableOptionHelper->getConfigurationConfig($product) ?>
-
-        <script>
-
-            Vue.component('product-options', {
-
-                template: '#product-options-template',
-
-                inject: ['$validator'],
-
-                data: function() {
-                    return {
-                        config: @json($config),
-
-                        childAttributes: [],
-
-                        selectedProductId: '',
-
-                        simpleProduct: null,
-
-                        galleryImages: []
-                    }
-                },
-
-                created: function() {
-                    this.galleryImages = galleryImages.slice(0)
-
-                    var config = @json($config);
-
-                    var childAttributes = this.childAttributes,
-                        attributes = config.attributes.slice(),
-                        index = attributes.length,
-                        attribute;
-
-                    while (index--) {
-                        attribute = attributes[index];
-
-                        attribute.options = [];
-
-                        if (index) {
-                            attribute.disabled = true;
-                        } else {
-                            this.fillSelect(attribute);
-                        }
-
-                        attribute = Object.assign(attribute, {
-                            childAttributes: childAttributes.slice(),
-                            prevAttribute: attributes[index - 1],
-                            nextAttribute: attributes[index + 1]
-                        });
-
-                        childAttributes.unshift(attribute);
-                    }
-                },
-
-                methods: {
-                    configure: function(attribute, value) {
-                        this.simpleProduct = this.getSelectedProductId(attribute, value);
-
-                        if (value) {
-                            attribute.selectedIndex = this.getSelectedIndex(attribute, value);
-
-                            if (attribute.nextAttribute) {
-                                attribute.nextAttribute.disabled = false;
-
-                                this.fillSelect(attribute.nextAttribute);
-
-                                this.resetChildren(attribute.nextAttribute);
-                            } else {
-                                this.selectedProductId = this.simpleProduct;
-                            }
-                        } else {
-                            attribute.selectedIndex = 0;
-
-                            this.resetChildren(attribute);
-
-                            this.clearSelect(attribute.nextAttribute)
-                        }
-
-                        this.reloadPrice();
-                        this.changeProductImages();
-                        this.changeStock(this.simpleProduct);
-                    },
-
-                    getSelectedIndex: function(attribute, value) {
-                        var selectedIndex = 0;
-
-                        attribute.options.forEach(function(option, index) {
-                            if (option.id == value) {
-                                selectedIndex = index;
-                            }
-                        })
-
-                        return selectedIndex;
-                    },
-
-                    getSelectedProductId: function(attribute, value) {
-                        var options = attribute.options,
-                            matchedOptions;
-
-                        matchedOptions = options.filter(function (option) {
-                            return option.id == value;
-                        });
-
-                        if (matchedOptions[0] != undefined && matchedOptions[0].allowedProducts != undefined) {
-                            return matchedOptions[0].allowedProducts[0];
-                        }
-
-                        return undefined;
-                    },
-
-                    fillSelect: function(attribute) {
-                        var options = this.getAttributeOptions(attribute.id),
-                            prevOption,
-                            index = 1,
-                            allowedProducts,
-                            i,
-                            j;
-
-                        this.clearSelect(attribute)
-
-                        attribute.options = [{'id': '', 'label': this.config.chooseText, 'products': []}];
-
-                        if (attribute.prevAttribute) {
-                            prevOption = attribute.prevAttribute.options[attribute.prevAttribute.selectedIndex];
-                        }
-
-                        if (options) {
-                            for (i = 0; i < options.length; i++) {
-                                allowedProducts = [];
-
-                                if (prevOption) {
-                                    for (j = 0; j < options[i].products.length; j++) {
-                                        if (prevOption.allowedProducts && prevOption.allowedProducts.indexOf(options[i].products[j]) > -1) {
-                                            allowedProducts.push(options[i].products[j]);
-                                        }
-                                    }
-                                } else {
-                                    allowedProducts = options[i].products.slice(0);
-                                }
-
-                                if (allowedProducts.length > 0) {
-                                    options[i].allowedProducts = allowedProducts;
-
-                                    attribute.options[index] = options[i];
-
-                                    index++;
-                                }
-                            }
-                        }
-                    },
-
-                    resetChildren: function(attribute) {
-                        if (attribute.childAttributes) {
-                            attribute.childAttributes.forEach(function (set) {
-                                set.selectedIndex = 0;
-                                set.disabled = true;
-                            });
-                        }
-                    },
-
-                    clearSelect: function (attribute) {
-                        if (! attribute)
-                            return;
-
-                        if (! attribute.swatch_type || attribute.swatch_type == '' || attribute.swatch_type == 'dropdown') {
-                            var element = document.getElementById("attribute_" + attribute.id);
-
-                            if (element) {
-                                element.selectedIndex = "0";
-                            }
-                        } else {
-                            var elements = document.getElementsByName('super_attribute[' + attribute.id + ']');
-
-                            var this_this = this;
-
-                            elements.forEach(function(element) {
-                                element.checked = false;
-                            })
-                        }
-                    },
-
-                    getAttributeOptions: function (attributeId) {
-                        var this_this = this,
-                            options;
-
-                        this.config.attributes.forEach(function(attribute, index) {
-                            if (attribute.id == attributeId) {
-                                options = attribute.options;
-                            }
-                        })
-
-                        return options;
-                    },
-
-                    reloadPrice: function () {
-                        var selectedOptionCount = 0;
-
-                        this.childAttributes.forEach(function(attribute) {
-                            if (attribute.selectedIndex) {
-                                selectedOptionCount++;
-                            }
-                        });
-
-                        var priceLabelElement = document.querySelector('.price-label');
-                        var priceElement = document.querySelector('.final-price');
-
-                        if (this.childAttributes.length == selectedOptionCount) {
-                            priceLabelElement.style.display = 'none';
-
-                            priceElement.innerHTML = this.config.variant_prices[this.simpleProduct].final_price.formated_price;
-
-                            eventBus.$emit('configurable-variant-selected-event', this.simpleProduct)
-                        } else {
-                            priceLabelElement.style.display = 'inline-block';
-
-                            priceElement.innerHTML = this.config.regular_price.formated_price;
-
-                            eventBus.$emit('configurable-variant-selected-event', 0)
-                        }
-                    },
-
-                    changeProductImages: function () {
-                        galleryImages.splice(0, galleryImages.length)
-
-                        this.galleryImages.forEach(function(image) {
-                            galleryImages.push(image)
-                        });
-
-                        if (this.simpleProduct) {
-                            this.config.variant_images[this.simpleProduct].forEach(function(image) {
-                                galleryImages.unshift(image)
-                            });
-                        }
-                    },
-
-                    changeStock: function (productId) {
-                        var inStockElement = document.querySelector('.stock-status');
-
-                        if (productId) {
-                            inStockElement.style.display= "block";
-                        } else {
-                            inStockElement.style.display= "none";
-                        }
-                    },
-                }
-
-            });
-
-        </script>
-    @endpush
-
-@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/cross-sells.blade.php b/resources/themes/shop/views/products/view/cross-sells.blade.php
deleted file mode 100644
index f7b3e03b8..000000000
--- a/resources/themes/shop/views/products/view/cross-sells.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-@foreach ($cart->items as $item)
-    <?php
-        $product = $item->product;
-
-        if ($product->cross_sells()->count()) {
-            $products[] = $product;
-            $products = array_unique($products);
-        }
-    ?>
-@endforeach
-
-@if (isset($products))
-
-    <div class="attached-products-wrapper mt-50">
-
-        <div class="title">
-            {{ __('shop::app.products.cross-sell-title') }}
-             <span class="border-bottom"></span>
-        </div>
-
-        <div class="product-grid-4">
-            @foreach($products as $product)
-
-                @foreach ($product->cross_sells()->paginate(2) as $cross_sell_product)
-
-                    @include ('shop::products.list.card', ['product' => $cross_sell_product])
-
-                @endforeach
-
-            @endforeach
-
-        </div>
-
-    </div>
-
-@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/downloadable.blade.php b/resources/themes/shop/views/products/view/downloadable.blade.php
deleted file mode 100644
index 7f41196f7..000000000
--- a/resources/themes/shop/views/products/view/downloadable.blade.php
+++ /dev/null
@@ -1,50 +0,0 @@
-@if ($product->type == 'downloadable')
-    {!! view_render_event('bagisto.shop.products.view.downloadable.before', ['product' => $product]) !!}
-
-    <div class="downloadable-container">
-        
-        @if ($product->downloadable_samples->count())
-            <div class="sample-list">
-                <h3>{{ __('shop::app.products.samples') }}</h3>
-
-                <ul>
-                    @foreach ($product->downloadable_samples as $sample)
-                        <li>
-                            <a href="{{ route('shop.downloadable.download_sample', ['type' => 'sample', 'id' => $sample->id]) }}" target="_blank">
-                                {{ $sample->title }}
-                            </a>
-                        </li>
-                    @endforeach
-                </ul>
-            </div>
-        @endif
-
-        @if ($product->downloadable_links->count())
-            <div class="link-list control-group" :class="[errors.has('links[]') ? 'has-error' : '']">
-                <h3>{{ __('shop::app.products.links') }}</h3>
-
-                <ul>
-                    @foreach ($product->downloadable_links as $link)
-                        <li>
-                            <span class="checkbox">
-                                <input type="checkbox" name="links[]" v-validate="'required'" value="{{ $link->id }}" id="{{ $link->id }}" data-vv-as="&quot;{{ __('shop::app.products.links') }}&quot;"/>
-                                <label class="checkbox-view" for="{{ $link->id }}"></label>
-                                {{ $link->title . ' + ' . core()->currency($link->price) }}
-                            </span>
-
-                            @if ($link->sample_file || $link->sample_url)
-                                <a href="{{ route('shop.downloadable.download_sample', ['type' => 'link', 'id' => $link->id]) }}" target="_blank">
-                                    {{ __('shop::app.products.sample') }}
-                                </a>
-                            @endif
-                        </li>
-                    @endforeach
-                </ul>
-
-                <span class="control-error" v-if="errors.has('links[]')">@{{ errors.first('links[]') }}</span>
-            </div>
-        @endif
-    </div>
-
-    {!! view_render_event('bagisto.shop.products.view.downloadable.before', ['product' => $product]) !!}
-@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/gallery.blade.php b/resources/themes/shop/views/products/view/gallery.blade.php
deleted file mode 100644
index 7ffa5261b..000000000
--- a/resources/themes/shop/views/products/view/gallery.blade.php
+++ /dev/null
@@ -1,221 +0,0 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-@inject ('productVideoHelper', 'Webkul\Product\Helpers\ProductVideo')
-@inject ('wishListHelper', 'Webkul\Customer\Helpers\Wishlist')
-
-<?php 
-    $images = $productImageHelper->getGalleryImages($product); 
-
-    $videos = $productVideoHelper->getVideos($product);
-
-    $images = array_merge($images, $videos); 
-?>
-
-
-{!! view_render_event('bagisto.shop.products.view.gallery.before', ['product' => $product]) !!}
-
-<div class="product-image-group">
-
-    <div class="cp-spinner cp-round" id="loader">
-    </div>
-
-    <product-gallery></product-gallery>
-
-    @include ('shop::products.view.product-add')
-
-</div>
-
-{!! view_render_event('bagisto.shop.products.view.gallery.after', ['product' => $product]) !!}
-
-@push('scripts')
-
-    <script type="text/x-template" id="product-gallery-template">
-        <div>
-
-            <ul class="thumb-list">
-                <li class="gallery-control top" @click="moveThumbs('top')" v-if="(thumbs.length > 4) && this.is_move.up">
-                    <span class="overlay"></span>
-                    <i class="icon arrow-up-white-icon"></i>
-                </li>
-
-                <li class="thumb-frame" v-for='(thumb, index) in thumbs' @mouseover="changeImage(thumb)" :class="[thumb.large_image_url == currentLargeImageUrl ? 'active' : '']" id="thumb-frame">
-                    <video v-if="thumb.type == 'video'" width="100%" height="100%" onclick="this.paused ? this.play() : this.pause();">
-                        <source :src="thumb.video_url" type="video/mp4">
-                        {{ __('admin::app.catalog.products.not-support-video') }}
-                    </video>
-
-                    <img v-else  :src="thumb.small_image_url" alt=""/>
-                </li>
-
-                <li class="gallery-control bottom" @click="moveThumbs('bottom')" v-if="(thumbs.length > 4) && this.is_move.down">
-                    <span class="overlay"></span>
-                    <i class="icon arrow-down-white-icon"></i>
-                </li>
-            </ul>
-
-            <div class="product-hero-image" id="product-hero-image">
-                <video :key="currentVideoUrl" v-if="currentType == 'video'" width="100%" height="100%" controls>
-                    <source :src="currentVideoUrl" :data-image="currentOriginalImageUrl"  type="video/mp4">
-                        {{ __('admin::app.catalog.products.not-support-video') }}
-                </video>
-
-                <img v-else :src="currentLargeImageUrl" id="pro-img" :data-image="currentOriginalImageUrl" alt=""/>
-
-                @auth('customer')
-                    @php
-                        $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
-                    @endphp
-
-                    @if ($showWishlist)
-                        <a @if ($wishListHelper->getWishlistProduct($product)) class="add-to-wishlist already" @else class="add-to-wishlist" @endif href="{{ route('customer.wishlist.add', $product->product_id) }}">
-                        </a>
-                    @endif
-                @endauth
-            </div>
-
-        </div>
-    </script>
-
-    <script>
-        var galleryImages = @json($images);
-
-        Vue.component('product-gallery', {
-
-            template: '#product-gallery-template',
-
-            data: function() {
-                return {
-                    images: galleryImages,
-
-                    thumbs: [],
-
-                    currentLargeImageUrl: '',
-
-                    currentOriginalImageUrl: '',
-
-                    currentVideoUrl: '',
-
-                    currentType: '',
-
-                    counter: {
-                        up: 0,
-                        down: 0,
-                    },
-
-                    is_move: {
-                        up: true,
-                        down: true,
-                    }
-                }
-            },
-
-            watch: {
-                'images': function(newVal, oldVal) {
-                    this.changeImage(this.images[0])
-
-                    this.prepareThumbs()
-                }
-            },
-
-            created: function() {
-                this.changeImage(this.images[0])
-
-                this.prepareThumbs()
-            },
-
-            methods: {
-                prepareThumbs: function() {
-                    var this_this = this;
-
-                    this_this.thumbs = [];
-
-                    this.images.forEach(function(image) {
-                        this_this.thumbs.push(image);
-                    });
-                },
-
-                changeImage: function(image) {
-                    this.currentType = image.type;
-
-                    if (image.type == 'video') {
-                        this.currentVideoUrl = image.video_url;
-
-                        this.currentLargeImageUrl = image.large_image_url = image.video_url;
-                    } else {
-                        this.currentLargeImageUrl = image.large_image_url;
-
-                        this.currentOriginalImageUrl = image.original_image_url;
-                    }
-
-                    if ($(window).width() > 580 && image.original_image_url) {
-                        $('img#pro-img').data('zoom-image', image.original_image_url).ezPlus();
-                    }
-                },
-
-                moveThumbs: function(direction) {
-                    let len = this.thumbs.length;
-
-                    if (direction === "top") {
-                        const moveThumb = this.thumbs.splice(len - 1, 1);
-
-                        this.thumbs = [moveThumb[0]].concat((this.thumbs));
-
-                        this.counter.up = this.counter.up+1;
-
-                        this.counter.down = this.counter.down-1;
-
-                    } else {
-                        const moveThumb = this.thumbs.splice(0, 1);
-
-                        this.thumbs = [].concat((this.thumbs), [moveThumb[0]]);
-
-                        this.counter.down = this.counter.down+1;
-
-                        this.counter.up = this.counter.up-1;
-                    }
-
-                    if ((len-4) == this.counter.down) {
-                        this.is_move.down = false;
-                    } else {
-                        this.is_move.down = true;
-                    }
-
-                    if ((len-4) == this.counter.up) {
-                        this.is_move.up = false;
-                    } else {
-                        this.is_move.up = true;
-                    }
-                },
-            }
-        });
-
-    </script>
-
-    <script>
-        $(document).ready(function() {
-            if ($(window).width() > 580) {
-                $('img#pro-img').data('zoom-image', $('img#pro-img').data('image')).ezPlus();
-            }
-
-            var wishlist = " <?php echo $wishListHelper->getWishlistProduct($product);  ?> ";
-
-            $(document).mousemove(function(event) {
-                if ($('.add-to-wishlist').length || wishlist != 0) {
-                    if (event.pageX > $('.add-to-wishlist').offset().left && event.pageX < $('.add-to-wishlist').offset().left+32 && event.pageY > $('.add-to-wishlist').offset().top && event.pageY < $('.add-to-wishlist').offset().top+32) {
-
-                        $(".zoomContainer").addClass("show-wishlist");
-
-                    } else {
-                        $(".zoomContainer").removeClass("show-wishlist");
-                    }
-                };
-
-                if ($("body").hasClass("rtl")) {
-                    $(".zoomWindow").addClass("zoom-image-direction");
-                } else {
-                    $(".zoomWindow").removeClass("zoom-image-direction");
-                }
-            });
-        })
-    </script>
-
-@endpush
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/grouped-products.blade.php b/resources/themes/shop/views/products/view/grouped-products.blade.php
deleted file mode 100644
index 1f2b36dcc..000000000
--- a/resources/themes/shop/views/products/view/grouped-products.blade.php
+++ /dev/null
@@ -1,38 +0,0 @@
-@if ($product->type == 'grouped')
-    {!! view_render_event('bagisto.shop.products.view.grouped_products.before', ['product' => $product]) !!}
-
-    <div class="grouped-product-container">
-        @if ($product->grouped_products->count())
-            <div class="grouped-product-list">
-                <ul>
-                    <li>
-                        <span>{{ __('shop::app.products.name') }}</span>
-                        <span>{{ __('shop::app.products.qty') }}</span>
-                    </li>
-                    @foreach ($product->grouped_products as $groupedProduct)
-                        @if($groupedProduct->associated_product->getTypeInstance()->isSaleable())
-                            <li>
-                                <span class="name">
-                                    {{ $groupedProduct->associated_product->name }}
-
-                                    @include ('shop::products.price', ['product' => $groupedProduct->associated_product])
-                                </span>
-
-                                <span class="qty">
-                                    <quantity-changer
-                                        :control-name="'qty[{{$groupedProduct->associated_product_id}}]'"
-                                        :validations="'required|numeric|min_value:0'"
-                                        quantity="{{ $groupedProduct->qty }}"
-                                        min-quantity="0">
-                                    </quantity-changer>
-                                </span>
-                            </li>
-                        @endif
-                    @endforeach
-                </ul>
-            </div>
-        @endif
-    </div>
-
-    {!! view_render_event('bagisto.shop.products.view.grouped_products.before', ['product' => $product]) !!}
-@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/product-add.blade.php b/resources/themes/shop/views/products/view/product-add.blade.php
deleted file mode 100644
index cb621c137..000000000
--- a/resources/themes/shop/views/products/view/product-add.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-{!! view_render_event('bagisto.shop.products.view.product-add.before', ['product' => $product]) !!}
-
-<div class="add-to-buttons">
-    @include ('shop::products.add-to-cart', ['product' => $product])
-
-    @if (core()->getConfigData('catalog.products.storefront.buy_now_button_display'))
-        @include ('shop::products.buy-now')                                      
-    @endif
-</div>
-
-{!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/related-products.blade.php b/resources/themes/shop/views/products/view/related-products.blade.php
deleted file mode 100644
index 722b4bf05..000000000
--- a/resources/themes/shop/views/products/view/related-products.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-    $relatedProducts = $product->related_products()->get();
-?>
-
-@if ($relatedProducts->count())
-    <div class="attached-products-wrapper">
-
-        <div class="title">
-            {{ __('shop::app.products.related-product-title') }}
-            <span class="border-bottom"></span>
-        </div>
-
-        <div class="product-grid-4">
-
-            @foreach ($relatedProducts as $related_product)
-
-                @include ('shop::products.list.card', ['product' => $related_product])
-
-            @endforeach
-
-        </div>
-
-    </div>
-@endif
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/reviews.blade.php b/resources/themes/shop/views/products/view/reviews.blade.php
deleted file mode 100644
index fbd627628..000000000
--- a/resources/themes/shop/views/products/view/reviews.blade.php
+++ /dev/null
@@ -1,98 +0,0 @@
-@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
-
-{!! view_render_event('bagisto.shop.products.view.reviews.after', ['product' => $product]) !!}
-
-@if ($total = $reviewHelper->getTotalReviews($product))
-    <div class="rating-reviews">
-        <div class="rating-header">
-            {{ __('shop::app.products.reviews-title') }}
-        </div>
-
-        <div class="overall">
-            <div class="review-info">
-
-                <span class="number">
-                    {{ $reviewHelper->getAverageRating($product) }}
-                </span>
-
-                <span class="stars">
-                    @for ($i = 1; $i <= 5; $i++)
-
-                      @if($i <= round($reviewHelper->getAverageRating($product)))
-                        <span class="icon star-icon"></span>
-                      @else
-                        <span class="icon star-icon-blank"></span>
-                      @endif
-
-                    @endfor
-                </span>
-
-                <div class="total-reviews">
-                    {{ __('shop::app.products.total-reviews', ['total' => $total]) }}
-                </div>
-
-            </div>
-
-            @if (core()->getConfigData('catalog.products.review.guest_review') || auth()->guard('customer')->check())
-                <a href="{{ route('shop.reviews.create', $product->url_key) }}" class="btn btn-lg btn-primary">
-                    {{ __('shop::app.products.write-review-btn') }}
-                </a>
-            @endif
-
-        </div>
-
-        <div class="reviews">
-
-            @foreach ($reviewHelper->getReviews($product)->paginate(10) as $review)
-                <div class="review">
-                    <div class="title">
-                        {{ $review->title }}
-                    </div>
-
-                    <span class="stars">
-                        @for ($i = 1; $i <= 5; $i++)
-
-                          @if($i <= $review->rating)
-                            <span class="icon star-icon"></span>
-                          @else
-                            <span class="icon star-icon-blank"></span>
-                          @endif
-
-                        @endfor
-                    </span>
-
-                    <div class="message">
-                        {{ $review->comment }}
-                    </div>
-
-                    <div class="reviewer-details">
-                        <span class="by">
-                            {{ __('shop::app.products.by', ['name' => $review->name]) }},
-                        </span>
-
-                        <span class="when">
-                            {{ core()->formatDate($review->created_at, 'F d, Y') }}
-                        </span>
-                    </div>
-                </div>
-            @endforeach
-
-            <a href="{{ route('shop.reviews.index', $product->url_key) }}" class="view-all">
-                {{ __('shop::app.products.view-all') }}
-            </a>
-
-        </div>
-    </div>
-@else
-    @if (core()->getConfigData('catalog.products.review.guest_review') || auth()->guard('customer')->check())
-        <div class="rating-reviews">
-            <div class="rating-header">
-                <a href="{{ route('shop.reviews.create', $product->url_key) }}" class="btn btn-lg btn-primary">
-                    {{ __('shop::app.products.write-review-btn') }}
-                </a>
-            </div>
-        </div>
-    @endif
-@endif
-
-{!! view_render_event('bagisto.shop.products.view.reviews.after', ['product' => $product]) !!}
diff --git a/resources/themes/shop/views/products/view/stock.blade.php b/resources/themes/shop/views/products/view/stock.blade.php
deleted file mode 100644
index 391462011..000000000
--- a/resources/themes/shop/views/products/view/stock.blade.php
+++ /dev/null
@@ -1,13 +0,0 @@
-{!! view_render_event('bagisto.shop.products.view.stock.before', ['product' => $product]) !!}
-
-<div class="stock-status {{! $product->haveSufficientQuantity(1) ? '' : 'active' }}">
-    @if ( $product->haveSufficientQuantity(1) === true )
-        {{ __('shop::app.products.in-stock') }}
-    @elseif ( $product->haveSufficientQuantity(1) > 0 )
-        {{ __('shop::app.products.available-for-order') }}
-    @else
-        {{ __('shop::app.products.out-of-stock') }}
-    @endif
-</div>
-
-{!! view_render_event('bagisto.shop.products.view.stock.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/view/up-sells.blade.php b/resources/themes/shop/views/products/view/up-sells.blade.php
deleted file mode 100644
index 0f85e80e2..000000000
--- a/resources/themes/shop/views/products/view/up-sells.blade.php
+++ /dev/null
@@ -1,28 +0,0 @@
-{!! view_render_event('bagisto.shop.products.view.up-sells.after', ['product' => $product]) !!}
-
-<?php
-    $productUpSells = $product->up_sells()->get();
-?>
-
-@if ($productUpSells->count())
-    <div class="attached-products-wrapper">
-
-        <div class="title">
-            {{ __('shop::app.products.up-sell-title') }}
-            <span class="border-bottom"></span>
-        </div>
-
-        <div class="product-grid-4">
-
-            @foreach ($productUpSells as $up_sell_product)
-
-                @include ('shop::products.list.card', ['product' => $up_sell_product])
-
-            @endforeach
-
-        </div>
-
-    </div>
-@endif
-
-{!! view_render_event('bagisto.shop.products.view.up-sells.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/resources/themes/shop/views/products/wishlist.blade.php b/resources/themes/shop/views/products/wishlist.blade.php
deleted file mode 100644
index a91b33d2c..000000000
--- a/resources/themes/shop/views/products/wishlist.blade.php
+++ /dev/null
@@ -1,21 +0,0 @@
-@inject ('wishListHelper', 'Webkul\Customer\Helpers\Wishlist')
-
-@auth('customer')
-    {!! view_render_event('bagisto.shop.products.wishlist.before') !!}
-
-    <a
-        @if ($wishListHelper->getWishlistProduct($product))
-            class="add-to-wishlist already"
-            title="{{ __('shop::app.customer.account.wishlist.remove-wishlist-text') }}"
-        @else
-            class="add-to-wishlist"
-            title="{{ __('shop::app.customer.account.wishlist.add-wishlist-text') }}"
-        @endif
-        id="wishlist-changer"
-        style="margin-right: 15px;"
-        href="{{ route('customer.wishlist.add', $product->product_id) }}">
-        <span class="icon wishlist-icon"></span>
-    </a>
-
-    {!! view_render_event('bagisto.shop.products.wishlist.after') !!}
-@endauth
diff --git a/resources/themes/shop/views/search/search.blade.php b/resources/themes/shop/views/search/search.blade.php
deleted file mode 100644
index 1f6543788..000000000
--- a/resources/themes/shop/views/search/search.blade.php
+++ /dev/null
@@ -1,87 +0,0 @@
-@extends('shop::layouts.master')
-
-@section('page_title')
-    {{ __('shop::app.search.page-title') }}
-@endsection
-
-@section('content-wrapper')
-    @if (request('image-search'))
-        <image-search-result-component></image-search-result-component>
-    @endif
-
-    @if (! $results)
-        {{  __('shop::app.search.no-results') }}
-    @endif
-
-    @if ($results)
-        <div class="main mb-30" style="min-height: 27vh;">
-            @if ($results->isEmpty())
-                <div class="search-result-status">
-                    <h2>{{ __('shop::app.products.whoops') }}</h2>
-                    <span>{{ __('shop::app.search.no-results') }}</span>
-                </div>
-            @else
-                <div class="search-result-status mb-20">
-                    <span>
-                        <b>{{ $results->total() }} </b>
-
-                        {{ ($results->total() == 1) ? __('shop::app.search.found-result') : __('shop::app.search.found-results') }}
-                    </span>
-                </div>
-
-                <div class="product-grid-4">
-                    @foreach ($results as $productFlat)
-
-                        @include('shop::products.list.card', ['product' => $productFlat->product])
-
-                    @endforeach
-                </div>
-
-                @include('ui::datagrid.pagination')
-            @endif
-        </div>
-    @endif
-@endsection
-
-@push('scripts')
-
-    <script type="text/x-template" id="image-search-result-component-template">
-        <div class="image-search-result">
-            <div class="searched-image">
-                <img :src="searched_image_url" alt=""/>
-            </div>
-
-            <div class="searched-terms">
-                <h3>{{ __('shop::app.search.analysed-keywords') }}</h3>
-
-                <div class="term-list">
-                    <a v-for="term in searched_terms" :href="'{{ route('shop.search.index') }}?term=' + term">
-                        @{{ term }}
-                    </a>
-                </div>
-            </div>
-        </div>
-    </script>
-
-    <script>
-        Vue.component('image-search-result-component', {
-
-            template: '#image-search-result-component-template',
-
-            data: function() {
-                return {
-                    searched_image_url: localStorage.searched_image_url,
-
-                    searched_terms: []
-                }
-            },
-
-            created: function() {
-                if (localStorage.searched_terms && localStorage.searched_terms != '') {
-                    this.searched_terms = localStorage.searched_terms.split('_');
-                }
-            }
-        });
-    </script>
-
-@endpush
\ No newline at end of file

From 142f04ad41aaf07a9103493aa6f2fd2448703352 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Mon, 18 Jan 2021 16:23:53 +0530
Subject: [PATCH 4/7] fixing as per comment

---
 .../src/Http/Controllers/RegistrationController.php      | 1 -
 packages/Webkul/Customer/src/Models/Customer.php         | 9 +++++++++
 .../views/customers/account/profile/edit.blade.php       | 2 +-
 .../views/shop/customers/account/profile/edit.blade.php  | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
index a3b14395f..3503ef018 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
@@ -97,7 +97,6 @@ class RegistrationController extends Controller
             'is_verified'       => core()->getConfigData('customer.settings.email.verification') ? 0 : 1,
             'customer_group_id' => $this->customerGroupRepository->findOneWhere(['code' => 'general'])->id,
             'token'             => md5(uniqid(rand(), true)),
-            'subscribed_to_news_letter' => isset(request()->input()['is_subscribed']) ? 1 : 0,
         ]);
 
         Event::dispatch('customer.registration.before');
diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php
index be81d5e72..12a3a3283 100755
--- a/packages/Webkul/Customer/src/Models/Customer.php
+++ b/packages/Webkul/Customer/src/Models/Customer.php
@@ -7,6 +7,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
 use Tymon\JWTAuth\Contracts\JWTSubject;
 use Webkul\Checkout\Models\CartProxy;
 use Webkul\Sales\Models\OrderProxy;
+use Webkul\Core\Models\SubscribersListProxy;
 use Webkul\Product\Models\ProductReviewProxy;
 use Webkul\Customer\Notifications\CustomerResetPassword;
 use Webkul\Customer\Contracts\Customer as CustomerContract;
@@ -160,4 +161,12 @@ class Customer extends Authenticatable implements CustomerContract, JWTSubject
     {
         return [];
     }
+
+    /**
+     * Get the customer's subscription.
+     */
+    public function subscription()
+    {
+        return $this->hasOne(SubscribersListProxy::modelClass(), 'customer_id');
+    }
 }
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
index db57418cf..18f2afc45 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
@@ -101,7 +101,7 @@
                     </div>
 
                     <div class="control-group">
-                        <input type="checkbox" id="checkbox2" name="subscribed_to_news_letter" value="{{ $customer->subscribed_to_news_letter }}" {{ $customer->subscribed_to_news_letter ? 'checked' : ''}}>
+                        <input type="checkbox" id="checkbox2" name="subscribed_to_news_letter"@if (isset($customer->subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif>
                         <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
                     </div>
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php
index 94d22a384..47a9ee72a 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php
@@ -179,7 +179,7 @@
             </div>
 
             <div class="control-group">
-                <input type="checkbox" id="checkbox2" name="subscribed_to_news_letter" value="{{ $customer->subscribed_to_news_letter }}" {{ $customer->subscribed_to_news_letter ? 'checked' : ''}} style="width: auto;">
+                <input type="checkbox" id="checkbox2" name="subscribed_to_news_letter"@if (isset($customer->subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif  style="width: auto;">
                 <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
             </div>
 

From 9f67e46ef82b0775c639c4b66e81a4f72cd50a08 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Mon, 18 Jan 2021 20:13:46 +0530
Subject: [PATCH 5/7] added missed condition in marketing

---
 .../Core/src/Http/Controllers/SubscriptionController.php | 8 +++++++-
 packages/Webkul/Core/src/Models/SubscribersList.php      | 9 +++++++++
 .../src/Http/Controllers/RegistrationController.php      | 1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php
index e40c1a2e2..f019d40ce 100755
--- a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php
@@ -70,6 +70,12 @@ class SubscriptionController extends Controller
 
         $subscriber = $this->subscribersListRepository->findOrFail($id);
 
+        $customer = $subscriber->customer;
+
+        $customer->subscribed_to_news_letter = $data['is_subscribed'];
+
+        $customer->save();
+
         $result = $subscriber->update($data);
 
         if ($result) {
@@ -99,7 +105,7 @@ class SubscriptionController extends Controller
             return response()->json(['message' => true], 200);
         } catch (\Exception $e) {
             report($e);
-            
+
             session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Subscriber']));
         }
 
diff --git a/packages/Webkul/Core/src/Models/SubscribersList.php b/packages/Webkul/Core/src/Models/SubscribersList.php
index 1259e83a8..d016047f0 100755
--- a/packages/Webkul/Core/src/Models/SubscribersList.php
+++ b/packages/Webkul/Core/src/Models/SubscribersList.php
@@ -3,6 +3,7 @@
 namespace Webkul\Core\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Webkul\Customer\Models\CustomerProxy;
 use Webkul\Core\Contracts\SubscribersList as SubscribersListContract;
 
 class SubscribersList extends Model implements SubscribersListContract
@@ -24,4 +25,12 @@ class SubscribersList extends Model implements SubscribersListContract
     ];
 
     protected $hidden = ['token'];
+
+    /**
+     * Get the customer associated with the subscription.
+     */
+    public function customer()
+    {
+        return $this->belongsTo(CustomerProxy::modelClass());
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
index 3503ef018..a3b14395f 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
@@ -97,6 +97,7 @@ class RegistrationController extends Controller
             'is_verified'       => core()->getConfigData('customer.settings.email.verification') ? 0 : 1,
             'customer_group_id' => $this->customerGroupRepository->findOneWhere(['code' => 'general'])->id,
             'token'             => md5(uniqid(rand(), true)),
+            'subscribed_to_news_letter' => isset(request()->input()['is_subscribed']) ? 1 : 0,
         ]);
 
         Event::dispatch('customer.registration.before');

From cdd037e0aeddfa3400ba1ff37636d2ea9f16d9c0 Mon Sep 17 00:00:00 2001
From: andy <lsm04@o2pluss.com>
Date: Tue, 19 Jan 2021 16:09:53 +0900
Subject: [PATCH 6/7] fix typo

---
 packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php b/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php
index 5c53c3a66..5fbeb32d3 100644
--- a/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php
+++ b/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php
@@ -67,7 +67,7 @@ class ExchangeRates extends ExchangeRate
             $result = json_decode($result->getBody()->getContents(), true);
 
             if (isset($result['success']) && ! $result['success']) {
-                throw new E\xception(
+                throw new \Exception(
                     isset($result['error']['info'])
                     ? $result['error']['info']
                     : $result['error']['type'], 1);

From 0b7475c2bb26831490b82e437edfaee181aa953d Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 19 Jan 2021 13:24:20 +0530
Subject: [PATCH 7/7] Some Cleanups And Ignored Files

---
 .gitignore                                    |   5 +-
 resources/themes/.gitignore                   |   2 +
 resources/views/.gitignore                    |   2 +
 resources/views/errors/401.blade.php          |   5 -
 resources/views/errors/403.blade.php          |   5 -
 resources/views/errors/404.blade.php          |   5 -
 resources/views/errors/419.blade.php          |   5 -
 resources/views/errors/429.blade.php          |   5 -
 resources/views/errors/500.blade.php          |   5 -
 resources/views/errors/503.blade.php          |   5 -
 .../views/errors/illustrated-layout.blade.php | 486 ------------------
 resources/views/errors/layout.blade.php       |  57 --
 resources/views/errors/minimal.blade.php      |  62 ---
 .../views/vendor/mail/html/button.blade.php   |  19 -
 .../views/vendor/mail/html/footer.blade.php   |  11 -
 .../views/vendor/mail/html/header.blade.php   |  11 -
 .../views/vendor/mail/html/layout.blade.php   |  54 --
 .../views/vendor/mail/html/message.blade.php  |  27 -
 .../views/vendor/mail/html/panel.blade.php    |  14 -
 .../vendor/mail/html/promotion.blade.php      |   7 -
 .../mail/html/promotion/button.blade.php      |  13 -
 .../views/vendor/mail/html/subcopy.blade.php  |   7 -
 .../views/vendor/mail/html/table.blade.php    |   3 -
 .../views/vendor/mail/html/themes/default.css | 289 -----------
 .../vendor/mail/markdown/button.blade.php     |   1 -
 .../vendor/mail/markdown/footer.blade.php     |   1 -
 .../vendor/mail/markdown/header.blade.php     |   1 -
 .../vendor/mail/markdown/layout.blade.php     |   9 -
 .../vendor/mail/markdown/message.blade.php    |  27 -
 .../vendor/mail/markdown/panel.blade.php      |   1 -
 .../vendor/mail/markdown/promotion.blade.php  |   1 -
 .../mail/markdown/promotion/button.blade.php  |   1 -
 .../vendor/mail/markdown/subcopy.blade.php    |   1 -
 .../vendor/mail/markdown/table.blade.php      |   1 -
 .../views/vendor/mail/text/button.blade.php   |   1 -
 .../views/vendor/mail/text/footer.blade.php   |   1 -
 .../views/vendor/mail/text/header.blade.php   |   1 -
 .../views/vendor/mail/text/layout.blade.php   |   9 -
 .../views/vendor/mail/text/message.blade.php  |  27 -
 .../views/vendor/mail/text/panel.blade.php    |   1 -
 .../vendor/mail/text/promotion.blade.php      |   1 -
 .../mail/text/promotion/button.blade.php      |   1 -
 .../views/vendor/mail/text/subcopy.blade.php  |   1 -
 .../views/vendor/mail/text/table.blade.php    |   1 -
 .../vendor/notifications/email.blade.php      |  62 ---
 .../vendor/pagination/bootstrap-4.blade.php   |  46 --
 .../views/vendor/pagination/default.blade.php |  46 --
 .../vendor/pagination/semantic-ui.blade.php   |  36 --
 .../pagination/simple-bootstrap-4.blade.php   |  27 -
 .../pagination/simple-default.blade.php       |  19 -
 .../pagination/simple-tailwind.blade.php      |  25 -
 .../vendor/pagination/tailwind.blade.php      | 102 ----
 52 files changed, 5 insertions(+), 1550 deletions(-)
 create mode 100755 resources/themes/.gitignore
 create mode 100755 resources/views/.gitignore
 delete mode 100644 resources/views/errors/401.blade.php
 delete mode 100644 resources/views/errors/403.blade.php
 delete mode 100644 resources/views/errors/404.blade.php
 delete mode 100644 resources/views/errors/419.blade.php
 delete mode 100644 resources/views/errors/429.blade.php
 delete mode 100644 resources/views/errors/500.blade.php
 delete mode 100644 resources/views/errors/503.blade.php
 delete mode 100644 resources/views/errors/illustrated-layout.blade.php
 delete mode 100644 resources/views/errors/layout.blade.php
 delete mode 100644 resources/views/errors/minimal.blade.php
 delete mode 100755 resources/views/vendor/mail/html/button.blade.php
 delete mode 100755 resources/views/vendor/mail/html/footer.blade.php
 delete mode 100755 resources/views/vendor/mail/html/header.blade.php
 delete mode 100755 resources/views/vendor/mail/html/layout.blade.php
 delete mode 100755 resources/views/vendor/mail/html/message.blade.php
 delete mode 100755 resources/views/vendor/mail/html/panel.blade.php
 delete mode 100755 resources/views/vendor/mail/html/promotion.blade.php
 delete mode 100755 resources/views/vendor/mail/html/promotion/button.blade.php
 delete mode 100755 resources/views/vendor/mail/html/subcopy.blade.php
 delete mode 100755 resources/views/vendor/mail/html/table.blade.php
 delete mode 100755 resources/views/vendor/mail/html/themes/default.css
 delete mode 100755 resources/views/vendor/mail/markdown/button.blade.php
 delete mode 100755 resources/views/vendor/mail/markdown/footer.blade.php
 delete mode 100755 resources/views/vendor/mail/markdown/header.blade.php
 delete mode 100755 resources/views/vendor/mail/markdown/layout.blade.php
 delete mode 100755 resources/views/vendor/mail/markdown/message.blade.php
 delete mode 100755 resources/views/vendor/mail/markdown/panel.blade.php
 delete mode 100755 resources/views/vendor/mail/markdown/promotion.blade.php
 delete mode 100755 resources/views/vendor/mail/markdown/promotion/button.blade.php
 delete mode 100755 resources/views/vendor/mail/markdown/subcopy.blade.php
 delete mode 100755 resources/views/vendor/mail/markdown/table.blade.php
 delete mode 100644 resources/views/vendor/mail/text/button.blade.php
 delete mode 100644 resources/views/vendor/mail/text/footer.blade.php
 delete mode 100644 resources/views/vendor/mail/text/header.blade.php
 delete mode 100644 resources/views/vendor/mail/text/layout.blade.php
 delete mode 100644 resources/views/vendor/mail/text/message.blade.php
 delete mode 100644 resources/views/vendor/mail/text/panel.blade.php
 delete mode 100644 resources/views/vendor/mail/text/promotion.blade.php
 delete mode 100644 resources/views/vendor/mail/text/promotion/button.blade.php
 delete mode 100644 resources/views/vendor/mail/text/subcopy.blade.php
 delete mode 100644 resources/views/vendor/mail/text/table.blade.php
 delete mode 100755 resources/views/vendor/notifications/email.blade.php
 delete mode 100755 resources/views/vendor/pagination/bootstrap-4.blade.php
 delete mode 100755 resources/views/vendor/pagination/default.blade.php
 delete mode 100755 resources/views/vendor/pagination/semantic-ui.blade.php
 delete mode 100755 resources/views/vendor/pagination/simple-bootstrap-4.blade.php
 delete mode 100755 resources/views/vendor/pagination/simple-default.blade.php
 delete mode 100644 resources/views/vendor/pagination/simple-tailwind.blade.php
 delete mode 100644 resources/views/vendor/pagination/tailwind.blade.php

diff --git a/.gitignore b/.gitignore
index c0635892a..b26a20012 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,10 +18,7 @@ package-lock.json
 /public/storage
 /public/themes
 /public/vendor
-/resources/themes/velocity/*
-/resources/lang/vendor/admin/*
-/resources/lang/vendor/shop/*
-/resources/lang/vendor/velocity/*
+/resources/lang/vendor
 /storage/*.key
 /storage/dcc-data/
 /vendor
diff --git a/resources/themes/.gitignore b/resources/themes/.gitignore
new file mode 100755
index 000000000..d6b7ef32c
--- /dev/null
+++ b/resources/themes/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/resources/views/.gitignore b/resources/views/.gitignore
new file mode 100755
index 000000000..d6b7ef32c
--- /dev/null
+++ b/resources/views/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/resources/views/errors/401.blade.php b/resources/views/errors/401.blade.php
deleted file mode 100644
index 5c586db96..000000000
--- a/resources/views/errors/401.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('errors::minimal')
-
-@section('title', __('Unauthorized'))
-@section('code', '401')
-@section('message', __('Unauthorized'))
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
deleted file mode 100644
index a5506f01f..000000000
--- a/resources/views/errors/403.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('errors::minimal')
-
-@section('title', __('Forbidden'))
-@section('code', '403')
-@section('message', __($exception->getMessage() ?: 'Forbidden'))
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
deleted file mode 100644
index 7549540d8..000000000
--- a/resources/views/errors/404.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('errors::minimal')
-
-@section('title', __('Not Found'))
-@section('code', '404')
-@section('message', __('Not Found'))
diff --git a/resources/views/errors/419.blade.php b/resources/views/errors/419.blade.php
deleted file mode 100644
index c09216e21..000000000
--- a/resources/views/errors/419.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('errors::minimal')
-
-@section('title', __('Page Expired'))
-@section('code', '419')
-@section('message', __('Page Expired'))
diff --git a/resources/views/errors/429.blade.php b/resources/views/errors/429.blade.php
deleted file mode 100644
index f01b07b8e..000000000
--- a/resources/views/errors/429.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('errors::minimal')
-
-@section('title', __('Too Many Requests'))
-@section('code', '429')
-@section('message', __('Too Many Requests'))
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
deleted file mode 100644
index d9e95d9b9..000000000
--- a/resources/views/errors/500.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('errors::minimal')
-
-@section('title', __('Server Error'))
-@section('code', '500')
-@section('message', __('Server Error'))
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
deleted file mode 100644
index acd38100a..000000000
--- a/resources/views/errors/503.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('errors::minimal')
-
-@section('title', __('Service Unavailable'))
-@section('code', '503')
-@section('message', __($exception->getMessage() ?: 'Service Unavailable'))
diff --git a/resources/views/errors/illustrated-layout.blade.php b/resources/views/errors/illustrated-layout.blade.php
deleted file mode 100644
index 64eb7cbb8..000000000
--- a/resources/views/errors/illustrated-layout.blade.php
+++ /dev/null
@@ -1,486 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-        <title>@yield('title')</title>
-
-        <!-- Fonts -->
-        <link rel="dns-prefetch" href="//fonts.gstatic.com">
-        <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
-
-        <!-- Styles -->
-        <style>
-            html {
-                line-height: 1.15;
-                    -ms-text-size-adjust: 100%;
-                -webkit-text-size-adjust: 100%;
-            }
-
-            body {
-                margin: 0;
-            }
-
-            header,
-            nav,
-            section {
-                display: block;
-            }
-
-            figcaption,
-            main {
-                display: block;
-            }
-
-            a {
-                background-color: transparent;
-                -webkit-text-decoration-skip: objects;
-            }
-
-            strong {
-                font-weight: inherit;
-            }
-
-            strong {
-                font-weight: bolder;
-            }
-
-            code {
-                font-family: monospace, monospace;
-                font-size: 1em;
-            }
-
-            dfn {
-                font-style: italic;
-            }
-
-            svg:not(:root) {
-                overflow: hidden;
-            }
-
-            button,
-            input {
-                font-family: sans-serif;
-                font-size: 100%;
-                line-height: 1.15;
-                margin: 0;
-            }
-
-            button,
-            input {
-                overflow: visible;
-            }
-
-            button {
-                text-transform: none;
-            }
-
-            button,
-            html [type="button"],
-            [type="reset"],
-            [type="submit"] {
-                -webkit-appearance: button;
-            }
-
-            button::-moz-focus-inner,
-            [type="button"]::-moz-focus-inner,
-            [type="reset"]::-moz-focus-inner,
-            [type="submit"]::-moz-focus-inner {
-                border-style: none;
-                padding: 0;
-            }
-
-            button:-moz-focusring,
-            [type="button"]:-moz-focusring,
-            [type="reset"]:-moz-focusring,
-            [type="submit"]:-moz-focusring {
-                outline: 1px dotted ButtonText;
-            }
-
-            legend {
-                -webkit-box-sizing: border-box;
-                        box-sizing: border-box;
-                color: inherit;
-                display: table;
-                max-width: 100%;
-                padding: 0;
-                white-space: normal;
-            }
-
-            [type="checkbox"],
-            [type="radio"] {
-                -webkit-box-sizing: border-box;
-                        box-sizing: border-box;
-                padding: 0;
-            }
-
-            [type="number"]::-webkit-inner-spin-button,
-            [type="number"]::-webkit-outer-spin-button {
-                height: auto;
-            }
-
-            [type="search"] {
-                -webkit-appearance: textfield;
-                outline-offset: -2px;
-            }
-
-            [type="search"]::-webkit-search-cancel-button,
-            [type="search"]::-webkit-search-decoration {
-                -webkit-appearance: none;
-            }
-
-            ::-webkit-file-upload-button {
-                -webkit-appearance: button;
-                font: inherit;
-            }
-
-            menu {
-                display: block;
-            }
-
-            canvas {
-                display: inline-block;
-            }
-
-            template {
-                display: none;
-            }
-
-            [hidden] {
-                display: none;
-            }
-
-            html {
-                -webkit-box-sizing: border-box;
-                        box-sizing: border-box;
-                font-family: sans-serif;
-            }
-
-            *,
-            *::before,
-            *::after {
-                -webkit-box-sizing: inherit;
-                        box-sizing: inherit;
-            }
-
-            p {
-                margin: 0;
-            }
-
-            button {
-                background: transparent;
-                padding: 0;
-            }
-
-            button:focus {
-                outline: 1px dotted;
-                outline: 5px auto -webkit-focus-ring-color;
-            }
-
-            *,
-            *::before,
-            *::after {
-                border-width: 0;
-                border-style: solid;
-                border-color: #dae1e7;
-            }
-
-            button,
-            [type="button"],
-            [type="reset"],
-            [type="submit"] {
-                border-radius: 0;
-            }
-
-            button,
-            input {
-                font-family: inherit;
-            }
-
-            input::-webkit-input-placeholder {
-                color: inherit;
-                opacity: .5;
-            }
-
-            input:-ms-input-placeholder {
-                color: inherit;
-                opacity: .5;
-            }
-
-            input::-ms-input-placeholder {
-                color: inherit;
-                opacity: .5;
-            }
-
-            input::placeholder {
-                color: inherit;
-                opacity: .5;
-            }
-
-            button,
-            [role=button] {
-                cursor: pointer;
-            }
-
-            .bg-transparent {
-                background-color: transparent;
-            }
-
-            .bg-white {
-                background-color: #fff;
-            }
-
-            .bg-teal-light {
-                background-color: #64d5ca;
-            }
-
-            .bg-blue-dark {
-                background-color: #2779bd;
-            }
-
-            .bg-indigo-light {
-                background-color: #7886d7;
-            }
-
-            .bg-purple-light {
-                background-color: #a779e9;
-            }
-
-            .bg-no-repeat {
-                background-repeat: no-repeat;
-            }
-
-            .bg-cover {
-                background-size: cover;
-            }
-
-            .border-grey-light {
-                border-color: #dae1e7;
-            }
-
-            .hover\:border-grey:hover {
-                border-color: #b8c2cc;
-            }
-
-            .rounded-lg {
-                border-radius: .5rem;
-            }
-
-            .border-2 {
-                border-width: 2px;
-            }
-
-            .hidden {
-                display: none;
-            }
-
-            .flex {
-                display: -webkit-box;
-                display: -ms-flexbox;
-                display: flex;
-            }
-
-            .items-center {
-                -webkit-box-align: center;
-                    -ms-flex-align: center;
-                        align-items: center;
-            }
-
-            .justify-center {
-                -webkit-box-pack: center;
-                    -ms-flex-pack: center;
-                        justify-content: center;
-            }
-
-            .font-sans {
-                font-family: Nunito, sans-serif;
-            }
-
-            .font-light {
-                font-weight: 300;
-            }
-
-            .font-bold {
-                font-weight: 700;
-            }
-
-            .font-black {
-                font-weight: 900;
-            }
-
-            .h-1 {
-                height: .25rem;
-            }
-
-            .leading-normal {
-                line-height: 1.5;
-            }
-
-            .m-8 {
-                margin: 2rem;
-            }
-
-            .my-3 {
-                margin-top: .75rem;
-                margin-bottom: .75rem;
-            }
-
-            .mb-8 {
-                margin-bottom: 2rem;
-            }
-
-            .max-w-sm {
-                max-width: 30rem;
-            }
-
-            .min-h-screen {
-                min-height: 100vh;
-            }
-
-            .py-3 {
-                padding-top: .75rem;
-                padding-bottom: .75rem;
-            }
-
-            .px-6 {
-                padding-left: 1.5rem;
-                padding-right: 1.5rem;
-            }
-
-            .pb-full {
-                padding-bottom: 100%;
-            }
-
-            .absolute {
-                position: absolute;
-            }
-
-            .relative {
-                position: relative;
-            }
-
-            .pin {
-                top: 0;
-                right: 0;
-                bottom: 0;
-                left: 0;
-            }
-
-            .text-black {
-                color: #22292f;
-            }
-
-            .text-grey-darkest {
-                color: #3d4852;
-            }
-
-            .text-grey-darker {
-                color: #606f7b;
-            }
-
-            .text-2xl {
-                font-size: 1.5rem;
-            }
-
-            .text-5xl {
-                font-size: 3rem;
-            }
-
-            .uppercase {
-                text-transform: uppercase;
-            }
-
-            .antialiased {
-                -webkit-font-smoothing: antialiased;
-                -moz-osx-font-smoothing: grayscale;
-            }
-
-            .tracking-wide {
-                letter-spacing: .05em;
-            }
-
-            .w-16 {
-                width: 4rem;
-            }
-
-            .w-full {
-                width: 100%;
-            }
-
-            @media (min-width: 768px) {
-                .md\:bg-left {
-                    background-position: left;
-                }
-
-                .md\:bg-right {
-                    background-position: right;
-                }
-
-                .md\:flex {
-                    display: -webkit-box;
-                    display: -ms-flexbox;
-                    display: flex;
-                }
-
-                .md\:my-6 {
-                    margin-top: 1.5rem;
-                    margin-bottom: 1.5rem;
-                }
-
-                .md\:min-h-screen {
-                    min-height: 100vh;
-                }
-
-                .md\:pb-0 {
-                    padding-bottom: 0;
-                }
-
-                .md\:text-3xl {
-                    font-size: 1.875rem;
-                }
-
-                .md\:text-15xl {
-                    font-size: 9rem;
-                }
-
-                .md\:w-1\/2 {
-                    width: 50%;
-                }
-            }
-
-            @media (min-width: 992px) {
-                .lg\:bg-center {
-                    background-position: center;
-                }
-            }
-        </style>
-    </head>
-    <body class="antialiased font-sans">
-        <div class="md:flex min-h-screen">
-            <div class="w-full md:w-1/2 bg-white flex items-center justify-center">
-                <div class="max-w-sm m-8">
-                    <div class="text-black text-5xl md:text-15xl font-black">
-                        @yield('code', __('Oh no'))
-                    </div>
-
-                    <div class="w-16 h-1 bg-purple-light my-3 md:my-6"></div>
-
-                    <p class="text-grey-darker text-2xl md:text-3xl font-light mb-8 leading-normal">
-                        @yield('message')
-                    </p>
-
-                    <a href="{{ app('router')->has('home') ? route('home') : url('/') }}">
-                        <button class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">
-                            {{ __('Go Home') }}
-                        </button>
-                    </a>
-                </div>
-            </div>
-
-            <div class="relative pb-full md:flex md:pb-0 md:min-h-screen w-full md:w-1/2">
-                @yield('image')
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/resources/views/errors/layout.blade.php b/resources/views/errors/layout.blade.php
deleted file mode 100644
index 2c51d4f35..000000000
--- a/resources/views/errors/layout.blade.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>@yield('title')</title>
-
-        <!-- Fonts -->
-        <link rel="dns-prefetch" href="//fonts.gstatic.com">
-        <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet" type="text/css">
-
-        <!-- Styles -->
-        <style>
-            html, body {
-                background-color: #fff;
-                color: #636b6f;
-                font-family: 'Nunito', sans-serif;
-                font-weight: 100;
-                height: 100vh;
-                margin: 0;
-            }
-
-            .full-height {
-                height: 100vh;
-            }
-
-            .flex-center {
-                align-items: center;
-                display: flex;
-                justify-content: center;
-            }
-
-            .position-ref {
-                position: relative;
-            }
-
-            .content {
-                text-align: center;
-            }
-
-            .title {
-                font-size: 36px;
-                padding: 20px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="flex-center position-ref full-height">
-            <div class="content">
-                <div class="title">
-                    @yield('message')
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/resources/views/errors/minimal.blade.php b/resources/views/errors/minimal.blade.php
deleted file mode 100644
index b63ac2b37..000000000
--- a/resources/views/errors/minimal.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>@yield('title')</title>
-
-        <!-- Fonts -->
-        <link rel="dns-prefetch" href="//fonts.gstatic.com">
-        <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
-
-        <!-- Styles -->
-        <style>
-            html, body {
-                background-color: #fff;
-                color: #636b6f;
-                font-family: 'Nunito', sans-serif;
-                font-weight: 100;
-                height: 100vh;
-                margin: 0;
-            }
-
-            .full-height {
-                height: 100vh;
-            }
-
-            .flex-center {
-                align-items: center;
-                display: flex;
-                justify-content: center;
-            }
-
-            .position-ref {
-                position: relative;
-            }
-
-            .code {
-                border-right: 2px solid;
-                font-size: 26px;
-                padding: 0 15px 0 15px;
-                text-align: center;
-            }
-
-            .message {
-                font-size: 18px;
-                text-align: center;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="flex-center position-ref full-height">
-            <div class="code">
-                @yield('code')
-            </div>
-
-            <div class="message" style="padding: 10px;">
-                @yield('message')
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/resources/views/vendor/mail/html/button.blade.php b/resources/views/vendor/mail/html/button.blade.php
deleted file mode 100755
index e74fe55a7..000000000
--- a/resources/views/vendor/mail/html/button.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<table class="action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td align="center">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td align="center">
-<table border="0" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td>
-<a href="{{ $url }}" class="button button-{{ $color ?? 'primary' }}" target="_blank" rel="noopener">{{ $slot }}</a>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
diff --git a/resources/views/vendor/mail/html/footer.blade.php b/resources/views/vendor/mail/html/footer.blade.php
deleted file mode 100755
index 3ff41f89c..000000000
--- a/resources/views/vendor/mail/html/footer.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<tr>
-<td>
-<table class="footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td class="content-cell" align="center">
-{{ Illuminate\Mail\Markdown::parse($slot) }}
-</td>
-</tr>
-</table>
-</td>
-</tr>
diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php
deleted file mode 100755
index fa1875caa..000000000
--- a/resources/views/vendor/mail/html/header.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<tr>
-<td class="header">
-<a href="{{ $url }}" style="display: inline-block;">
-@if (trim($slot) === 'Laravel')
-<img src="https://laravel.com/img/notification-logo.png" class="logo" alt="Laravel Logo">
-@else
-{{ $slot }}
-@endif
-</a>
-</td>
-</tr>
diff --git a/resources/views/vendor/mail/html/layout.blade.php b/resources/views/vendor/mail/html/layout.blade.php
deleted file mode 100755
index 02a54e2da..000000000
--- a/resources/views/vendor/mail/html/layout.blade.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-</head>
-<body>
-<style>
-@media only screen and (max-width: 600px) {
-.inner-body {
-width: 100% !important;
-}
-
-.footer {
-width: 100% !important;
-}
-}
-
-@media only screen and (max-width: 500px) {
-.button {
-width: 100% !important;
-}
-}
-</style>
-
-<table class="wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td align="center">
-<table class="content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-{{ $header ?? '' }}
-
-<!-- Email Body -->
-<tr>
-<td class="body" width="100%" cellpadding="0" cellspacing="0">
-<table class="inner-body" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
-<!-- Body content -->
-<tr>
-<td class="content-cell">
-{{ Illuminate\Mail\Markdown::parse($slot) }}
-
-{{ $subcopy ?? '' }}
-</td>
-</tr>
-</table>
-</td>
-</tr>
-
-{{ $footer ?? '' }}
-</table>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
deleted file mode 100755
index deec4a1f4..000000000
--- a/resources/views/vendor/mail/html/message.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-@component('mail::layout')
-{{-- Header --}}
-@slot('header')
-@component('mail::header', ['url' => config('app.url')])
-{{ config('app.name') }}
-@endcomponent
-@endslot
-
-{{-- Body --}}
-{{ $slot }}
-
-{{-- Subcopy --}}
-@isset($subcopy)
-@slot('subcopy')
-@component('mail::subcopy')
-{{ $subcopy }}
-@endcomponent
-@endslot
-@endisset
-
-{{-- Footer --}}
-@slot('footer')
-@component('mail::footer')
-© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
-@endcomponent
-@endslot
-@endcomponent
diff --git a/resources/views/vendor/mail/html/panel.blade.php b/resources/views/vendor/mail/html/panel.blade.php
deleted file mode 100755
index 2975a60a0..000000000
--- a/resources/views/vendor/mail/html/panel.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<table class="panel" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td class="panel-content">
-<table width="100%" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td class="panel-item">
-{{ Illuminate\Mail\Markdown::parse($slot) }}
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-
diff --git a/resources/views/vendor/mail/html/promotion.blade.php b/resources/views/vendor/mail/html/promotion.blade.php
deleted file mode 100755
index 8fef44c97..000000000
--- a/resources/views/vendor/mail/html/promotion.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<table class="promotion" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td align="center">
-{{ Illuminate\Mail\Markdown::parse($slot) }}
-</td>
-</tr>
-</table>
diff --git a/resources/views/vendor/mail/html/promotion/button.blade.php b/resources/views/vendor/mail/html/promotion/button.blade.php
deleted file mode 100755
index 1dcb2ee46..000000000
--- a/resources/views/vendor/mail/html/promotion/button.blade.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<table width="100%" border="0" cellpadding="0" cellspacing="0" role="presentation">
-    <tr>
-        <td align="center">
-            <table border="0" cellpadding="0" cellspacing="0" role="presentation">
-                <tr>
-                    <td>
-                        <a href="{{ $url }}" class="button button-green" target="_blank">{{ $slot }}</a>
-                    </td>
-                </tr>
-            </table>
-        </td>
-    </tr>
-</table>
diff --git a/resources/views/vendor/mail/html/subcopy.blade.php b/resources/views/vendor/mail/html/subcopy.blade.php
deleted file mode 100755
index 790ce6c24..000000000
--- a/resources/views/vendor/mail/html/subcopy.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<table class="subcopy" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td>
-{{ Illuminate\Mail\Markdown::parse($slot) }}
-</td>
-</tr>
-</table>
diff --git a/resources/views/vendor/mail/html/table.blade.php b/resources/views/vendor/mail/html/table.blade.php
deleted file mode 100755
index a5f3348b2..000000000
--- a/resources/views/vendor/mail/html/table.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="table">
-{{ Illuminate\Mail\Markdown::parse($slot) }}
-</div>
diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css
deleted file mode 100755
index 350fb838f..000000000
--- a/resources/views/vendor/mail/html/themes/default.css
+++ /dev/null
@@ -1,289 +0,0 @@
-/* Base */
-
-body,
-body *:not(html):not(style):not(br):not(tr):not(code) {
-    box-sizing: border-box;
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif,
-        'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
-    position: relative;
-}
-
-body {
-    -webkit-text-size-adjust: none;
-    background-color: #ffffff;
-    color: #718096;
-    height: 100%;
-    line-height: 1.4;
-    margin: 0;
-    padding: 0;
-    width: 100% !important;
-}
-
-p,
-ul,
-ol,
-blockquote {
-    line-height: 1.4;
-    text-align: left;
-}
-
-a {
-    color: #3869d4;
-}
-
-a img {
-    border: none;
-}
-
-/* Typography */
-
-h1 {
-    color: #3d4852;
-    font-size: 18px;
-    font-weight: bold;
-    margin-top: 0;
-    text-align: left;
-}
-
-h2 {
-    font-size: 16px;
-    font-weight: bold;
-    margin-top: 0;
-    text-align: left;
-}
-
-h3 {
-    font-size: 14px;
-    font-weight: bold;
-    margin-top: 0;
-    text-align: left;
-}
-
-p {
-    font-size: 16px;
-    line-height: 1.5em;
-    margin-top: 0;
-    text-align: left;
-}
-
-p.sub {
-    font-size: 12px;
-}
-
-img {
-    max-width: 100%;
-}
-
-/* Layout */
-
-.wrapper {
-    -premailer-cellpadding: 0;
-    -premailer-cellspacing: 0;
-    -premailer-width: 100%;
-    background-color: #edf2f7;
-    margin: 0;
-    padding: 0;
-    width: 100%;
-}
-
-.content {
-    -premailer-cellpadding: 0;
-    -premailer-cellspacing: 0;
-    -premailer-width: 100%;
-    margin: 0;
-    padding: 0;
-    width: 100%;
-}
-
-/* Header */
-
-.header {
-    padding: 25px 0;
-    text-align: center;
-}
-
-.header a {
-    color: #3d4852;
-    font-size: 19px;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-/* Logo */
-
-.logo {
-    height: 75px;
-    width: 75px;
-}
-
-/* Body */
-
-.body {
-    -premailer-cellpadding: 0;
-    -premailer-cellspacing: 0;
-    -premailer-width: 100%;
-    background-color: #edf2f7;
-    border-bottom: 1px solid #edf2f7;
-    border-top: 1px solid #edf2f7;
-    margin: 0;
-    padding: 0;
-    width: 100%;
-}
-
-.inner-body {
-    -premailer-cellpadding: 0;
-    -premailer-cellspacing: 0;
-    -premailer-width: 570px;
-    background-color: #ffffff;
-    border-color: #e8e5ef;
-    border-radius: 2px;
-    border-width: 1px;
-    box-shadow: 0 2px 0 rgba(0, 0, 150, 0.025), 2px 4px 0 rgba(0, 0, 150, 0.015);
-    margin: 0 auto;
-    padding: 0;
-    width: 570px;
-}
-
-/* Subcopy */
-
-.subcopy {
-    border-top: 1px solid #e8e5ef;
-    margin-top: 25px;
-    padding-top: 25px;
-}
-
-.subcopy p {
-    font-size: 14px;
-}
-
-/* Footer */
-
-.footer {
-    -premailer-cellpadding: 0;
-    -premailer-cellspacing: 0;
-    -premailer-width: 570px;
-    margin: 0 auto;
-    padding: 0;
-    text-align: center;
-    width: 570px;
-}
-
-.footer p {
-    color: #b0adc5;
-    font-size: 12px;
-    text-align: center;
-}
-
-.footer a {
-    color: #b0adc5;
-    text-decoration: underline;
-}
-
-/* Tables */
-
-.table table {
-    -premailer-cellpadding: 0;
-    -premailer-cellspacing: 0;
-    -premailer-width: 100%;
-    margin: 30px auto;
-    width: 100%;
-}
-
-.table th {
-    border-bottom: 1px solid #edeff2;
-    margin: 0;
-    padding-bottom: 8px;
-}
-
-.table td {
-    color: #74787e;
-    font-size: 15px;
-    line-height: 18px;
-    margin: 0;
-    padding: 10px 0;
-}
-
-.content-cell {
-    max-width: 100vw;
-    padding: 32px;
-}
-
-/* Buttons */
-
-.action {
-    -premailer-cellpadding: 0;
-    -premailer-cellspacing: 0;
-    -premailer-width: 100%;
-    margin: 30px auto;
-    padding: 0;
-    text-align: center;
-    width: 100%;
-}
-
-.button {
-    -webkit-text-size-adjust: none;
-    border-radius: 4px;
-    color: #fff;
-    display: inline-block;
-    overflow: hidden;
-    text-decoration: none;
-}
-
-.button-blue,
-.button-primary {
-    background-color: #2d3748;
-    border-bottom: 8px solid #2d3748;
-    border-left: 18px solid #2d3748;
-    border-right: 18px solid #2d3748;
-    border-top: 8px solid #2d3748;
-}
-
-.button-green,
-.button-success {
-    background-color: #48bb78;
-    border-bottom: 8px solid #48bb78;
-    border-left: 18px solid #48bb78;
-    border-right: 18px solid #48bb78;
-    border-top: 8px solid #48bb78;
-}
-
-.button-red,
-.button-error {
-    background-color: #e53e3e;
-    border-bottom: 8px solid #e53e3e;
-    border-left: 18px solid #e53e3e;
-    border-right: 18px solid #e53e3e;
-    border-top: 8px solid #e53e3e;
-}
-
-/* Panels */
-
-.panel {
-    border-left: #2d3748 solid 4px;
-    margin: 21px 0;
-}
-
-.panel-content {
-    background-color: #edf2f7;
-    color: #718096;
-    padding: 16px;
-}
-
-.panel-content p {
-    color: #718096;
-}
-
-.panel-item {
-    padding: 0;
-}
-
-.panel-item p:last-of-type {
-    margin-bottom: 0;
-    padding-bottom: 0;
-}
-
-/* Utilities */
-
-.break-all {
-    word-break: break-all;
-}
diff --git a/resources/views/vendor/mail/markdown/button.blade.php b/resources/views/vendor/mail/markdown/button.blade.php
deleted file mode 100755
index 97444ebdc..000000000
--- a/resources/views/vendor/mail/markdown/button.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-{{ $slot }}: {{ $url }}
diff --git a/resources/views/vendor/mail/markdown/footer.blade.php b/resources/views/vendor/mail/markdown/footer.blade.php
deleted file mode 100755
index 3338f620e..000000000
--- a/resources/views/vendor/mail/markdown/footer.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-{{ $slot }}
diff --git a/resources/views/vendor/mail/markdown/header.blade.php b/resources/views/vendor/mail/markdown/header.blade.php
deleted file mode 100755
index aaa3e5754..000000000
--- a/resources/views/vendor/mail/markdown/header.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-[{{ $slot }}]({{ $url }})
diff --git a/resources/views/vendor/mail/markdown/layout.blade.php b/resources/views/vendor/mail/markdown/layout.blade.php
deleted file mode 100755
index 9378baa07..000000000
--- a/resources/views/vendor/mail/markdown/layout.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-{!! strip_tags($header) !!}
-
-{!! strip_tags($slot) !!}
-@isset($subcopy)
-
-{!! strip_tags($subcopy) !!}
-@endisset
-
-{!! strip_tags($footer) !!}
diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php
deleted file mode 100755
index b409c71cb..000000000
--- a/resources/views/vendor/mail/markdown/message.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-@component('mail::layout')
-    {{-- Header --}}
-    @slot('header')
-        @component('mail::header', ['url' => config('app.url')])
-            {{ config('app.name') }}
-        @endcomponent
-    @endslot
-
-    {{-- Body --}}
-    {{ $slot }}
-
-    {{-- Subcopy --}}
-    @isset($subcopy)
-        @slot('subcopy')
-            @component('mail::subcopy')
-                {{ $subcopy }}
-            @endcomponent
-        @endslot
-    @endisset
-
-    {{-- Footer --}}
-    @slot('footer')
-        @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
-        @endcomponent
-    @endslot
-@endcomponent
diff --git a/resources/views/vendor/mail/markdown/panel.blade.php b/resources/views/vendor/mail/markdown/panel.blade.php
deleted file mode 100755
index 3338f620e..000000000
--- a/resources/views/vendor/mail/markdown/panel.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-{{ $slot }}
diff --git a/resources/views/vendor/mail/markdown/promotion.blade.php b/resources/views/vendor/mail/markdown/promotion.blade.php
deleted file mode 100755
index 3338f620e..000000000
--- a/resources/views/vendor/mail/markdown/promotion.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-{{ $slot }}
diff --git a/resources/views/vendor/mail/markdown/promotion/button.blade.php b/resources/views/vendor/mail/markdown/promotion/button.blade.php
deleted file mode 100755
index aaa3e5754..000000000
--- a/resources/views/vendor/mail/markdown/promotion/button.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-[{{ $slot }}]({{ $url }})
diff --git a/resources/views/vendor/mail/markdown/subcopy.blade.php b/resources/views/vendor/mail/markdown/subcopy.blade.php
deleted file mode 100755
index 3338f620e..000000000
--- a/resources/views/vendor/mail/markdown/subcopy.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-{{ $slot }}
diff --git a/resources/views/vendor/mail/markdown/table.blade.php b/resources/views/vendor/mail/markdown/table.blade.php
deleted file mode 100755
index 3338f620e..000000000
--- a/resources/views/vendor/mail/markdown/table.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-{{ $slot }}
diff --git a/resources/views/vendor/mail/text/button.blade.php b/resources/views/vendor/mail/text/button.blade.php
deleted file mode 100644
index 97444ebdc..000000000
--- a/resources/views/vendor/mail/text/button.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-{{ $slot }}: {{ $url }}
diff --git a/resources/views/vendor/mail/text/footer.blade.php b/resources/views/vendor/mail/text/footer.blade.php
deleted file mode 100644
index 3338f620e..000000000
--- a/resources/views/vendor/mail/text/footer.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-{{ $slot }}
diff --git a/resources/views/vendor/mail/text/header.blade.php b/resources/views/vendor/mail/text/header.blade.php
deleted file mode 100644
index aaa3e5754..000000000
--- a/resources/views/vendor/mail/text/header.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-[{{ $slot }}]({{ $url }})
diff --git a/resources/views/vendor/mail/text/layout.blade.php b/resources/views/vendor/mail/text/layout.blade.php
deleted file mode 100644
index 9378baa07..000000000
--- a/resources/views/vendor/mail/text/layout.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-{!! strip_tags($header) !!}
-
-{!! strip_tags($slot) !!}
-@isset($subcopy)
-
-{!! strip_tags($subcopy) !!}
-@endisset
-
-{!! strip_tags($footer) !!}
diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php
deleted file mode 100644
index 1ae9ed8f1..000000000
--- a/resources/views/vendor/mail/text/message.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-@component('mail::layout')
-    {{-- Header --}}
-    @slot('header')
-        @component('mail::header', ['url' => config('app.url')])
-            {{ config('app.name') }}
-        @endcomponent
-    @endslot
-
-    {{-- Body --}}
-    {{ $slot }}
-
-    {{-- Subcopy --}}
-    @isset($subcopy)
-        @slot('subcopy')
-            @component('mail::subcopy')
-                {{ $subcopy }}
-            @endcomponent
-        @endslot
-    @endisset
-
-    {{-- Footer --}}
-    @slot('footer')
-        @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
-        @endcomponent
-    @endslot
-@endcomponent
diff --git a/resources/views/vendor/mail/text/panel.blade.php b/resources/views/vendor/mail/text/panel.blade.php
deleted file mode 100644
index 3338f620e..000000000
--- a/resources/views/vendor/mail/text/panel.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-{{ $slot }}
diff --git a/resources/views/vendor/mail/text/promotion.blade.php b/resources/views/vendor/mail/text/promotion.blade.php
deleted file mode 100644
index 3338f620e..000000000
--- a/resources/views/vendor/mail/text/promotion.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-{{ $slot }}
diff --git a/resources/views/vendor/mail/text/promotion/button.blade.php b/resources/views/vendor/mail/text/promotion/button.blade.php
deleted file mode 100644
index aaa3e5754..000000000
--- a/resources/views/vendor/mail/text/promotion/button.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-[{{ $slot }}]({{ $url }})
diff --git a/resources/views/vendor/mail/text/subcopy.blade.php b/resources/views/vendor/mail/text/subcopy.blade.php
deleted file mode 100644
index 3338f620e..000000000
--- a/resources/views/vendor/mail/text/subcopy.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-{{ $slot }}
diff --git a/resources/views/vendor/mail/text/table.blade.php b/resources/views/vendor/mail/text/table.blade.php
deleted file mode 100644
index 3338f620e..000000000
--- a/resources/views/vendor/mail/text/table.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-{{ $slot }}
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
deleted file mode 100755
index e7a56b461..000000000
--- a/resources/views/vendor/notifications/email.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-@component('mail::message')
-{{-- Greeting --}}
-@if (! empty($greeting))
-# {{ $greeting }}
-@else
-@if ($level === 'error')
-# @lang('Whoops!')
-@else
-# @lang('Hello!')
-@endif
-@endif
-
-{{-- Intro Lines --}}
-@foreach ($introLines as $line)
-{{ $line }}
-
-@endforeach
-
-{{-- Action Button --}}
-@isset($actionText)
-<?php
-    switch ($level) {
-        case 'success':
-        case 'error':
-            $color = $level;
-            break;
-        default:
-            $color = 'primary';
-    }
-?>
-@component('mail::button', ['url' => $actionUrl, 'color' => $color])
-{{ $actionText }}
-@endcomponent
-@endisset
-
-{{-- Outro Lines --}}
-@foreach ($outroLines as $line)
-{{ $line }}
-
-@endforeach
-
-{{-- Salutation --}}
-@if (! empty($salutation))
-{{ $salutation }}
-@else
-@lang('Regards'),<br>
-{{ config('app.name') }}
-@endif
-
-{{-- Subcopy --}}
-@isset($actionText)
-@slot('subcopy')
-@lang(
-    "If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n".
-    'into your web browser:',
-    [
-        'actionText' => $actionText,
-    ]
-) <span class="break-all">[{{ $displayableActionUrl }}]({{ $actionUrl }})</span>
-@endslot
-@endisset
-@endcomponent
diff --git a/resources/views/vendor/pagination/bootstrap-4.blade.php b/resources/views/vendor/pagination/bootstrap-4.blade.php
deleted file mode 100755
index 63c6f56b5..000000000
--- a/resources/views/vendor/pagination/bootstrap-4.blade.php
+++ /dev/null
@@ -1,46 +0,0 @@
-@if ($paginator->hasPages())
-    <nav>
-        <ul class="pagination">
-            {{-- Previous Page Link --}}
-            @if ($paginator->onFirstPage())
-                <li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.previous')">
-                    <span class="page-link" aria-hidden="true">&lsaquo;</span>
-                </li>
-            @else
-                <li class="page-item">
-                    <a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev" aria-label="@lang('pagination.previous')">&lsaquo;</a>
-                </li>
-            @endif
-
-            {{-- Pagination Elements --}}
-            @foreach ($elements as $element)
-                {{-- "Three Dots" Separator --}}
-                @if (is_string($element))
-                    <li class="page-item disabled" aria-disabled="true"><span class="page-link">{{ $element }}</span></li>
-                @endif
-
-                {{-- Array Of Links --}}
-                @if (is_array($element))
-                    @foreach ($element as $page => $url)
-                        @if ($page == $paginator->currentPage())
-                            <li class="page-item active" aria-current="page"><span class="page-link">{{ $page }}</span></li>
-                        @else
-                            <li class="page-item"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li>
-                        @endif
-                    @endforeach
-                @endif
-            @endforeach
-
-            {{-- Next Page Link --}}
-            @if ($paginator->hasMorePages())
-                <li class="page-item">
-                    <a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next" aria-label="@lang('pagination.next')">&rsaquo;</a>
-                </li>
-            @else
-                <li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.next')">
-                    <span class="page-link" aria-hidden="true">&rsaquo;</span>
-                </li>
-            @endif
-        </ul>
-    </nav>
-@endif
diff --git a/resources/views/vendor/pagination/default.blade.php b/resources/views/vendor/pagination/default.blade.php
deleted file mode 100755
index 0db70b562..000000000
--- a/resources/views/vendor/pagination/default.blade.php
+++ /dev/null
@@ -1,46 +0,0 @@
-@if ($paginator->hasPages())
-    <nav>
-        <ul class="pagination">
-            {{-- Previous Page Link --}}
-            @if ($paginator->onFirstPage())
-                <li class="disabled" aria-disabled="true" aria-label="@lang('pagination.previous')">
-                    <span aria-hidden="true">&lsaquo;</span>
-                </li>
-            @else
-                <li>
-                    <a href="{{ $paginator->previousPageUrl() }}" rel="prev" aria-label="@lang('pagination.previous')">&lsaquo;</a>
-                </li>
-            @endif
-
-            {{-- Pagination Elements --}}
-            @foreach ($elements as $element)
-                {{-- "Three Dots" Separator --}}
-                @if (is_string($element))
-                    <li class="disabled" aria-disabled="true"><span>{{ $element }}</span></li>
-                @endif
-
-                {{-- Array Of Links --}}
-                @if (is_array($element))
-                    @foreach ($element as $page => $url)
-                        @if ($page == $paginator->currentPage())
-                            <li class="active" aria-current="page"><span>{{ $page }}</span></li>
-                        @else
-                            <li><a href="{{ $url }}">{{ $page }}</a></li>
-                        @endif
-                    @endforeach
-                @endif
-            @endforeach
-
-            {{-- Next Page Link --}}
-            @if ($paginator->hasMorePages())
-                <li>
-                    <a href="{{ $paginator->nextPageUrl() }}" rel="next" aria-label="@lang('pagination.next')">&rsaquo;</a>
-                </li>
-            @else
-                <li class="disabled" aria-disabled="true" aria-label="@lang('pagination.next')">
-                    <span aria-hidden="true">&rsaquo;</span>
-                </li>
-            @endif
-        </ul>
-    </nav>
-@endif
diff --git a/resources/views/vendor/pagination/semantic-ui.blade.php b/resources/views/vendor/pagination/semantic-ui.blade.php
deleted file mode 100755
index ef0dbb184..000000000
--- a/resources/views/vendor/pagination/semantic-ui.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-@if ($paginator->hasPages())
-    <div class="ui pagination menu" role="navigation">
-        {{-- Previous Page Link --}}
-        @if ($paginator->onFirstPage())
-            <a class="icon item disabled" aria-disabled="true" aria-label="@lang('pagination.previous')"> <i class="left chevron icon"></i> </a>
-        @else
-            <a class="icon item" href="{{ $paginator->previousPageUrl() }}" rel="prev" aria-label="@lang('pagination.previous')"> <i class="left chevron icon"></i> </a>
-        @endif
-
-        {{-- Pagination Elements --}}
-        @foreach ($elements as $element)
-            {{-- "Three Dots" Separator --}}
-            @if (is_string($element))
-                <a class="icon item disabled" aria-disabled="true">{{ $element }}</a>
-            @endif
-
-            {{-- Array Of Links --}}
-            @if (is_array($element))
-                @foreach ($element as $page => $url)
-                    @if ($page == $paginator->currentPage())
-                        <a class="item active" href="{{ $url }}" aria-current="page">{{ $page }}</a>
-                    @else
-                        <a class="item" href="{{ $url }}">{{ $page }}</a>
-                    @endif
-                @endforeach
-            @endif
-        @endforeach
-
-        {{-- Next Page Link --}}
-        @if ($paginator->hasMorePages())
-            <a class="icon item" href="{{ $paginator->nextPageUrl() }}" rel="next" aria-label="@lang('pagination.next')"> <i class="right chevron icon"></i> </a>
-        @else
-            <a class="icon item disabled" aria-disabled="true" aria-label="@lang('pagination.next')"> <i class="right chevron icon"></i> </a>
-        @endif
-    </div>
-@endif
diff --git a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php
deleted file mode 100755
index 4bb491742..000000000
--- a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-@if ($paginator->hasPages())
-    <nav>
-        <ul class="pagination">
-            {{-- Previous Page Link --}}
-            @if ($paginator->onFirstPage())
-                <li class="page-item disabled" aria-disabled="true">
-                    <span class="page-link">@lang('pagination.previous')</span>
-                </li>
-            @else
-                <li class="page-item">
-                    <a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">@lang('pagination.previous')</a>
-                </li>
-            @endif
-
-            {{-- Next Page Link --}}
-            @if ($paginator->hasMorePages())
-                <li class="page-item">
-                    <a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">@lang('pagination.next')</a>
-                </li>
-            @else
-                <li class="page-item disabled" aria-disabled="true">
-                    <span class="page-link">@lang('pagination.next')</span>
-                </li>
-            @endif
-        </ul>
-    </nav>
-@endif
diff --git a/resources/views/vendor/pagination/simple-default.blade.php b/resources/views/vendor/pagination/simple-default.blade.php
deleted file mode 100755
index 36bdbc18c..000000000
--- a/resources/views/vendor/pagination/simple-default.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-@if ($paginator->hasPages())
-    <nav>
-        <ul class="pagination">
-            {{-- Previous Page Link --}}
-            @if ($paginator->onFirstPage())
-                <li class="disabled" aria-disabled="true"><span>@lang('pagination.previous')</span></li>
-            @else
-                <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">@lang('pagination.previous')</a></li>
-            @endif
-
-            {{-- Next Page Link --}}
-            @if ($paginator->hasMorePages())
-                <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">@lang('pagination.next')</a></li>
-            @else
-                <li class="disabled" aria-disabled="true"><span>@lang('pagination.next')</span></li>
-            @endif
-        </ul>
-    </nav>
-@endif
diff --git a/resources/views/vendor/pagination/simple-tailwind.blade.php b/resources/views/vendor/pagination/simple-tailwind.blade.php
deleted file mode 100644
index 1c5e52f3e..000000000
--- a/resources/views/vendor/pagination/simple-tailwind.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-@if ($paginator->hasPages())
-    <nav role="navigation" aria-label="Pagination Navigation" class="flex justify-between">
-        {{-- Previous Page Link --}}
-        @if ($paginator->onFirstPage())
-            <span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
-                {!! __('pagination.previous') !!}
-            </span>
-        @else
-            <a href="{{ $paginator->previousPageUrl() }}" rel="prev" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
-                {!! __('pagination.previous') !!}
-            </a>
-        @endif
-
-        {{-- Next Page Link --}}
-        @if ($paginator->hasMorePages())
-            <a href="{{ $paginator->nextPageUrl() }}" rel="next" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
-                {!! __('pagination.next') !!}
-            </a>
-        @else
-            <span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
-                {!! __('pagination.next') !!}
-            </span>
-        @endif
-    </nav>
-@endif
diff --git a/resources/views/vendor/pagination/tailwind.blade.php b/resources/views/vendor/pagination/tailwind.blade.php
deleted file mode 100644
index 4b92aaba1..000000000
--- a/resources/views/vendor/pagination/tailwind.blade.php
+++ /dev/null
@@ -1,102 +0,0 @@
-@if ($paginator->hasPages())
-    <nav role="navigation" aria-label="Pagination Navigation" class="flex items-center justify-between">
-        <div class="flex justify-between flex-1 sm:hidden">
-            @if ($paginator->onFirstPage())
-                <span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
-                    {!! __('pagination.previous') !!}
-                </span>
-            @else
-                <a href="{{ $paginator->previousPageUrl() }}" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
-                    {!! __('pagination.previous') !!}
-                </a>
-            @endif
-
-            @if ($paginator->hasMorePages())
-                <a href="{{ $paginator->nextPageUrl() }}" class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
-                    {!! __('pagination.next') !!}
-                </a>
-            @else
-                <span class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
-                    {!! __('pagination.next') !!}
-                </span>
-            @endif
-        </div>
-
-        <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
-            <div>
-                <p class="text-sm text-gray-700 leading-5">
-                    {!! __('Showing') !!}
-                    <span class="font-medium">{{ $paginator->firstItem() }}</span>
-                    {!! __('to') !!}
-                    <span class="font-medium">{{ $paginator->lastItem() }}</span>
-                    {!! __('of') !!}
-                    <span class="font-medium">{{ $paginator->total() }}</span>
-                    {!! __('results') !!}
-                </p>
-            </div>
-
-            <div>
-                <span class="relative z-0 inline-flex shadow-sm">
-                    {{-- Previous Page Link --}}
-                    @if ($paginator->onFirstPage())
-                        <span aria-disabled="true" aria-label="{{ __('pagination.previous') }}">
-                            <span class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default rounded-l-md leading-5" aria-hidden="true">
-                                <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
-                                    <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
-                                </svg>
-                            </span>
-                        </span>
-                    @else
-                        <a href="{{ $paginator->previousPageUrl() }}" rel="prev" class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-l-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150" aria-label="{{ __('pagination.previous') }}">
-                            <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
-                                <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
-                            </svg>
-                        </a>
-                    @endif
-
-                    {{-- Pagination Elements --}}
-                    @foreach ($elements as $element)
-                        {{-- "Three Dots" Separator --}}
-                        @if (is_string($element))
-                            <span aria-disabled="true">
-                                <span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 cursor-default leading-5">{{ $element }}</span>
-                            </span>
-                        @endif
-
-                        {{-- Array Of Links --}}
-                        @if (is_array($element))
-                            @foreach ($element as $page => $url)
-                                @if ($page == $paginator->currentPage())
-                                    <span aria-current="page">
-                                        <span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">{{ $page }}</span>
-                                    </span>
-                                @else
-                                    <a href="{{ $url }}" class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 hover:text-gray-500 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150" aria-label="{{ __('Go to page :page', ['page' => $page]) }}">
-                                        {{ $page }}
-                                    </a>
-                                @endif
-                            @endforeach
-                        @endif
-                    @endforeach
-
-                    {{-- Next Page Link --}}
-                    @if ($paginator->hasMorePages())
-                        <a href="{{ $paginator->nextPageUrl() }}" rel="next" class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-r-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150" aria-label="{{ __('pagination.next') }}">
-                            <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
-                                <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
-                            </svg>
-                        </a>
-                    @else
-                        <span aria-disabled="true" aria-label="{{ __('pagination.next') }}">
-                            <span class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default rounded-r-md leading-5" aria-hidden="true">
-                                <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
-                                    <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
-                                </svg>
-                            </span>
-                        </span>
-                    @endif
-                </span>
-            </div>
-        </div>
-    </nav>
-@endif