Issues #217, #396, #227, #321

2019-01-29 16:05:43 +05:30 · 2019-01-29 16:05:43 +05:30 · 209f73d46b
parent f92594176a
commit 209f73d46b
48 changed files with 244 additions and 41 deletions
--- a/packages/Webkul/Admin/publishable/assets/css/admin.css
+++ b/packages/Webkul/Admin/publishable/assets/css/admin.css
--- a/packages/Webkul/Admin/publishable/assets/mix-manifest.json
+++ b/packages/Webkul/Admin/publishable/assets/mix-manifest.json
@ -1,4 +1,4 @@
 {
    "/js/admin.js": "/js/admin.js?id=da5ebef9c25a064e7ed6",
-    "/css/admin.css": "/css/admin.css?id=3e790c2215bf5c60ac21"
+    "/css/admin.css": "/css/admin.css?id=0864a44c0f49929aff6a"
 }
--- a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss
@ -185,6 +185,15 @@ body {
            .page-title {
                float: left;

+                .back-link {
+                    float: left;
+                    margin-right: 10px;
+                    width: 24px;
+                    height: 24px;
+                    cursor: pointer;
+                    margin-top: 5px;
+                }
+
                h1 {
                    margin-bottom: 0;
                    vertical-align: middle;
--- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
@ -10,7 +10,11 @@

            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.catalog.attributes.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+                        
+                        {{ __('admin::app.catalog.attributes.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
@ -10,7 +10,11 @@

            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.catalog.attributes.edit-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+                        
+                        {{ __('admin::app.catalog.attributes.edit-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
@ -11,7 +11,11 @@

            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.catalog.categories.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+                        
+                        {{ __('admin::app.catalog.categories.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
@ -12,7 +12,11 @@

            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.catalog.categories.edit-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+                        
+                        {{ __('admin::app.catalog.categories.edit-title') }}
+                    </h1>

                    <div class="control-group">
                        <select class="control" id="locale-switcher" onChange="window.location.href = this.value">
--- a/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php
@ -10,7 +10,11 @@

            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.catalog.families.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+                        
+                        {{ __('admin::app.catalog.families.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
@ -10,7 +10,11 @@

            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.catalog.families.edit-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+                        
+                        {{ __('admin::app.catalog.families.edit-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php
@ -25,7 +25,11 @@

            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.catalog.products.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+                        
+                        {{ __('admin::app.catalog.products.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
@ -14,7 +14,11 @@
            <div class="page-header">

                <div class="page-title">
-                    <h1>{{ __('admin::app.catalog.products.edit-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.catalog.products.edit-title') }}
+                    </h1>

                    <div class="control-group">
                        <select class="control" id="channel-switcher" name="channel">
--- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
@ -11,6 +11,8 @@
            <div class="page-header">
                <div class="page-title">
                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
                        {{ __('admin::app.customers.customers.title') }}

                        {{ Config::get('carrier.social.facebook.url') }}
--- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
@ -11,6 +11,8 @@
            <div class="page-header">
                <div class="page-title">
                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
                        {{ __('admin::app.customers.customers.title') }}
                    </h1>
                </div>
--- a/packages/Webkul/Admin/src/Resources/views/customers/groups/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/groups/create.blade.php
@ -11,6 +11,8 @@
            <div class="page-header">
                <div class="page-title">
                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+                        
                        {{ __('admin::app.customers.groups.add-title') }}
                    </h1>
                </div>
--- a/packages/Webkul/Admin/src/Resources/views/customers/groups/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/groups/edit.blade.php
@ -11,6 +11,8 @@
            <div class="page-header">
                <div class="page-title">
                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+                        
                        {{ __('admin::app.customers.groups.edit-title') }}
                    </h1>
                </div>
--- a/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php
@ -11,6 +11,8 @@
            <div class="page-header">
                <div class="page-title">
                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+                        
                        {{ __('admin::app.customers.reviews.edit-title') }}
                    </h1>
                </div>
--- a/packages/Webkul/Admin/src/Resources/views/customers/subscribers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/subscribers/edit.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.customers.subscribers.update', $subscriber->id) }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.customers.subscribers.title-edit') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+                        
+                        {{ __('admin::app.customers.subscribers.title-edit') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
@ -11,7 +11,11 @@
            
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.sales.invoices.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.sales.invoices.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
@ -11,7 +11,11 @@
    <div class="content full-page">
        <div class="page-header">
            <div class="page-title">
-                <h1>{{ __('admin::app.sales.invoices.view-title', ['invoice_id' => $invoice->id]) }}</h1>
+                <h1>
+                    <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                    {{ __('admin::app.sales.invoices.view-title', ['invoice_id' => $invoice->id]) }}
+                </h1>
            </div>

            <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
@ -11,7 +11,11 @@
        <div class="page-header">

            <div class="page-title">
-                <h1>{{ __('admin::app.sales.orders.view-title', ['order_id' => $order->id]) }}</h1>
+                <h1>
+                    <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                    {{ __('admin::app.sales.orders.view-title', ['order_id' => $order->id]) }}
+                </h1>
            </div>

            <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
@ -11,7 +11,11 @@
            
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.sales.shipments.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.sales.shipments.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php
@ -10,7 +10,11 @@
    <div class="content full-page">
        <div class="page-header">
            <div class="page-title">
-                <h1>{{ __('admin::app.sales.shipments.view-title', ['shipment_id' => $shipment->id]) }}</h1>
+                <h1>
+                    <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                    {{ __('admin::app.sales.shipments.view-title', ['shipment_id' => $shipment->id]) }}
+                </h1>
            </div>

            <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.channels.store') }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.channels.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.channels.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.channels.update', $channel->id) }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.channels.edit-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.channels.edit-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.currencies.store') }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.currencies.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.currencies.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.currencies.update', $currency->id) }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.currencies.edit-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.currencies.edit-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.exchange_rates.store') }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.exchange_rates.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.exchange_rates.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.exchange_rates.update', $exchangeRate->id) }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.exchange_rates.edit-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.exchange_rates.edit-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.inventory_sources.store') }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.inventory_sources.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.inventory_sources.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.inventory_sources.update', $inventorySource->id) }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.inventory_sources.edit-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.inventory_sources.edit-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.locales.store') }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.locales.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.locales.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.locales.update', $locale->id) }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.locales.edit-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.locales.edit-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
@ -9,7 +9,11 @@
        <form method="POST" action="{{ route('admin.sliders.create') }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.sliders.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.sliders.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
@ -9,7 +9,11 @@
        <form method="POST" action="{{ route('admin.sliders.update', $slider->id) }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.sliders.edit-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.sliders.edit-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/create.blade.php
@ -9,7 +9,11 @@
        <form method="POST" action="{{ route('admin.tax-categories.create') }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.tax-categories.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.tax-categories.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
@ -9,7 +9,11 @@
        <form method="POST" action="{{ route('admin.tax-categories.update', $taxCategory->id) }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.tax-categories.edit.title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.tax-categories.edit.title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
@ -9,7 +9,11 @@
        <form method="POST" action="{{ route('admin.tax-rates.create') }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.tax-rates.add-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.tax-rates.add-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
@ -9,7 +9,11 @@
        <form method="POST" action="{{ route('admin.tax-rates.update', $taxRate->id) }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.settings.tax-rates.edit.title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.settings.tax-rates.edit.title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.roles.store') }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.users.roles.add-role-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.users.roles.add-role-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php
@ -10,7 +10,11 @@
        <form method="POST" action="{{ route('admin.roles.update', $role->id) }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.users.roles.edit-role-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.users.roles.edit-role-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
@ -9,7 +9,11 @@
        <form method="POST" action="{{ route('admin.users.store') }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.users.users.add-user-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.users.users.add-user-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
@ -9,7 +9,11 @@
        <form method="POST" action="{{ route('admin.users.update', $user->id) }}" @submit.prevent="onSubmit">
            <div class="page-header">
                <div class="page-title">
-                    <h1>{{ __('admin::app.users.users.edit-user-title') }}</h1>
+                    <h1>
+                        <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
+
+                        {{ __('admin::app.users.users.edit-user-title') }}
+                    </h1>
                </div>

                <div class="page-action">
--- a/packages/Webkul/Core/src/Core.php
+++ b/packages/Webkul/Core/src/Core.php
@ -423,10 +423,10 @@ class Core
            $toTimeStamp += 86400;
        }

-        $result = false;
-
        if (! $this->is_empty_date($dateFrom) && $channelTimeStamp < $fromTimeStamp) {
+            $result = false;
        } elseif (! $this->is_empty_date($dateTo) && $channelTimeStamp > $toTimeStamp) {
+            $result = false;
        } else {
            $result = true;
        }
--- a/packages/Webkul/Product/src/Database/Migrations/2019_01_29_123053_add_min_price_and_max_price_column_in_product_flat_table.php
+++ b/packages/Webkul/Product/src/Database/Migrations/2019_01_29_123053_add_min_price_and_max_price_column_in_product_flat_table.php
@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddMinPriceAndMaxPriceColumnInProductFlatTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('product_flat', function (Blueprint $table) {
+            $table->decimal('min_price', 12, 4)->nullable();
+            $table->decimal('max_price', 12, 4)->nullable();
+            $table->decimal('special_price', 12, 4)->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('product_flat', function (Blueprint $table) {
+            //
+        });
+    }
+}
--- a/packages/Webkul/Product/src/Listeners/ProductFlat.php
+++ b/packages/Webkul/Product/src/Listeners/ProductFlat.php
@ -179,7 +179,11 @@ class ProductFlat
                        }
                    }

-                    $productFlat->{$attribute->code} = $productAttributeValue[ProductAttributeValue::$attributeTypeFields[$attribute->type]];
+                    if ($product->type == 'configurable' && $attribute->code == 'price') {
+                        $productFlat->{$attribute->code} = app('Webkul\Product\Helpers\Price')->getVariantMinPrice($product);
+                    } else {
+                        $productFlat->{$attribute->code} = $productAttributeValue[ProductAttributeValue::$attributeTypeFields[$attribute->type]];
+                    }

                    if ($attribute->type == 'select') {
                        $attributeOption = $this->attributeOptionRepository->find($product->{$attribute->code});
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@ -3,6 +3,7 @@
 namespace Webkul\Product\Repositories;

 use Illuminate\Container\Container as App;
+use DB;
 use Illuminate\Support\Facades\Event;
 use Webkul\Core\Eloquent\Repository;
 use Webkul\Attribute\Repositories\AttributeRepository;
@ -402,6 +403,11 @@ class ProductRepository extends Repository
     */
    public function findAllByCategory($categoryId = null)
    {
+        // IF( special_price_from IS NOT NULL 
+        // AND special_price_to IS NOT NULL , IF( NOW( ) >= special_price_from
+        // AND NOW( ) <= special_price_to, IF( special_price IS NULL OR special_price = 0 , price, LEAST( special_price, price ) ) , price ) , IF( special_price_from IS NULL , IF( special_price_to IS NULL , IF( special_price IS NULL OR special_price = 0 , price, LEAST( special_price, price ) ) , IF( NOW( ) <= special_price_to, IF( special_price IS NULL OR special_price = 0 , price, LEAST( special_price, price ) ) , price ) ) , IF( special_price_to IS NULL , IF( NOW( ) >= special_price_from, IF( special_price IS NULL OR special_price = 0 , price, LEAST( special_price, price ) ) , price ) , price ) ) ) AS min_price
+
+
        $params = request()->input();

        $results = app('Webkul\Product\Repositories\ProductFlatRepository')->scopeQuery(function($query) use($params, $categoryId) {
@ -411,6 +417,10 @@ class ProductRepository extends Repository

                $qb = $query->distinct()
                        ->addSelect('product_flat.*')
+                        ->addSelect(DB::raw('IF( product_flat.special_price_from IS NOT NULL 
+                            AND product_flat.special_price_to IS NOT NULL , IF( NOW( ) >= product_flat.special_price_from
+                            AND NOW( ) <= product_flat.special_price_to, IF( product_flat.special_price IS NULL OR product_flat.special_price = 0 , product_flat.price, LEAST( product_flat.special_price, product_flat.price ) ) , product_flat.price ) , IF( product_flat.special_price_from IS NULL , IF( product_flat.special_price_to IS NULL , IF( product_flat.special_price IS NULL OR product_flat.special_price = 0 , product_flat.price, LEAST( product_flat.special_price, product_flat.price ) ) , IF( NOW( ) <= product_flat.special_price_to, IF( product_flat.special_price IS NULL OR product_flat.special_price = 0 , product_flat.price, LEAST( product_flat.special_price, product_flat.price ) ) , product_flat.price ) ) , IF( product_flat.special_price_to IS NULL , IF( NOW( ) >= product_flat.special_price_from, IF( product_flat.special_price IS NULL OR product_flat.special_price = 0 , product_flat.price, LEAST( product_flat.special_price, product_flat.price ) ) , product_flat.price ) , product_flat.price ) ) ) AS price'))
+                            
                        ->leftJoin('products', 'product_flat.product_id', '=', 'products.id')
                        ->leftJoin('product_categories', 'products.id', '=', 'product_categories.product_id')
                        ->where('product_flat.visible_individually', 1)
--- a/packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php
@ -34,7 +34,7 @@
        <div class="filter-attributes-item" :class="[active ? 'active' : '']">

            <div class="filter-attributes-title" @click="active = !active">
-                @{{ attribute.name }}
+                @{{ attribute.name ? attribute.name : attribute.admin_name }}

                <div class="pull-right">
                    <span class="remove-filter-link" v-if="appliedFilters.length" @click.stop="clearFilters()">
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
@ -142,7 +142,7 @@
                        <span v-else>@{{ filter.label }}</span>

                        <span class="wrapper">
-                            @{{ filter.val }}
+                            @{{ decodeURIComponent(filter.val) }}
                            <span class="icon cross-icon" v-on:click="removeFilter(filter)"></span>
                        </span>
                    </span>