From e89a9ac9309a6d134c42fe8b91508c95ff0c2dd9 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 28 Jan 2019 14:01:49 +0530 Subject: [PATCH 01/13] Migration Fix --- ..._add_updated_at_column_in_product_flat_table.php | 13 +++++++++++++ .../Webkul/Product/src/Listeners/ProductFlat.php | 12 ++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/Product/src/Database/Migrations/2019_01_25_124522_add_updated_at_column_in_product_flat_table.php b/packages/Webkul/Product/src/Database/Migrations/2019_01_25_124522_add_updated_at_column_in_product_flat_table.php index 0767e32ba..ae5eb7cac 100644 --- a/packages/Webkul/Product/src/Database/Migrations/2019_01_25_124522_add_updated_at_column_in_product_flat_table.php +++ b/packages/Webkul/Product/src/Database/Migrations/2019_01_25_124522_add_updated_at_column_in_product_flat_table.php @@ -32,5 +32,18 @@ class AddUpdatedAtColumnInProductFlatTable extends Migration */ public function down() { + Schema::disableForeignKeyConstraints(); + + Schema::table('product_flat', function (Blueprint $table) { + $table->dropColumn('created_at'); + $table->dropColumn('size_label'); + $table->dropColumn('updated_at'); + $table->dropColumn('parent_id'); + $table->dropColumn('visible_individually'); + $table->dropForeign('parent_id'); + $table->dropIndex('product_flat_unique_index'); + }); + + Schema::enableForeignKeyConstraints(); } } diff --git a/packages/Webkul/Product/src/Listeners/ProductFlat.php b/packages/Webkul/Product/src/Listeners/ProductFlat.php index 5c183c8e0..86d199301 100644 --- a/packages/Webkul/Product/src/Listeners/ProductFlat.php +++ b/packages/Webkul/Product/src/Listeners/ProductFlat.php @@ -13,6 +13,7 @@ use Webkul\Product\Models\ProductAttributeValue; * Product Flat Event handler * * @author Jitendra Singh + * @author Prashant Singh * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) */ class ProductFlat @@ -148,10 +149,10 @@ class ProductFlat foreach (core()->getAllChannels() as $channel) { foreach ($channel->locales as $locale) { $productFlat = $this->productFlatRepository->findOneWhere([ - 'product_id' => $product->id, - 'channel' => $channel->code, - 'locale' => $locale->code - ]); + 'product_id' => $product->id, + 'channel' => $channel->code, + 'locale' => $locale->code + ]); if (!$productFlat) { $productFlat = $this->productFlatRepository->create([ @@ -160,7 +161,7 @@ class ProductFlat 'locale' => $locale->code ]); } - + foreach ($product->attribute_family->custom_attributes as $attribute) { if (!Schema::hasTable('product_flat') || !Schema::hasColumn('product_flat', $attribute->code)) continue; @@ -211,7 +212,6 @@ class ProductFlat } $productFlat->save(); - } } } From ef1687b88cd0adba12169617c1f256ecc8097175 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Tue, 29 Jan 2019 13:44:27 +0530 Subject: [PATCH 02/13] default sort order on the default index of the datagrids had beenh set to descending order --- packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php | 2 ++ .../Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/UserDataGrid.php | 2 ++ 21 files changed, 42 insertions(+) diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index 89837a79d..3bb2e1817 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -19,6 +19,8 @@ class AttributeDataGrid extends DataGrid protected $index = 'id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('attributes') diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php index e661a6009..9fd1fdd2d 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php @@ -19,6 +19,8 @@ class AttributeFamilyDataGrid extends DataGrid protected $index = 'id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('attribute_families')->select('id')->addSelect('id', 'code', 'name'); diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php index 111b1fd18..33a173a26 100755 --- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php @@ -19,6 +19,8 @@ class CategoryDataGrid extends DataGrid protected $index = 'category_id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('categories as cat') diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php index 106ed124c..716fa12c8 100755 --- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php @@ -19,6 +19,8 @@ class ChannelDataGrid extends DataGrid protected $index = 'id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('channels')->addSelect('id', 'code', 'name', 'hostname'); diff --git a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php index db694db08..e83f764b6 100755 --- a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php @@ -19,6 +19,8 @@ class CurrencyDataGrid extends DataGrid protected $index = 'id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('currencies')->addSelect('id', 'name', 'code'); diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index b4ea36ff0..8b15050f0 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -19,6 +19,8 @@ class CustomerDataGrid extends DataGrid protected $index = 'customer_id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('customers as custs') diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php index 79e700ca7..3e96102d9 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -19,6 +19,8 @@ class CustomerGroupDataGrid extends DataGrid protected $index = 'id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('customer_groups')->addSelect('id', 'name'); diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php index a33fc8e74..0858b7e50 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -19,6 +19,8 @@ class CustomerReviewDataGrid extends DataGrid protected $index = 'product_review_id'; //column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('product_reviews as pr') diff --git a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php index 4a1535534..ad535bc79 100755 --- a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php @@ -19,6 +19,8 @@ class ExchangeRatesDataGrid extends DataGrid protected $index = 'currency_exch_id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('currency_exchange_rates as cer')->addSelect('cer.id as currency_exch_id', 'curr.name', 'cer.rate')->leftJoin('currencies as curr', 'cer.target_currency', '=', 'curr.id'); diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php index 3d3dc3b7a..a29d80480 100755 --- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php @@ -19,6 +19,8 @@ class InventorySourcesDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('inventory_sources')->addSelect('id', 'code', 'name', 'priority', 'status'); diff --git a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php index 76cfe699e..4bc3a5ecc 100755 --- a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php @@ -19,6 +19,8 @@ class LocalesDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('locales')->addSelect('id', 'code', 'name'); diff --git a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php index 4cded8a4a..999dcbc5e 100755 --- a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php @@ -19,6 +19,8 @@ class NewsLetterDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('subscribers_list')->addSelect('id', 'is_subscribed', 'email'); diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php index 3c4a8e4ed..a4dff89c3 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php @@ -19,6 +19,8 @@ class OrderDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('orders')->select('id', 'base_sub_total', 'base_grand_total', 'created_at', 'channel_name', 'status')->addSelect(DB::raw('CONCAT(customer_first_name, " ", customer_last_name) as full_name')); diff --git a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php index c12dfd4ea..8b4db58c8 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php @@ -19,6 +19,8 @@ class OrderInvoicesDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('invoices')->select('id', 'order_id', 'state', 'grand_total', 'created_at'); diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php index e10c78f79..bbf9be8fc 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php @@ -19,6 +19,8 @@ class OrderShipmentsDataGrid extends DataGrid protected $index = 'shipment_id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('shipments as ship') diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 2aa1d2214..1b7af6ec8 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -17,6 +17,8 @@ class ProductDataGrid extends DataGrid protected $itemsPerPage = 10; //overriding the default items per page + protected $sortOrder = 'desc'; //asc or desc + protected $index = 'product_id'; public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php index 47669cf56..856446021 100755 --- a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php @@ -19,6 +19,8 @@ class RolesDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('roles')->addSelect('id', 'name', 'permission_type'); diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index 2c7eb4124..94c3d7937 100755 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -19,6 +19,8 @@ class SliderDataGrid extends DataGrid protected $index = 'slider_id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('sliders as sl')->addSelect('sl.id as slider_id', 'sl.title', 'ch.name')->leftJoin('channels as ch', 'sl.channel_id', '=', diff --git a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php index fedffa723..d963610b4 100755 --- a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php @@ -19,6 +19,8 @@ class TaxCategoryDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('tax_categories')->addSelect('id', 'name', 'code'); diff --git a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php index 5196bf813..03f1066ee 100755 --- a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php @@ -19,6 +19,8 @@ class TaxRateDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('tax_rates')->addSelect('id', 'identifier', 'state', 'country', 'tax_rate'); diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index 31fd8d7b3..60e900f46 100755 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -19,6 +19,8 @@ class UserDataGrid extends DataGrid protected $index = 'user_id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('admins as u')->addSelect('u.id as user_id', 'u.name as user_name', 'u.status', 'u.email', 'ro.name as role_name')->leftJoin('roles as ro', 'u.role_id', '=', 'ro.id'); From 3a69f76b965c32c0df02bdfe345c4c62a1437dc3 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Tue, 29 Jan 2019 16:05:30 +0530 Subject: [PATCH 03/13] Fixed issue #368 --- packages/Webkul/Checkout/src/Cart.php | 2 +- packages/Webkul/Shop/src/Http/Controllers/CartController.php | 3 +-- .../src/Resources/views/checkout/cart/mini-cart.blade.php | 4 ++++ packages/Webkul/Shop/webpack.mix.js | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 58e9bc39d..39a37f18b 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -13,7 +13,7 @@ use Webkul\Checkout\Models\CartPayment; use Webkul\Customer\Repositories\WishlistRepository; /** - * Facade for all the methods to be implemented in Cart. + * Facades handler for all the methods to be implemented in Cart. * * @author Prashant Singh * @author Jitendra Singh diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 00c2d5fee..c7c9b01f9 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -108,7 +108,7 @@ class CartController extends Controller } catch(\Exception $e) { session()->flash('error', trans($e->getMessage())); - + return redirect()->back(); } } @@ -191,7 +191,6 @@ class CartController extends Controller Cart::collectTotals(); - if (! $result) { return redirect()->back(); } else { diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php index f47a2b057..f69d4dfd4 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php @@ -25,6 +25,10 @@ {!! view_render_event('bagisto.shop.checkout.cart-mini.subtotal.before', ['cart' => $cart]) !!} + @php + Cart::collectTotals(); + @endphp + {{ core()->currency($cart->base_sub_total) }} {!! view_render_event('bagisto.shop.checkout.cart-mini.subtotal.after', ['cart' => $cart]) !!} diff --git a/packages/Webkul/Shop/webpack.mix.js b/packages/Webkul/Shop/webpack.mix.js index acf0d5b90..cc2d629f2 100755 --- a/packages/Webkul/Shop/webpack.mix.js +++ b/packages/Webkul/Shop/webpack.mix.js @@ -1,8 +1,8 @@ const { mix } = require("laravel-mix"); require("laravel-mix-merge-manifest"); -var publicPath = 'publishable/assets'; -// var publicPath = "../../../public/themes/default/assets"; +// var publicPath = 'publishable/assets'; +var publicPath = "../../../public/themes/default/assets"; mix.setPublicPath(publicPath).mergeManifest(); mix.disableNotifications(); From 209f73d46bcb96fe22a4148125a3279b3292ab16 Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 29 Jan 2019 16:05:43 +0530 Subject: [PATCH 04/13] Issues #217, #396, #227, #321 --- .../Admin/publishable/assets/css/admin.css | 2 +- .../publishable/assets/mix-manifest.json | 2 +- .../Admin/src/Resources/assets/sass/app.scss | 9 +++++ .../views/catalog/attributes/create.blade.php | 6 +++- .../views/catalog/attributes/edit.blade.php | 6 +++- .../views/catalog/categories/create.blade.php | 6 +++- .../views/catalog/categories/edit.blade.php | 6 +++- .../views/catalog/families/create.blade.php | 6 +++- .../views/catalog/families/edit.blade.php | 6 +++- .../views/catalog/products/create.blade.php | 6 +++- .../views/catalog/products/edit.blade.php | 6 +++- .../views/customers/create.blade.php | 2 ++ .../Resources/views/customers/edit.blade.php | 2 ++ .../views/customers/groups/create.blade.php | 2 ++ .../views/customers/groups/edit.blade.php | 2 ++ .../views/customers/reviews/edit.blade.php | 2 ++ .../customers/subscribers/edit.blade.php | 6 +++- .../views/sales/invoices/create.blade.php | 6 +++- .../views/sales/invoices/view.blade.php | 6 +++- .../views/sales/orders/view.blade.php | 6 +++- .../views/sales/shipments/create.blade.php | 6 +++- .../views/sales/shipments/view.blade.php | 6 +++- .../views/settings/channels/create.blade.php | 6 +++- .../views/settings/channels/edit.blade.php | 6 +++- .../settings/currencies/create.blade.php | 6 +++- .../views/settings/currencies/edit.blade.php | 6 +++- .../settings/exchange_rates/create.blade.php | 6 +++- .../settings/exchange_rates/edit.blade.php | 6 +++- .../inventory_sources/create.blade.php | 6 +++- .../settings/inventory_sources/edit.blade.php | 6 +++- .../views/settings/locales/create.blade.php | 6 +++- .../views/settings/locales/edit.blade.php | 6 +++- .../views/settings/sliders/create.blade.php | 6 +++- .../views/settings/sliders/edit.blade.php | 6 +++- .../views/tax/tax-categories/create.blade.php | 6 +++- .../views/tax/tax-categories/edit.blade.php | 6 +++- .../views/tax/tax-rates/create.blade.php | 6 +++- .../views/tax/tax-rates/edit.blade.php | 6 +++- .../views/users/roles/create.blade.php | 6 +++- .../views/users/roles/edit.blade.php | 6 +++- .../views/users/users/create.blade.php | 6 +++- .../views/users/users/edit.blade.php | 6 +++- packages/Webkul/Core/src/Core.php | 4 +-- ...max_price_column_in_product_flat_table.php | 34 +++++++++++++++++++ .../Product/src/Listeners/ProductFlat.php | 6 +++- .../src/Repositories/ProductRepository.php | 10 ++++++ .../list/layered-navigation.blade.php | 2 +- .../Resources/views/datagrid/table.blade.php | 2 +- 48 files changed, 244 insertions(+), 41 deletions(-) create mode 100644 packages/Webkul/Product/src/Database/Migrations/2019_01_29_123053_add_min_price_and_max_price_column_in_product_flat_table.php diff --git a/packages/Webkul/Admin/publishable/assets/css/admin.css b/packages/Webkul/Admin/publishable/assets/css/admin.css index 8f7f3bc94..bb29f290f 100755 --- a/packages/Webkul/Admin/publishable/assets/css/admin.css +++ b/packages/Webkul/Admin/publishable/assets/css/admin.css @@ -1 +1 @@ -@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500);body{margin:0;color:#3a3a3a;font-family:Montserrat,sans-serif;font-size:14px;font-weight:500;position:static;min-height:100%}::-webkit-scrollbar{width:12px}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 6px hsla(0,0%,100%,.3);border-radius:10px}::-webkit-scrollbar-thumb{border-radius:10px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.5)}.navbar-top{height:60px;background:#fff;font-size:0;-webkit-box-shadow:0 3px 6px 0 rgba(0,0,0,.05);box-shadow:0 3px 6px 0 rgba(0,0,0,.05);border-bottom:1px solid hsla(0,0%,64%,.2);position:fixed;left:0;right:0;z-index:5}.navbar-top .navbar-top-left{width:50%;height:60px;display:inline-block;vertical-align:middle}.navbar-top .navbar-top-left .brand-logo{padding:10px}.navbar-top .navbar-top-right{width:50%;height:60px;text-align:right;display:inline-block;vertical-align:middle}.navbar-top .navbar-top-right .profile-info{display:inline-block;vertical-align:middle;text-align:left;min-width:50px;padding:12px 0;margin:0 25px 0 30px;font-size:15px;cursor:pointer;position:relative}.navbar-top .navbar-top-right .profile-info .dropdown-list{top:63px}.navbar-top .navbar-top-right .profile-info .name{color:#000311;display:block;text-align:left}.navbar-top .navbar-top-right .profile-info .role{font-size:14px;color:#8e8e8e;display:block;text-align:left}.navbar-top .navbar-top-right .profile-info i.icon{margin-left:10px}.navbar-left{position:absolute;top:60px;bottom:0;width:90px;padding-top:20px;height:auto;border-right:1px solid hsla(0,0%,64%,.2);z-index:2}.navbar-left ul.menubar li.menu-item{height:90px;padding:10px 5px;font-size:11px;text-align:center;text-transform:uppercase}.navbar-left ul.menubar li.menu-item a{color:#a2a2a2}.navbar-left ul.menubar li.menu-item.active a{color:#0041ff}.content-container{padding-left:90px;position:absolute;margin-top:60px;top:0;right:0;left:0;bottom:0;overflow-x:hidden;overflow-y:auto}.content-container .aside-nav{width:280px;position:fixed;top:60px;bottom:0;border-right:1px solid hsla(0,0%,64%,.2);background:#f8f9fa;padding-top:10px;overflow-y:auto;z-index:4}.content-container .aside-nav a{padding:15px;display:block;color:#000311}.content-container .aside-nav .active a{background:#fff;border-top:1px solid hsla(0,0%,64%,.2);border-bottom:1px solid hsla(0,0%,64%,.2)}.content-container .aside-nav .active i{float:right}.content-container .content-wrapper{padding:25px 25px 25px 305px}.content-container .content{margin-top:25px}.content-container .content.full-page{padding:25px}.content-container .content .page-header{display:inline-block;margin-bottom:20px;width:100%}.content-container .content .page-header .page-title{float:left}.content-container .content .page-header .page-title h1{margin-bottom:0;vertical-align:middle;display:inline-block}.content-container .content .page-header .page-action{float:right}.content-container .content .page-header .page-action *{display:inline-block}.content-container .content .page-header .page-action a{margin-left:25px}.content-container .content .page-header .control-group{width:180px;display:inline-block;margin-bottom:0;margin-left:20px}.content-container .content .page-header .control{width:100%;margin:0}.content-container .content .page-content{width:100%;display:inline-block}.control-group label{width:70%}.control-group label .locale{float:right;color:#8e8e8e}.control-group .mce-tinymce{margin-top:10px;margin-bottom:5px}.dashboard .page-header{margin-bottom:0!important;padding-bottom:15px;border-bottom:1px solid hsla(0,0%,64%,.2)}.dashboard .page-content{margin-top:15px}.dashboard .card{height:445px;background:#fff;border:1px solid #e7e7e7;-webkit-box-shadow:0 5px 10px 2px rgba(0,0,0,.08);box-shadow:0 5px 10px 2px rgba(0,0,0,.08);border-radius:2px;padding:20px 0 0 20px}.dashboard .card .card-title{font-size:14px;color:#a2a2a2;letter-spacing:-.26px;text-transform:uppercase}.dashboard .card .card-info{width:100%;height:100%;display:inline-block}.dashboard .card .card-info.center{text-align:center}.dashboard .card .card-info ul li{border-bottom:1px solid hsla(0,0%,64%,.2);width:100%;display:inline-block;padding:10px 0;position:relative}.dashboard .card .card-info ul li .image{height:60px;width:60px;float:left;margin-right:15px}.dashboard .card .card-info ul li .image.product{background:#f2f2f2}.dashboard .card .card-info ul li .image img{width:100%}.dashboard .card .card-info ul li .description{margin-top:10px}.dashboard .card .card-info ul li .description .name{color:#0041ff}.dashboard .card .card-info ul li .description .info{color:#3a3a3a;margin-top:5px}.dashboard .card .card-info ul li .icon.angle-right-icon{position:absolute;right:30px;top:50%;margin-top:-8px}.dashboard .card .card-info ul li:last-child{border-bottom:0}.dashboard .card .card-info .no-result-found{margin-top:146px}.dashboard .card .card-info .no-result-found p{margin:0;color:#a2a2a2}.dashboard .dashboard-stats{display:grid;grid-template-columns:repeat(auto-fill,minmax(320px,1fr));grid-auto-rows:auto;grid-column-gap:30px;grid-row-gap:15px}.dashboard .dashboard-stats .dashboard-card{height:100px;background:#fff;border:1px solid #e7e7e7;-webkit-box-shadow:0 5px 10px 2px rgba(0,0,0,.08);box-shadow:0 5px 10px 2px rgba(0,0,0,.08);border-radius:5px;position:relative;padding:15px}.dashboard .dashboard-stats .dashboard-card .title{font-size:14px;color:#a2a2a2;text-transform:uppercase}.dashboard .dashboard-stats .dashboard-card .data{padding-top:3px;font-size:32px;color:#0041ff}.dashboard .dashboard-stats .dashboard-card .data .progress{font-size:14px;color:#8e8e8e;float:right;margin-top:9px}.dashboard .dashboard-stats .dashboard-card .data .progress .icon{vertical-align:middle}.dashboard .graph-stats{margin-top:30px;width:100%;display:inline-block}.dashboard .graph-stats .left-card-container{float:left;width:75%;padding-right:9px}.dashboard .graph-stats .right-card-container{float:left;width:25%;padding-left:21px}.dashboard .sale-stock{width:100%;display:inline-block;display:grid;grid-template-columns:repeat(auto-fill,minmax(435px,1fr));grid-auto-rows:auto;grid-column-gap:30px;grid-row-gap:15px;margin-top:30px}.sale-container .sale-section{font-size:16px}.sale-container .sale-section .secton-title{font-size:18px;color:#8e8e8e;padding:15px 0;border-bottom:1px solid hsla(0,0%,64%,.2)}.sale-container .sale-section .section-content{display:block;padding:20px 0}.sale-container .sale-section .section-content .row{display:block;padding:7px 0}.sale-container .sale-section .section-content .row .title{width:200px;color:#3a3a3a;letter-spacing:-.26px;display:inline-block}.sale-container .sale-section .section-content .row .value{color:#3a3a3a;letter-spacing:-.26px;display:inline-block}.sale-container .table .qty-row{display:block;margin-bottom:5px}.sale-container .table .qty-row:last-child{margin-bottom:0}.sale-container .table .radio{margin:0}.sale-container .sale-summary{margin-top:2%;height:130px;float:right}.sale-container .sale-summary tr td{padding:5px 8px}.sale-container .sale-summary tr.bold{font-weight:600;font-size:15px}.sale-container .sale-summary tr.border td{border-bottom:1px solid hsla(0,0%,64%,.2)}.stars{margin-top:5px}.stars .icon{width:16px;height:16px}.export{cursor:pointer}.export .export-icon{position:relative;top:10px}.export span{margin-left:2px}.rtl{direction:rtl}.rtl .navbar-top .navbar-top-right{text-align:left}.rtl .navbar-top .navbar-top-right .profile-info{margin:0 30px 0 25px}.rtl .navbar-top .navbar-top-right .profile-info i.icon{margin-left:0;margin-right:10px}.rtl .navbar-left{border-left:1px solid hsla(0,0%,64%,.2);border-right:none}.rtl .content-container{padding-right:90px;padding-left:0}.rtl .content-container .content .page-header .page-title{float:right}.rtl .content-container .content .page-header .page-action{float:left}.rtl .content-container .content .page-header .control-group{margin-right:20px;margin-left:0}.rtl .content-container .content .page-header .control-group.date:after{margin-top:6px;position:absolute;margin-right:-35px}.rtl .content-container .content .page-header .control-group.date:last-child{margin-left:0}.rtl .content-container .content-wrapper{padding:25px 305px 25px 25px}.rtl .content-container .aside-nav .active i{float:left;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .dashboard .dashboard-stats .dashboard-card .data span{float:left}.rtl .dashboard .card{padding:20px 20px 0 0}.rtl .dashboard .card .card-info ul li .image{float:right;margin-right:0;margin-left:15px}.rtl .dashboard .card .card-info ul li .icon.angle-right-icon{left:30px;right:auto;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .dashboard .graph-stats .left-card-container{float:right;padding-right:0}.rtl .dashboard .graph-stats .right-card-container{float:right;padding-left:0;padding-right:30px}.rtl .sale-container .sale-summary{float:left}.rtl .grid-container .filter-wrapper .filter-row-one .search-filter{border:2px solid #c7c7c7}.rtl .grid-container .filter-wrapper .filter-row-one .search-filter .control{border:none;padding-right:10px}.rtl .grid-container .filter-wrapper .filter-row-one .search-filter .ic-wrapper{border:none;padding-top:2px;padding-right:5px}.rtl .grid-container .filter-wrapper .filter-row-two .filter-one{margin-right:0}.rtl .grid-container .filter-wrapper .filter-row-two .filter-one .filter-name{margin-right:0;margin-left:5px}.rtl .grid-container .filter-wrapper .filter-row-two .filter-one .filter-value{padding-right:5px;padding-left:0}.rtl .grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle .dropdown-header span{padding-right:5px}.rtl .grid-container .table tbody td.action a:first-child{margin-left:10px;margin-right:0}.rtl .table table{text-align:right}.rtl .dropdown-list.bottom-right{left:0;right:auto}.rtl .dropdown-list .dropdown-container{text-align:right}.rtl .accordian .accordian-header .icon{float:left}.rtl .tree-container .tree-item{padding-right:30px}.rtl .tree-container .tree-item .expand-icon,.rtl .tree-container .tree-item .folder-icon{margin-left:10px;margin-right:0}.rtl .tree-container>.tree-item{padding-right:0}.rtl .radio .radio-view{margin-left:5px}.rtl .image-wrapper .image-item{margin-right:0;margin-left:20px}.rtl .image-wrapper .image-item .remove-image{margin-right:0}.rtl .control-group label.required:before{content:"*";color:#fc6868;font-weight:700}.rtl .control-group label.required:after{content:none}.rtl .control-group label .locale{float:left}.rtl .control-group.date:after{margin-top:15px;position:absolute;margin-right:-35px}.rtl .pagination .page-item .icon{-webkit-transform:rotate(180deg);transform:rotate(180deg)} \ No newline at end of file +@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500);body{margin:0;color:#3a3a3a;font-family:Montserrat,sans-serif;font-size:14px;font-weight:500;position:static;min-height:100%}::-webkit-scrollbar{width:12px}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 6px hsla(0,0%,100%,.3);border-radius:10px}::-webkit-scrollbar-thumb{border-radius:10px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.5)}.navbar-top{height:60px;background:#fff;font-size:0;-webkit-box-shadow:0 3px 6px 0 rgba(0,0,0,.05);box-shadow:0 3px 6px 0 rgba(0,0,0,.05);border-bottom:1px solid hsla(0,0%,64%,.2);position:fixed;left:0;right:0;z-index:5}.navbar-top .navbar-top-left{width:50%;height:60px;display:inline-block;vertical-align:middle}.navbar-top .navbar-top-left .brand-logo{padding:10px}.navbar-top .navbar-top-right{width:50%;height:60px;text-align:right;display:inline-block;vertical-align:middle}.navbar-top .navbar-top-right .profile-info{display:inline-block;vertical-align:middle;text-align:left;min-width:50px;padding:12px 0;margin:0 25px 0 30px;font-size:15px;cursor:pointer;position:relative}.navbar-top .navbar-top-right .profile-info .dropdown-list{top:63px}.navbar-top .navbar-top-right .profile-info .name{color:#000311;display:block;text-align:left}.navbar-top .navbar-top-right .profile-info .role{font-size:14px;color:#8e8e8e;display:block;text-align:left}.navbar-top .navbar-top-right .profile-info i.icon{margin-left:10px}.navbar-left{position:absolute;top:60px;bottom:0;width:90px;padding-top:20px;height:auto;border-right:1px solid hsla(0,0%,64%,.2);z-index:2}.navbar-left ul.menubar li.menu-item{height:90px;padding:10px 5px;font-size:11px;text-align:center;text-transform:uppercase}.navbar-left ul.menubar li.menu-item a{color:#a2a2a2}.navbar-left ul.menubar li.menu-item.active a{color:#0041ff}.content-container{padding-left:90px;position:absolute;margin-top:60px;top:0;right:0;left:0;bottom:0;overflow-x:hidden;overflow-y:auto}.content-container .aside-nav{width:280px;position:fixed;top:60px;bottom:0;border-right:1px solid hsla(0,0%,64%,.2);background:#f8f9fa;padding-top:10px;overflow-y:auto;z-index:4}.content-container .aside-nav a{padding:15px;display:block;color:#000311}.content-container .aside-nav .active a{background:#fff;border-top:1px solid hsla(0,0%,64%,.2);border-bottom:1px solid hsla(0,0%,64%,.2)}.content-container .aside-nav .active i{float:right}.content-container .content-wrapper{padding:25px 25px 25px 305px}.content-container .content{margin-top:25px}.content-container .content.full-page{padding:25px}.content-container .content .page-header{display:inline-block;margin-bottom:20px;width:100%}.content-container .content .page-header .page-title{float:left}.content-container .content .page-header .page-title .back-link{float:left;margin-right:10px;width:24px;height:24px;cursor:pointer;margin-top:5px}.content-container .content .page-header .page-title h1{margin-bottom:0;vertical-align:middle;display:inline-block}.content-container .content .page-header .page-action{float:right}.content-container .content .page-header .page-action *{display:inline-block}.content-container .content .page-header .page-action a{margin-left:25px}.content-container .content .page-header .control-group{width:180px;display:inline-block;margin-bottom:0;margin-left:20px}.content-container .content .page-header .control{width:100%;margin:0}.content-container .content .page-content{width:100%;display:inline-block}.control-group label{width:70%}.control-group label .locale{float:right;color:#8e8e8e}.control-group .mce-tinymce{margin-top:10px;margin-bottom:5px}.dashboard .page-header{margin-bottom:0!important;padding-bottom:15px;border-bottom:1px solid hsla(0,0%,64%,.2)}.dashboard .page-content{margin-top:15px}.dashboard .card{height:445px;background:#fff;border:1px solid #e7e7e7;-webkit-box-shadow:0 5px 10px 2px rgba(0,0,0,.08);box-shadow:0 5px 10px 2px rgba(0,0,0,.08);border-radius:2px;padding:20px 0 0 20px}.dashboard .card .card-title{font-size:14px;color:#a2a2a2;letter-spacing:-.26px;text-transform:uppercase}.dashboard .card .card-info{width:100%;height:100%;display:inline-block}.dashboard .card .card-info.center{text-align:center}.dashboard .card .card-info ul li{border-bottom:1px solid hsla(0,0%,64%,.2);width:100%;display:inline-block;padding:10px 0;position:relative}.dashboard .card .card-info ul li .image{height:60px;width:60px;float:left;margin-right:15px}.dashboard .card .card-info ul li .image.product{background:#f2f2f2}.dashboard .card .card-info ul li .image img{width:100%}.dashboard .card .card-info ul li .description{margin-top:10px}.dashboard .card .card-info ul li .description .name{color:#0041ff}.dashboard .card .card-info ul li .description .info{color:#3a3a3a;margin-top:5px}.dashboard .card .card-info ul li .icon.angle-right-icon{position:absolute;right:30px;top:50%;margin-top:-8px}.dashboard .card .card-info ul li:last-child{border-bottom:0}.dashboard .card .card-info .no-result-found{margin-top:146px}.dashboard .card .card-info .no-result-found p{margin:0;color:#a2a2a2}.dashboard .dashboard-stats{display:grid;grid-template-columns:repeat(auto-fill,minmax(320px,1fr));grid-auto-rows:auto;grid-column-gap:30px;grid-row-gap:15px}.dashboard .dashboard-stats .dashboard-card{height:100px;background:#fff;border:1px solid #e7e7e7;-webkit-box-shadow:0 5px 10px 2px rgba(0,0,0,.08);box-shadow:0 5px 10px 2px rgba(0,0,0,.08);border-radius:5px;position:relative;padding:15px}.dashboard .dashboard-stats .dashboard-card .title{font-size:14px;color:#a2a2a2;text-transform:uppercase}.dashboard .dashboard-stats .dashboard-card .data{padding-top:3px;font-size:32px;color:#0041ff}.dashboard .dashboard-stats .dashboard-card .data .progress{font-size:14px;color:#8e8e8e;float:right;margin-top:9px}.dashboard .dashboard-stats .dashboard-card .data .progress .icon{vertical-align:middle}.dashboard .graph-stats{margin-top:30px;width:100%;display:inline-block}.dashboard .graph-stats .left-card-container{float:left;width:75%;padding-right:9px}.dashboard .graph-stats .right-card-container{float:left;width:25%;padding-left:21px}.dashboard .sale-stock{width:100%;display:inline-block;display:grid;grid-template-columns:repeat(auto-fill,minmax(435px,1fr));grid-auto-rows:auto;grid-column-gap:30px;grid-row-gap:15px;margin-top:30px}.sale-container .sale-section{font-size:16px}.sale-container .sale-section .secton-title{font-size:18px;color:#8e8e8e;padding:15px 0;border-bottom:1px solid hsla(0,0%,64%,.2)}.sale-container .sale-section .section-content{display:block;padding:20px 0}.sale-container .sale-section .section-content .row{display:block;padding:7px 0}.sale-container .sale-section .section-content .row .title{width:200px;color:#3a3a3a;letter-spacing:-.26px;display:inline-block}.sale-container .sale-section .section-content .row .value{color:#3a3a3a;letter-spacing:-.26px;display:inline-block}.sale-container .table .qty-row{display:block;margin-bottom:5px}.sale-container .table .qty-row:last-child{margin-bottom:0}.sale-container .table .radio{margin:0}.sale-container .sale-summary{margin-top:2%;height:130px;float:right}.sale-container .sale-summary tr td{padding:5px 8px}.sale-container .sale-summary tr.bold{font-weight:600;font-size:15px}.sale-container .sale-summary tr.border td{border-bottom:1px solid hsla(0,0%,64%,.2)}.stars{margin-top:5px}.stars .icon{width:16px;height:16px}.export{cursor:pointer}.export .export-icon{position:relative;top:10px}.export span{margin-left:2px}.rtl{direction:rtl}.rtl .navbar-top .navbar-top-right{text-align:left}.rtl .navbar-top .navbar-top-right .profile-info{margin:0 30px 0 25px}.rtl .navbar-top .navbar-top-right .profile-info i.icon{margin-left:0;margin-right:10px}.rtl .navbar-left{border-left:1px solid hsla(0,0%,64%,.2);border-right:none}.rtl .content-container{padding-right:90px;padding-left:0}.rtl .content-container .content .page-header .page-title{float:right}.rtl .content-container .content .page-header .page-action{float:left}.rtl .content-container .content .page-header .control-group{margin-right:20px;margin-left:0}.rtl .content-container .content .page-header .control-group.date:after{margin-top:6px;position:absolute;margin-right:-35px}.rtl .content-container .content .page-header .control-group.date:last-child{margin-left:0}.rtl .content-container .content-wrapper{padding:25px 305px 25px 25px}.rtl .content-container .aside-nav .active i{float:left;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .dashboard .dashboard-stats .dashboard-card .data span{float:left}.rtl .dashboard .card{padding:20px 20px 0 0}.rtl .dashboard .card .card-info ul li .image{float:right;margin-right:0;margin-left:15px}.rtl .dashboard .card .card-info ul li .icon.angle-right-icon{left:30px;right:auto;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .dashboard .graph-stats .left-card-container{float:right;padding-right:0}.rtl .dashboard .graph-stats .right-card-container{float:right;padding-left:0;padding-right:30px}.rtl .sale-container .sale-summary{float:left}.rtl .grid-container .filter-wrapper .filter-row-one .search-filter{border:2px solid #c7c7c7}.rtl .grid-container .filter-wrapper .filter-row-one .search-filter .control{border:none;padding-right:10px}.rtl .grid-container .filter-wrapper .filter-row-one .search-filter .ic-wrapper{border:none;padding-top:2px;padding-right:5px}.rtl .grid-container .filter-wrapper .filter-row-two .filter-one{margin-right:0}.rtl .grid-container .filter-wrapper .filter-row-two .filter-one .filter-name{margin-right:0;margin-left:5px}.rtl .grid-container .filter-wrapper .filter-row-two .filter-one .filter-value{padding-right:5px;padding-left:0}.rtl .grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle .dropdown-header span{padding-right:5px}.rtl .grid-container .table tbody td.action a:first-child{margin-left:10px;margin-right:0}.rtl .table table{text-align:right}.rtl .dropdown-list.bottom-right{left:0;right:auto}.rtl .dropdown-list .dropdown-container{text-align:right}.rtl .accordian .accordian-header .icon{float:left}.rtl .tree-container .tree-item{padding-right:30px}.rtl .tree-container .tree-item .expand-icon,.rtl .tree-container .tree-item .folder-icon{margin-left:10px;margin-right:0}.rtl .tree-container>.tree-item{padding-right:0}.rtl .radio .radio-view{margin-left:5px}.rtl .image-wrapper .image-item{margin-right:0;margin-left:20px}.rtl .image-wrapper .image-item .remove-image{margin-right:0}.rtl .control-group label.required:before{content:"*";color:#fc6868;font-weight:700}.rtl .control-group label.required:after{content:none}.rtl .control-group label .locale{float:left}.rtl .control-group.date:after{margin-top:15px;position:absolute;margin-right:-35px}.rtl .pagination .page-item .icon{-webkit-transform:rotate(180deg);transform:rotate(180deg)} \ No newline at end of file diff --git a/packages/Webkul/Admin/publishable/assets/mix-manifest.json b/packages/Webkul/Admin/publishable/assets/mix-manifest.json index c9df69527..733bac15a 100755 --- 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" } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss index 4e1464a90..8df2fbcc2 100755 --- 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; diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php index 387e0bfb9..a521f156a 100755 --- 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 @@