diff --git a/packages/Webkul/Attribute/src/Database/Migrations/2019_07_29_142734_add_use_in_flat_column_in_attributes_table.php b/packages/Webkul/Attribute/src/Database/Migrations/2019_07_29_142734_add_use_in_flat_column_in_attributes_table.php
new file mode 100644
index 000000000..d52675871
--- /dev/null
+++ b/packages/Webkul/Attribute/src/Database/Migrations/2019_07_29_142734_add_use_in_flat_column_in_attributes_table.php
@@ -0,0 +1,32 @@
+boolean('use_in_flat')->default(1);
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('attributes', function (Blueprint $table) {
+ //
+ });
+ }
+}
diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeGroupTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeGroupTableSeeder.php
index 78d719819..92fa5db6c 100755
--- a/packages/Webkul/Attribute/src/Database/Seeders/AttributeGroupTableSeeder.php
+++ b/packages/Webkul/Attribute/src/Database/Seeders/AttributeGroupTableSeeder.php
@@ -43,7 +43,8 @@ class AttributeGroupTableSeeder extends Seeder
['attribute_id' => '21','attribute_group_id' => '5','position' => '3'],
['attribute_id' => '22','attribute_group_id' => '5','position' => '4'],
['attribute_id' => '23','attribute_group_id' => '1','position' => '9'],
- ['attribute_id' => '24','attribute_group_id' => '1','position' => '10']
+ ['attribute_id' => '24','attribute_group_id' => '1','position' => '10'],
+ ['attribute_id' => '25','attribute_group_id' => '1','position' => '11']
]);
}
}
\ No newline at end of file
diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php
index 7d24e2e9e..6d0eac76c 100755
--- a/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php
+++ b/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php
@@ -16,30 +16,52 @@ class AttributeTableSeeder extends Seeder
$now = Carbon::now();
DB::table('attributes')->insert([
- ['id' => '1','code' => 'sku','admin_name' => 'SKU','type' => 'text','validation' => NULL,'position' => '1','is_required' => '1','is_unique' => '1','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '2','code' => 'name','admin_name' => 'Name','type' => 'text','validation' => NULL,'position' => '2','is_required' => '1','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '3','code' => 'url_key','admin_name' => 'URL Key','type' => 'text','validation' => NULL,'position' => '3','is_required' => '1','is_unique' => '1','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '4','code' => 'tax_category_id','admin_name' => 'Tax Category','type' => 'select','validation' => NULL,'position' => '4','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '5','code' => 'new','admin_name' => 'New','type' => 'boolean','validation' => NULL,'position' => '5','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '6','code' => 'featured','admin_name' => 'Featured','type' => 'boolean','validation' => NULL,'position' => '6','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '7','code' => 'visible_individually','admin_name' => 'Visible Individually','type' => 'boolean','validation' => NULL,'position' => '7','is_required' => '1','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '8','code' => 'status','admin_name' => 'Status','type' => 'boolean','validation' => NULL,'position' => '8','is_required' => '1','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '9','code' => 'short_description','admin_name' => 'Short Description','type' => 'textarea','validation' => NULL,'position' => '9','is_required' => '1','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '10','code' => 'description','admin_name' => 'Description','type' => 'textarea','validation' => NULL,'position' => '10','is_required' => '1','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '11','code' => 'price','admin_name' => 'Price','type' => 'price','validation' => 'decimal','position' => '11','is_required' => '1','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '1','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '12','code' => 'cost','admin_name' => 'Cost','type' => 'price','validation' => 'decimal','position' => '12','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '13','code' => 'special_price','admin_name' => 'Special Price','type' => 'price','validation' => 'decimal','position' => '13','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '14','code' => 'special_price_from','admin_name' => 'Special Price From','type' => 'date','validation' => NULL,'position' => '14','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '15','code' => 'special_price_to','admin_name' => 'Special Price To','type' => 'date','validation' => NULL,'position' => '15','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '16','code' => 'meta_title','admin_name' => 'Meta Title','type' => 'textarea','validation' => NULL,'position' => '16','is_required' => '0','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '17','code' => 'meta_keywords','admin_name' => 'Meta Keywords','type' => 'textarea','validation' => NULL,'position' => '17','is_required' => '0','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '18','code' => 'meta_description','admin_name' => 'Meta Description','type' => 'textarea','validation' => NULL,'position' => '18','is_required' => '0','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '19','code' => 'width','admin_name' => 'Width','type' => 'text','validation' => 'decimal','position' => '19','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '20','code' => 'height','admin_name' => 'Height','type' => 'text','validation' => 'decimal','position' => '20','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '21','code' => 'depth','admin_name' => 'Depth','type' => 'text','validation' => 'decimal','position' => '21','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '22','code' => 'weight','admin_name' => 'Weight','type' => 'text','validation' => 'decimal','position' => '22','is_required' => '1','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '23','code' => 'color','admin_name' => 'Color','type' => 'select','validation' => NULL,'position' => '23','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '1','is_configurable' => '1','is_user_defined' => '1','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
- ['id' => '24','code' => 'size','admin_name' => 'Size','type' => 'select','validation' => NULL,'position' => '24','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '1','is_configurable' => '1','is_user_defined' => '1','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now]
+ ['id' => '1','code' => 'sku','admin_name' => 'SKU','type' => 'text','validation' => NULL,'position' => '1','is_required' => '1','is_unique' => '1','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '2','code' => 'name','admin_name' => 'Name','type' => 'text','validation' => NULL,'position' => '2','is_required' => '1','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '3','code' => 'url_key','admin_name' => 'URL Key','type' => 'text','validation' => NULL,'position' => '3','is_required' => '1','is_unique' => '1','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '4','code' => 'tax_category_id','admin_name' => 'Tax Category','type' => 'select','validation' => NULL,'position' => '4','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '5','code' => 'new','admin_name' => 'New','type' => 'boolean','validation' => NULL,'position' => '5','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '6','code' => 'featured','admin_name' => 'Featured','type' => 'boolean','validation' => NULL,'position' => '6','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '7','code' => 'visible_individually','admin_name' => 'Visible Individually','type' => 'boolean','validation' => NULL,'position' => '7','is_required' => '1','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','created_at' => $now,
+ 'use_in_flat' => '1','updated_at' => $now],
+ ['id' => '8','code' => 'status','admin_name' => 'Status','type' => 'boolean','validation' => NULL,'position' => '8','is_required' => '1','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '9','code' => 'short_description','admin_name' => 'Short Description','type' => 'textarea','validation' => NULL,'position' => '9','is_required' => '1','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0',
+ 'is_visible_on_front' => '0','use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '10','code' => 'description','admin_name' => 'Description','type' => 'textarea','validation' => NULL,'position' => '10','is_required' => '1','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '11','code' => 'price','admin_name' => 'Price','type' => 'price','validation' => 'decimal','position' => '11','is_required' => '1','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '1','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '12','code' => 'cost','admin_name' => 'Cost','type' => 'price','validation' => 'decimal','position' => '12','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '13','code' => 'special_price','admin_name' => 'Special Price','type' => 'price','validation' => 'decimal','position' => '13','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '14','code' => 'special_price_from','admin_name' => 'Special Price From','type' => 'date','validation' => NULL,'position' => '14','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '15','code' => 'special_price_to','admin_name' => 'Special Price To','type' => 'date','validation' => NULL,'position' => '15','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0',
+ 'use_in_flat' => '1','is_visible_on_front' => '0','created_at' => $now,'updated_at' => $now],
+ ['id' => '16','code' => 'meta_title','admin_name' => 'Meta Title','type' => 'textarea','validation' => NULL,'position' => '16','is_required' => '0','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '17','code' => 'meta_keywords','admin_name' => 'Meta Keywords','type' => 'textarea','validation' => NULL,'position' => '17','is_required' => '0','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '18','code' => 'meta_description','admin_name' => 'Meta Description','type' => 'textarea','validation' => NULL,'position' => '18','is_required' => '0','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0','use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '19','code' => 'width','admin_name' => 'Width','type' => 'text','validation' => 'decimal','position' => '19','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '20','code' => 'height','admin_name' => 'Height','type' => 'text','validation' => 'decimal','position' => '20','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '21','code' => 'depth','admin_name' => 'Depth','type' => 'text','validation' => 'decimal','position' => '21','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '22','code' => 'weight','admin_name' => 'Weight','type' => 'text','validation' => 'decimal','position' => '22','is_required' => '1','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '23','code' => 'color','admin_name' => 'Color','type' => 'select','validation' => NULL,'position' => '23','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '1','is_configurable' => '1','is_user_defined' => '1','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '24','code' => 'size','admin_name' => 'Size','type' => 'select','validation' => NULL,'position' => '24','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '1','is_configurable' => '1','is_user_defined' => '1','is_visible_on_front' => '0',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now],
+ ['id' => '25','code' => 'brand','admin_name' => 'Brand','type' => 'text','validation' => NULL,'position' => '25','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '1','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '1',
+ 'use_in_flat' => '1','created_at' => $now,'updated_at' => $now]
]);
@@ -67,7 +89,8 @@ class AttributeTableSeeder extends Seeder
['id' => '21','locale' => 'en','name' => 'Depth','attribute_id' => '21'],
['id' => '22','locale' => 'en','name' => 'Weight','attribute_id' => '22'],
['id' => '23','locale' => 'en','name' => 'Color','attribute_id' => '23'],
- ['id' => '24','locale' => 'en','name' => 'Size','attribute_id' => '24']
+ ['id' => '24','locale' => 'en','name' => 'Size','attribute_id' => '24'],
+ ['id' => '25','locale' => 'en','name' => 'Brand','attribute_id' => '25']
]);
}
}
\ No newline at end of file
diff --git a/packages/Webkul/Attribute/src/Models/Attribute.php b/packages/Webkul/Attribute/src/Models/Attribute.php
index e6bf8ba94..244d94497 100755
--- a/packages/Webkul/Attribute/src/Models/Attribute.php
+++ b/packages/Webkul/Attribute/src/Models/Attribute.php
@@ -9,7 +9,7 @@ class Attribute extends TranslatableModel implements AttributeContract
{
public $translatedAttributes = ['name'];
- protected $fillable = ['code', 'admin_name', 'type', 'position', 'is_required', 'is_unique', 'validation', 'value_per_locale', 'value_per_channel', 'is_filterable', 'is_configurable', 'is_visible_on_front', 'is_user_defined', 'swatch_type'];
+ protected $fillable = ['code', 'admin_name', 'type', 'position', 'is_required', 'is_unique', 'validation', 'value_per_locale', 'value_per_channel', 'is_filterable', 'is_configurable', 'is_visible_on_front', 'is_user_defined', 'swatch_type', 'use_in_flat'];
// protected $with = ['options'];
diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
index af160eba3..816a30e5b 100755
--- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
+++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
@@ -229,12 +229,26 @@ class AttributeRepository extends Repository
|| $attribute->type == 'multiselect'
|| $attribute->code == 'sku'
)) {
- array_push($trimmed, [
- 'id' => $attribute->id,
- 'name' => $attribute->name,
- 'type' => $attribute->type,
- 'code' => $attribute->code
- ]);
+ if ($attribute->options()->exists()) {
+ array_push($trimmed, [
+ 'id' => $attribute->id,
+ 'name' => $attribute->admin_name,
+ 'type' => $attribute->type,
+ 'code' => $attribute->code,
+ 'has_options' => true,
+ 'options' => $attribute->options
+ ]);
+ } else {
+ array_push($trimmed, [
+ 'id' => $attribute->id,
+ 'name' => $attribute->admin_name,
+ 'type' => $attribute->type,
+ 'code' => $attribute->code,
+ 'has_options' => false,
+ 'options' => null
+ ]);
+ }
+
}
}
diff --git a/packages/Webkul/CMS/composer.json b/packages/Webkul/CMS/composer.json
new file mode 100644
index 000000000..9ecd07c1c
--- /dev/null
+++ b/packages/Webkul/CMS/composer.json
@@ -0,0 +1,27 @@
+{
+ "name": "bagisto/laravel-cms",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "Prashant Singh",
+ "email": "prashant.singh852@webkul.com"
+ }
+ ],
+ "require": {
+ "konekt/concord": "^1.2"
+ },
+ "autoload": {
+ "psr-4": {
+ "Webkul\\CMS\\": "src/"
+ }
+ },
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Webkul\\CMS\\Providers\\CMSServiceProvider"
+ ],
+ "aliases": {}
+ }
+ },
+ "minimum-stability": "dev"
+}
diff --git a/packages/Webkul/CMS/src/Contracts/CMS.php b/packages/Webkul/CMS/src/Contracts/CMS.php
new file mode 100644
index 000000000..2d920f51d
--- /dev/null
+++ b/packages/Webkul/CMS/src/Contracts/CMS.php
@@ -0,0 +1,7 @@
+increments('id');
+ $table->string('url_key')->nullable();
+ $table->longtext('html_content');
+ $table->string('page_title');
+ $table->string('meta_title');
+ $table->text('meta_description')->nullable();
+ $table->text('meta_keywords')->nullable();
+ $table->json('content')->nullable();
+ $table->string('layout')->nullable();
+ $table->integer('channel_id')->unsigned();
+ $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
+ $table->integer('locale_id')->unsigned();
+ $table->foreign('locale_id')->references('id')->on('locales')->onDelete('cascade');
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('cms_pages');
+ }
+}
diff --git a/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php b/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php
new file mode 100644
index 000000000..2dffd9771
--- /dev/null
+++ b/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php
@@ -0,0 +1,286 @@
+ @prashant-webkul
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+ class PageController extends Controller
+{
+ /**
+ * To hold the request variables from route file
+ */
+ protected $_config;
+
+ /**
+ * To hold the channel reposotry instance
+ */
+ protected $channel;
+
+ /**
+ * To hold the locale reposotry instance
+ */
+ protected $locale;
+
+ /**
+ * To hold the CMSRepository instance
+ */
+ protected $cms;
+
+ public function __construct(Channel $channel, Locale $locale, CMS $cms)
+ {
+ /**
+ * Pass the class instance through admin middleware
+ */
+ $this->middleware('auth:admin');
+
+ /**
+ * Channel repository instance
+ */
+ $this->channel = $channel;
+
+ /**
+ * Locale repository instance
+ */
+ $this->locale = $locale;
+
+ /**
+ * CMS repository instance
+ */
+ $this->cms = $cms;
+
+ $this->_config = request('_config');
+ }
+
+ /**
+ * Loads the index page showing the static pages resources
+ */
+ public function index()
+ {
+ return view($this->_config['view']);
+ }
+
+ /**
+ * To create a new CMS page
+ *
+ * @return view
+ */
+ public function create()
+ {
+ return view($this->_config['view']);
+ }
+
+ /**
+ * To store a new CMS page in storage
+ *
+ * @return view
+ */
+ public function store()
+ {
+ $this->validate(request(), [
+ 'channels' => 'required',
+ 'locales' => 'required',
+ 'url_key' => 'required|unique:cms_pages,url_key',
+ 'html_content' => 'required|string',
+ 'page_title' => 'required|string',
+ 'meta_title' => 'required|string',
+ 'meta_description' => 'string',
+ 'meta_keywords' => 'required|string'
+ ]);
+
+ $data = request()->all();
+
+ foreach ($data['channels'] as $channel) {
+ foreach ($data['locales'] as $locale) {
+ $data['channel_id'] = $channel;
+
+ $data['locale_id'] = $locale;
+
+ $data['content']['html'] = $data['html_content'];
+ $data['content']['page_title'] = $data['page_title'];
+ $data['content']['meta_keywords'] = $data['meta_keywords'];
+ $data['content']['meta_title'] = $data['meta_title'];
+ $data['content']['meta_description'] = $data['meta_description'];
+
+ $data['content'] = json_encode($data['content']);
+
+ $result = $this->cms->create($data);
+
+ unset($data['content']);
+ }
+ }
+
+ if ($result) {
+ session()->flash('success', trans('admin::app.cms.pages.create-success'));
+ } else {
+ session()->flash('success', trans('admin::app.cms.pages.create-failure'));
+ }
+
+ return redirect()->route($this->_config['redirect']);
+ }
+
+ /**
+ * To edit a previously created CMS page
+ *
+ * @return view
+ */
+ public function edit($id)
+ {
+ $page = $this->cms->findOrFail($id);
+
+ if (request()->has('channel') && request()->has('locale')) {
+ $channel = $this->channel->findOneWhere([
+ 'code' => request()->input('channel')
+ ]);
+
+ $locale = $this->locale->findOneWhere([
+ 'code' => request()->input('locale')
+ ]);
+
+ $page = $this->cms->findOneWhere([
+ 'channel_id' => $channel->id,
+ 'locale_id' => $locale->id,
+ 'url_key' => $page->url_key
+ ]);
+
+ if (! $page) {
+ $page = $this->cms->create([
+ 'url_key' => str_random(8),
+ 'channel' => $channel->code,
+ 'locale' => $locale->code
+ ]);
+
+ return redirect()->route('admin.cms.edit', $page->id);
+ }
+ } else {
+ $page = $this->cms->findOrFail($id);
+ }
+
+ return view($this->_config['view'])->with('page', $page);
+ }
+
+ /**
+ * To update the previously created CMS page in storage
+ *
+ * @param Integer $id
+ *
+ * @return View
+ */
+ public function update($id)
+ {
+ $page = $this->cms->findOrFail($id);
+
+ $data = request()->all();
+
+ $this->validate(request(), [
+ 'page_title' => 'required|string',
+ 'html_content' => 'required|string',
+ 'meta_title' => 'required|string',
+ 'meta_description' => 'string',
+ 'meta_keywords' => 'required|string'
+ ]);
+
+ $data['content']['html'] = $data['html_content'];
+ $data['content']['page_title'] = $data['page_title'];
+ $data['content']['meta_keywords'] = $data['meta_keywords'];
+ $data['content']['meta_title'] = $data['meta_title'];
+ $data['content']['meta_description'] = $data['meta_description'];
+ $data['content'] = json_encode($data['content']);
+
+ $result = $this->cms->update($data, $id);
+
+ if ($result) {
+ session()->flash('success', trans('admin::app.cms.pages.update-success'));
+ } else {
+ session()->flash('success', trans('admin::app.cms.pages.update-failure'));
+ }
+ return redirect()->route($this->_config['redirect']);
+ }
+
+ /**
+ * To preview the content of the currently creating page or previously creating page
+ *
+ * @param Integer $id
+ *
+ * @return mixed
+ */
+ public function preview($id)
+ {
+ $page = $this->cms->findOrFail($id);
+
+ return view('shop::cms.page')->with('page', $page);
+ }
+
+ /**
+ * To delete the previously create CMS page
+ *
+ * @param Integer $id
+ *
+ * @return Response JSON
+ */
+ public function delete($id)
+ {
+ $page = $this->cms->findOrFail($id);
+
+ if ($page->delete()) {
+ session()->flash('success', trans('admin::app.cms.pages.delete-success'));
+
+ return response()->json(['message' => true], 200);
+ } else {
+ session()->flash('success', trans('admin::app.cms.pages.delete-failure'));
+
+ return response()->json(['message' => false], 200);
+ }
+ }
+
+ /**
+ * To mass delete the CMS resource from storage
+ *
+ * @return Response redirect
+ */
+ public function massDelete()
+ {
+ $data = request()->all();
+
+ if ($data['indexes']) {
+ $pageIDs = explode(',', $data['indexes']);
+
+ $actualCount = count($pageIDs);
+
+ $count = 0;
+
+ foreach ($pageIDs as $pageId) {
+
+ $page = $this->cms->find($pageId);
+
+ if ($page) {
+ $page->delete();
+
+ $count++;
+ }
+ }
+
+ if ($actualCount == $count) {
+ session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success', [
+ 'resource' => 'CMS Pages'
+ ]));
+ } else {
+ session()->flash('success', trans('admin::app.datagrid.mass-ops.partial-action', [
+ 'resource' => 'CMS Pages'
+ ]));
+ }
+ } else {
+ session()->flash('warning', trans('admin::app.datagrid.mass-ops.no-resource'));
+ }
+
+ return redirect()->route('admin.cms.index');
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CMS/src/Http/Controllers/Controller.php b/packages/Webkul/CMS/src/Http/Controllers/Controller.php
new file mode 100644
index 000000000..1abdaf472
--- /dev/null
+++ b/packages/Webkul/CMS/src/Http/Controllers/Controller.php
@@ -0,0 +1,12 @@
+ @prashant-webkul
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+ class PagePresenterController extends Controller
+{
+ /**
+ * To hold the request variables from route file
+ */
+ protected $_config;
+
+ /**
+ * To hold the channel reposotry instance
+ */
+ protected $channel;
+
+ /**
+ * To hold the locale reposotry instance
+ */
+ protected $locale;
+
+ /**
+ * To hold the CMSRepository instance
+ */
+ protected $cms;
+
+ public function __construct(Channel $channel, Locale $locale, CMS $cms)
+ {
+ /**
+ * Channel repository instance
+ */
+ $this->channel = $channel;
+
+ /**
+ * Locale repository instance
+ */
+ $this->locale = $locale;
+
+ /**
+ * CMS repository instance
+ */
+ $this->cms = $cms;
+
+ $this->_config = request('_config');
+ }
+
+ /**
+ * To extract the page content and load it in the respective view file\
+ *
+ * @return view
+ */
+ public function presenter($slug)
+ {
+ $currentChannel = core()->getCurrentChannel();
+ $currentLocale = app()->getLocale();
+
+ $currentLocale = $this->locale->findOneWhere([
+ 'code' => $currentLocale
+ ]);
+
+ $page = $this->cms->findOneWhere([
+ 'url_key' => $slug,
+ 'locale_id' => $currentLocale->id,
+ 'channel_id' => $currentChannel->id
+ ]);
+
+ if ($page) {
+ return view('shop::cms.page')->with('page', $page);
+ } else {
+ abort(404);
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CMS/src/Models/CMS.php b/packages/Webkul/CMS/src/Models/CMS.php
new file mode 100644
index 000000000..92688600e
--- /dev/null
+++ b/packages/Webkul/CMS/src/Models/CMS.php
@@ -0,0 +1,13 @@
+loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'cms');
+
+ $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CMS/src/Providers/ModuleServiceProvider.php b/packages/Webkul/CMS/src/Providers/ModuleServiceProvider.php
new file mode 100644
index 000000000..d95c1b094
--- /dev/null
+++ b/packages/Webkul/CMS/src/Providers/ModuleServiceProvider.php
@@ -0,0 +1,12 @@
+ @prashant-webkul
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+
+class CMSRepository extends Repository
+{
+ /**
+ * To hold the channel reposotry instance
+ */
+ protected $channel;
+
+ /**
+ * To hold the locale reposotry instance
+ */
+ protected $locale;
+
+ public function __construct(Channel $channel, Locale $locale, App $app)
+ {
+ $this->channel = $channel;
+
+ $this->locale = $locale;
+
+ parent::__construct($app);
+ }
+ /**
+ * Specify Model class name
+ *
+ * @return mixed
+ */
+ function model()
+ {
+ return 'Webkul\CMS\Contracts\CMS';
+ }
+
+ public function create(array $data)
+ {
+ $result = $this->model->create($data);
+
+ if ($result) {
+ return $result;
+ } else {
+ return $result;
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Category/src/Database/Migrations/2019_07_11_151210_add_locale_id_in_category_translations.php b/packages/Webkul/Category/src/Database/Migrations/2019_07_11_151210_add_locale_id_in_category_translations.php
new file mode 100644
index 000000000..5c4e754c3
--- /dev/null
+++ b/packages/Webkul/Category/src/Database/Migrations/2019_07_11_151210_add_locale_id_in_category_translations.php
@@ -0,0 +1,34 @@
+integer('locale_id')->nullable()->unsigned();
+ });
+
+ Schema::table('category_translations', function (Blueprint $table) {
+ $table->foreign('locale_id')->references('id')->on('locales')->onDelete('cascade');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ //
+ }
+}
diff --git a/packages/Webkul/Category/src/Database/Migrations/2019_07_31_143339_create_category_filterable_attributes_table.php b/packages/Webkul/Category/src/Database/Migrations/2019_07_31_143339_create_category_filterable_attributes_table.php
new file mode 100644
index 000000000..3301581ad
--- /dev/null
+++ b/packages/Webkul/Category/src/Database/Migrations/2019_07_31_143339_create_category_filterable_attributes_table.php
@@ -0,0 +1,33 @@
+integer('category_id')->unsigned();
+ $table->integer('attribute_id')->unsigned();
+ $table->foreign('category_id')->references('id')->on('categories')->onDelete('cascade');
+ $table->foreign('attribute_id')->references('id')->on('attributes')->onDelete('cascade');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('category_filterable_attributes');
+ }
+}
diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
index b1cac74b5..809fcaf6f 100755
--- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
+++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
@@ -24,20 +24,33 @@ class CategoryController extends Controller
/**
* CategoryRepository object
*
- * @var array
+ * @var Object
*/
protected $categoryRepository;
+ /**
+ * AttributeRepository object
+ *
+ * @var Object
+ */
+ protected $attributeRepository;
+
/**
* Create a new controller instance.
*
- * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository
+ * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository
+ * @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository
* @return void
*/
- public function __construct(CategoryRepository $categoryRepository)
+ public function __construct(
+ CategoryRepository $categoryRepository,
+ AttributeRepository $attributeRepository
+ )
{
$this->categoryRepository = $categoryRepository;
+ $this->attributeRepository = $attributeRepository;
+
$this->_config = request('_config');
}
@@ -60,7 +73,9 @@ class CategoryController extends Controller
{
$categories = $this->categoryRepository->getCategoryTree(null, ['id']);
- return view($this->_config['view'], compact('categories'));
+ $attributes = $this->attributeRepository->findWhere(['is_filterable' => 1]);
+
+ return view($this->_config['view'], compact('categories', 'attributes'));
}
/**
@@ -108,7 +123,9 @@ class CategoryController extends Controller
$category = $this->categoryRepository->findOrFail($id);
- return view($this->_config['view'], compact('category', 'categories'));
+ $attributes = $this->attributeRepository->findWhere(['is_filterable' => 1]);
+
+ return view($this->_config['view'], compact('category', 'categories', 'attributes'));
}
/**
diff --git a/packages/Webkul/Category/src/Models/Category.php b/packages/Webkul/Category/src/Models/Category.php
index 48b8e3046..8a38f7c02 100755
--- a/packages/Webkul/Category/src/Models/Category.php
+++ b/packages/Webkul/Category/src/Models/Category.php
@@ -6,6 +6,7 @@ use Webkul\Core\Eloquent\TranslatableModel;
use Kalnoy\Nestedset\NodeTrait;
use Illuminate\Support\Facades\Storage;
use Webkul\Category\Contracts\Category as CategoryContract;
+use Webkul\Attribute\Models\AttributeProxy;
class Category extends TranslatableModel implements CategoryContract
{
@@ -35,4 +36,12 @@ class Category extends TranslatableModel implements CategoryContract
{
return $this->image_url();
}
+
+ /**
+ * The filterable attributes that belong to the category.
+ */
+ public function filterableAttributes()
+ {
+ return $this->belongsToMany(AttributeProxy::modelClass(), 'category_filterable_attributes')->with('options');
+ }
}
\ No newline at end of file
diff --git a/packages/Webkul/Category/src/Models/CategoryTranslation.php b/packages/Webkul/Category/src/Models/CategoryTranslation.php
index d8882e757..6916e3146 100755
--- a/packages/Webkul/Category/src/Models/CategoryTranslation.php
+++ b/packages/Webkul/Category/src/Models/CategoryTranslation.php
@@ -9,5 +9,5 @@ class CategoryTranslation extends Model implements CategoryTranslationContract
{
public $timestamps = false;
- protected $fillable = ['name', 'description', 'slug', 'meta_title', 'meta_description', 'meta_keywords'];
+ protected $fillable = ['name', 'description', 'slug', 'meta_title', 'meta_description', 'meta_keywords', 'locale_id'];
}
\ No newline at end of file
diff --git a/packages/Webkul/Category/src/Repositories/CategoryRepository.php b/packages/Webkul/Category/src/Repositories/CategoryRepository.php
index a5b3432d0..e6380d55f 100755
--- a/packages/Webkul/Category/src/Repositories/CategoryRepository.php
+++ b/packages/Webkul/Category/src/Repositories/CategoryRepository.php
@@ -53,6 +53,7 @@ class CategoryRepository extends Repository
foreach ($model->translatedAttributes as $attribute) {
if (isset($data[$attribute])) {
$data[$locale->code][$attribute] = $data[$attribute];
+ $data[$locale->code]['locale_id'] = $locale->id;
}
}
}
@@ -62,6 +63,10 @@ class CategoryRepository extends Repository
$this->uploadImages($data, $category);
+ if (isset($data['attributes'])) {
+ $category->filterableAttributes()->sync($data['attributes']);
+ }
+
Event::fire('catalog.category.create.after', $category);
return $category;
@@ -88,7 +93,7 @@ class CategoryRepository extends Repository
*/
public function getRootCategories()
{
- return $this->model::withDepth()->having('depth', '=', 0)->get();
+ return $this->getModel()->where('parent_id', NULL)->get();
}
/**
@@ -162,6 +167,10 @@ class CategoryRepository extends Repository
$this->uploadImages($data, $category);
+ if (isset($data['attributes'])) {
+ $category->filterableAttributes()->sync($data['attributes']);
+ }
+
Event::fire('catalog.category.update.after', $id);
return $category;
@@ -213,7 +222,7 @@ class CategoryRepository extends Repository
}
}
- public function getPartial()
+ public function getPartial($columns = null)
{
$categories = $this->model->all();
$trimmed = array();
@@ -222,7 +231,8 @@ class CategoryRepository extends Repository
if ($category->name != null || $category->name != "") {
$trimmed[$key] = [
'id' => $category->id,
- 'name' => $category->name
+ 'name' => $category->name,
+ 'slug' => $category->slug
];
}
}
diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index 0179e2504..48130cd53 100755
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -705,27 +705,35 @@ class Cart {
'country' => $shippingAddress->country,
])->orderBy('tax_rate', 'desc')->get();
- foreach ($taxRates as $rate) {
- $haveTaxRate = false;
+ if (count( $taxRates) > 0) {
+ foreach ($taxRates as $rate) {
+ $haveTaxRate = false;
- if (! $rate->is_zip) {
- if ($rate->zip_code == '*' || $rate->zip_code == $shippingAddress->postcode) {
- $haveTaxRate = true;
+ if (! $rate->is_zip) {
+ if ($rate->zip_code == '*' || $rate->zip_code == $shippingAddress->postcode) {
+ $haveTaxRate = true;
+ }
+ } else {
+ if ($shippingAddress->postcode >= $rate->zip_from && $shippingAddress->postcode <= $rate->zip_to) {
+ $haveTaxRate = true;
+ }
}
- } else {
- if ($shippingAddress->postcode >= $rate->zip_from && $shippingAddress->postcode <= $rate->zip_to) {
- $haveTaxRate = true;
+
+ if ($haveTaxRate) {
+ $item->tax_percent = $rate->tax_rate;
+ $item->tax_amount = ($item->total * $rate->tax_rate) / 100;
+ $item->base_tax_amount = ($item->base_total * $rate->tax_rate) / 100;
+
+ $item->save();
+ break;
}
}
+ } else {
+ $item->tax_percent = 0;
+ $item->tax_amount = 0;
+ $item->base_tax_amount = 0;
- if ($haveTaxRate) {
- $item->tax_percent = $rate->tax_rate;
- $item->tax_amount = ($item->total * $rate->tax_rate) / 100;
- $item->base_tax_amount = ($item->base_total * $rate->tax_rate) / 100;
-
- $item->save();
- break;
- }
+ $item->save();
}
}
}
diff --git a/packages/Webkul/Core/src/Config/concord.php b/packages/Webkul/Core/src/Config/concord.php
index b9e18a31e..fb94c450d 100644
--- a/packages/Webkul/Core/src/Config/concord.php
+++ b/packages/Webkul/Core/src/Config/concord.php
@@ -15,8 +15,10 @@ return [
\Webkul\Core\Providers\ModuleServiceProvider::class,
\Webkul\Customer\Providers\ModuleServiceProvider::class,
\Webkul\Inventory\Providers\ModuleServiceProvider::class,
- \Webkul\Product\Providers\ModuleServiceProvider::class,\Webkul\Sales\Providers\ModuleServiceProvider::class,
+ \Webkul\Product\Providers\ModuleServiceProvider::class,
+ \Webkul\Sales\Providers\ModuleServiceProvider::class,
\Webkul\Tax\Providers\ModuleServiceProvider::class,
- \Webkul\User\Providers\ModuleServiceProvider::class,\Webkul\Discount\Providers\ModuleServiceProvider::class,
+ \Webkul\User\Providers\ModuleServiceProvider::class,
+ \Webkul\Discount\Providers\ModuleServiceProvider::class,
]
];
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Database/Migrations/2019_07_23_033128_alter_locales_table.php b/packages/Webkul/Core/src/Database/Migrations/2019_07_23_033128_alter_locales_table.php
new file mode 100644
index 000000000..bcca3d042
--- /dev/null
+++ b/packages/Webkul/Core/src/Database/Migrations/2019_07_23_033128_alter_locales_table.php
@@ -0,0 +1,30 @@
+enum('direction', ['ltr', 'rtl'])->default('ltr');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+
+ }
+}
diff --git a/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRate.php b/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRate.php
new file mode 100644
index 000000000..4d0612399
--- /dev/null
+++ b/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRate.php
@@ -0,0 +1,10 @@
+apiKey = config('services.exchange-api')['fixer']['key'];
+
+ $this->apiEndPoint = 'http://data.fixer.io/api/latest?access_key='.$this->apiKey;
+ }
+
+ public function fetchRates()
+ {
+ $rates = array();
+
+ $this->exchangeRate = app('Webkul\Core\Repositories\ExchangeRateRepository');
+
+ // dummy api call
+ $client = new \GuzzleHttp\Client();
+
+ if (config('services.exchange-api')['fixer']['paid_account']) {
+ $result = $client->request('GET', 'http://data.fixer.io/api/'.date('Y-m-d').'?access_key='.$this->apiKey.'&base='.core()->getBaseCurrency()->code.'&symbols=INR');
+
+ } else {
+ $result = $client->request('GET', 'http://data.fixer.io/api/'.date('Y-m-d').'?access_key='.$this->apiKey.'&symbols=USD');
+ }
+
+ $result = json_decode($result->getBody()->getContents());
+
+ return $result;
+ }
+
+ public function updateRates()
+ {
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
index cb76fd96e..783b72301 100755
--- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
@@ -22,16 +22,16 @@ class ExchangeRateController extends Controller
protected $_config;
/**
- * ExchangeRateRepository object
- *
- * @var array
+ * ExchangeRateRepository instance
+ *
+ * @var Object
*/
protected $exchangeRateRepository;
/**
* CurrencyRepository object
*
- * @var array
+ * @var Object
*/
protected $currencyRepository;
@@ -51,6 +51,8 @@ class ExchangeRateController extends Controller
$this->currencyRepository = $currencyRepository;
+ $this->exchangeRate = $exchangeRate;
+
$this->_config = request('_config');
}
@@ -138,6 +140,42 @@ class ExchangeRateController extends Controller
return redirect()->route($this->_config['redirect']);
}
+ /**
+ * Update Rates Using Exchange Rates API
+ *
+ * @return \Illuminate\Http\JsonResponse
+ */
+ public function updateRates($service)
+ {
+ $exchangeService = config('services.exchange-api')[$service];
+
+ if (is_array($exchangeService)) {
+ if (! array_key_exists('class', $exchangeService)) {
+ return response()->json([
+ 'success' => false,
+ 'rates' => null,
+ 'error' => trans('admin::app.exchange-rate.exchange-class-not-found', [
+ 'service' => $service
+ ])
+ ], 400);
+ }
+
+ $exchangeServiceInstance = new $exchangeService['class'];
+ $updatedRates = $exchangeServiceInstance->fetchRates();
+
+ return response()->json([
+ 'success' => true,
+ 'rates' => 'rates'
+ ], 200);
+ } else {
+ return response()->json([
+ 'success' => false,
+ 'rates' => null,
+ 'error' => trans('admin::app.exchange-rate.invalid-config')
+ ], 400);
+ }
+ }
+
/**
* Remove the specified resource from storage.
*
diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
index 019e8d854..2b95866d7 100755
--- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
@@ -69,7 +69,8 @@ class LocaleController extends Controller
{
$this->validate(request(), [
'code' => ['required', 'unique:locales,code', new \Webkul\Core\Contracts\Validations\Code],
- 'name' => 'required'
+ 'name' => 'required',
+ 'direction' => 'in:ltr,rtl'
]);
Event::fire('core.locale.create.before');
@@ -106,7 +107,8 @@ class LocaleController extends Controller
{
$this->validate(request(), [
'code' => ['required', 'unique:locales,code,' . $id, new \Webkul\Core\Contracts\Validations\Code],
- 'name' => 'required'
+ 'name' => 'required',
+ 'direction' => 'in:ltr,rtl'
]);
Event::fire('core.locale.update.before', $id);
diff --git a/packages/Webkul/Core/src/Http/Controllers/SliderController.php b/packages/Webkul/Core/src/Http/Controllers/SliderController.php
index 04deeb442..8a6725720 100755
--- a/packages/Webkul/Core/src/Http/Controllers/SliderController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/SliderController.php
@@ -22,7 +22,7 @@ class SliderController extends Controller
/**
* SliderRepository
*
- * Object
+ * @var Object
*/
protected $sliderRepository;
diff --git a/packages/Webkul/Core/src/Models/Locale.php b/packages/Webkul/Core/src/Models/Locale.php
index b12be89de..572e576a5 100755
--- a/packages/Webkul/Core/src/Models/Locale.php
+++ b/packages/Webkul/Core/src/Models/Locale.php
@@ -13,6 +13,6 @@ class Locale extends Model implements LocaleContract
* @var array
*/
protected $fillable = [
- 'code', 'name'
+ 'code', 'name', 'direction'
];
-}
\ No newline at end of file
+}
diff --git a/packages/Webkul/Core/src/Resources/lang/fa/app.php b/packages/Webkul/Core/src/Resources/lang/fa/app.php
new file mode 100644
index 000000000..da43b37d9
--- /dev/null
+++ b/packages/Webkul/Core/src/Resources/lang/fa/app.php
@@ -0,0 +1,7 @@
+ ':attribute باید نامک معتبر داشته باشد.',
+ 'code' => ':attribute باید معتبر باشد.',
+ 'decimal' => ':attribute باید معتبر باشد.'
+];
diff --git a/packages/Webkul/Customer/src/Database/Migrations/2019_06_15_183412_add_code_column_in_customer_groups_table.php b/packages/Webkul/Customer/src/Database/Migrations/2019_06_15_183412_add_code_column_in_customer_groups_table.php
index daafae532..02c82b1ec 100644
--- a/packages/Webkul/Customer/src/Database/Migrations/2019_06_15_183412_add_code_column_in_customer_groups_table.php
+++ b/packages/Webkul/Customer/src/Database/Migrations/2019_06_15_183412_add_code_column_in_customer_groups_table.php
@@ -14,7 +14,7 @@ class AddCodeColumnInCustomerGroupsTable extends Migration
public function up()
{
Schema::table('customer_groups', function (Blueprint $table) {
- $table->string('code');
+ $table->string('code')->unique();
});
}
diff --git a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
index e05616ad3..c70d4ff88 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
@@ -6,9 +6,10 @@ use Hash;
use Webkul\Customer\Repositories\CustomerRepository;
/**
- * Customer controlller for the customer basically for the tasks of customers which will be done after customer authentication.
+ * Customer controlller for the customer basically for the tasks of customers which will be
+ * done after customer authentication.
*
- * @author Prashant Singh
+ * @author Prashant Singh
* @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class CustomerController extends Controller
diff --git a/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php b/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php
index a98503c06..9c7c9333b 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php
@@ -50,25 +50,31 @@ class ForgotPasswordController extends Controller
*/
public function store()
{
- $this->validate(request(), [
- 'email' => 'required|email'
- ]);
+ try {
+ $this->validate(request(), [
+ 'email' => 'required|email'
+ ]);
- $response = $this->broker()->sendResetLink(
- request(['email'])
- );
-
- if ($response == Password::RESET_LINK_SENT) {
- session()->flash('success', trans($response));
-
- return back();
- }
-
- return back()
- ->withInput(request(['email']))
- ->withErrors(
- ['email' => trans($response)]
+ $response = $this->broker()->sendResetLink(
+ request(['email'])
);
+
+ if ($response == Password::RESET_LINK_SENT) {
+ session()->flash('success', trans($response));
+
+ return back();
+ }
+
+ return back()
+ ->withInput(request(['email']))
+ ->withErrors(
+ ['email' => trans($response)]
+ );
+ } catch (\Exception $e) {
+ session()->flash('error', trans($e->getMessage()));
+
+ return redirect()->back();
+ }
}
/**
diff --git a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
index da3dc2015..5c5a65f7b 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
@@ -45,7 +45,7 @@ class SessionController extends Controller
public function show()
{
if (auth()->guard('customer')->check()) {
- return redirect()->route('customer.session.index');
+ return redirect()->route('customer.profile.index');
} else {
return view($this->_config['view']);
}
diff --git a/packages/Webkul/Customer/src/Mail/VerificationEmail.php b/packages/Webkul/Customer/src/Mail/VerificationEmail.php
index 55653dba4..3978eca55 100755
--- a/packages/Webkul/Customer/src/Mail/VerificationEmail.php
+++ b/packages/Webkul/Customer/src/Mail/VerificationEmail.php
@@ -31,6 +31,7 @@ class VerificationEmail extends Mailable
public function build()
{
return $this->to($this->verificationData['email'])
+ ->from(env('SHOP_MAIL_FROM'))
->subject('Verification email')
->view('shop::emails.customer.verification-email')->with('data', ['email' => $this->verificationData['email'], 'token' => $this->verificationData['token']]);
}
diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php
index 411b41397..c44dc3fd6 100755
--- a/packages/Webkul/Customer/src/Models/Customer.php
+++ b/packages/Webkul/Customer/src/Models/Customer.php
@@ -28,6 +28,19 @@ class Customer extends Authenticatable implements CustomerContract, JWTSubject
return ucfirst($this->first_name) . ' ' . ucfirst($this->last_name);
}
+ /**
+ * Email exists or not
+ */
+ public function emailExists($email) {
+ $results = $this->where('email', $email);
+
+ if ($results->count() == 0) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
/**
* Get the customer group that owns the customer.
*/
diff --git a/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php b/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php
index 148bd4b96..1f8b39858 100755
--- a/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php
+++ b/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php
@@ -21,6 +21,8 @@ class CustomerResetPassword extends ResetPassword
}
return (new MailMessage)
+ ->from(env('SHOP_MAIL_FROM'))
+ ->subject(__('shop::app.mail.forget-password.subject') )
->view('shop::emails.customer.forget-password', [
'user_name' => $notifiable->name,
'token' => $this->token
diff --git a/packages/Webkul/Discount/Untitled-1.txt b/packages/Webkul/Discount/Untitled-1.txt
deleted file mode 100644
index b2803cd5d..000000000
--- a/packages/Webkul/Discount/Untitled-1.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Discount Condition:
-Attribute Family is all the attributes
-Cart Attribute such as
-base_total,
-grand_total,
-shipping_free,
-shipping_not_free,
-
diff --git a/packages/Webkul/Discount/src/Actions/Action.php b/packages/Webkul/Discount/src/Actions/Action.php
index 62268aa18..737f2d18a 100644
--- a/packages/Webkul/Discount/src/Actions/Action.php
+++ b/packages/Webkul/Discount/src/Actions/Action.php
@@ -4,7 +4,5 @@ namespace Webkul\Discount\Actions;
abstract class Action
{
- abstract public function calculate($rule, $item, $cart);
-
- abstract public function calculateOnShipping($cart);
+ abstract public function calculate($rule);
}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/BuyAGetB.php b/packages/Webkul/Discount/src/Actions/BuyAGetB.php
deleted file mode 100644
index 99add92fc..000000000
--- a/packages/Webkul/Discount/src/Actions/BuyAGetB.php
+++ /dev/null
@@ -1,52 +0,0 @@
-action_type; // action type used
- $disc_threshold = $rule->disc_threshold; // atleast quantity by default 1
- $disc_amount = $rule->disc_amount; // value of discount
- $disc_quantity = $rule->disc_quantity; //max quantity allowed to be discounted
-
- $amountDiscounted = 0;
-
- $realQty = $item['quantity'];
-
- if ($cart->items_qty >= $disc_threshold) {
- $amountDiscounted = $disc_amount;
-
- if ($realQty > $disc_quantity) {
- $amountDiscounted = $amountDiscounted * $disc_quantity;
- } else {
- $amountDiscounted = $amountDiscounted * $realQty;
- }
-
- if ($amountDiscounted > $item['base_price'] && $realQty == 1) {
- $amountDiscounted = $item['base_price'];
- }
- }
-
- $report['discount'] = $amountDiscounted;
- $report['formatted_discount'] = core()->currency($amountDiscounted);
-
- return $report;
- }
-
- /**
- * Calculates the impact on the shipping amount if the rule is apply_to_shipping enabled
- */
- public function calculateOnShipping($cart)
- {
- $percentOfDiscount = ($cart->base_discount_amount * 100) / $cart->base_grand_total;
-
- $discountOnShipping = ($percentOfDiscount / 100) * $cart->selected_shipping_rate->base_price;
-
- return $discountOnShipping;
- }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php b/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php
new file mode 100644
index 000000000..b5f9b7978
--- /dev/null
+++ b/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php
@@ -0,0 +1,73 @@
+items;
+
+ $impact = collect();
+
+ $impact->discount = $rule->disc_amount;
+ $impact->formatted_discount = core()->currency($impact->discount);
+
+ if ($rule->uses_attribute_conditions) {
+ $productIDs = $rule->product_ids;
+
+ $productIDs = explode(',', $productIDs);
+
+ $matchCount = 0;
+
+ foreach ($productIDs as $productID) {
+ foreach ($items as $item) {
+ if ($item->product_id == $productID) {
+ $matchCount++;
+ }
+ }
+ }
+
+ if ($matchCount > 0) {
+ $discountPerItem = $impact->discount / $matchCount;
+ }
+
+ foreach ($productIDs as $productID) {
+ foreach ($items as $item) {
+ if ($item->product_id == $productID) {
+ $report = array();
+
+ $report['item_id'] = $item->id;
+ $report['product_id'] = $item->product_id;
+ $report['discount'] = round($discountPerItem, 4);
+ $report['formatted_discount'] = core()->currency(round($discountPerItem, 4));
+
+ $impact->push($report);
+
+ unset($report);
+ }
+ }
+ }
+ } else {
+ $discountPerItem = $impact->discount / $cart->items_qty;
+
+ foreach ($items as $item) {
+ $report = array();
+
+ $report['item_id'] = $item->id;
+ $report['product_id'] = $item->product_id;
+ $report['discount'] = round($discountPerItem, 4);
+ $report['formatted_discount'] = core()->currency(round($discountPerItem, 4));
+
+ $impact->push($report);
+
+ unset($report);
+ }
+ }
+
+ return $impact;
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php b/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php
new file mode 100644
index 000000000..adeb2c379
--- /dev/null
+++ b/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php
@@ -0,0 +1,99 @@
+items;
+
+ $impact = collect();
+
+ $totalDiscount = 0;
+
+ if ($rule->discount_amount >= 100) {
+ $impact->discount = $cart->base_sub_total;
+
+ $impact->formatted_discount = core()->currency($impact->discount);
+ } else {
+ if ($rule->uses_attribute_conditions) {
+ $productIDs = $rule->product_ids;
+
+ $productIDs = explode(',', $productIDs);
+
+ $matchCount = 0;
+
+ foreach ($productIDs as $productID) {
+ foreach ($items as $item) {
+ if ($item->product_id == $productID) {
+ $matchCount++;
+ }
+ }
+ }
+
+ foreach ($productIDs as $productID) {
+ foreach ($items as $item) {
+ $itemPrice = $item->base_price;
+
+ if ($item->product->type == 'configurable') {
+ $itemProductId = $item->child->product_id;
+ } else {
+ $itemProductId = $item->product_id;
+ }
+
+ $discount = round(($itemPrice * $rule->disc_amount) / 100, 4);
+
+ if ($itemProductId == $productID) {
+ $totalDiscount = $totalDiscount + $discount;
+
+ $report = array();
+
+ $report['item_id'] = $item->id;
+ $report['product_id'] = $item->child ? $item->child->product_id : $item->product_id;
+ $report['discount'] = $discount;
+ $report['formatted_discount'] = core()->currency($discount);
+
+ $impact->push($report);
+
+ unset($report);
+ }
+ }
+ }
+ } else {
+ foreach ($items as $item) {
+ $itemPrice = $item->base_price;
+
+ if ($item->product->type == 'configurable') {
+ $itemProductId = $item->child->product_id;
+ } else {
+ $itemProductId = $item->product_id;
+ }
+
+ $discount = round(($itemPrice * $rule->disc_amount) / 100, 4);
+
+ $totalDiscount = $totalDiscount + $discount;
+
+ $report = array();
+
+ $report['item_id'] = $item->id;
+ $report['product_id'] = $item->child ? $item->child->product_id : $item->product_id;
+ $report['discount'] = $discount;
+ $report['formatted_discount'] = core()->currency($discount);
+
+ $impact->push($report);
+
+ unset($report);
+ }
+ }
+ }
+
+ $impact->discount = $totalDiscount;
+ $impact->formatted_discount = core()->currency($impact->discount);
+
+ return $impact;
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Cart/WholeCartToFixed.php b/packages/Webkul/Discount/src/Actions/Cart/WholeCartToFixed.php
new file mode 100644
index 000000000..c0f97699b
--- /dev/null
+++ b/packages/Webkul/Discount/src/Actions/Cart/WholeCartToFixed.php
@@ -0,0 +1,87 @@
+items;
+
+ $impact = collect();
+
+ $impact->discount = $rule->disc_amount;
+ $impact->formatted_discount = core()->currency($impact->discount);
+
+ if ($rule->uses_attribute_conditions) {
+ $productIDs = $rule->product_ids;
+
+ $productIDs = explode(',', $productIDs);
+
+ $matchCount = 0;
+
+ foreach ($productIDs as $productID) {
+ foreach ($items as $item) {
+ if ($item->product_id == $productID) {
+ $matchCount++;
+ }
+ }
+ }
+
+ foreach ($productIDs as $productID) {
+ foreach ($items as $item) {
+ $itemPrice = $item->base_price;
+
+ if ($item->product->type == 'configurable') {
+ $itemProductId = $item->child->product_id;
+ } else {
+ $itemProductId = $item->product_id;
+ }
+
+ $discount = round(($itemPrice * $impact->discount) / 100, 4);
+
+ if ($itemProductId == $productID) {
+ $report = array();
+
+ $report['item_id'] = $item->id;
+ $report['product_id'] = $item->product_id;
+ $report['discount'] = $discount;
+ $report['formatted_discount'] = core()->currency($discount);
+
+ $impact->push($report);
+
+ unset($report);
+ }
+ }
+ }
+ } else {
+ foreach ($items as $item) {
+ $itemPrice = $item->base_price;
+
+ if ($item->product->type == 'configurable') {
+ $itemProductId = $item->child->product_id;
+ } else {
+ $itemProductId = $item->product_id;
+ }
+
+ $discount = round(($itemPrice * $impact->discount) / 100, 4);
+
+ $report = array();
+
+ $report['item_id'] = $item->id;
+ $report['product_id'] = $item->product_id;
+ $report['discount'] = $discount;
+ $report['formatted_discount'] = core()->currency($discount);
+
+ $impact->push($report);
+
+ unset($report);
+ }
+ }
+
+ return $impact;
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Cart/WholeCartToPercent.php b/packages/Webkul/Discount/src/Actions/Cart/WholeCartToPercent.php
new file mode 100644
index 000000000..4d7d3554a
--- /dev/null
+++ b/packages/Webkul/Discount/src/Actions/Cart/WholeCartToPercent.php
@@ -0,0 +1,88 @@
+items;
+
+ $impact = collect();
+
+ if ($rule->discount_amount >= 100) {
+ $impact->discount = $cart->base_sub_total;
+ } else {
+ $impact->discount = ($rule->disc_amount / 100) * $cart->base_sub_total;
+ }
+
+ $impact->formatted_discount = core()->currency($impact->discount);
+
+ if ($rule->uses_attribute_conditions) {
+ $productIDs = $rule->product_ids;
+
+ $productIDs = explode(',', $productIDs);
+
+ $matchCount = 0;
+
+ foreach ($productIDs as $productID) {
+ foreach ($items as $item) {
+ if ($item->product_id == $productID) {
+ $matchCount++;
+ }
+ }
+ }
+
+ if ($matchCount > 0) {
+ $discountPerItem = $impact->discount / $matchCount;
+ }
+
+ foreach ($productIDs as $productID) {
+ foreach ($items as $item) {
+ if ($item->product_id == $productID) {
+ $report = array();
+
+ $report['item_id'] = $item->id;
+ $report['product_id'] = $item->product_id;
+ $report['discount'] = round($discountPerItem, 4);
+ $report['formatted_discount'] = core()->currency(round($discountPerItem, 4));
+
+ $impact->push($report);
+
+ unset($report);
+ }
+ }
+ }
+ } else {
+ $discountPerItem = $impact->discount / $cart->items_qty;
+
+ foreach ($items as $item) {
+ $report = array();
+
+ $report['item_id'] = $item->id;
+ $report['product_id'] = $item->product_id;
+ $report['discount'] = round($discountPerItem, 4);
+ $report['formatted_discount'] = core()->currency(round($discountPerItem, 4));
+
+ $impact->push($report);
+
+ unset($report);
+ }
+ }
+
+ return $impact;
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Catalog/Action.php b/packages/Webkul/Discount/src/Actions/Catalog/Action.php
new file mode 100644
index 000000000..ddd2ddc56
--- /dev/null
+++ b/packages/Webkul/Discount/src/Actions/Catalog/Action.php
@@ -0,0 +1,8 @@
+discount_amount;
+ $price = $product->price;
+
+ if ($discountAmount <= $price) {
+ $discount = $price - $discountAmount;
+
+ return $discount;
+ } else {
+ return $price;
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Catalog/AdjustToPercent.php b/packages/Webkul/Discount/src/Actions/Catalog/AdjustToPercent.php
new file mode 100644
index 000000000..6c085a63a
--- /dev/null
+++ b/packages/Webkul/Discount/src/Actions/Catalog/AdjustToPercent.php
@@ -0,0 +1,19 @@
+discount_amount;
+
+ $price = $product->price;
+
+ $discount = ($discountAmount / 100) * $price;
+
+ return $discount;
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Catalog/FixedAmount.php b/packages/Webkul/Discount/src/Actions/Catalog/FixedAmount.php
new file mode 100644
index 000000000..d37f65df9
--- /dev/null
+++ b/packages/Webkul/Discount/src/Actions/Catalog/FixedAmount.php
@@ -0,0 +1,20 @@
+discount_amount;
+ $price = $product->price;
+
+ if ($discountAmount <= $price) {
+ return $discountAmount;
+ } else {
+ return $price;
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Catalog/PercentOfOriginal.php b/packages/Webkul/Discount/src/Actions/Catalog/PercentOfOriginal.php
new file mode 100644
index 000000000..4fc7c0408
--- /dev/null
+++ b/packages/Webkul/Discount/src/Actions/Catalog/PercentOfOriginal.php
@@ -0,0 +1,19 @@
+discount_amount;
+
+ $price = $product->price;
+
+ $discount = ($discountAmount / 100) * $price;
+
+ return $discount;
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/FixedAmount.php b/packages/Webkul/Discount/src/Actions/FixedAmount.php
deleted file mode 100644
index 5f6209c27..000000000
--- a/packages/Webkul/Discount/src/Actions/FixedAmount.php
+++ /dev/null
@@ -1,52 +0,0 @@
-action_type; // action type used
- $disc_threshold = $rule->disc_threshold; // atleast quantity by default 1 --> may be omitted in near future
- $disc_amount = $rule->disc_amount; // value of discount
- $disc_quantity = $rule->disc_quantity; //max quantity allowed to be discounted
-
- $amountDiscounted = 0;
-
- $realQty = $item['quantity'];
-
- if ($cart->items_qty >= $disc_threshold) {
- $amountDiscounted = $disc_amount;
-
- if ($realQty > $disc_quantity) {
- $amountDiscounted = $amountDiscounted * $disc_quantity;
- } else {
- $amountDiscounted = $amountDiscounted * $realQty;
- }
-
- if ($amountDiscounted > $item['base_price'] && $realQty == 1) {
- $amountDiscounted = $item['base_price'];
- }
- }
-
- $report['discount'] = $amountDiscounted;
- $report['formatted_discount'] = core()->currency($amountDiscounted);
-
- return $report;
- }
-
- /**
- * Calculates the impact on the shipping amount if the rule is apply_to_shipping enabled
- */
- public function calculateOnShipping($cart)
- {
- $cart = \Cart::getCart();
-
- $percentOfDiscount = ($cart->base_discount_amount * 100) / $cart->base_grand_total;
-
- return $percentOfDiscount;
- }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/PercentOfProduct.php b/packages/Webkul/Discount/src/Actions/PercentOfProduct.php
deleted file mode 100644
index 6d3ee3772..000000000
--- a/packages/Webkul/Discount/src/Actions/PercentOfProduct.php
+++ /dev/null
@@ -1,49 +0,0 @@
-disc_threshold;
- $disc_amount = $rule->disc_amount;
- $disc_quantity = $rule->disc_quantity;
-
- $realQty = $item['quantity'];
-
- if ($cart->items_qty >= $disc_threshold) {
- $amountDiscounted = $item['base_price'] * ($disc_amount / 100);
-
- if ($realQty > $disc_quantity) {
- $amountDiscounted = $amountDiscounted * $disc_quantity;
- } else {
- $amountDiscounted = $amountDiscounted * $realQty;
- }
-
- if ($amountDiscounted > $item['base_price'] && $realQty == 1) {
- $amountDiscounted = $item['base_price'];
- }
- }
-
- $report['discount'] = $amountDiscounted;
- $report['formatted_discount'] = core()->currency($amountDiscounted);
-
- return $report;
- }
-
- /**
- * Calculates the impact on the shipping amount if the rule is apply_to_shipping enabled
- */
- public function calculateOnShipping($cart)
- {
- $cart = \Cart::getCart();
-
- $percentOfDiscount = ($cart->base_discount_amount * 100) / $cart->base_grand_total;
-
- return $percentOfDiscount;
- }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Commands/Console/ActivateCatalogRule.php b/packages/Webkul/Discount/src/Commands/Console/ActivateCatalogRule.php
new file mode 100644
index 000000000..38d216eda
--- /dev/null
+++ b/packages/Webkul/Discount/src/Commands/Console/ActivateCatalogRule.php
@@ -0,0 +1,72 @@
+attribute = $attribute;
+
+ $this->description = trans('admin::app.promotion.activate-catalog');
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return mixed
+ */
+ public function handle()
+ {
+ $param = $this->argument('param');
+
+ if (isset($param) && $param == 'catalog-rule') {
+ $attribute = $this->attribute->findWhere([
+ 'code' => 'special_price'
+ ]);
+
+ if ($attribute->count()) {
+ $attribute = $attribute->first();
+
+ if ($attribute->value_per_channel == 1) {
+ $this->info(trans('admin::app.promotion.catalog-rule-already-activated'));
+ } else {
+ $attribute->update(['value_per_channel' => 1]);
+
+ $this->info(trans('admin::app.promotion.catalog-rule-activated'));
+ }
+ } else {
+ $this->info(trans('admin::app.promotion.cannot-activate-catalog-rule'));
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Config/discount-rules.php b/packages/Webkul/Discount/src/Config/discount-rules.php
index 40c4d59fa..703db431d 100644
--- a/packages/Webkul/Discount/src/Config/discount-rules.php
+++ b/packages/Webkul/Discount/src/Config/discount-rules.php
@@ -1,7 +1,18 @@
'Webkul\Discount\Actions\PercentOfProduct',
- 'fixed_amount' => 'Webkul\Discount\Actions\FixedAmount',
- 'buy_a_get_b' => 'Webkul\Discount\Actions\BuyAGetB'
+
+ 'cart' => [
+ 'fixed_amount' => 'Webkul\Discount\Actions\Cart\FixedAmount',
+ 'percent_of_product' => 'Webkul\Discount\Actions\Cart\PercentOfProduct',
+ // 'whole_cart_to_fixed' => 'aWebkul\Discount\Actions\Cart\WholeCartToFixed',
+ 'whole_cart_to_percent' => 'Webkul\Discount\Actions\Cart\WholeCartToPercent'
+ ],
+
+ 'catalog' => [
+ 'fixed_amount' => 'Webkul\Discount\Actions\Catalog\FixedAmount',
+ 'final_price_to_percent' => 'Webkul\Discount\Actions\Catalog\AdjustToPercent',
+ 'percent_of_original' => 'Webkul\Discount\Actions\Catalog\PercentOfOriginal',
+ 'to_discount_value' => 'Webkul\Discount\Actions\Catalog\AdjustToDiscountValue'
+ ]
];
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Config/rule-conditions.php b/packages/Webkul/Discount/src/Config/rule-conditions.php
index 5974af80a..85df3ce89 100644
--- a/packages/Webkul/Discount/src/Config/rule-conditions.php
+++ b/packages/Webkul/Discount/src/Config/rule-conditions.php
@@ -3,45 +3,22 @@
return [
'test_mode' => [
'all_are_true' => 'All conditions are true',
- // 'all_are_false' => 'All conditions are false',
'any_is_true' => 'Any condition is true',
- // 'any_is_false' => 'Any condition is false'
- ],
-
- 'conditions' => [
- 'numeric' => [
- 0 => 'Equals',
- 1 => 'Equals or greater',
- 2 => 'Equals or lesser',
- 3 => 'Greater than',
- 4 => 'Lesser than'
- ],
-
- 'text' => [
- 0 => 'is',
- 1 => 'is not',
- 2 => 'contains',
- 3 => 'does not contains'
- ],
-
- 'boolean' => [
- 0 => 'True/Yes',
- 1 => 'False/No',
- ]
],
'cart' => [
'actions' => [
- 'percent_of_product' => 'Percentage of product',
'fixed_amount' => 'Apply as fixed amount',
- // 'buy_a_get_b' => 'Buy A get B'
+ 'percent_of_product' => 'Percentage of product',
+ // 'whole_cart_to_fixed' => 'Adjust whole cart to fixed amount',
+ 'whole_cart_to_percent' => 'Adjust whole cart to percent'
],
'validation' => [
0 => 'percent_of_product',
1 => 'fixed_amount',
- 2 => 'buy_a_get_b',
- // 3 => 'fixed_amount_cart'
+ 2 => 'whole_cart_to_percent',
+ 3 => 'whole_cart_to_fixed'
],
'conditions' => [
@@ -50,7 +27,7 @@ return [
'>=' => 'Greater or equals',
'<=' => 'Lesser or equals',
'>' => 'Greater than',
- '<' => 'Lesser than',
+ '<' => 'Lesser than'
],
'string' => [
@@ -66,6 +43,18 @@ return [
'boolean' => [
0 => 'True/Yes',
1 => 'False/No'
+ ],
+
+ 'symbols' => [
+ '=' => 'equals',
+ '>=' => 'greater_or_equals',
+ '<=' => 'lesser_or_equals',
+ '>' => 'greater_than',
+ '<' => 'lesser_than',
+ '{}' => 'contains',
+ '={}' => 'is_one_of',
+ '!={}' => 'is_not_one_of',
+ '!{}' => 'does_not_contains'
]
],
@@ -120,41 +109,66 @@ return [
'catalog' => [
'actions' => [
- 0 => 'admin::app.promotion.catalog.apply-percent',
- 1 => 'admin::app.promotion.catalog.apply-fixed',
- 2 => 'admin::app.promotion.catalog.adjust-to-percent',
- // 3 => 'admin::app.promotion.catalog.adjust-to-value'
+ 'percent_of_original' => 'Percentage of product',
+ 'fixed_amount' => 'Apply as fixed amount',
+ 'final_price_to_percent' => 'Adjust price to percentage',
+ 'to_discount_value' => 'Adjust price to given amount'
],
- 'attributes' => [
- 0 => [
- 'name' => 'Sub-total',
- 'type' => 'numeric'
- ],
- 1 => [
- 'name' => 'Total Items Quantity',
- 'type' => 'numeric'
- ],
- 2 => [
- 'name' => 'Total Weight',
- 'type' => 'numeric'
- ],
- 3 => [
- 'name' => 'Payment Method',
- 'type' => 'string'
- ],
- 4 => [
- 'name' => 'Shipping Postcode',
- 'type' => 'string'
- ],
- 5 => [
- 'name' => 'Shipping State',
- 'type' => 'string'
- ],
- 6 => [
- 'name' => 'Shipping Country',
- 'type' => 'string'
- ]
+ 'validation' => [
+ 0 => 'percent_of_product',
+ 1 => 'fixed_amount',
+ 2 => 'buy_a_get_b',
+ 3 => 'fixed_amount_cart'
+ ],
+
+ 'conditions' => [
+ 'numeric' => [
+ '=' => 'Equals',
+ '>=' => 'Greater or equals',
+ '<=' => 'Lesser or equals',
+ '>' => 'Greater than',
+ '<' => 'Lesser than',
+ ],
+
+ 'string' => [
+ '=' => 'Equals',
+ '>=' => 'Greater or equals',
+ '<=' => 'Lesser or equals',
+ '>' => 'Greater than',
+ '<' => 'Lesser than',
+ '{}' => 'Contains',
+ '!{}' => 'Does not contains'
+ ],
+
+ 'select' => [
+ '=' => 'Equals',
+ '{}' => 'Contains',
+ '!{}' => 'Does not contains'
+ ],
+
+ 'multiselect' => [
+ '=' => 'Equals',
+ '{}' => 'Contains',
+ '!{}' => 'Does not contains'
+ ],
+
+ 'boolean' => [
+ 0 => 'True/Yes',
+ 1 => 'False/No'
+ ],
+
+ 'symbols' => [
+ '=' => 'equals',
+ '>=' => 'greater_or_equals',
+ '<=' => 'lesser_or_equals',
+ '>' => 'greater_than',
+ '<' => 'lesser_than',
+ '{}' => 'contains',
+ '={}' => 'is_one_of',
+ '!={}' => 'is_not_one_of',
+ '!{}' => 'does_not_contains'
+ ]
]
- ],
+ ]
];
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_07_14_070809_add_products_selection_column_in_cart_rules_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_07_14_070809_add_products_selection_column_in_cart_rules_table.php
new file mode 100644
index 000000000..c8c86276b
--- /dev/null
+++ b/packages/Webkul/Discount/src/Database/Migrations/2019_07_14_070809_add_products_selection_column_in_cart_rules_table.php
@@ -0,0 +1,32 @@
+json('products_selection')->nullable();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('cart_rules', function (Blueprint $table) {
+ $table->dropColumn('products_selection');
+ });
+ }
+}
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130433_create_catalog_rules_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130433_create_catalog_rules_table.php
new file mode 100644
index 000000000..69a4a8bcc
--- /dev/null
+++ b/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130433_create_catalog_rules_table.php
@@ -0,0 +1,41 @@
+increments('id');
+ $table->string('name');
+ $table->text('description');
+ $table->datetime('starts_from')->nullable();
+ $table->datetime('ends_till')->nullable();
+ $table->boolean('status')->default(0);
+ $table->json('conditions')->nullable();
+ $table->json('actions')->nullable();
+ $table->boolean('end_other_rules')->default(0);
+ $table->string('action_code')->nullable();
+ $table->decimal('discount_amount', 20, 4)->default(0.0000);
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('catalog_rules');
+ }
+}
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130451_create_catalog_rule_customer_groups_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130451_create_catalog_rule_customer_groups_table.php
new file mode 100644
index 000000000..7337cef44
--- /dev/null
+++ b/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130451_create_catalog_rule_customer_groups_table.php
@@ -0,0 +1,35 @@
+increments('id');
+ $table->integer('customer_group_id')->unsigned();
+ $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade');
+ $table->integer('catalog_rule_id')->unsigned();
+ $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade');
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('catalog_rule_customer_groups');
+ }
+}
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130458_create_catalog_rule_channels_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130458_create_catalog_rule_channels_table.php
new file mode 100644
index 000000000..32e0ea36e
--- /dev/null
+++ b/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130458_create_catalog_rule_channels_table.php
@@ -0,0 +1,35 @@
+increments('id');
+ $table->integer('channel_id')->unsigned();
+ $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
+ $table->integer('catalog_rule_id')->unsigned();
+ $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade');
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('catalog_rule_channels');
+ }
+}
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130550_create_catalog_rule_products_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130550_create_catalog_rule_products_table.php
new file mode 100644
index 000000000..2f456559e
--- /dev/null
+++ b/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130550_create_catalog_rule_products_table.php
@@ -0,0 +1,43 @@
+bigIncrements('id');
+ $table->integer('catalog_rule_id')->unsigned();
+ $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade');
+ $table->datetime('starts_from')->nullable();
+ $table->datetime('ends_till')->nullable();
+ $table->integer('customer_group_id')->unsigned();
+ $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade');
+ $table->integer('channel_id')->unsigned();
+ $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
+ $table->integer('product_id')->unsigned();
+ $table->foreign('product_id')->references('id')->on('products')->onDelete('cascade');
+ $table->string('action_code')->nullable();
+ $table->decimal('action_amount', 20, 4)->default(0.0000);
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('catalog_rule_products');
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130583_create_catalog_rule_products_price_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130583_create_catalog_rule_products_price_table.php
new file mode 100644
index 000000000..b9d9eff19
--- /dev/null
+++ b/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130583_create_catalog_rule_products_price_table.php
@@ -0,0 +1,42 @@
+bigIncrements('id');
+ $table->integer('channel_id')->unsigned();
+ $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
+ $table->integer('customer_group_id')->unsigned();
+ $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade');
+ $table->integer('product_id')->unsigned();
+ $table->foreign('product_id')->references('id')->on('products')->onDelete('cascade');
+ $table->integer('catalog_rule_id')->unsigned();
+ $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade');
+ $table->decimal('rule_price', 20, 4)->default(0.0000);
+ $table->datetime('starts_from')->nullable();
+ $table->datetime('ends_till')->nullable();
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('catalog_rule_product_price');
+ }
+}
diff --git a/packages/Webkul/Discount/src/Helpers/Cart/ConvertXToProductId.php b/packages/Webkul/Discount/src/Helpers/Cart/ConvertXToProductId.php
new file mode 100644
index 000000000..0ac03a8cc
--- /dev/null
+++ b/packages/Webkul/Discount/src/Helpers/Cart/ConvertXToProductId.php
@@ -0,0 +1,299 @@
+category = $category;
+
+ $this->attribute = $attribute;
+
+ $this->product = $product;
+
+ $this->attributeOption = $attributeOption;
+
+ $this->cartRule = $cartRule;
+
+ $this->pav = $pav;
+
+ $this->conditionSymbols = config('pricerules.cart.conditions.symbols');
+ }
+
+ public function convertX($ruleId, $attribute_conditions)
+ {
+ $attributeConditions = json_decode($attribute_conditions);
+
+ $categoryValues = $attributeConditions->categories;
+
+ $attributeValues = $attributeConditions->attributes;
+
+ if (!isset($categoryValues) && ! isset($attributeValues)) {
+ return false;
+ }
+
+ $categoryResult = collect();
+
+ if (isset($categoryValues) && count($categoryValues)) {
+ $categoryResult = $this->convertFromCategories($categoryValues);
+ }
+
+ $attributeResult = collect();
+ if (isset($attributeValues) && count($attributeValues)) {
+ $attributeResult = $this->convertFromAttributes($attributeValues);
+ }
+
+ // now call the function that will find all the unique product ids
+ $productIDs = $this->findAllUniqueIds($attributeResult, $categoryResult);
+
+ // save the product ids against the cart rules
+ $result = $this->saveIDs($ruleId, $productIDs);
+
+ if ($result) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * This method will return product id from the attribute and attribute option params
+ *
+ * @return array
+ */
+ public function convertFromAttributes($attributeOptions)
+ {
+ $products = collect();
+
+ foreach ($attributeOptions as $attributeOption) {
+ $selectedOptions = $attributeOption->value;
+
+ if ($attributeOption->type == 'select' || $attributeOption->type == 'multiselect') {
+ $attribute = $this->attribute->findWhere([
+ 'code' => $attributeOption->attribute
+ ]);
+
+ $attributeOptions = $attribute->first()->options;
+
+ $selectedAttributeOptions = collect();
+
+ foreach ($attributeOptions as $attributeOption) {
+ foreach ($selectedOptions as $key => $value) {
+ if ($attributeOption->id == $value) {
+ $selectedAttributeOptions->push($attributeOption);
+ }
+ }
+ }
+
+ foreach($selectedAttributeOptions as $selectedAttributeOption) {
+ $typeColumn = $this->pav::$attributeTypeFields[$attribute->first()->type];
+
+ $pavResults = $this->pav->where(
+ "{$typeColumn}", $selectedAttributeOption->id
+ )->get();
+
+ foreach ($pavResults as $pavResult) {
+ if ($pavResult->product->type == 'simple')
+ $products->push($pavResult->product);
+ }
+ }
+ } else {
+ $attribute = $this->attribute->findWhere([
+ 'code' => $attributeOption->attribute
+ ]);
+
+ $pavValues = $attribute->first();
+
+ $selectedAttributeValues = collect();
+
+ if ($attributeOption->attribute == 'sku') {
+ $testValue = $attributeOption->value;
+ $testCondition = $attributeOption->condition;
+
+ if ($testCondition == '{}') {
+ $foundProducts = $this->product->findWhere([
+ ['sku', 'like', '%'.$testValue.'%'],
+ ['type', '!=', 'configurable']
+ ])->flatten()->all();
+ } else if ($testCondition == '!{}') {
+ $foundProducts = $this->product->findWhere([
+ ['sku', 'not like', '%'.$testValue.'%'],
+ ['type', '!=', 'configurable']
+ ])->flatten()->all();
+ } else if ($testCondition == '=') {
+ $foundProducts = $this->product->findWhere([
+ ['sku', '=', '%'.$testValue.'%'],
+ ['type', '!=', 'configurable']
+ ])->flatten()->all();
+ }
+ }
+
+ foreach($foundProducts as $foundProduct) {
+ $products->push($foundProduct);
+ }
+ }
+ }
+
+ return $products;
+ }
+
+ /**
+ * This method will return product id from the attribute and attribute option params
+ *
+ * @param Collection $categories
+ *
+ * @return array
+ */
+ public function convertFromCategories($categories)
+ {
+ $products = collect();
+
+ foreach ($categories as $category) {
+ $data = $this->getAll($category->id);
+ if ($data->count()) {
+ $products->push($data);
+
+ unset($data);
+ }
+ }
+
+ return $products->flatten()->all();
+ }
+
+ /**
+ * This method will remove the duplicates from the array and merge all the items into single array
+ *
+ * @param array
+ *
+ * @return array
+ */
+ public function findAllUniqueIds(...$data)
+ {
+ $attributeResult = $data[0] ?? collect();
+ $categoryResult = $data[1] ?? collect();
+
+ // find matched attribute options product ids
+ $mergedCollection = $attributeResult->merge($categoryResult);
+
+ $productIDs = collect();
+ foreach ($mergedCollection as $merged) {
+ $productIDs->push($merged->id);
+ }
+
+ // find all the unique product ids
+ $productIDs = $productIDs->unique();
+
+ return $productIDs->flatten()->all();
+ }
+
+ /**
+ * This method will save the product ids in the datastore
+ *
+ * @param integer $ruleId
+ *
+ * @param array $productIDs
+ *
+ * @return boolean
+ */
+ public function saveIDs($ruleId, $productIDs)
+ {
+ $cartRule = $this->cartRule->find($ruleId);
+
+ $productIDs = implode(',', $productIDs);
+
+ return $cartRule->update([
+ 'product_ids' => $productIDs
+ ]);
+ }
+
+ /**
+ * To get all product ids lying in the criteria
+ *
+ * @param integer $categoryId
+ *
+ * @return Collection
+ */
+ public function getAll($categoryId = null)
+ {
+
+ $results = app('Webkul\Product\Repositories\ProductFlatRepository')->scopeQuery(function($query) use ($categoryId) {
+
+ $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+
+ $locale = request()->get('locale') ?: app()->getLocale();
+
+ $qb = $query->distinct()
+ ->select('products.id')
+ ->leftJoin('products', 'product_flat.product_id', '=', 'products.id')
+ ->leftJoin('product_categories', 'products.id', '=', 'product_categories.product_id')
+ ->where('products.type', '!=', 'configurable')
+ ->whereNotNull('product_flat.url_key');
+
+ if ($categoryId) {
+ $qb->where('product_categories.category_id', $categoryId);
+ }
+
+ $qb->where('product_flat.status', 1);
+
+ $qb->where('product_flat.visible_individually', 1);
+
+ $queryBuilder = $qb->leftJoin('product_flat as flat_variants', function($qb) use($channel, $locale) {
+ $qb->on('product_flat.id', '=', 'flat_variants.parent_id');
+ });
+
+ return $qb->groupBy('product_flat.id');
+ })->get();
+
+ return $results;
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/Cart/CouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/Cart/CouponAbleRule.php
new file mode 100644
index 000000000..6973ebefc
--- /dev/null
+++ b/packages/Webkul/Discount/src/Helpers/Cart/CouponAbleRule.php
@@ -0,0 +1,59 @@
+validateIfAlreadyApplied();
+
+ $rules = $this->getApplicableRules($code);
+
+ if ($rules->count() == 1) {
+ $rule = $rules->first();
+
+ $canApply = $this->canApply($rule);
+
+ if ($canApply) {
+ $this->save($rule);
+
+ $this->updateCartItemAndCart($rule);
+
+ return true;
+ }
+ } else {
+ return false;
+ }
+
+ return false;
+ }
+
+ /**
+ * Removes the already applied coupon on the current cart instance
+ *
+ * @return boolean
+ */
+ public function remove()
+ {
+ $cart = Cart::getCart();
+
+ $existingRule = $this->cartRuleCart->findWhere([
+ 'cart_id' => $cart->id
+ ]);
+
+ $this->clearDiscount();
+
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Cart/Discount.php
similarity index 57%
rename from packages/Webkul/Discount/src/Helpers/Discount.php
rename to packages/Webkul/Discount/src/Helpers/Cart/Discount.php
index bce1770dd..e1334315d 100644
--- a/packages/Webkul/Discount/src/Helpers/Discount.php
+++ b/packages/Webkul/Discount/src/Helpers/Cart/Discount.php
@@ -1,8 +1,9 @@
cartRule = $cartRule;
$this->cartRuleCart = $cartRuleCart;
+ $this->cartItem = $cartItem;
+
$this->rules = config('discount-rules');
}
@@ -44,16 +52,280 @@ abstract class Discount
abstract public function apply($code);
/**
- * Checks whether coupon is getting applied on current cart instance or not
+ * To find all the suitable rules that can be applied on the current cart
+ *
+ * @return collection $rules
+ */
+ public function getApplicableRules($code = null)
+ {
+ if ($code != null) {
+ $rules = $this->cartRule->findWhere([
+ 'use_coupon' => 1,
+ 'status' => 1
+ ]);
+ } else {
+ $rules = $this->cartRule->findWhere([
+ 'use_coupon' => 0,
+ 'status' => 1
+ ]);
+ }
+
+ $filteredRules = collect();
+
+ // time based constraints
+ foreach ($rules as $rule) {
+ if ($this->checkApplicability($rule)) {
+ if ($rule->starts_from != null && $rule->ends_till == null) {
+ if (Carbon::parse($rule->starts_from) < now()) {
+ $rule->impact = $this->calculateImpact($rule);
+
+ $filteredRules->push($rule);
+ }
+ } else if ($rule->starts_from == null && $rule->ends_till != null) {
+ if (Carbon::parse($rule->ends_till) > now()) {
+ $rule->impact = $this->calculateImpact($rule);
+
+ $filteredRules->push($rule);
+ }
+ } else if ($rule->starts_from != null && $rule->ends_till != null) {
+ if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) {
+ $rule->impact = $this->calculateImpact($rule);
+
+ $filteredRules->push($rule);
+ }
+ } else {
+ $rule->impact = $this->calculateImpact($rule);
+
+ $filteredRules->push($rule);
+ }
+ }
+ }
+
+ return $filteredRules;
+ }
+
+ /**
+ * To find that one rule that is going to be applied on the current cart
+ *
+ * @param Collection $rules
+ *
+ * @return CartRule $rule
+ */
+ public function breakTie($rules)
+ {
+ $result = $this->sortByLeastPriority($rules);
+
+ if (count($result) > 1) {
+ // check for max impact criteria
+ if (count($result) > 1) {
+ $result = $this->findMaxImpact($result);
+
+ if (count($result) > 1) {
+ $result = $this->findOldestRule($result);
+
+ return $result;
+ } else if (count($result) == 1) {
+ return $result->first();
+ } else {
+ return collect();
+ }
+ } else if (count($result) == 1) {
+ return $result->first();
+ } else {
+ return collect();
+ }
+ } else if (count($result) == 1) {
+ return $result->first();
+ } else {
+ return collect();
+ }
+
+ return collect();
+ }
+
+ /**
+ * To sort the rules by the least priority
+ *
+ * @param Collection $rules
+ *
+ * @return Collection $rule
+ */
+ public function sortByLeastPriority($rules)
+ {
+ $sortedRules = collect();
+
+ $minPriority = $rules->min('priority');
+
+ foreach ($rules as $rule) {
+ if ($rule->priority == $minPriority) {
+ $sortedRules->push($rule);
+ }
+ }
+
+ return $sortedRules;
+ }
+
+ /**
+ * To check where rule ends other rules
+ *
+ * @param CartRule $rule
+ *
+ * @return $rule
+ */
+ public function isEndRule($rule)
+ {
+ if ($rule->end_other_rules) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * To find whether rule can be applied or not
+ *
+ * @param CartRule $rule
*
* @return boolean
*/
+ public function canApply($rule)
+ {
+ $cart = \Cart::getCart();
+
+ $alreadyApplied = $this->cartRuleCart->findWhere([
+ 'cart_id' => $cart->id
+ ]);
+
+ if ($alreadyApplied->count() && $alreadyApplied->first()->cart_rule->id == $rule->id) {
+ if ($this->validateRule($alreadyApplied->first()->cart_rule)) {
+ return false;
+ } else {
+ $this->clearDiscount();
+
+ return true;
+ }
+ } else if ($alreadyApplied->count() && $alreadyApplied->first()->cart_rule->id != $rule->id && ! $alreadyApplied->first()->cart_rule->end_other_rules) {
+ if ($rule->use_coupon) {
+ if ($alreadyApplied->first()->cart_rule->use_coupon) {
+ $rules = collect();
+
+ $alreadyAppliedRule = $alreadyApplied->first()->cart_rule;
+ $alreadyAppliedRule->impact = $this->calculateImpact($alreadyAppliedRule);
+
+ $rule->impact = $this->calculateImpact($alreadyAppliedRule);
+
+ $rules->push($alreadyAppliedRule);
+ $rules->push($rule);
+
+ $result = $this->breakTie($rules);
+
+ if ($result->id == $rule->id) {
+ return true;
+ } else {
+ return false;
+ }
+ } else {
+ return true;
+ }
+ } else {
+ // this case will work when non couponable rule is applied and another non couponable rule is created
+ // again break tie
+ $rules = collect();
+
+ $alreadyAppliedRule = $alreadyApplied->first()->cart_rule;
+ $alreadyAppliedRule->impact = $this->calculateImpact($alreadyAppliedRule);
+
+ $rule->impact = $this->calculateImpact($alreadyAppliedRule);
+
+ $rules->push($alreadyAppliedRule);
+ $rules->push($rule);
+
+ $result = $this->breakTie($rules);
+
+ if ($result) {
+ if ($result->id != $rule->id) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
+ } else {
+ return true;
+ }
+ }
+
+ /**
+ * To return cart rule which has the max impact
+ *
+ * @param Collection $rules
+ *
+ * @return Collection $rule
+ */
+ public function findMaxImpact($rules)
+ {
+ $maxImpact = collect();
+
+ $maxDiscount = 0;
+
+ if ($rules->count()) {
+ $maxDiscount = $rules->max('impact.discount');
+
+ foreach ($rules as $rule) {
+ if ($rule->impact->discount == $maxDiscount) {
+ $maxImpact = $maxImpact->push($rule);
+ }
+ }
+ } else {
+ return collect();
+ }
+
+ return $maxImpact;
+ }
+
+ /**
+ * To calculate the impact of the rule
+ *
+ * @return collection
+ */
+ public function calculateImpact($rule)
+ {
+ $impact = $this->getActionInstance($rule);
+
+ $outcome = $impact->calculate($rule);
+
+ return $outcome;
+ }
+
+ /**
+ * Return the instance of the related rule's action type
+ *
+ * @param CartRule $rule
+ *
+ * @return Object
+ */
+ public function getActionInstance($rule)
+ {
+ $actionType = new $this->rules['cart'][$rule->action_type];
+
+ return $actionType;
+ }
+
+ /**
+ * Checks whether rules is getting applied on current cart instance or not
+ *
+ * @param CartRule $rule
+ *
+ * @return Boolean
+ */
public function checkApplicability($rule)
{
$cart = \Cart::getCart();
$timeBased = false;
+ $channelBased = false;
+
// time based constraints
if ($rule->starts_from != null && $rule->ends_till == null) {
if (Carbon::parse($rule->starts_from) < now()) {
@@ -71,8 +343,6 @@ abstract class Discount
$timeBased = true;
}
- $channelBased = false;
-
// channel based constraints
foreach ($rule->channels as $channel) {
if ($channel->channel_id == core()->getCurrentChannel()->id) {
@@ -116,8 +386,28 @@ abstract class Discount
}
}
- if ($timeBased && $channelBased && $customerGroupBased && $conditionsBased) {
- return true;
+ $partialMatch = 0;
+
+ if ($rule->uses_attribute_conditions) {
+ $productIDs = explode(',', $rule->product_ids);
+
+ foreach ($productIDs as $productID) {
+ foreach ($cart->items as $item) {
+ if ($item->product_id == $productID) {
+ $partialMatch = 1;
+ }
+ }
+ }
+ }
+
+ if ($channelBased && $customerGroupBased && $timeBased && $conditionsBased) {
+ if ($rule->uses_attribute_conditions == 1 && $partialMatch) {
+ return true;
+ } else if ($rule->uses_attribute_conditions == 0) {
+ return true;
+ } else {
+ return false;
+ }
} else {
return false;
}
@@ -126,103 +416,43 @@ abstract class Discount
/**
* Save the rule in the CartRule for current cart instance
*
- * @return boolean
+ * @param CartRule $rule
+ *
+ * @return Boolean
*/
public function save($rule)
{
$cart = \Cart::getCart();
- // Create or update
- $existingRule = $this->cartRuleCart->findWhere([
+ $alreadyApplied = $this->cartRuleCart->findWhere([
'cart_id' => $cart->id
]);
- if ($rule->use_coupon) {
- $this->resetShipping($cart);
- }
-
- if (count($existingRule)) {
- if ($existingRule->first()->cart_rule_id != $rule->id) {
- $existingRule->first()->update([
- 'cart_rule_id' => $rule->id
- ]);
-
- $this->clearDiscount();
-
- $this->updateCartItemAndCart($rule);
-
- if ($rule->use_coupon) {
- $this->checkOnShipping($cart);
- }
-
- return true;
- } else {
- // $this->checkOnShipping($cart);
- }
+ if ($alreadyApplied->count()) {
+ $result = $alreadyApplied->first()->update([
+ 'cart_rule_id' => $rule->id
+ ]);
} else {
- $this->cartRuleCart->create([
+ $result = $this->cartRuleCart->create([
'cart_id' => $cart->id,
'cart_rule_id' => $rule->id
]);
+ }
- $this->clearDiscount();
-
- $this->updateCartItemAndCart($rule);
-
- if ($rule->use_coupon) {
- $this->checkOnShipping($cart);
- }
-
+ if ($result) {
return true;
- }
-
- return false;
- }
-
- /**
- * Checks whether rule is getting applied on shipping or not
- */
- public function checkOnShipping($cart)
- {
- if (! isset($cart->selected_shipping_rate)) {
- return false;
- }
-
- $shippingRate = config('carriers')[$cart->selected_shipping_rate->carrier]['class'];
-
- $actualShippingRate = new $shippingRate;
- $actualShippingRate = $actualShippingRate->calculate();
- $actualShippingPrice = $actualShippingRate->price;
- $actualShippingBasePrice = $actualShippingRate->base_price;
-
- $alreadyAppliedCartRuleCart = $this->cartRuleCart->findWhere([
- 'cart_id' => $cart->id
- ]);
-
- if (count($alreadyAppliedCartRuleCart)) {
- $this->resetShipping($cart);
-
- $alreadyAppliedRule = $alreadyAppliedCartRuleCart->first()->cart_rule;
-
- $cartShippingRate = $cart->selected_shipping_rate;
-
- if (isset($cartShippingRate)) {
- if ($cartShippingRate->base_price < $actualShippingBasePrice) {
- return false;
- } else {
- $this->applyOnShipping($alreadyAppliedRule, $cart);
- }
- } else {
- $this->applyOnShipping($alreadyAppliedRule, $cart);
- }
} else {
- $this->resetShipping($cart);
+ return false;
}
}
/**
* Apply on shipping
*
+ * @param CartRule $apploedRule
+ *
+ * @param Cart $cart
+ *
* @return void
*/
public function applyOnShipping($appliedRule, $cart)
@@ -257,7 +487,9 @@ abstract class Discount
/**
* Resets the shipping for the current items in the cart
*
- * @return void
+ * @param Cart $cart
+ *
+ * @return Void
*/
public function resetShipping($cart)
{
@@ -268,6 +500,17 @@ abstract class Discount
$actualShippingRate = new $shippingRate;
$actualShippingRate = $actualShippingRate->calculate();
+
+ if (is_array($actualShippingRate)) {
+ foreach($actualShippingRate as $actualRate) {
+ if ($actualRate->method == $cart->selected_shipping_rate->method) {
+ $actualShippingRate = $actualRate;
+
+ break;
+ }
+ }
+ }
+
$actualShippingPrice = $actualShippingRate->price;
$actualShippingBasePrice = $actualShippingRate->base_price;
$cartShippingRate = $cart->selected_shipping_rate;
@@ -279,10 +522,61 @@ abstract class Discount
}
}
+ /**
+ * Update discount for least worth item
+ *
+ * @param CartRule $rule
+ *
+ * @return Boolean
+ */
+ public function updateCartItemAndCart($rule)
+ {
+ $cart = Cart::getCart();
+
+ $itemImpacts = $rule->impact;
+
+ foreach ($itemImpacts as $itemImpact) {
+ $item = $this->cartItem->findOneWhere(['id' => $itemImpact['item_id']]);
+
+ $item->update([
+ 'discount_amount' => core()->convertPrice($itemImpact['discount'], $cart->cart_currency_code),
+ 'base_discount_amount' => $itemImpact['discount']
+ ]);
+
+ if ($rule->action_type == 'percent_of_product') {
+ $item->update([
+ 'discount_percent' => $rule->discount_amount
+ ]);
+ }
+
+ if ($rule->use_coupon) {
+ $coupon = $rule->coupons->code;
+
+ $item->update([
+ 'coupon_code' => $coupon
+ ]);
+ }
+ }
+
+ if ($rule->use_coupon) {
+ $cart->update([
+ 'coupon_code' => $rule->coupons->code
+ ]);
+ }
+
+ // if ($rule->free_shipping || $rule->apply_on_shipping) {
+ // $this->applyOnShipping($rule);
+ // }
+
+ Cart::collectTotals();
+
+ return true;
+ }
+
/**
* Removes any cart rule from the current cart instance
*
- * @return void
+ * @return Boolean
*/
public function clearDiscount()
{
@@ -290,7 +584,8 @@ abstract class Discount
$cartItems = $cart->items;
- foreach($cartItems as $item) {
+ // remove all the discount properties from items
+ foreach ($cartItems as $item) {
$item->update([
'coupon_code' => NULL,
'discount_percent' => 0,
@@ -299,144 +594,68 @@ abstract class Discount
]);
}
+ // remove all the discount properties from cart
$cart->update([
'coupon_code' => NULL,
'discount_amount' => 0,
'base_discount_amount' => 0
]);
- return true;
- }
+ // find & remove cart rule from cart rule cart resource
+ $cartRuleCart = $this->cartRuleCart->findWhere([
+ 'cart_id' => $cart->id
+ ]);
- /**
- * Update discount for least worth item
- */
- public function updateCartItemAndCart($rule)
- {
- $cart = Cart::getCart();
-
- $leastWorthItem = $this->leastWorthItem();
-
- $actionInstance = new $this->rules[$rule->action_type];
-
- $impact = $actionInstance->calculate($rule, $leastWorthItem, $cart);
-
- foreach ($cart->items as $item) {
- if ($item->id == $leastWorthItem['id']) {
- if ($rule->action_type == 'percent_of_product') {
- $item->update([
- 'discount_percent' => $rule->discount_amount,
- 'discount_amount' => core()->convertPrice($impact['discount'], $cart->cart_currency_code),
- 'base_discount_amount' => $impact['discount']
- ]);
- } else {
- $item->update([
- 'discount_amount' => core()->convertPrice($impact['discount'], $cart->cart_currency_code),
- 'base_discount_amount' => $impact['discount']
- ]);
- }
-
- // save coupon if rule use it
- if ($rule->use_coupon) {
- $coupon = $rule->coupons->code;
-
- $item->update([
- 'coupon_code' => $coupon
- ]);
-
- $cart->update([
- 'coupon_code' => $coupon
- ]);
- }
-
- break;
- }
- }
-
- Cart::collectTotals();
+ $cartRuleCart->first()->delete();
return true;
}
- /**
- * To find the least worth item in current cart instance
- *
- * @return array
- */
- public function leastWorthItem()
- {
- $cart = Cart::getCart();
-
- $leastValue = 999999999999;
- $leastWorthItem = [];
-
- foreach ($cart->items as $item) {
- if ($item->price < $leastValue) {
- $leastValue = $item->price;
- $leastWorthItem = [
- 'id' => $item->id,
- 'price' => $item->price,
- 'base_price' => $item->base_price,
- 'quantity' => $item->quantity
- ];
- }
- }
-
- return $leastWorthItem;
- }
-
- /**
- * To find the max worth item in current cart instance
- *
- * @return array
- */
- public function maxWorthItem()
- {
- $cart = Cart::getCart();
-
- $maxValue = 0;
- $maxWorthItem = [];
-
- foreach ($cart->items as $item) {
- if ($item->base_total > $maxValue) {
- $maxValue = $item->total;
-
- $maxWorthItem = [
- 'id' => $item->id,
- 'price' => $item->price,
- 'base_price' => $item->base_price,
- 'quantity' => $item->quantity
- ];
- }
- }
-
- return $maxWorthItem;
- }
-
/**
* Validate the currently applied cart rule
*
- * @return boolean
+ * @param CartRule $rule
+ *
+ * @return Boolean
*/
public function validateRule($rule)
{
$applicability = $this->checkApplicability($rule);
- if ($applicability) {
- if ($rule->status) {
- return true;
- } else {
- return false;
- }
+ if ($applicability && $rule->status) {
+ return true;
} else {
return false;
}
}
+ /**
+ * Will validate already applied rule
+ *
+ * @return Void
+ */
+ public function validateIfAlreadyApplied()
+ {
+ $cart = \Cart::getCart();
+
+ $alreadyAppliedRule = $this->cartRuleCart->findWhere([
+ 'cart_id' => $cart->id
+ ]);
+
+ if ($alreadyAppliedRule->count()) {
+ $alreadyAppliedRule = $alreadyAppliedRule->first()->cart_rule;
+
+ $result = $this->validateRule($alreadyAppliedRule);
+
+ if (! $result)
+ $this->clearDiscount();
+ }
+ }
+
/**
* Retreives all the payment methods from application config
*
- * @return array
+ * @return Array
*/
public function getPaymentMethods()
{
@@ -461,7 +680,11 @@ abstract class Discount
* Checks the rule against the current cart instance whether rule conditions are applicable
* or not
*
- * @return boolean
+ * @param Array $conditions
+ *
+ * @param Cart $cart
+ *
+ * @return Boolean
*/
protected function testIfAllConditionAreTrue($conditions, $cart)
{
@@ -561,13 +784,13 @@ abstract class Discount
break;
}
} else if ($test_condition == '{}') {
- if (! str_contains($actual_value, $test_value)) {
+ if (! str_contains($test_value, $actual_value)) {
$result = false;
break;
}
} else if ($test_condition == '!{}') {
- if (str_contains($actual_value, $test_value)) {
+ if (str_contains($test_value, $actual_value)) {
$result = false;
break;
@@ -583,7 +806,11 @@ abstract class Discount
* Checks the rule against the current cart instance whether rule conditions are applicable
* or not
*
- * @return boolean
+ * @param Array $conditions
+ *
+ * @param Cart $cart
+ *
+ * @return Boolean
*/
protected function testIfAnyConditionIsTrue($conditions, $cart)
{
@@ -683,13 +910,13 @@ abstract class Discount
break;
}
} else if ($test_condition == '{}') {
- if (! str_contains($actual_value, $test_value)) {
+ if (str_contains($test_value, $actual_value)) {
$result = true;
break;
}
} else if ($test_condition == '!{}') {
- if (str_contains($actual_value, $test_value)) {
+ if (! str_contains($test_value, $actual_value)) {
$result = true;
break;
diff --git a/packages/Webkul/Discount/src/Helpers/Cart/NonCouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/Cart/NonCouponAbleRule.php
new file mode 100644
index 000000000..76d4cf0f4
--- /dev/null
+++ b/packages/Webkul/Discount/src/Helpers/Cart/NonCouponAbleRule.php
@@ -0,0 +1,46 @@
+validateIfAlreadyApplied();
+
+ $rules = $this->getApplicableRules();
+
+ if ($rules->count() == 1) {
+ $rule = $rules->first();
+
+ $canApply = $this->canApply($rule);
+
+ if ($canApply) {
+ $this->save($rule);
+
+ $this->updateCartItemAndCart($rule);
+ }
+ } else if ($rules->count() > 1) {
+ $rule = $this->breakTie($rules);
+
+ $canApply = $this->canApply($rule);
+
+ if ($canApply) {
+ $this->save($rule);
+
+ $this->updateCartItemAndCart($rule);
+ }
+ } else {
+ return false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/ValidatesDiscount.php b/packages/Webkul/Discount/src/Helpers/Cart/ValidatesDiscount.php
similarity index 71%
rename from packages/Webkul/Discount/src/Helpers/ValidatesDiscount.php
rename to packages/Webkul/Discount/src/Helpers/Cart/ValidatesDiscount.php
index 84e472b40..ef0681497 100644
--- a/packages/Webkul/Discount/src/Helpers/ValidatesDiscount.php
+++ b/packages/Webkul/Discount/src/Helpers/Cart/ValidatesDiscount.php
@@ -1,8 +1,8 @@
cartRuleCart->findWhere([
- 'cart_id' => $cart->id
- ]);
-
- if ($appliedRule->count()) {
- $appliedRule = $appliedRule->first()->cart_rule;
-
- if ($appliedRule->status == 1) {
- $applicability = $this->checkApplicability($appliedRule);
-
- if (! $applicability) {
- return $this->remove();
- }
- } else {
- return $this->remove();
- }
- }
-
- return false;
+ $this->validateIfAlreadyApplied();
}
/**
diff --git a/packages/Webkul/Discount/src/Helpers/Catalog/Apply.php b/packages/Webkul/Discount/src/Helpers/Catalog/Apply.php
new file mode 100644
index 000000000..69af195c5
--- /dev/null
+++ b/packages/Webkul/Discount/src/Helpers/Catalog/Apply.php
@@ -0,0 +1,240 @@
+ @prashant-webkul
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class Apply extends Sale
+{
+ /**
+ * To hold the catalog rule repository instance
+ */
+ protected $catalogRule;
+
+ /**
+ * To maintain the list of deceased rules and remove their records if present
+ */
+ protected $activeRules;
+
+ /**
+ * To maintain the list of deceased rules and remove their records if present
+ */
+ protected $deceased;
+
+ /**
+ * Holds convertXToProductId instance
+ */
+ protected $convertX;
+
+ /**
+ * Hold catalog rule products repository instance
+ */
+ protected $catalogRuleProduct;
+
+ /**
+ * Hold catalog rule products price repository instance
+ */
+ protected $catalogRuleProductPrice;
+
+ /**
+ * To hold the rule classes
+ */
+ protected $rules;
+
+ /**
+ * @param CatalogRule $catalogRule
+ */
+ public function __construct(
+ CatalogRule $catalogRule,
+ ConvertX $convertX,
+ CatalogRuleProducts $catalogRuleProduct,
+ CatalogRuleProductsPrice $catalogRuleProductPrice
+ ) {
+ $this->catalogRule = $catalogRule;
+
+ $this->convertX = $convertX;
+
+ $this->catalogRuleProduct = $catalogRuleProduct;
+
+ $this->catalogRuleProductPrice = $catalogRuleProductPrice;
+
+ $this->active = collect();
+
+ $this->activeRules = collect();
+
+ $this->deceased = collect();
+
+ $this->rules = config('discount-rules.catalog');
+ }
+
+ /**
+ * To apply the new catalog rules and sync previous rules changes,
+ */
+ public function apply()
+ {
+ $rules = $this->catalogRule->all();
+
+ foreach ($rules as $rule) {
+ $validated = $this->checkApplicability($rule);
+
+ if ($validated) {
+ $this->active->push($rule->id);
+
+ $this->activeRules->push($rule);
+ } else {
+ $this->deceased->push($rule->id);
+
+ // Job execution for deceased rules
+ }
+ }
+
+ if ($this->active->count()) {
+ $productIDs = array();
+ $temp = collect();
+
+ foreach ($this->activeRules as $rule) {
+ $productIDs = $this->getProductIds($rule);
+
+ $productIDs = $this->expandProducts($productIDs);
+
+ $result = $this->setSale($rule, $productIDs);
+ }
+
+ dd($result, 'processing done');
+ } else {
+ // handle the deceased rules here
+ dd($this->deceased);
+ }
+ }
+
+ /**
+ * To set the sale price for products falling catalog rule criteria
+ *
+ * @param CatalogRule $catalogRule
+ *
+ * @return Void
+ */
+ public function setSale($rule, $productIDs)
+ {
+ if (is_array($productIDs)) {
+ // apply on selected products
+ foreach ($productIDs as $productID) {
+ // catalog rule product resource is updated here
+ $this->catalogRuleProduct->createOrUpdate($rule, $productID);
+
+ // catalog rule product price resource is updated here
+ $this->catalogRuleProductPrice->createOrUpdate($rule, $productID);
+ }
+ } else if ($productIDs == '*') {
+ $this->catalogRuleProduct->createOrUpdate($rule, $productIDs);
+
+ $this->catalogRuleProductPrice->createOrUpdate($rule, $productIDs);
+ }
+ }
+
+ /**
+ * To expand the productIDs of configurable products
+ *
+ * @param Array $productIDs
+ *
+ * @return Array
+ */
+ protected function expandProducts($productIDs)
+ {
+ $products = app('Webkul\Product\Repositories\ProductRepository');
+
+ $newProductIDs = collect();
+
+ foreach ($productIDs as $productID) {
+ $product = $products->find($productID);
+
+ if ($product->type == 'configurable') {
+ $variants = $product->variants;
+
+ foreach($variants as $variant) {
+ $newProductIDs->push($variant->id);
+ }
+ } else {
+ $newProductIDs->push($productID);
+ }
+ }
+
+ if ($newProductIDs->count()) {
+ return $newProductIDs->toArray();
+ } else {
+ return [];
+ }
+ }
+
+ /**
+ * To break tie between two rules
+ *
+ * @param Integer $previousRuleID
+ * @param Integer $newRuleID
+ *
+ * @return String $id
+ */
+ public function breakTie($previousRuleID, $newRuleID)
+ {
+ $oldRule = $this->catalogRule->find($previousRuleID);
+
+ $newRule = $this->catalogRule->find($newRuleID);
+
+ dd($oldRule->name, $newRule->name);
+ }
+
+ /**
+ * To declutter the catalog rules that are either inactive or deleted
+ *
+ * @return Boolean
+ */
+ public function deClutter()
+ {
+ $rules = $this->catalogRule->all();
+
+ foreach ($rules as $rule) {
+ $validated = $this->checkApplicability($rule);
+
+ if (! $validated) {
+ $this->deceased->push($rule->id);
+ }
+ }
+
+ if (count($this->deceased)) {
+ $count = 0;
+
+ foreach ($this->deceased as $deceased) {
+ $cartRuleProducts = $this->catalogRuleProduct->findWhere([
+ 'catalog_rule_id' => $deceased
+ ]);
+
+ $cartRuleProductsPrice = $this->catalogRuleProductPrice->findWhere([
+ 'catalog_rule_id' => $deceased
+ ]);
+
+ // obvious logic for removing entries as entries in both storage needs to be exactly equal for a product
+ foreach ($cartRuleProducts as $cartRuleProduct) {
+ // deletes cartRuleProducts resource
+ $cartRuleProduct->delete();
+
+ // deletes cartRuleProductsPrice resource
+ $cartRuleProductsPrice->delete();
+ }
+ }
+
+ return true;
+ } else {
+ return false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/Catalog/ConvertXToProductId.php b/packages/Webkul/Discount/src/Helpers/Catalog/ConvertXToProductId.php
new file mode 100644
index 000000000..4c000f893
--- /dev/null
+++ b/packages/Webkul/Discount/src/Helpers/Catalog/ConvertXToProductId.php
@@ -0,0 +1,278 @@
+ @prashant-webkul
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class ConvertXToProductId
+{
+ /**
+ * CategoryRepository instance
+ */
+ protected $category;
+
+ /**
+ * AttributeRepository instance
+ */
+ protected $attribute;
+
+ /**
+ * ProductRepository instance
+ */
+ protected $product;
+
+ /**
+ * AttributeOptionRepository instance
+ */
+ protected $attributeOption;
+
+ /**
+ * CatalogRuleRepository instance
+ */
+ protected $catalogRule;
+
+ /**
+ * ProductAttributeValueRepository instance
+ */
+ protected $pav;
+
+ /**
+ * Condition symbols for matching the criteria with attributes selected
+ */
+ protected $symbols;
+
+ public function __construct(
+ Category $category,
+ Attribute $attribute,
+ Product $product,
+ AttributeOption $attributeOption,
+ CatalogRule $catalogRule,
+ ProductAttributeValue $pav
+ ) {
+ $this->category = $category;
+
+ $this->attribute = $attribute;
+
+ $this->product = $product;
+
+ $this->attributeOption = $attributeOption;
+
+ $this->catalogRule = $catalogRule;
+
+ $this->pav = $pav;
+
+ $this->conditionSymbols = config('pricerules.cart.conditions.symbols');
+ }
+
+ public function convertX($attribute_conditions)
+ {
+ $attributeConditions = json_decode(json_decode($attribute_conditions));
+
+ $categoryValues = $attributeConditions->categories;
+
+ $attributeValues = $attributeConditions->attributes;
+
+ if (!isset($categoryValues) && !isset($attributeValues)) {
+ return false;
+ }
+
+ $categoryResult = collect();
+
+ if (isset($categoryValues) && count($categoryValues)) {
+ $categoryResult = $this->convertFromCategories($categoryValues);
+ }
+
+ $attributeResult = collect();
+ if (isset($attributeValues) && count($attributeValues)) {
+ $attributeResult = $this->convertFromAttributes($attributeValues);
+ }
+
+ // now call the function that will find all the unique product ids
+ $productIDs = $this->findAllUniqueIds($attributeResult, $categoryResult);
+
+ return $productIDs;
+ }
+
+ /**
+ * This method will return product id from the attribute and attribute option params
+ *
+ * @return array
+ */
+ public function convertFromAttributes($attributeOptions)
+ {
+ $products = collect();
+
+ foreach ($attributeOptions as $attributeOption) {
+ $selectedOptions = $attributeOption->value;
+
+ if ($attributeOption->type == 'select' || $attributeOption->type == 'multiselect') {
+ $attribute = $this->attribute->findWhere([
+ 'code' => $attributeOption->attribute
+ ]);
+
+ $attributeOptions = $attribute->first()->options;
+
+ $selectedAttributeOptions = collect();
+
+ foreach ($attributeOptions as $attributeOption) {
+ foreach ($selectedOptions as $key => $value) {
+ if ($attributeOption->id == $value) {
+ $selectedAttributeOptions->push($attributeOption);
+ }
+ }
+ }
+
+ foreach ($selectedAttributeOptions as $selectedAttributeOption) {
+ $typeColumn = $this->pav::$attributeTypeFields[$attribute->first()->type];
+
+ $pavResults = $this->pav->where(
+ "{$typeColumn}",
+ $selectedAttributeOption->id
+ )->get();
+
+ foreach ($pavResults as $pavResult) {
+ if ($pavResult->product->type == 'simple')
+ $products->push($pavResult->product);
+ }
+ }
+ } else {
+ $attribute = $this->attribute->findWhere([
+ 'code' => $attributeOption->attribute
+ ]);
+
+ $pavValues = $attribute->first();
+
+ $selectedAttributeValues = collect();
+
+ if ($attributeOption->attribute == 'sku') {
+ $testValue = $attributeOption->value;
+ $testCondition = $attributeOption->condition;
+
+ if ($testCondition == '{}') {
+ $foundProducts = $this->product->findWhere([
+ ['sku', 'like', '%' . $testValue . '%'],
+ ['type', '!=', 'configurable']
+ ])->flatten()->all();
+ } else if ($testCondition == '!{}') {
+ $foundProducts = $this->product->findWhere([
+ ['sku', 'not like', '%' . $testValue . '%'],
+ ['type', '!=', 'configurable']
+ ])->flatten()->all();
+ } else if ($testCondition == '=') {
+ $foundProducts = $this->product->findWhere([
+ ['sku', '=', '%' . $testValue . '%'],
+ ['type', '!=', 'configurable']
+ ])->flatten()->all();
+ }
+ }
+
+ foreach ($foundProducts as $foundProduct) {
+ $products->push($foundProduct);
+ }
+ }
+ }
+
+ return $products;
+ }
+
+ /**
+ * This method will return product id from the attribute and attribute option params
+ *
+ * @param Collection $categories
+ *
+ * @return array
+ */
+ public function convertFromCategories($categories)
+ {
+ $products = collect();
+
+ foreach ($categories as $category) {
+ $data = $this->getAll($category->id);
+
+ if ($data->count()) {
+ $products->push($data);
+
+ unset($data);
+ }
+ }
+
+ return $products->flatten()->all();
+ }
+
+ /**
+ * This method will remove the duplicates from the array and merge all the items into single array
+ *
+ * @param array
+ *
+ * @return array
+ */
+ public function findAllUniqueIds(...$data)
+ {
+ $attributeResult = $data[0] ?? collect();
+ $categoryResult = $data[1] ?? collect();
+
+ // find matched attribute options product ids
+ $mergedCollection = $attributeResult->merge($categoryResult);
+
+ $productIDs = collect();
+ foreach ($mergedCollection as $merged) {
+ $productIDs->push($merged->id);
+ }
+
+ // find all the unique product ids
+ $productIDs = $productIDs->unique();
+
+ return $productIDs->flatten()->all();
+ }
+
+ /**
+ * To get all product ids lying in the criteria
+ *
+ * @param integer $categoryId
+ *
+ * @return Collection
+ */
+ public function getAll($categoryId = null)
+ {
+
+ $results = app('Webkul\Product\Repositories\ProductFlatRepository')->scopeQuery(function ($query) use ($categoryId) {
+
+ $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+
+ $locale = request()->get('locale') ?: app()->getLocale();
+
+ $qb = $query->distinct()
+ ->select('products.id')
+ ->leftJoin('products', 'product_flat.product_id', '=', 'products.id')
+ ->leftJoin('product_categories', 'products.id', '=', 'product_categories.product_id')
+ ->whereNotNull('product_flat.url_key');
+
+ if ($categoryId) {
+ $qb->where('product_categories.category_id', $categoryId);
+ }
+
+ $qb->where('product_flat.status', 1);
+
+ $qb->where('product_flat.visible_individually', 1);
+
+ $queryBuilder = $qb->leftJoin('product_flat as flat_variants', function ($qb) use ($channel, $locale) {
+ $qb->on('product_flat.id', '=', 'flat_variants.parent_id');
+ });
+
+ return $qb->groupBy('product_flat.id');
+ })->get();
+
+ return $results;
+ }
+}
diff --git a/packages/Webkul/Discount/src/Helpers/Catalog/Sale.php b/packages/Webkul/Discount/src/Helpers/Catalog/Sale.php
new file mode 100644
index 000000000..93087ec4b
--- /dev/null
+++ b/packages/Webkul/Discount/src/Helpers/Catalog/Sale.php
@@ -0,0 +1,85 @@
+ @prashant-webkul
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+abstract class Sale
+{
+ abstract function apply();
+
+ /**
+ * To validate rule
+ *
+ * @param CatalogRule $rule
+ *
+ * @return Boolean
+ */
+ public function checkApplicability($rule)
+ {
+ $cart = \Cart::getCart();
+
+ $timeBased = false;
+
+ $status = false;
+
+ // time based constraints
+ if ($rule->starts_from != null && $rule->ends_till == null) {
+ if (Carbon::parse($rule->starts_from) < now()) {
+ $timeBased = true;
+ }
+ } else if ($rule->starts_from == null && $rule->ends_till != null) {
+ if (Carbon::parse($rule->ends_till) > now()) {
+ $timeBased = true;
+ }
+ } else if ($rule->starts_from != null && $rule->ends_till != null) {
+ if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) {
+ $timeBased = true;
+ }
+ } else {
+ $timeBased = true;
+ }
+
+ if ($rule->status) {
+ $status = true;
+ }
+
+ if ($timeBased && $status) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Function to maintain products and catalog rule
+ *
+ * @param CatalogRule $rule
+ *
+ * @return String|NULL
+ */
+ public function getProductIds($rule)
+ {
+ if ($rule->conditions) {
+ $conditions = $rule->conditions;
+
+ $productIDs = $this->convertX->convertX($rule->conditions);
+ } else {
+ $productIDs = '*';
+ }
+
+ return $productIDs;
+ }
+
+ /**
+ * Function to maintain products, catalog rule, price
+ */
+
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/Catalog/SyncPreviousRules.php b/packages/Webkul/Discount/src/Helpers/Catalog/SyncPreviousRules.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/Webkul/Discount/src/Helpers/CouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/CouponAbleRule.php
deleted file mode 100644
index 11ab89d40..000000000
--- a/packages/Webkul/Discount/src/Helpers/CouponAbleRule.php
+++ /dev/null
@@ -1,165 +0,0 @@
-cartRule->findWhere([
- 'use_coupon' => 1,
- 'status' => 1
- ]);
-
- $applicableRule = null;
-
- foreach($rules as $rule) {
- if ($rule->use_coupon && ($rule->coupons->code == $code)) {
- $applicableRule = $rule;
-
- break;
- }
- }
-
- if (! isset($applicableRule)) {
- return false;
- }
-
- $applicability = $this->checkApplicability($applicableRule);
-
- if ($applicability) {
- $item = $this->leastWorthItem();
-
- $actionInstance = new $this->rules[$applicableRule->action_type];
-
- $impact = $actionInstance->calculate($applicableRule, $item, $cart);
-
- if ($impact['discount'] == 0) {
- return false;
- }
-
- // avoid applying the same rule
- $ifAlreadyApplied = $this->cartRuleCart->findWhere([
- 'cart_id' => $cart->id,
- 'cart_rule_id' => $applicableRule->id
- ]);
-
- if ($ifAlreadyApplied->count() == 1) {
- // can give a message that coupon is already applied
- return false;
- }
-
- // if the rule ain't same
- $ifAlreadyApplied = $this->cartRuleCart->findWhere([
- 'cart_id' => $cart->id,
- ]);
-
- if ($ifAlreadyApplied->count() == 0) {
- $this->save($applicableRule);
-
- return $impact;
- }
-
- // the only case where a non couponable rule defeats couponable rule
- if ($ifAlreadyApplied->first()->cart_rule->use_coupon == 0 && $ifAlreadyApplied->first()->cart_rule->end_other_rules == 1) {
- return false;
- }
-
- if ($ifAlreadyApplied->first()->cart_rule->use_coupon == 1 && $ifAlreadyApplied->first()->cart_rule->end_other_rules == 1) {
- return false;
- }
-
- if ($ifAlreadyApplied->first()->cart_rule->use_coupon == 1) {
- $alreadyAppliedRule = $ifAlreadyApplied->first()->cart_rule;
-
- if ($alreadyAppliedRule->priority < $applicableRule->priority) {
- return false;
- } else if ($alreadyAppliedRule->priority == $applicableRule->priority) {
- $actionInstance = new $this->rules[$alreadyAppliedRule->action_type];
-
- $alreadyAppliedRuleImpact = $actionInstance->calculate($alreadyAppliedRule, $item, $cart);
-
- if ($alreadyAppliedRule['discount'] > $impact['discount']) {
- return false;
- } else if ($alreadyAppliedRule['discount'] < $impact['discount']) {
- $this->save($applicableRule);
-
- return $impact;
- } else {
- // least id case
- if ($applicableRule->id < $alreadyAppliedRule->id) {
- $this->save($applicableRule);
-
- return $impact;
- }
- }
- } else {
- $this->save($applicableRule);
-
- return $impact;
- }
- } else {
- $this->save($applicableRule);
-
- return $impact;
- }
- } else {
- return false;
- }
- }
-
- /**
- * Removes the already applied coupon on the current cart instance
- *
- * @return boolean
- */
- public function remove()
- {
- $cart = Cart::getCart();
-
- $existingRule = $this->cartRuleCart->findWhere([
- 'cart_id' => $cart->id
- ]);
-
- if ($existingRule->count()) {
- $existingRule->first()->delete();
-
- $this->resetShipping($cart);
-
- foreach ($cart->items as $item) {
- if ($item->discount_amount > 0) {
- $item->update([
- 'discount_amount' => 0,
- 'base_discount_amount' => 0,
- 'discount_percent' => 0,
- 'coupon_code' => NULL
- ]);
- }
- }
-
- $cart->update([
- 'coupon_code' => NULL,
- 'discount_amount' => 0,
- 'base_discount_amount' => 0
- ]);
-
- Cart::collectTotals();
-
- return true;
- } else {
- return false;
- }
- }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/FindProducts.php b/packages/Webkul/Discount/src/Helpers/FindProducts.php
deleted file mode 100644
index fffa421cd..000000000
--- a/packages/Webkul/Discount/src/Helpers/FindProducts.php
+++ /dev/null
@@ -1,72 +0,0 @@
-product = $product;
-
- $this->attribute = $attribute;
-
- $this->productFlat = $productFlat;
-
- $this->locale = $locale;
- }
-
- public function findByConditions($conditions)
- {
- dd($conditions);
- /**
- * Empty collection instance to hold all the products that satisfy the conditions
- */
- $products = array();
-
- foreach ($conditions as $condition) {
- $attribute = $this->attribute->findOneByField('code', $condition->attribute);
- dump($attribute->type);
- if ($condition->type == 'select' || $condition->type == 'multiselect') {
- $values = $condition->value;
- $attributeValues = array();
-
- foreach ($condition->options as $option) {
- foreach ($values as $value) {
- if ($value == $option->id) {
- array_push($attributeValues, $option);
- }
- }
- }
-
- $defaultChannelCode = core()->getDefaultChannel()->code;
- $defaultLocaleCode = $this->locale->find(core()->getDefaultChannel()->default_locale_id)->code;
-
- foreach ($attributeValues as $attributeValue) {
- $productFound = $this->productFlat->findByField([$attribute->code => $attributeValue->id, 'locale' => $defaultLocaleCode, 'channel' => $defaultChannelCode]);
-
- if ($productFound->count()) {
- array_push($products, $productFound->toArray());
- }
- }
- } else {
- }
- }
-
- dd(array_flatten($products, 1));
- }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php
deleted file mode 100644
index 831ae2902..000000000
--- a/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php
+++ /dev/null
@@ -1,203 +0,0 @@
-cartRule->findWhere([
- 'use_coupon' => 0,
- 'status' => 1
- ]);
-
- $alreadyAppliedCartRuleCart = $this->cartRuleCart->findWhere([
- 'cart_id' => $cart->id,
- ]);
-
- if (count($alreadyAppliedCartRuleCart)) {
- $alreadyAppliedRule = $alreadyAppliedCartRuleCart->first()->cart_rule;
-
- $validated = $this->validateRule($alreadyAppliedRule);
-
- if (! $validated) {
- // if the validation fails then the cart rule gets deleted from cart rule cart
- $alreadyAppliedCartRuleCart->first()->delete();
-
- $this->resetShipping($cart);
-
- // all discount is cleared fro mthe cart and cart items table
- $this->clearDiscount();
-
- return false;
- }
-
- if ($alreadyAppliedRule->use_coupon) {
- return false;
- }
- }
-
- // time based filter
- foreach($rules as $rule) {
- $applicability = $this->checkApplicability($rule);
-
- if ($applicability) {
- $item = $this->leastWorthItem();
-
- $actionInstance = new $this->rules[$rule->action_type];
-
- $impact = $actionInstance->calculate($rule, $item, $cart);
-
- if ($impact['discount'] > 0) {
- array_push($applicableRules, [
- 'rule' => $rule,
- 'impact' => $impact
- ]);
- }
-
- if (count($alreadyAppliedCartRuleCart)) {
- $alreadyAppliedRule = $alreadyAppliedCartRuleCart->first()->cart_rule;
-
- if ($alreadyAppliedRule->id == $rule->id) {
- if ($impact['discount'] == 0) {
- $alreadyAppliedCartRuleCart->first()->delete();
-
- // all discount is cleared from cart and cart items table
- $this->clearDiscount();
- }
- }
- }
- }
- }
-
- if (count($applicableRules) > 1) {
- // priority criteria
- $prioritySorted = array();
- $leastPriority = 999999999999;
-
- foreach ($applicableRules as $applicableRule) {
- if ($applicableRule['rule']->priority <= $leastPriority) {
- $leastPriority = $applicableRule['rule']->priority;
- array_push($prioritySorted, $applicableRule);
- }
- }
-
- // end rule criteria with end rule
- $endRules = array();
-
- if (count($prioritySorted) > 1) {
- foreach ($prioritySorted as $prioritySortedRule) {
- if ($prioritySortedRule['rule']->end_other_rules) {
- array_push($endRules, $prioritySortedRule);
- }
- }
- } else {
- $this->save(array_first($prioritySorted)['rule']);
-
- return $prioritySorted;
- }
-
- // max impact criteria with end rule
- $maxImpacts = array();
-
- if (count($endRules)) {
- $this->endRuleActive = true;
-
- if (count($endRules) == 1) {
- $this->save(array_first($endRules)['rule']);
-
- return array_first($endRules)['impact'];
- }
-
- $maxImpact = 0;
-
- foreach ($endRules as $endRule) {
- if ($endRule['impact']['discount'] >= $maxImpact) {
- $maxImpact = $endRule['impact']['discount'];
-
- array_push($maxImpacts, $endRule);
- }
- }
-
- // oldest and max impact criteria
- $leastId = 999999999999;
- $leastIdImpactIndex = 0;
-
- if (count($maxImpacts) > 1) {
- foreach ($maxImpacts as $index => $maxImpactRule) {
- if ($maxImpactRule['rule']->id < $leastId) {
- $leastId = $maxImpactRule['rule']->id;
-
- $leastIdImpactIndex = $index;
- }
- }
-
- $this->save($maxImpacts[$leastIdImpactIndex]['rule']);
-
- return $maxImpacts[$leastIdImpactIndex];
- } else {
- $this->save(array_first($maxImpacts)['rule']);
-
- return $maxImpacts;
- }
- }
-
- if (count($prioritySorted) > 1) {
- $maxImpact = 0;
-
- foreach ($prioritySorted as $prioritySortedRule) {
- if ($prioritySortedRule['impact']['discount'] >= $maxImpact) {
- $maxImpact = $prioritySortedRule['impact']['discount'];
-
- array_push($maxImpacts, $prioritySortedRule);
- }
- }
-
- // oldest and max impact criteria
- $leastId = 999999999999;
- $leastIdImpactIndex = 0;
-
- if (count($maxImpacts) > 1) {
- foreach ($maxImpacts as $index => $maxImpactRule) {
- if ($maxImpactRule['rule']->id < $leastId) {
- $leastId = $maxImpactRule['rule']->id;
-
- $leastIdImpactIndex = $index;
- }
- }
-
- $this->save($maxImpacts[$leastIdImpactIndex]['rule']);
-
- return $maxImpacts[$leastIdImpactIndex];
- } else {
- $this->save(array_first($maxImpacts)['rule']);
-
- return array_first($applicableRules)['impact'];
- }
- } else {
- $this->save(array_first($prioritySorted)['rule']);
-
- return $prioritySorted;
- }
- } else if (count($applicableRules) == 1) {
- $this->save(array_first($applicableRules)['rule']);
-
- return array_first($applicableRules)['impact'];
- } else {
- return false;
- }
- }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
index 0529d4517..164b5e45e 100644
--- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
+++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
@@ -3,7 +3,9 @@
namespace Webkul\Discount\Http\Controllers;
use Webkul\Discount\Repositories\CartRuleRepository as CartRule;
-use Webkul\Checkout\Repositories\CartRepository as Cart;
+use Webkul\Category\Repositories\CategoryRepository as Category;
+use Webkul\Attribute\Repositories\AttributeRepository as Attribute;
+use Webkul\Discount\Helpers\Cart\ConvertXToProductId as ConvertX;
use Webkul\Discount\Repositories\CartRuleLabelsRepository as CartRuleLabels;
use Webkul\Discount\Repositories\CartRuleCouponsRepository as CartRuleCoupons;
@@ -40,15 +42,34 @@ class CartRuleController extends Controller
*/
protected $cartRuleCoupon;
+ /**
+ * To hold category repository instance
+ */
+ protected $category;
+
+ /**
+ * To hold attribute repository instance
+ */
+ protected $attribute;
+
/**
* To hold the cart repository instance
*/
protected $cart;
+ /**
+ * Convert X To Product ID.
+ *
+ */
+ protected $convertX;
+
public function __construct(
CartRule $cartRule,
CartRuleCoupons $cartRuleCoupon,
- CartRuleLabels $cartRuleLabel
+ CartRuleLabels $cartRuleLabel,
+ Attribute $attribute,
+ Category $category,
+ ConvertX $convertX
)
{
$this->_config = request('_config');
@@ -59,6 +80,12 @@ class CartRuleController extends Controller
$this->cartRuleLabel = $cartRuleLabel;
+ $this->attribute = $attribute;
+
+ $this->category = $category;
+
+ $this->convertX = $convertX;
+
$this->appliedConfig = config('pricerules.cart');
}
@@ -75,16 +102,18 @@ class CartRuleController extends Controller
*/
public function create()
{
- return view($this->_config['view'])->with('cart_rule', [$this->appliedConfig, [], $this->getStatesAndCountries()]);
+ return view($this->_config['view'])->with('cart_rule', [$this->appliedConfig, $this->category->getPartial(), $this->getStatesAndCountries(), $this->attribute->getPartial()]);
}
/**
+ * Stores the response from cart rule store page to datastore
+ *
* @return redirect
*/
public function store()
{
$validated = $this->validate(request(), [
- 'name' => 'required|string',
+ 'name' => 'required|string|unique:cart_rules,name',
'description' => 'string',
'customer_groups' => 'required|array',
'channels' => 'required|array',
@@ -95,7 +124,7 @@ class CartRuleController extends Controller
'action_type' => 'required|string',
'disc_amount' => 'required|numeric',
'disc_quantity' => 'numeric',
- 'disc_threshold' => 'numeric',
+ // 'disc_threshold' => 'numeric',
'free_shipping' => 'required|boolean',
'apply_to_shipping' => 'required|boolean',
'code' => 'string|required_if:auto_generation,0',
@@ -105,15 +134,12 @@ class CartRuleController extends Controller
$data = request()->all();
+ $attribute_conditions = $data['all_attributes'];
+ unset($data['all_attributes']);
+
// unset token
unset($data['_token']);
- // set usage limit
- $data['usage_limit'] = 0;
-
- // set per customer usage limit
- $data['per_customer'] = 0;
-
// check if starts_from is null
if ($data['starts_from'] == "") {
$data['starts_from'] = null;
@@ -147,19 +173,32 @@ class CartRuleController extends Controller
// prepare json object from actions
if (isset($data['disc_amount']) && $data['action_type'] == config('pricerules.cart.validations.2')) {
- $data['actions'] = [
- 'action_type' => $data['action_type'],
- 'disc_amount' => $data['disc_amount'],
- 'disc_threshold' => $data['disc_threshold']
- ];
-
- $data['disc_quantity'] = $data['disc_amount'];
- } else {
$data['actions'] = [
'action_type' => $data['action_type'],
'disc_amount' => $data['disc_amount'],
- 'disc_quantity' => $data['disc_quantity']
+ 'disc_threshold' => $data['disc_threshold']
];
+
+ $data['disc_quantity'] = $data['disc_amount'];
+ } else {
+ if (! isset($attribute_conditions) || $attribute_conditions == "[]" || $attribute_conditions == "") {
+ $data['uses_attribute_conditions'] = 0;
+
+ $data['actions'] = [
+ 'action_type' => $data['action_type'],
+ 'disc_amount' => $data['disc_amount'],
+ 'disc_quantity' => $data['disc_quantity']
+ ];
+ } else {
+ $data['uses_attribute_conditions'] = 1;
+
+ $data['actions'] = [
+ 'action_type' => $data['action_type'],
+ 'disc_amount' => $data['disc_amount'],
+ 'disc_quantity' => $data['disc_quantity'],
+ 'attribute_conditions' => $attribute_conditions
+ ];
+ }
}
// prepare json object from conditions
@@ -201,7 +240,7 @@ class CartRuleController extends Controller
}
// set coupon usage per customer same as per_customer limit which is disabled for now
- $coupons['usage_per_customer'] = $data['per_customer']; //0 is for unlimited usage
+ // $coupons['usage_per_customer'] = $data['per_customer']; //0 is for unlimited usage
// unset coupon code from coupon section
unset($data['code']);
// } else {
@@ -229,6 +268,11 @@ class CartRuleController extends Controller
// create a cart rule
$ruleCreated = $this->cartRule->create($data);
+ // can execute convert x here after when the rule is updated
+ if (isset($attribute_conditions) && $attribute_conditions != "[]" && $attribute_conditions != "") {
+ $this->convertX->convertX($ruleCreated->id, $attribute_conditions);
+ }
+
// create customer groups for cart rule
$ruleGroupCreated = $this->cartRule->CustomerGroupSync($customer_groups, $ruleCreated);
@@ -285,19 +329,22 @@ class CartRuleController extends Controller
return view($this->_config['view'])->with('cart_rule', [
$this->appliedConfig,
- [],
+ $this->category->getPartial(),
$this->getStatesAndCountries(),
- $cart_rule
+ $cart_rule,
+ $this->attribute->getPartial()
]);
}
/**
+ * Collects the response from cart rule update page and update datastore
+ *
* @return redirect
*/
public function update($id)
{
$this->validate(request(), [
- 'name' => 'required|string',
+ 'name' => 'required|string|unique:cart_rules,name,'.$id,
'description' => 'string',
'customer_groups' => 'required|array',
'channels' => 'required|array',
@@ -308,7 +355,7 @@ class CartRuleController extends Controller
'action_type' => 'required|string',
'disc_amount' => 'required|numeric',
'disc_quantity' => 'required|numeric',
- 'disc_threshold' => 'required|numeric',
+ // 'disc_threshold' => 'required|numeric',
'free_shipping' => 'required|boolean',
'apply_to_shipping' => 'required|boolean',
'code' => 'string|required_if:user_coupon,1',
@@ -319,15 +366,12 @@ class CartRuleController extends Controller
// collecting request in $data
$data = request()->all();
+ $attribute_conditions = $data['all_attributes'];
+ unset($data['all_attributes']);
+
// unset request token from $data
unset($data['_token']);
- // set rule uasge limit
- $data['usage_limit'] = 0;
-
- // set rule usage per customer
- $data['per_customer'] = 0;
-
// check if starts_from is null
if ($data['starts_from'] == "") {
$data['starts_from'] = null;
@@ -366,16 +410,28 @@ class CartRuleController extends Controller
$data['actions'] = [
'action_type' => $data['action_type'],
'disc_amount' => $data['disc_amount'],
- 'disc_threshold' => $data['disc_threshold']
];
$data['disc_quantity'] = $data['disc_amount'];
} else {
- $data['actions'] = [
- 'action_type' => $data['action_type'],
- 'disc_amount' => $data['disc_amount'],
- 'disc_quantity' => $data['disc_quantity']
- ];
+ if (! isset($attribute_conditions) || $attribute_conditions == "[]" || $attribute_conditions == "") {
+ $data['uses_attribute_conditions'] = 0;
+
+ $data['actions'] = [
+ 'action_type' => $data['action_type'],
+ 'disc_amount' => $data['disc_amount'],
+ 'disc_quantity' => $data['disc_quantity']
+ ];
+ } else {
+ $data['uses_attribute_conditions'] = 1;
+
+ $data['actions'] = [
+ 'action_type' => $data['action_type'],
+ 'disc_amount' => $data['disc_amount'],
+ 'disc_quantity' => $data['disc_quantity'],
+ 'attribute_conditions' => $attribute_conditions
+ ];
+ }
}
// encode php array to json for actions
@@ -436,6 +492,15 @@ class CartRuleController extends Controller
// update cart rule
$ruleUpdated = $this->cartRule->update($data, $id);
+ if (isset($attribute_conditions) && $attribute_conditions != "[]" && $attribute_conditions != "") {
+ // can execute convert X here after when the rule is updated
+ $this->convertX->convertX($ruleUpdated->id, $attribute_conditions);
+ } else {
+ $ruleUpdated->update([
+ 'product_ids' => null
+ ]);
+ }
+
// update customer groups for cart rule
$ruleGroupUpdated = $this->cartRule->CustomerGroupSync($customer_groups, $ruleUpdated);
diff --git a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php
index 207401d9c..76b75c283 100644
--- a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php
+++ b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php
@@ -2,9 +2,6 @@
namespace Webkul\Discount\Http\Controllers;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-
use Webkul\Attribute\Repositories\AttributeRepository as Attribute;
use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily;
use Webkul\Category\Repositories\CategoryRepository as Category;
@@ -12,10 +9,10 @@ use Webkul\Product\Repositories\ProductFlatRepository as Product;
use Webkul\Discount\Repositories\CatalogRuleRepository as CatalogRule;
use Webkul\Discount\Repositories\CatalogRuleChannelsRepository as CatalogRuleChannels;
use Webkul\Discount\Repositories\CatalogRuleCustomerGroupsRepository as CatalogRuleCustomerGroups;
-use Webkul\Discount\Helpers\FindProducts;
+use Webkul\Discount\Helpers\Catalog\Apply;
/**
- * Catalog Rule controller
+ * CatalogRule controller
*
* @author Prashant Singh @prashant-webkul
* @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
@@ -68,28 +65,35 @@ class CatalogRuleController extends Controller
protected $catalogRuleCustomerGroups;
/**
- * To hold the catalog repository instance
+ * To hold catalog repository instance
*/
protected $catalogRule;
/**
- * Find products using conditions helper instance
+ * To hold Sale instance
*/
- protected $findProducts;
+ protected $apply;
- public function __construct(Attribute $attribute, AttributeFamily $attributeFamily, Category $category, Product $product, CatalogRule $catalogRule, CatalogRuleChannels $catalogRuleChannels, CatalogRuleCustomerGroups $catalogRuleCustomerGroups, FindProducts $findProducts)
- {
+ public function __construct(
+ Attribute $attribute,
+ AttributeFamily $attributeFamily,
+ Category $category, Product $product,
+ CatalogRule $catalogRule,
+ CatalogRuleChannels $catalogRuleChannels,
+ CatalogRuleCustomerGroups $catalogRuleCustomerGroups,
+ Apply $sale
+ ) {
$this->_config = request('_config');
$this->attribute = $attribute;
$this->attributeFamily = $attributeFamily;
$this->category = $category;
$this->product = $product;
+ $this->sale = $sale;
$this->catalogRule = $catalogRule;
$this->catalogRuleChannels = $catalogRuleChannels;
$this->catalogRuleCustomerGroups = $catalogRuleCustomerGroups;
$this->appliedConfig = config('pricerules.catalog');
$this->appliedConditions = config('pricerules.conditions');
- $this->findProducts = $findProducts;
}
public function index()
@@ -97,26 +101,33 @@ class CatalogRuleController extends Controller
return view($this->_config['view']);
}
+ /**
+ * To load create form for catalog rule
+ *
+ * @return View
+ */
public function create()
{
- return view($this->_config['view'])->with('catalog_rule', [$this->attribute->getPartial(), $this->category->getPartial(), $this->fetchOptionableAttributes(), $this->appliedConfig, $this->appliedConditions, $this->attributeFamily->getPartial()]);
+ return view($this->_config['view'])->with('catalog_rule', [$this->appliedConfig, $this->category->getPartial(), $this->getStatesAndCountries(), $this->attribute->getPartial()]);
}
+ /**
+ * To store newly created catalog rule and store it
+ *
+ * @return Redirect
+ */
public function store()
{
$this->validate(request(), [
- 'name' => 'required|string',
+ 'name' => 'required|string|unique:catalog_rules,name',
'description' => 'string',
+ 'starts_from' => 'present|nullable|date',
+ 'ends_till' => 'present|nullable|date',
'customer_groups' => 'required',
'channels' => 'required',
- 'starts_from' => 'required|date',
- 'ends_till' => 'required|date',
'status' => 'required|boolean',
'end_other_rules' => 'required|boolean',
- 'priority' => 'required|numeric',
- 'criteria' => 'required',
- 'all_conditions' => 'required|array',
- 'apply' => 'required|numeric|min:0|max:3',
+ 'all_conditions' => 'present',
'disc_amount' => 'sometimes',
'disc_percent' => 'sometimes',
]);
@@ -126,6 +137,16 @@ class CatalogRuleController extends Controller
$catalog_rule_channels = array();
$catalog_rule_customer_groups = array();
+ // check if starts_from is null
+ if ($catalog_rule['starts_from'] == "") {
+ $catalog_rule['starts_from'] = null;
+ }
+
+ // check if end_till is null
+ if ($catalog_rule['ends_till'] == "") {
+ $catalog_rule['ends_till'] = null;
+ }
+
$catalog_rule_channels = $catalog_rule['channels'];
$catalog_rule_customer_groups = $catalog_rule['customer_groups'];
unset($catalog_rule['channels']); unset($catalog_rule['customer_groups']);
@@ -133,29 +154,34 @@ class CatalogRuleController extends Controller
unset($catalog_rule['criteria']);
$catalog_rule['conditions'] = $catalog_rule['all_conditions'];
+
unset($catalog_rule['all_conditions']);
+ $catalog_rule['conditions'] = json_encode($catalog_rule['conditions']);
+
if (isset($catalog_rule['disc_amount'])) {
- $catalog_rule['action_type'] = $catalog_rule['apply'];
$catalog_rule['actions'] = [
- 'action_type' => $catalog_rule['apply'],
+ 'action_code' => $catalog_rule['action_type'],
'disc_amount' => $catalog_rule['disc_amount']
];
} else if (isset($catalog_rule['disc_percent'])) {
- $catalog_rule['action_type'] = $catalog_rule['apply'];
$catalog_rule['actions'] = [
- 'action_type' => $catalog_rule['apply'],
+ 'action_code' => $catalog_rule['action_type'],
'disc_percent' => $catalog_rule['disc_percent'],
];
}
+ $catalog_rule['discount_amount'] = $catalog_rule['disc_amount'];
+
+ $catalog_rule['action_code'] = $catalog_rule['action_type'];
+
+ unset($catalog_rule['disc_amount']);
unset($catalog_rule['apply']);
unset($catalog_rule['attributes']);
unset($catalog_rule['_token']);
unset($catalog_rule['all_actions']);
$catalog_rule['actions'] = json_encode($catalog_rule['actions']);
- $catalog_rule['conditions'] = json_encode($catalog_rule['conditions']);
$catalogRule = $this->catalogRule->create($catalog_rule);
@@ -185,32 +211,78 @@ class CatalogRuleController extends Controller
}
}
+ /**
+ * To load edit for previously created catalog rule
+ *
+ * @param $id
+ *
+ * @return View
+ */
public function edit($id)
{
$catalog_rule = $this->catalogRule->find($id);
+
$catalog_rule_channels = $this->catalogRuleChannels->findByField('catalog_rule_id', $id);
+
$catalog_rule_customer_groups = $this->catalogRuleCustomerGroups->findByField('catalog_rule_id', $id);
- return view($this->_config['view'])->with('catalog_rule', [$this->attribute->getPartial(), $this->category->getPartial(), $this->fetchOptionableAttributes(), $this->appliedConfig, $this->appliedConditions, $catalog_rule, $catalog_rule_channels, $catalog_rule_customer_groups, $this->attributeFamily->getPartial()]);
+ return view($this->_config['view'])->with('catalog_rule', [
+ $this->attribute->getPartial(),
+ $this->category->getPartial(),
+ $this->fetchOptionableAttributes(),
+ $this->appliedConfig,
+ $this->appliedConditions,
+ $catalog_rule,
+ $catalog_rule_channels,
+ $catalog_rule_customer_groups,
+ $this->attributeFamily->getPartial()
+ ]);
}
+ /**
+ * To update previously created catalog rule
+ *
+ * @param $id
+ *
+ * @return Redirect
+ */
public function update($id)
{
+ $data = request()->input();
+
+ // $validated = \Validator::make($data, [
+ // 'name' => 'required|string|unique:catalog_rules,name,' . $id,
+ // 'starts_from' => 'present|nullable|date',
+ // 'ends_till' => 'present|nullable|date',
+ // 'description' => 'string',
+ // 'customer_groups' => 'required',
+ // 'channels' => 'required',
+ // 'status' => 'required|boolean',
+ // 'end_other_rules' => 'required|boolean',
+ // 'all_conditions' => 'present',
+ // 'disc_amount' => 'sometimes',
+ // 'disc_percent' => 'sometimes'
+ // ]);
+
+ // if ($validated->fails()) {
+ // dd($validated->errors());
+ // } else {
+ // dd('passed');
+ // }
+
$this->validate(request(), [
- 'name' => 'required|string',
+ 'name' => 'required|string|unique:catalog_rules,name,'.$id,
+ // 'name' => 'required|string',
+ 'starts_from' => 'present|nullable|date',
+ 'ends_till' => 'present|nullable|date',
'description' => 'string',
'customer_groups' => 'required',
'channels' => 'required',
- 'starts_from' => 'required|date',
- 'ends_till' => 'required|date',
'status' => 'required|boolean',
'end_other_rules' => 'required|boolean',
- 'priority' => 'required|numeric',
- 'criteria' => 'required',
- 'all_conditions' => 'required|array',
- 'apply' => 'required|numeric|min:0|max:3',
+ 'all_conditions' => 'present',
'disc_amount' => 'sometimes',
- 'disc_percent' => 'sometimes',
+ 'disc_percent' => 'sometimes'
]);
$catalog_rule = request()->all();
@@ -218,6 +290,16 @@ class CatalogRuleController extends Controller
$catalog_rule_channels = array();
$catalog_rule_customer_groups = array();
+ // check if starts_from is null
+ if ($catalog_rule['starts_from'] == "") {
+ $catalog_rule['starts_from'] = null;
+ }
+
+ // check if end_till is null
+ if ($catalog_rule['ends_till'] == "") {
+ $catalog_rule['ends_till'] = null;
+ }
+
$catalog_rule_channels = $catalog_rule['channels'];
$catalog_rule_customer_groups = $catalog_rule['customer_groups'];
unset($catalog_rule['channels']); unset($catalog_rule['customer_groups']);
@@ -228,19 +310,22 @@ class CatalogRuleController extends Controller
unset($catalog_rule['all_conditions']);
if (isset($catalog_rule['disc_amount'])) {
- $catalog_rule['action_type'] = $catalog_rule['apply'];
+ $catalog_rule['action_code'] = $catalog_rule['action_type'];
$catalog_rule['actions'] = [
- 'action_type' => $catalog_rule['apply'],
+ 'action_code' => $catalog_rule['action_type'],
'disc_amount' => $catalog_rule['disc_amount']
];
} else if (isset($catalog_rule['disc_percent'])) {
- $catalog_rule['action_type'] = $catalog_rule['apply'];
+ $catalog_rule['action_code'] = $catalog_rule['action_type'];
$catalog_rule['actions'] = [
- 'action_type' => $catalog_rule['apply'],
+ 'action_code' => $catalog_rule['action'],
'disc_percent' => $catalog_rule['disc_percent'],
];
}
+ $catalog_rule['discount_amount'] = $catalog_rule['disc_amount'];
+
+ unset($catalog_rule['disc_amount']);
unset($catalog_rule['apply']);
unset($catalog_rule['attributes']);
unset($catalog_rule['_token']);
@@ -265,16 +350,32 @@ class CatalogRuleController extends Controller
}
}
+ /**
+ * To apply the catalog rules
+ *
+ * @return Redirect
+ */
public function applyRules()
{
- $catalogRules = $this->catalogRule->all();
- $decoded = json_decode($catalogRules->first()->conditions);
- $conditions = json_decode($decoded[0]);
- $optionableAttributes = $this->fetchOptionableAttributes();
+ $this->sale->apply();
+ }
- $results = $this->findProducts->findByConditions($conditions);
+ /**
+ * Initiates decluttering of rules and even reindexes the table if empty
+ *
+ * @return Response redirect
+ */
+ public function deClutter()
+ {
+ $result = $this->sale->deClutter();
- dd($results);
+ if ($result) {
+ session()->flash('success', trans('admin::app.promotion.declut-success'));
+ } else {
+ session()->flash('warning', trans('admin::app.promotion.declut-failure'));
+ }
+
+ return redirect()->route($this->_config['redirect']);
}
public function fetchOptionableAttributes()
@@ -290,6 +391,13 @@ class CatalogRuleController extends Controller
return $attributesWithOptions;
}
+ /**
+ * To delete existing catalog rule
+ *
+ * @param Integer $id
+ *
+ * @return Redirect
+ */
public function destroy($id)
{
$catalogRule = $this->catalogRule->findOrFail($id);
@@ -304,4 +412,20 @@ class CatalogRuleController extends Controller
return response()->json(['message' => false], 400);
}
}
+
+ /**
+ * Get Countries and states list from core helpers
+ *
+ * @return Array
+ */
+ public function getStatesAndCountries()
+ {
+ $countries = core()->countries()->toArray();
+ $states = core()->groupedStatesByCountries();
+
+ return [
+ 'countries' => $countries,
+ 'states' => $states
+ ];
+ }
}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRule.php b/packages/Webkul/Discount/src/Models/CatalogRule.php
index 56f05475c..1c29bc299 100644
--- a/packages/Webkul/Discount/src/Models/CatalogRule.php
+++ b/packages/Webkul/Discount/src/Models/CatalogRule.php
@@ -11,7 +11,7 @@ class CatalogRule extends Model implements CatalogRuleContract
{
protected $table = 'catalog_rules';
- protected $guarded = ['created_at', 'updated_at'];
+ protected $fillable = ['name', 'description', 'starts_from', 'ends_till', 'status', 'conditions', 'actions', 'end_other_rules', 'action_code', 'discount_amount'];
public function channels()
{
diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroups.php b/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroups.php
index 9a6d56d4f..d34e4541f 100644
--- a/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroups.php
+++ b/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroups.php
@@ -3,8 +3,8 @@
namespace Webkul\Discount\Models;
use Illuminate\Database\Eloquent\Model;
+use Webkul\Customer\Models\CustomerGroupProxy;
use Webkul\Discount\Contracts\CatalogRuleCustomerGroups as CatalogRuleCustomerGroupsContract;
-use Webkul\Discount\Models\CatalogRuleProxy as CatalogRule;
class CatalogRuleCustomerGroups extends Model implements CatalogRuleCustomerGroupsContract
{
@@ -12,8 +12,8 @@ class CatalogRuleCustomerGroups extends Model implements CatalogRuleCustomerGrou
protected $guarded = ['created_at', 'updated_at'];
- public function catalog_rule()
+ public function customer_group()
{
- return $this->belongsTo(CatalogRule::modelClass(), 'catalog_rule_id');
+ return $this->hasOne(CustomerGroupProxy::modelClass(), 'id', 'customer_group_id');
}
}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleProducts.php b/packages/Webkul/Discount/src/Models/CatalogRuleProducts.php
index bcf009c08..ba8e1468f 100644
--- a/packages/Webkul/Discount/src/Models/CatalogRuleProducts.php
+++ b/packages/Webkul/Discount/src/Models/CatalogRuleProducts.php
@@ -4,10 +4,12 @@ namespace Webkul\Discount\Models;
use Illuminate\Database\Eloquent\Model;
use Webkul\Discount\Contracts\CatalogRuleProducts as CatalogRuleProductsContract;
+use Webkul\Discount\Models\CatalogRuleChannelsProxy as CatalogRuleChannels;
+use Webkul\Discount\Models\CatalogRuleCustomerGroupsProxy as CatalogRuleCustomerGroups;
class CatalogRuleProducts extends Model implements CatalogRuleProductsContract
{
- protected $table = 'cart_rules_products';
+ protected $table = 'catalog_rule_products';
- protected $guarded = ['created_at', 'updated_at'];
-}
+ protected $fillable = ['catalog_rule_id', 'starts_from', 'ends_till', 'customer_group_id', 'channel_id', 'product_id', 'action_code', 'action_amount'];
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleProductsPrice.php b/packages/Webkul/Discount/src/Models/CatalogRuleProductsPrice.php
index 79b575e6d..f9597a0a4 100644
--- a/packages/Webkul/Discount/src/Models/CatalogRuleProductsPrice.php
+++ b/packages/Webkul/Discount/src/Models/CatalogRuleProductsPrice.php
@@ -7,7 +7,7 @@ use Webkul\Discount\Contracts\CatalogRuleProductsPrice as CatalogRuleProductsPri
class CatalogRuleProductsPrice extends Model implements CatalogRuleProductsPriceContract
{
- protected $table = 'cart_rules_products_price';
+ protected $table = 'catalog_rule_products_price';
- protected $guarded = ['created_at', 'updated_at'];
-}
+ protected $fillable = ['catalog_rule_id', 'starts_from', 'ends_till', 'customer_group_id', 'channel_id', 'product_id', 'rule_price'];
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRulesProductsPriceProxy.php b/packages/Webkul/Discount/src/Models/CatalogRuleProductsPriceProxy.php
similarity index 98%
rename from packages/Webkul/Discount/src/Models/CatalogRulesProductsPriceProxy.php
rename to packages/Webkul/Discount/src/Models/CatalogRuleProductsPriceProxy.php
index e8654acdb..825d4d448 100644
--- a/packages/Webkul/Discount/src/Models/CatalogRulesProductsPriceProxy.php
+++ b/packages/Webkul/Discount/src/Models/CatalogRuleProductsPriceProxy.php
@@ -7,4 +7,4 @@ use Konekt\Concord\Proxies\ModelProxy;
class CatalogRuleProductsPriceProxy extends ModelProxy
{
-}
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Providers/DiscountServiceProvider.php b/packages/Webkul/Discount/src/Providers/DiscountServiceProvider.php
index 8ac038472..621d5728d 100644
--- a/packages/Webkul/Discount/src/Providers/DiscountServiceProvider.php
+++ b/packages/Webkul/Discount/src/Providers/DiscountServiceProvider.php
@@ -6,6 +6,10 @@ use Illuminate\Support\ServiceProvider;
class DiscountServiceProvider extends ServiceProvider
{
+ protected $commands = [
+ 'Webkul\Discount\Commands\Console\ActivateCatalogRule'
+ ];
+
/**
* Bootstrap services.
*
@@ -24,6 +28,8 @@ class DiscountServiceProvider extends ServiceProvider
public function register()
{
$this->registerConfig();
+
+ $this->commands($this->commands);
}
/**
diff --git a/packages/Webkul/Discount/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Discount/src/Providers/ModuleServiceProvider.php
index f654e68fa..4332e00dc 100644
--- a/packages/Webkul/Discount/src/Providers/ModuleServiceProvider.php
+++ b/packages/Webkul/Discount/src/Providers/ModuleServiceProvider.php
@@ -10,7 +10,8 @@ class ModuleServiceProvider extends BaseModuleServiceProvider
\Webkul\Discount\Models\CatalogRule::class,
\Webkul\Discount\Models\CatalogRuleChannels::class,
\Webkul\Discount\Models\CatalogRuleCustomerGroups::class,
- \Webkul\Discount\Models\CatalogRuleProducts::class,\Webkul\Discount\Models\CatalogRuleProductsPrice::class,
+ \Webkul\Discount\Models\CatalogRuleProducts::class,
+ \Webkul\Discount\Models\CatalogRuleProductsPrice::class,
\Webkul\Discount\Models\CartRule::class,
\Webkul\Discount\Models\CartRuleChannels::class,
\Webkul\Discount\Models\CartRuleCustomerGroups::class,
@@ -18,6 +19,6 @@ class ModuleServiceProvider extends BaseModuleServiceProvider
\Webkul\Discount\Models\CartRuleLabels::class,
\Webkul\Discount\Models\CartRuleCouponsUsage::class,
\Webkul\Discount\Models\CartRuleCustomers::class,
- \Webkul\Discount\Models\CartRuleCart::class,
+ \Webkul\Discount\Models\CartRuleCart::class
];
}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleCartRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleCartRepository.php
index 39523db45..e891556b0 100644
--- a/packages/Webkul/Discount/src/Repositories/CartRuleCartRepository.php
+++ b/packages/Webkul/Discount/src/Repositories/CartRuleCartRepository.php
@@ -5,10 +5,10 @@ namespace Webkul\Discount\Repositories;
use Webkul\Core\Eloquent\Repository;
/**
- * Cart Rule Cart Reposotory
+ * CartRuleCartReposotory
*
* @author Prashant Singh
- * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class CartRuleCartRepository extends Repository
{
diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php
index fe8680e40..2d6209445 100644
--- a/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php
+++ b/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php
@@ -5,10 +5,10 @@ namespace Webkul\Discount\Repositories;
use Webkul\Core\Eloquent\Repository;
/**
- * Cart Rule Reposotory
+ * CartRuleRepository
*
- * @author Prashant Singh
- * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ * @author Prashant Singh @prashant-webkul
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class CartRuleChannelsRepository extends Repository
{
diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleCouponsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleCouponsRepository.php
index 6db964d5b..8b0e53f99 100644
--- a/packages/Webkul/Discount/src/Repositories/CartRuleCouponsRepository.php
+++ b/packages/Webkul/Discount/src/Repositories/CartRuleCouponsRepository.php
@@ -4,6 +4,12 @@ namespace Webkul\Discount\Repositories;
use Webkul\Core\Eloquent\Repository;
+/**
+ * CartRuleCouponsRepository
+ *
+ * @author Prashant Singh @prashant-webkul
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
class CartRuleCouponsRepository extends Repository
{
/**
diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleCustomerGroupsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleCustomerGroupsRepository.php
index a2038e507..cfd4dbe75 100644
--- a/packages/Webkul/Discount/src/Repositories/CartRuleCustomerGroupsRepository.php
+++ b/packages/Webkul/Discount/src/Repositories/CartRuleCustomerGroupsRepository.php
@@ -5,10 +5,10 @@ namespace Webkul\Discount\Repositories;
use Webkul\Core\Eloquent\Repository;
/**
- * Cart Rule Customer Groups Reposotory
+ * CartRuleCustomerGroupsReposotory
*
* @author Prashant Singh
- * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class CartRuleCustomerGroupsRepository extends Repository
{
diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleLabelsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleLabelsRepository.php
index ba5ba2aaa..2a4d03be7 100644
--- a/packages/Webkul/Discount/src/Repositories/CartRuleLabelsRepository.php
+++ b/packages/Webkul/Discount/src/Repositories/CartRuleLabelsRepository.php
@@ -4,6 +4,12 @@ namespace Webkul\Discount\Repositories;
use Webkul\Core\Eloquent\Repository;
+/**
+ * CartRuleLabelsRepository
+ *
+ * @author Prashant Singh
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
class CartRuleLabelsRepository extends Repository
{
/**
diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleRepository.php
index a28f27aa7..e45911cce 100644
--- a/packages/Webkul/Discount/src/Repositories/CartRuleRepository.php
+++ b/packages/Webkul/Discount/src/Repositories/CartRuleRepository.php
@@ -10,26 +10,46 @@ use Webkul\Discount\Repositories\CartRuleLabelsRepository as CartRuleLabels;
use Illuminate\Container\Container as App;
/**
- * Cart Rule Reposotory
+ * CartRuleReposotory
*
* @author Prashant Singh
- * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class CartRuleRepository extends Repository
{
+ /**
+ * Will hold cartRuleChannelsRepository instance
+ */
protected $cartRuleChannels;
+ /**
+ * Will hold cartRuleCustomerGroupsRepository instance
+ */
protected $cartRuleCustomerGroups;
+ /**
+ * Will hold cartRuleCoupons instance
+ */
protected $cartRuleCoupons;
+ /**
+ * Will hold cartRuleCustomerGroupsRepository instance
+ */
protected $cartRuleLabels;
/**
- *
+ * @param CartRuleChannels $cartRuleChannels
+ * @param CartRuleCustomerGroups $cartRuleCustomerGroups
+ * @param CartRuleCoupons $cartRuleCoupons
+ * @param
*/
- public function __construct(CartRuleChannels $cartRuleChannels, CartRuleCustomerGroups $cartRuleCustomerGroups, CartRuleCoupons $cartRuleCoupons, CartRuleLabels $cartRuleLabels, App $app)
- {
+ public function __construct(
+ CartRuleChannels $cartRuleChannels,
+ CartRuleCustomerGroups $cartRuleCustomerGroups,
+ CartRuleCoupons $cartRuleCoupons,
+ CartRuleLabels $cartRuleLabels,
+ App $app
+ ) {
$this->cartRuleChannels = $cartRuleChannels;
$this->cartRuleCustomerGroups = $cartRuleCustomerGroups;
$this->cartRuleCoupons = $cartRuleCoupons;
diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php
index dbdf996ec..50ade8dbc 100644
--- a/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php
+++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php
@@ -5,17 +5,17 @@ namespace Webkul\Discount\Repositories;
use Webkul\Core\Eloquent\Repository;
/**
- * Catalog Rule Customer Groups Reposotory
+ * CatalogRuleChannelsReposotory
*
* @author Prashant Singh
- * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class CatalogRuleChannelsRepository extends Repository
{
/**
* Specify Model class name
*
- * @return mixed
+ * @return String
*/
function model()
{
diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php
index 76323d394..2d7184610 100644
--- a/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php
+++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php
@@ -5,17 +5,17 @@ namespace Webkul\Discount\Repositories;
use Webkul\Core\Eloquent\Repository;
/**
- * Catalog Rule Customer Groups Reposotory
+ * CatalogRuleCustomerGroupsReposotory
*
* @author Prashant Singh
- * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class CatalogRuleCustomerGroupsRepository extends Repository
{
/**
* Specify Model class name
*
- * @return mixed
+ * @return String
*/
function model()
{
diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleProducts.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleProducts.php
deleted file mode 100644
index 142179ddc..000000000
--- a/packages/Webkul/Discount/src/Repositories/CatalogRuleProducts.php
+++ /dev/null
@@ -1,24 +0,0 @@
-
- * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CatalogRuleProductsRepository extends Repository
-{
- /**
- * Specify Model class name
- *
- * @return mixed
- */
- function model()
- {
- return 'Webkul\Discount\Contracts\CatalogRuleProducts';
- }
-}
diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsPrice.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsPrice.php
deleted file mode 100644
index f330516dc..000000000
--- a/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsPrice.php
+++ /dev/null
@@ -1,24 +0,0 @@
-
- * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CatalogRuleProductsPriceRepository extends Repository
-{
- /**
- * Specify Model class name
- *
- * @return mixed
- */
- function model()
- {
- return 'Webkul\Discount\Contracts\CatalogRuleProductsPrice';
- }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsPriceRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsPriceRepository.php
new file mode 100644
index 000000000..05e60735b
--- /dev/null
+++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsPriceRepository.php
@@ -0,0 +1,183 @@
+ @prashant-webkul
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CatalogRuleProductsPriceRepository extends Repository
+{
+ /**
+ * To hold ProductRepository instance
+ */
+ protected $product;
+
+ /**
+ * To hold CatalogRuleProductRepository instance
+ *
+ */
+ protected $catalogRuleProduct;
+
+ /**
+ * @param Product $product
+ */
+ public function __construct(Product $product, CatalogRuleProduct $catalogRuleProduct,App $app)
+ {
+
+ $this->product = $product;
+
+ $this->catalogRuleProduct = $catalogRuleProduct;
+
+ parent::__construct($app);
+ }
+
+ /**
+ * Specify Model class name
+ *
+ * @return String
+ */
+ function model()
+ {
+ return 'Webkul\Discount\Contracts\CatalogRuleProductsPrice';
+ }
+
+ /**
+ * Create or update catalog rule product resource
+ *
+ * @param CatalogRule $rule
+ * @param Integer $productID
+ *
+ * @return Void
+ */
+ public function createOrUpdate($rule, $productID)
+ {
+ $channels = $rule->channels;
+ $customerGroups = $rule->customer_groups;
+
+ $channelsGroupsCross = $channels->crossJoin($customerGroups);
+
+ if ($productID == '*') {
+ $products = $this->product->all('id');
+
+ foreach ($channelsGroupsCross as $channelGroup) {
+ $channelId = $channelGroup[0]->channel_id;
+ $groupId = $channelGroup[1]->customer_group_id;
+
+ foreach ($products as $product) {
+ $productID = $product->id;
+
+ $catalogRuleProductPrice = $this->findWhere([
+ 'channel_id' => $channelId,
+ 'customer_group_id' => $groupId,
+ 'product_id' => $productID
+ ]);
+
+ if ($catalogRuleProductPrice->count()) {
+ // check for tie breaker rules and then update
+ $data = [
+ 'catalog_rule_id' => $rule->id,
+ 'starts_from' => $rule->starts_from,
+ 'ends_till' => $rule->ends_till,
+ 'customer_group_id' => $groupId,
+ 'channel_id' => $channelId,
+ 'product_id' => $productID,
+ 'action_code' => $rule->action_code,
+ 'action_amount' => $rule->discount_amount
+ ];
+
+ $this->update($data, $catalogRuleProductPrice->first()->id);
+ } else {
+ $data = [
+ 'catalog_rule_id' => $rule->id,
+ 'starts_from' => $rule->starts_from,
+ 'ends_till' => $rule->ends_till,
+ 'customer_group_id' => $groupId,
+ 'channel_id' => $channelId,
+ 'product_id' => $productID,
+ 'action_code' => $rule->action_code,
+ 'action_amount' => $rule->discount_amount
+ ];
+
+ $this->create($data);
+ }
+ }
+ }
+ } else {
+ foreach ($channelsGroupsCross as $channelGroup) {
+ $channelId = $channelGroup[0]->channel_id;
+ $groupId = $channelGroup[1]->customer_group_id;
+
+ $catalogRuleProduct = $this->catalogRuleProduct->findWhere([
+ 'channel_id' => $channelId,
+ 'customer_group_id' => $groupId,
+ 'product_id' => $productID
+ ]);
+
+ $catalogRuleProductPrice = $this->findWhere([
+ 'channel_id' => $channelId,
+ 'customer_group_id' => $groupId,
+ 'product_id' => $productID
+ ]);
+
+ if ($catalogRuleProductPrice->count() && $catalogRuleProductPrice->first()->catalog_rule_id != $rule->id) {
+ $catalogRuleProduct = $catalogRuleProduct->first();
+
+ $discountAmount = $rule->discount_amount;
+
+ $product = $this->product->find($productID);
+
+ $productPrice = $product->price - $catalogRuleProduct->action_amount;
+
+ $data = [
+ 'catalog_rule_id' => $rule->id,
+ 'starts_from' => $rule->starts_from,
+ 'ends_till' => $rule->ends_till,
+ 'customer_group_id' => $groupId,
+ 'channel_id' => $channelId,
+ 'product_id' => $productID,
+ 'rule_price' => $productPrice
+ ];
+
+ // update
+ $catalogRuleProductPrice->first()->update($data);
+ } else if ($catalogRuleProductPrice->count() == 0) {
+ $catalogRuleProduct = $catalogRuleProduct->first();
+
+ $discountAmount = $rule->discount_amount;
+
+ $product = $this->product->find($productID);
+
+ $productPrice = $product->price - $catalogRuleProduct->action_amount;
+
+ if ($productPrice <= $discountAmount) {
+ $product->price = $productPrice - $discountAmount;
+ } else {
+ $product->price = 0;
+ }
+
+ $data = [
+ 'catalog_rule_id' => $rule->id,
+ 'starts_from' => $rule->starts_from,
+ 'ends_till' => $rule->ends_till,
+ 'customer_group_id' => $groupId,
+ 'channel_id' => $channelId,
+ 'product_id' => $productID,
+ 'rule_price' => $productPrice
+ ];
+
+ $this->create($data);
+ } else {
+ // do the reassessment updation if the cart rule action changes the new action and its amount needs to be updated
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsRepository.php
new file mode 100644
index 000000000..f490930ab
--- /dev/null
+++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsRepository.php
@@ -0,0 +1,193 @@
+ @prashant-webkul
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CatalogRuleProductsRepository extends Repository
+{
+ /**
+ * ProductRepository instance
+ */
+ protected $product;
+
+ /**
+ * CatalogRule Apply instance
+ */
+ protected $apply;
+
+ /**
+ * @param Product $product
+ * @param App $app
+ * @param Apply $apply
+ */
+ public function __construct(Product $product, App $app)
+ {
+ $this->product = $product;
+
+ parent::__construct($app);
+ }
+
+ public function getDiscountAmount($product, $rule)
+ {
+
+ $actionClass = config('discount-rules.catalog')[$rule->action_code];
+
+ $actionInstance = new $actionClass();
+
+ $discountAmount = $actionInstance->calculate($rule, $product);
+
+ return $discountAmount;
+ }
+
+ /**
+ * Specify Model class name
+ *
+ * @return String
+ */
+ function model()
+ {
+ return 'Webkul\Discount\Contracts\CatalogRuleProducts';
+ }
+
+ /**
+ * Create or update catalog rule product resource
+ *
+ * @param CatalogRule $rule
+ * @param Integer $productID
+ *
+ * @return Void
+ */
+ public function createOrUpdate($rule, $productID)
+ {
+ $channels = $rule->channels;
+ $customerGroups = $rule->customer_groups;
+
+ $channelsGroupsCross = $channels->crossJoin($customerGroups);
+
+ if ($productID == '*') {
+ $products = $this->product->all('id');
+
+ foreach ($channelsGroupsCross as $channelGroup) {
+ $channelId = $channelGroup[0]->channel_id;
+ $groupId = $channelGroup[1]->customer_group_id;
+
+ $model = new $this->model();
+
+ foreach ($products as $product) {
+ $productID = $product->id;
+
+ $catalogRuleProduct = $this->findWhere([
+ 'channel_id' => $channelId,
+ 'customer_group_id' => $groupId,
+ 'product_id' => $productID
+ ]);
+
+ if ($catalogRuleProduct->count()) {
+ // check for tie breaker rules and then update
+ $previousRuleID = $catalogRuleProduct->first()->catalog_rule_id;
+
+ $newRuleID = $rule->id;
+
+ $winnerRuleId = $this->breakTie($previousRuleID, $newRuleID);
+
+ $data = [
+ 'catalog_rule_id' => $rule->id,
+ 'starts_from' => $rule->starts_from,
+ 'ends_till' => $rule->ends_till,
+ 'customer_group_id' => $groupId,
+ 'channel_id' => $channelId,
+ 'product_id' => $productID,
+ 'action_code' => $rule->action_code,
+ 'action_amount' => $rule->discount_amount
+ ];
+
+ if ($rule->id == $winnerRuleId) {
+ $this->catalogRuleProduct->create($data);
+ } else {
+ $this->catalogRuleProduct->update($data, $catalogRuleProduct->first()->id);
+ }
+ } else {
+ $data = [
+ 'catalog_rule_id' => $rule->id,
+ 'starts_from' => $rule->starts_from,
+ 'ends_till' => $rule->ends_till,
+ 'customer_group_id' => $groupId,
+ 'channel_id' => $channelId,
+ 'product_id' => $productID,
+ 'action_code' => $rule->action_code,
+ 'action_amount' => $rule->discount_amount
+ ];
+
+ $this->catalogRuleProduct->create($data);
+ }
+ }
+ }
+ } else {
+ foreach ($channelsGroupsCross as $channelGroup) {
+ $channelId = $channelGroup[0]->channel_id;
+ $groupId = $channelGroup[1]->customer_group_id;
+
+ $catalogRuleProduct = $this->findWhere([
+ 'channel_id' => $channelId,
+ 'customer_group_id' => $groupId,
+ 'product_id' => $productID
+ ]);
+
+ if ($catalogRuleProduct->count() && $catalogRuleProduct->first()->catalog_rule_id != $rule->id) {
+ $product = $this->product->find($productID);
+ $productPrice = $product->price;
+
+ $discountAmount = $this->getDiscountAmount($product, $rule);
+
+ // check for tie breaker rules and then update
+ $previousRuleID = $catalogRuleProduct->first()->catalog_rule_id;
+
+ $newRuleID = $rule->id;
+
+ $winnerRuleId = $this->breakTie($previousRuleID, $newRuleID);
+
+ // update
+ $catalogRuleProduct->first()->update([
+ 'catalog_rule_id' => $rule->id,
+ 'starts_from' => $rule->starts_from,
+ 'ends_till' => $rule->ends_till,
+ 'customer_group_id' => $groupId,
+ 'channel_id' => $channelId,
+ 'product_id' => $productID,
+ 'action_code' => $rule->action_code,
+ 'action_amount' => $discountAmount
+ ]);
+ } else if ($catalogRuleProduct->count() == 0) {
+ $product = $this->product->find($productID);
+ $productPrice = $product->price;
+
+ $discountAmount = $this->getDiscountAmount($product, $rule);
+
+ $data = [
+ 'catalog_rule_id' => $rule->id,
+ 'starts_from' => $rule->starts_from,
+ 'ends_till' => $rule->ends_till,
+ 'customer_group_id' => $groupId,
+ 'channel_id' => $channelId,
+ 'product_id' => $productID,
+ 'action_code' => $rule->action_code,
+ 'action_amount' => $discountAmount
+ ];
+
+ $this->create($data);
+ } else {
+ // do the reassessment updation if the cart rule action changes the new action and its amount needs to be updated
+ }
+ }
+ }
+ }
+}
diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleRepository.php
index d70f9ff75..527a0a915 100644
--- a/packages/Webkul/Discount/src/Repositories/CatalogRuleRepository.php
+++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleRepository.php
@@ -8,23 +8,32 @@ use Webkul\Discount\Repositories\CatalogRuleCustomerGroupsRepository as CatalogR
use Illuminate\Container\Container as App;
/**
- * Catalog Rule Reposotory
+ * CatalogRuleReposotory
*
* @author Prashant Singh
- * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class CatalogRuleRepository extends Repository
{
+ /**
+ * Will hold catalogRuleChannelsRepository instance
+ */
protected $catalogRuleChannels;
+ /**
+ * Will hold catalogRuleCustomerGroupsRepository instance
+ */
protected $catalogRuleCustomerGroups;
/**
- *
+ * @param CatalogRuleChannels $catalogRuleChannels
+ * @param CatalogRuleCustomerGroups $catalogRuleCustomerGroups
+ * @param App $app
*/
public function __construct(CatalogRuleChannels $catalogRuleChannels, CatalogRuleCustomerGroups $catalogRuleCustomerGroups, App $app)
{
$this->catalogRuleChannels = $catalogRuleChannels;
+
$this->catalogRuleCustomerGroups = $catalogRuleCustomerGroups;
parent::__construct($app);
@@ -33,7 +42,7 @@ class CatalogRuleRepository extends Repository
/**
* Specify Model class name
*
- * @return mixed
+ * @return String
*/
function model()
{
@@ -42,6 +51,11 @@ class CatalogRuleRepository extends Repository
/**
* To sync the customer groups related records
+ *
+ * @param Array $newCustomerGroups
+ * @param CatalogRule $catalogRule
+ *
+ * @return Boolean
*/
public function CustomerGroupSync($newCustomerGroups, $catalogRule)
{
@@ -90,6 +104,11 @@ class CatalogRuleRepository extends Repository
/**
* To sync the channels related records
+ *
+ * @param Array $newChannels
+ * @param CatalogRule $catalogRule
+ *
+ * @return Boolean
*/
public function ChannelSync($newChannels, $catalogRule)
{
diff --git a/packages/Webkul/Payment/src/Config/paymentmethods.php b/packages/Webkul/Payment/src/Config/paymentmethods.php
index 5f5b6433c..864751d7a 100755
--- a/packages/Webkul/Payment/src/Config/paymentmethods.php
+++ b/packages/Webkul/Payment/src/Config/paymentmethods.php
@@ -3,7 +3,7 @@ return [
'cashondelivery' => [
'code' => 'cashondelivery',
'title' => 'Cash On Delivery',
- 'description' => 'Cash On Delivery',
+ 'description' => 'shop::app.checkout.onepage.cash-desc',
'class' => 'Webkul\Payment\Payment\CashOnDelivery',
'active' => true,
'sort' => 1
@@ -12,7 +12,7 @@ return [
'moneytransfer' => [
'code' => 'moneytransfer',
'title' => 'Money Transfer',
- 'description' => 'Money Transfer',
+ 'description' => 'shop::app.checkout.onepage.money-desc',
'class' => 'Webkul\Payment\Payment\MoneyTransfer',
'active' => true,
'sort' => 2
@@ -21,7 +21,7 @@ return [
'paypal_standard' => [
'code' => 'paypal_standard',
'title' => 'Paypal Standard',
- 'description' => 'Paypal Standard',
+ 'description' => 'shop::app.checkout.onepage.paypal-desc',
'class' => 'Webkul\Paypal\Payment\Standard',
'sandbox' => true,
'active' => true,
diff --git a/packages/Webkul/Product/src/Helpers/View.php b/packages/Webkul/Product/src/Helpers/View.php
index eebd5effb..f52748552 100755
--- a/packages/Webkul/Product/src/Helpers/View.php
+++ b/packages/Webkul/Product/src/Helpers/View.php
@@ -13,22 +13,42 @@ class View extends AbstractProduct
/**
* Returns the visible custom attributes
*
- * @param Product $product
+ * @param Product $product
* @return integer
*/
public function getAdditionalData($product)
{
$data = [];
- $attributes = $product->product->attribute_family->custom_attributes()->where('attributes.is_visible_on_front', 1)->get();
+ $attributes = $product->attribute_family->custom_attributes()->where('attributes.is_visible_on_front', 1)->get();
+
+ $attributeOptionReposotory = app('Webkul\Attribute\Repositories\AttributeOptionRepository');
foreach ($attributes as $attribute) {
- $value = $product->{$attribute->code};
+ if ($product instanceof \Webkul\Product\Models\ProductFlat) {
+ $value = $product->product->{$attribute->code};
+ } else {
+ $value = $product->{$attribute->code};
+ }
if ($attribute->type == 'boolean') {
$value = $value ? 'Yes' : 'No';
- } else if ($attribute->type == 'select' || $attribute->type == 'multiselect') {
- $value = $product->{$attribute->code . '_label'};
+ } else if($value) {
+ if ($attribute->type == 'select') {
+ $attributeOption = $attributeOptionReposotory->find($value);
+ if ($attributeOption)
+ $value = $attributeOption->label ?? $attributeOption->admin_name;
+ } else if ($attribute->type == 'multiselect' || $attribute->type == 'checkbox') {
+ $lables = [];
+
+ $attributeOptions = $attributeOptionReposotory->findWhereIn('id', explode(",", $value));
+
+ foreach ($attributeOptions as $attributeOption) {
+ $lables[] = $attributeOption->label ?? $attributeOption->admin_name;
+ }
+
+ $value = implode(", ", $lables);
+ }
}
$data[] = [
diff --git a/packages/Webkul/Product/src/Listeners/ProductFlat.php b/packages/Webkul/Product/src/Listeners/ProductFlat.php
index 9634a53b1..07008b11a 100644
--- a/packages/Webkul/Product/src/Listeners/ProductFlat.php
+++ b/packages/Webkul/Product/src/Listeners/ProductFlat.php
@@ -68,6 +68,7 @@ class ProductFlat
'date' => 'date',
'file' => 'text',
'image' => 'text',
+ 'checkbox' => 'text'
];
/**
@@ -102,7 +103,12 @@ class ProductFlat
*/
public function afterAttributeCreatedUpdated($attribute)
{
- if(!$attribute->is_user_defined) {
+ if (! $attribute->is_user_defined) {
+ return false;
+ }
+
+ if (! $attribute->use_in_flat) {
+ $this->afterAttributeDeleted($attribute->id);
return false;
}
@@ -168,100 +174,125 @@ class ProductFlat
if ($parentProduct && ! array_key_exists($parentProduct->id, $superAttributes))
$superAttributes[$parentProduct->id] = $parentProduct->super_attributes()->pluck('code')->toArray();
- foreach (core()->getAllChannels() as $channel) {
- foreach ($channel->locales as $locale) {
- $productFlat = $this->productFlatRepository->findOneWhere([
- 'product_id' => $product->id,
- 'channel' => $channel->code,
- 'locale' => $locale->code
- ]);
+ if (isset($product['channels'])) {
+ foreach ($product['channels'] as $channel) {
+ $channel = app('Webkul\Core\Repositories\ChannelRepository')->findOrFail($channel);
+ $channels[] = $channel['code'];
+ }
+ } else if (isset($parentProduct['channels'])){
+ foreach ($parentProduct['channels'] as $channel) {
+ $channel = app('Webkul\Core\Repositories\ChannelRepository')->findOrFail($channel);
+ $channels[] = $channel['code'];
+ }
+ } else {
+ $channels[] = core()->getDefaultChannelCode();
+ }
- if (! $productFlat) {
- $productFlat = $this->productFlatRepository->create([
+ foreach (core()->getAllChannels() as $channel) {
+ if (in_array($channel->code, $channels)) {
+ foreach ($channel->locales as $locale) {
+ $productFlat = $this->productFlatRepository->findOneWhere([
'product_id' => $product->id,
'channel' => $channel->code,
'locale' => $locale->code
]);
- }
- foreach ($familyAttributes[$product->attribute_family->id] as $attribute) {
- if ($parentProduct && ! in_array($attribute->code, array_merge($superAttributes[$parentProduct->id], ['sku', 'name', 'price', 'weight', 'status'])))
- continue;
-
- if (in_array($attribute->code, ['tax_category_id']))
- continue;
-
- if (! Schema::hasColumn('product_flat', $attribute->code))
- continue;
-
- if ($attribute->value_per_channel) {
- if ($attribute->value_per_locale) {
- $productAttributeValue = $product->attribute_values()->where('channel', $channel->code)->where('locale', $locale->code)->where('attribute_id', $attribute->id)->first();
- } else {
- $productAttributeValue = $product->attribute_values()->where('channel', $channel->code)->where('attribute_id', $attribute->id)->first();
- }
- } else {
- if ($attribute->value_per_locale) {
- $productAttributeValue = $product->attribute_values()->where('locale', $locale->code)->where('attribute_id', $attribute->id)->first();
- } else {
- $productAttributeValue = $product->attribute_values()->where('attribute_id', $attribute->id)->first();
- }
- }
-
- 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});
-
- if ($attributeOption) {
- if ($attributeOptionTranslation = $attributeOption->translate($locale->code)) {
- $productFlat->{$attribute->code . '_label'} = $attributeOptionTranslation->label;
- } else {
- $productFlat->{$attribute->code . '_label'} = $attributeOption->admin_name;
- }
- }
- } elseif ($attribute->type == 'multiselect') {
- $attributeOptionIds = explode(',', $product->{$attribute->code});
-
- if (count($attributeOptionIds)) {
- $attributeOptions = $this->attributeOptionRepository->findWhereIn('id', $attributeOptionIds);
-
- $optionLabels = [];
-
- foreach ($attributeOptions as $attributeOption) {
- if ($attributeOptionTranslation = $attributeOption->translate($locale->code)) {
- $optionLabels[] = $attributeOptionTranslation->label;
- } else {
- $optionLabels[] = $attributeOption->admin_name;
- }
- }
-
- $productFlat->{$attribute->code . '_label'} = implode(', ', $optionLabels);
- }
- }
- }
-
- $productFlat->created_at = $product->created_at;
-
- $productFlat->updated_at = $product->updated_at;
-
- if ($parentProduct) {
- $parentProductFlat = $this->productFlatRepository->findOneWhere([
- 'product_id' => $parentProduct->id,
+ if (! $productFlat) {
+ $productFlat = $this->productFlatRepository->create([
+ 'product_id' => $product->id,
'channel' => $channel->code,
'locale' => $locale->code
]);
-
- if ($parentProductFlat) {
- $productFlat->parent_id = $parentProductFlat->id;
}
- }
- $productFlat->save();
+ foreach ($familyAttributes[$product->attribute_family->id] as $attribute) {
+ if ($parentProduct && ! in_array($attribute->code, array_merge($superAttributes[$parentProduct->id], ['sku', 'name', 'price', 'weight', 'status'])))
+ continue;
+
+ if (in_array($attribute->code, ['tax_category_id']))
+ continue;
+
+ if (! Schema::hasColumn('product_flat', $attribute->code))
+ continue;
+
+ if ($attribute->value_per_channel) {
+ if ($attribute->value_per_locale) {
+ $productAttributeValue = $product->attribute_values()->where('channel', $channel->code)->where('locale', $locale->code)->where('attribute_id', $attribute->id)->first();
+ } else {
+ $productAttributeValue = $product->attribute_values()->where('channel', $channel->code)->where('attribute_id', $attribute->id)->first();
+ }
+ } else {
+ if ($attribute->value_per_locale) {
+ $productAttributeValue = $product->attribute_values()->where('locale', $locale->code)->where('attribute_id', $attribute->id)->first();
+ } else {
+ $productAttributeValue = $product->attribute_values()->where('attribute_id', $attribute->id)->first();
+ }
+ }
+
+ 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});
+
+ if ($attributeOption) {
+ if ($attributeOptionTranslation = $attributeOption->translate($locale->code)) {
+ $productFlat->{$attribute->code . '_label'} = $attributeOptionTranslation->label;
+ } else {
+ $productFlat->{$attribute->code . '_label'} = $attributeOption->admin_name;
+ }
+ }
+ } elseif ($attribute->type == 'multiselect') {
+ $attributeOptionIds = explode(',', $product->{$attribute->code});
+
+ if (count($attributeOptionIds)) {
+ $attributeOptions = $this->attributeOptionRepository->findWhereIn('id', $attributeOptionIds);
+
+ $optionLabels = [];
+
+ foreach ($attributeOptions as $attributeOption) {
+ if ($attributeOptionTranslation = $attributeOption->translate($locale->code)) {
+ $optionLabels[] = $attributeOptionTranslation->label;
+ } else {
+ $optionLabels[] = $attributeOption->admin_name;
+ }
+ }
+
+ $productFlat->{$attribute->code . '_label'} = implode(', ', $optionLabels);
+ }
+ }
+ }
+
+ $productFlat->created_at = $product->created_at;
+
+ $productFlat->updated_at = $product->updated_at;
+
+ if ($parentProduct) {
+ $parentProductFlat = $this->productFlatRepository->findOneWhere([
+ 'product_id' => $parentProduct->id,
+ 'channel' => $channel->code,
+ 'locale' => $locale->code
+ ]);
+
+ if ($parentProductFlat) {
+ $productFlat->parent_id = $parentProductFlat->id;
+ }
+ }
+
+ $productFlat->save();
+ }
+ } else {
+ $productFlat = $this->productFlatRepository->findOneWhere([
+ 'product_id' => $product->id,
+ 'channel' => $channel->code,
+ ]);
+
+ if ($productFlat) {
+ $this->productFlatRepository->delete($productFlat->id);
+ }
}
}
}
diff --git a/packages/Webkul/Product/src/Models/ProductAttributeValue.php b/packages/Webkul/Product/src/Models/ProductAttributeValue.php
index 858e49c8e..942fa2142 100755
--- a/packages/Webkul/Product/src/Models/ProductAttributeValue.php
+++ b/packages/Webkul/Product/src/Models/ProductAttributeValue.php
@@ -27,6 +27,7 @@ class ProductAttributeValue extends Model implements ProductAttributeValueContra
'date' => 'date_value',
'file' => 'text_value',
'image' => 'text_value',
+ 'checkbox' => 'text_value',
];
protected $fillable = [
diff --git a/packages/Webkul/Product/src/Models/ProductFlat.php b/packages/Webkul/Product/src/Models/ProductFlat.php
index e5b47f256..549bcc056 100644
--- a/packages/Webkul/Product/src/Models/ProductFlat.php
+++ b/packages/Webkul/Product/src/Models/ProductFlat.php
@@ -23,6 +23,14 @@ class ProductFlat extends Model implements ProductFlatContract
return $this->product->getTypeInstance();
}
+ /**
+ * Get the product attribute family that owns the product.
+ */
+ public function getAttributeFamilyAttribute()
+ {
+ return $this->product->attribute_family;
+ }
+
/**
* Get the product that owns the attribute value.
*/
@@ -116,7 +124,7 @@ class ProductFlat extends Model implements ProductFlatContract
*/
public function getReviewsAttribute()
{
- return $this->images()->get();
+ return $this->reviews()->get();
}
/**
diff --git a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
index 1c4338fdc..5395dcb63 100644
--- a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
@@ -16,4 +16,58 @@ class ProductFlatRepository extends Repository
{
return 'Webkul\Product\Contracts\ProductFlat';
}
+
+ /**
+ * Maximum Price of Category Product
+ *
+ * @param int $categoryId
+ * return integer
+ */
+ public function getCategoryProductMaximumPrice($categoryId)
+ {
+ // return $this->model
+ // ->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id')
+ // ->where('product_categories.category_id', $categoryId)
+ // ->max('price');
+
+ return $this->model->max('price');
+ }
+
+ /**
+ * Maximum Price of Product
+ *
+ * return integer
+ */
+ public function getProductMaximumPrice()
+ {
+ return $this->model->max('price');
+ }
+
+ /**
+ * get Category Product
+ *
+ * return array
+ */
+ public function getCategoryProductAttribute($categoryId)
+ {
+ $qb = $this->model
+ ->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id')
+ ->where('product_categories.category_id', $categoryId)
+ ->where('product_flat.channel', core()->getCurrentChannelCode())
+ ->where('product_flat.locale', app()->getLocale());
+
+ $productArrributes = $qb
+ ->leftJoin('product_attribute_values as pa', 'product_flat.product_id', 'pa.product_id')
+ ->pluck('pa.attribute_id')
+ ->toArray();
+
+ $productSuperArrributes = $qb
+ ->leftJoin('product_super_attributes as ps', 'product_flat.product_id', 'ps.product_id')
+ ->pluck('ps.attribute_id')
+ ->toArray();
+
+ $productCategoryArrributes = array_unique(array_merge($productArrributes, $productSuperArrributes));
+
+ return $productCategoryArrributes;
+ }
}
\ No newline at end of file
diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index d474e9626..8bd57a85b 100755
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -81,6 +81,10 @@ class ProductRepository extends Repository
$product = $product->getTypeInstance()->update($data, $id, $attribute);
+ if (isset($data['channels'])) {
+ $product['channels'] = $data['channels'];
+ }
+
Event::fire('catalog.product.update.after', $product);
return $product;
@@ -155,28 +159,39 @@ class ProductRepository extends Repository
}
}
- $qb = $qb->where(function($query1) {
- foreach (['product_flat', 'flat_variants'] as $alias) {
- $query1 = $query1->orWhere(function($query2) use($alias) {
- $attributes = $this->attributeRepository->getProductDefaultAttributes(array_keys(request()->input()));
+ $qb = $qb->leftJoin('products as variants', 'products.id', '=', 'variants.parent_id');
- foreach ($attributes as $attribute) {
- $column = $alias . '.' . $attribute->code;
+ $qb = $qb->where(function($query1) use($qb) {
+ $aliases = [
+ 'products' => 'filter_',
+ 'variants' => 'variant_filter_'
+ ];
- $queryParams = explode(',', request()->get($attribute->code));
+ foreach($aliases as $table => $alias) {
+ $query1 = $query1->orWhere(function($query2) use($qb, $table, $alias) {
+
+ foreach ($this->attribute->getProductDefaultAttributes(array_keys(request()->input())) as $code => $attribute) {
+ $aliasTemp = $alias . $attribute->code;
+
+ $qb = $qb->leftJoin('product_attribute_values as ' . $aliasTemp, $table . '.id', '=', $aliasTemp . '.product_id');
+
+ $column = ProductAttributeValue::$attributeTypeFields[$attribute->type];
+
+ $temp = explode(',', request()->get($attribute->code));
if ($attribute->type != 'price') {
- $query2 = $query2->where(function($query3) use($column, $queryParams) {
- foreach ($queryParams as $filterValue) {
- $query3 = $query3->orwhereRaw("find_in_set($filterValue, $column)");
+ $query2 = $query2->where($aliasTemp . '.attribute_id', $attribute->id);
+
+ $query2 = $query2->where(function($query3) use($aliasTemp, $column, $temp) {
+ foreach($temp as $code => $filterValue) {
+ $columns = $aliasTemp . '.' . $column;
+ $query3 = $query3->orwhereRaw("find_in_set($filterValue, $columns)");
}
});
} else {
- if ($attribute->code != 'price') {
- $query2 = $query2->where($column, '>=', current($queryParams))->where($column, '<=', end($queryParams));
- } else {
- $query2 = $query2->where($column, '>=', current($queryParams))->where($column, '<=', end($queryParams));
- }
+ $query2 = $query2->where($aliasTemp . '.' . $column, '>=', core()->convertToBasePrice(current($temp)))
+ ->where($aliasTemp . '.' . $column, '<=', core()->convertToBasePrice(end($temp)))
+ ->where($aliasTemp . '.attribute_id', $attribute->id);
}
}
});
diff --git a/packages/Webkul/Product/src/Repositories/SearchRepository.php b/packages/Webkul/Product/src/Repositories/SearchRepository.php
index d05d4b1b7..f070b0276 100755
--- a/packages/Webkul/Product/src/Repositories/SearchRepository.php
+++ b/packages/Webkul/Product/src/Repositories/SearchRepository.php
@@ -47,17 +47,7 @@ class SearchRepository extends Repository
}
public function search($data) {
- $query = parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY);
- $searchTerm = explode("?", $query);
- $serachQuery = '';
-
- foreach ($searchTerm as $term) {
- if (strpos($term, 'term') !== false) {
- $serachQuery = last(explode("=", $term));
- }
- }
-
- $products = $this->productRepository->searchProductByAttribute($serachQuery);
+ $products = $this->product->searchProductByAttribute($data['term']);
return $products;
}
diff --git a/packages/Webkul/Shipping/src/Config/carriers.php b/packages/Webkul/Shipping/src/Config/carriers.php
index 5562a3f53..8f80fae2f 100755
--- a/packages/Webkul/Shipping/src/Config/carriers.php
+++ b/packages/Webkul/Shipping/src/Config/carriers.php
@@ -4,7 +4,7 @@ return [
'flatrate' => [
'code' => 'flatrate',
'title' => 'Flat Rate',
- 'description' => 'This is a flat rate',
+ 'description' => 'shop::app.checkout.onepage.flat-desc',
'active' => true,
'default_rate' => '10',
'type' => 'per_unit',
@@ -14,7 +14,7 @@ return [
'free' => [
'code' => 'free',
'title' => 'Free Shipping',
- 'description' => 'This is a free shipping',
+ 'description' => 'shop::app.checkout.onepage.free-desc',
'active' => true,
'default_rate' => '0',
'class' => 'Webkul\Shipping\Carriers\Free',
diff --git a/packages/Webkul/Shipping/src/Config/system.php b/packages/Webkul/Shipping/src/Config/system.php
index 34ac19479..916d61b99 100755
--- a/packages/Webkul/Shipping/src/Config/system.php
+++ b/packages/Webkul/Shipping/src/Config/system.php
@@ -4,7 +4,7 @@ return [
[
'key' => 'sales',
'name' => 'admin::app.admin.system.sales',
- 'sort' => 1
+ 'sort' => 5
], [
'key' => 'sales.carriers',
'name' => 'admin::app.admin.system.shipping-methods',
diff --git a/packages/Webkul/Shop/publishable/assets/css/shop.css b/packages/Webkul/Shop/publishable/assets/css/shop.css
index 70c296853..03e923e18 100755
--- a/packages/Webkul/Shop/publishable/assets/css/shop.css
+++ b/packages/Webkul/Shop/publishable/assets/css/shop.css
@@ -1 +1 @@
-@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500);.icon{display:inline-block;background-size:cover}.dropdown-right-icon{background-image:URL("../images/icon-dropdown-left.svg");width:8px;height:8px;margin-left:auto;margin-bottom:2px}.icon-menu-close{background-image:URL("../images/icon-menu-close.svg");width:24px;height:24px;margin-left:auto}.icon-menu-close-adj{background-image:URL("../images/cross-icon-adj.svg");margin-left:auto}.grid-view-icon{background-image:URL("../images/icon-grid-view.svg");width:24px;height:24px}.list-view-icon{background-image:URL("../images/icon-list-view.svg");width:24px;height:24px}.sort-icon{background-image:URL("../images/icon-sort.svg");width:32px;height:32px}.filter-icon{background-image:URL("../images/icon-filter.svg");width:32px;height:32px}.whishlist-icon{background-image:URL("../images/wishlist.svg");width:24px;height:24px}.share-icon{background-image:URL("../images/icon-share.svg");width:24px;height:24px}.icon-menu{background-image:URL("../images/icon-menu.svg");width:24px;height:24px}.icon-search{background-image:URL("../images/icon-search.svg");width:24px;height:24px}.icon-menu-back{background-image:URL("../images/icon-menu-back.svg");width:24px;height:24px}.shipping-icon{background-image:url("../images/shipping.svg");width:32px;height:32px}.payment-icon{background-image:url("../images/payment.svg");width:32px;height:32px}.cart-icon{background-image:url("../images/icon-cart.svg");width:24px;height:24px}.wishlist-icon{background-image:url("../images/wishlist.svg");width:32px;height:32px}.icon-arrow-up{background-image:url("../images/arrow-up.svg");width:16px;height:16px}.icon-arrow-down{background-image:url("../images/arrow-down.svg");width:16px;height:16px}.expand-icon{background-image:url("../images/Expand-Light.svg");width:18px;height:18px}.expand-on-icon{background-image:url("../images/Expand-Light-On.svg");width:18px;height:18px}.icon-menu-close-adj{background-image:url("../images/cross-icon-adj.svg");width:32px;height:32px}.icon-facebook{background-image:url("../images/facebook.svg")}.icon-twitter{background-image:url("../images/twitter.svg")}.icon-google-plus{background-image:url("../images/google-plus.svg")}.icon-instagram{background-image:url("../images/instagram.svg")}.icon-linkedin{background-image:url("../images/linkedin.svg")}.icon-dropdown{background-image:url("../images/icon-dropdown.svg")}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}body{margin:0;padding:0;font-weight:500;max-width:100%;width:auto;color:#242424;font-size:16px}*{font-family:Montserrat,sans-serif}::-webkit-input-placeholder{font-family:Montserrat,sans-serif}textarea{resize:none}input{font-family:Montserrat,sans-serif}.btn{border-radius:0!important}.pagination.shop{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}@media only screen and (max-width:770px){.pagination.shop{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.pagination.shop .page-item{display:none}.pagination.shop .page-item.next,.pagination.shop .page-item.previous{display:block}}.bold{font-weight:700;color:#3a3a3a}.radio-container{display:block;position:relative;padding-left:35px;margin-bottom:12px;cursor:pointer;font-size:16px;user-select:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.radio-container input{position:absolute;opacity:0;cursor:pointer;top:0;left:0}.radio-container .checkmark{position:absolute;top:0;left:0;height:16px;width:16px;background-color:#fff;border:2px solid #ff6472;border-radius:50%}.radio-container .checkmark:after{content:"";position:absolute;display:none;top:2px;left:2px;width:8px;height:8px;border-radius:50%;background:#ff6472}.radio-container input:checked~.checkmark:after{display:block}.radio-container input:disabled~.checkmark{display:block;border:2px solid rgba(255,100,113,.4)}.cp-spinner{width:48px;height:48px;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box}.cp-round:before{border-radius:50%;border:6px solid #bababa}.cp-round:after,.cp-round:before{content:" ";width:48px;height:48px;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;position:absolute;top:0;left:0}.cp-round:after{border-radius:50%;border-top:6px solid #0031f0;border-right:6px solid transparent;border-bottom:6px solid transparent;border-left:6px solid transparent;-webkit-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite}.pull-right{float:right}.add-to-wishlist .wishlist-icon:hover{background-image:url("../images/wishlist-added.svg")}.product-price{margin-bottom:14px;width:100%;font-weight:600}.product-price .price-label{font-size:14px;font-weight:400}.product-price .regular-price{color:#a5a5a5;text-decoration:line-through;margin-right:10px}.product-price .special-price{color:#ff6472}.horizontal-rule{display:block;width:100%;height:1px;background:#c7c7c7}.account-head .account-heading{font-size:28px;color:#242424;text-transform:capitalize;text-align:left}.account-head .account-action{font-size:17px;margin-top:1%;color:#0031f0;float:right}.account-head .horizontal-rule{margin-top:1.1%;width:100%;height:1px;vertical-align:middle;background:#c7c7c7}.account-item-card{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:125px}.account-item-card,.account-item-card .media-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.account-item-card .media-info .media{height:125px;width:110px}.account-item-card .media-info .info{margin-left:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly}.account-item-card .media-info .info .stars .icon{height:16px;width:16px}.account-item-card .operations{height:120px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.account-item-card .operations a{width:100%}.account-item-card .operations a span{float:right}.account-items-list{display:block;width:100%}.account-items-list .grid-container{margin-top:40px}.search-result-status{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.grid-container{margin-top:20px}.main-container-wrapper{max-width:1300px;width:auto;padding-left:15px;padding-right:15px;margin-left:auto;margin-right:auto}.main-container-wrapper .content-container{display:block;margin-bottom:40px}.main-container-wrapper .product-grid-4{display:grid;grid-template-columns:repeat(auto-fill,minmax(235px,1fr));grid-auto-rows:auto;grid-column-gap:30px;grid-row-gap:15px;justify-items:end}.main-container-wrapper .product-grid-3{display:grid;grid-template-columns:repeat(auto-fill,minmax(235px,1fr));grid-gap:27px;grid-auto-rows:auto;justify-items:center}.main-container-wrapper .product-card{position:relative;padding:15px}.main-container-wrapper .product-card .product-image{max-height:350px;max-width:280px;margin-bottom:10px;background:#f2f2f2}.main-container-wrapper .product-card .product-image img{display:block;width:100%}.main-container-wrapper .product-card .product-name{margin-bottom:14px;width:100%;color:#242424}.main-container-wrapper .product-card .product-name a{color:#242424}.main-container-wrapper .product-card .product-description{display:none}.main-container-wrapper .product-card .product-ratings{width:100%}.main-container-wrapper .product-card .product-ratings .icon{width:16px;height:16px}.main-container-wrapper .product-card .cart-wish-wrap{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:40px}.main-container-wrapper .product-card .cart-wish-wrap .addtocart{margin-right:10px;text-transform:uppercase;text-align:left;-webkit-box-shadow:1px 1px 0 #ccc;box-shadow:1px 1px 0 #ccc}.main-container-wrapper .product-card .cart-wish-wrap .add-to-wishlist{margin-top:5px;background:transparent;border:0;cursor:pointer;padding:0}.main-container-wrapper .product-card .sticker{border-radius:100px;position:absolute;top:20px;left:20px;text-transform:uppercase;padding:4px 13px;font-size:14px;color:#fff;-webkit-box-shadow:1px 1px 1px #ccc;box-shadow:1px 1px 1px #ccc}.main-container-wrapper .product-card .sticker.sale{background:#ff6472}.main-container-wrapper .product-card .sticker.new{background:#2ed04c}.main-container-wrapper .product-card:hover{outline:1px solid #eaeaec;box-shadow:0 1px 2px rgba(0,0,0,.05);-webkit-box-shadow:0 2px 16px 4px rgba(40,44,63,.07);box-shadow:0 2px 16px 4px rgba(40,44,63,.07)}@media only screen and (max-width:580px){.main-container-wrapper .main-container-wrapper{padding:0}}@media only screen and (max-width:551px){.main-container-wrapper .product-grid-3{grid-template-columns:48.5% 48.5%;grid-column-gap:20px}}@media only screen and (max-width:854px){.main-container-wrapper .product-grid-4{grid-template-columns:29.5% 29.5% 29.5%;grid-column-gap:35px}}@media only screen and (max-width:653px){.main-container-wrapper .product-grid-4{grid-template-columns:48.5% 48.5%;grid-column-gap:17px}}@media only screen and (max-width:425px){.main-container-wrapper .product-card{font-size:90%}.main-container-wrapper .product-card .btn.btn-md{padding:5px}.main-container-wrapper .product-grid-4{grid-template-columns:48.5% 48.5%;grid-column-gap:10px}}.main-container-wrapper .product-list{min-height:200px}.main-container-wrapper .product-list .product-card{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px}.main-container-wrapper .product-list .product-card .product-image{float:left;width:30%;height:350px}.main-container-wrapper .product-list .product-card .product-image img{height:100%}.main-container-wrapper .product-list .product-card .product-information{float:right;width:70%;padding-left:30px}.main-container-wrapper .product-list .product-card:last-child{margin-bottom:0}.main-container-wrapper .product-list.empty h2{font-size:20px}.main-container-wrapper section.featured-products{display:block;margin-bottom:5%}.main-container-wrapper section.featured-products .featured-heading{width:100%;text-align:center;text-transform:uppercase;font-size:18px;margin-bottom:20px}.main-container-wrapper section.featured-products .featured-heading .featured-separator{color:#d3d3d3}.main-container-wrapper section.news-update{display:block;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%;margin-bottom:5%}.main-container-wrapper section.news-update .news-update-grid{display:grid;grid-template-columns:58.5% 40%;grid-gap:20px}.main-container-wrapper section.news-update .news-update-grid .block1{display:block;-webkit-box-sizing:border-box;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block1 img{display:-webkit-box;display:-ms-flexbox;display:flex;height:100%;width:100%}.main-container-wrapper section.news-update .news-update-grid .block2{display:block;-webkit-box-sizing:border-box;box-sizing:border-box;display:grid;grid-template-rows:repeat(2,minmax(50%,1fr));grid-row-gap:20px}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block1{display:block;-webkit-box-sizing:border-box;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block1 img{width:100%}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block2{display:block;-webkit-box-sizing:border-box;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block2 img{width:100%}section.slider-block{display:block;margin-left:auto;margin-right:auto;margin-bottom:5%}section.slider-block div.slider-content{position:relative;height:500px;margin-left:auto;margin-right:auto}section.slider-block div.slider-content ul.slider-images .show-content{display:none}section.slider-block div.slider-content ul.slider-images li{position:absolute;visibility:hidden}section.slider-block div.slider-content ul.slider-images li.show{display:block;position:relative;visibility:visible;width:100%;-webkit-animation-name:example;animation-name:example;-webkit-animation-duration:4s;animation-duration:4s}section.slider-block div.slider-content ul.slider-images li.show .show-content{display:-webkit-box;display:-ms-flexbox;display:flex;position:absolute;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;color:#242424;height:100%;width:100%;top:0}@-webkit-keyframes example{0%{opacity:.1}to{opacity:1}}@keyframes example{0%{opacity:.1}to{opacity:1}}section.slider-block div.slider-content ul.slider-images li img{height:500px;width:100%}section.slider-block div.slider-content div.slider-control{display:block;cursor:pointer;position:absolute;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;bottom:2%;right:2%}section.slider-block div.slider-content div.slider-control .dark-left-icon{background-color:#f2f2f2;height:48px;width:48px;max-height:100%;max-width:100%}section.slider-block div.slider-content div.slider-control .light-right-icon{background-color:#242424;height:48px;width:48px;max-height:100%;max-width:100%}@media only screen and (max-width:770px){section.slider-block div.slider-content div.slider-control{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;bottom:46%;right:0;width:100%}}.header{margin-top:16px;margin-bottom:21px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.header .header-top{margin-bottom:16px;max-width:100%;width:auto;margin-left:auto;margin-right:auto;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.header .header-top,.header .header-top div.left-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.left-content{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.header .header-top div.left-content ul.logo-container{margin-right:12px}.header .header-top div.left-content ul.logo-container li{display:-webkit-box;display:-ms-flexbox;display:flex}.header .header-top div.left-content ul.logo-container li img{max-width:120px;max-height:40px}.header .header-top div.left-content ul.search-container li.search-group{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.left-content ul.search-container li.search-group .search-field{height:38px;border:2px solid #c7c7c7;border-radius:3px;border-right:none;border-top-right-radius:0;border-bottom-right-radius:0;padding-left:12px;font-size:14px}.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper{-webkit-box-sizing:border-box;box-sizing:border-box;height:38px;width:38px;border:2px solid #c7c7c7;border-top-right-radius:3px;border-bottom-right-radius:3px}.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper button{background:#fff;border:0;padding:3px 5px}.header .header-top div.right-content .right-content-menu>li{display:inline-block;border-right:2px solid #c7c7c7;padding:0 15px;min-height:15px;padding-top:3px}.header .header-top div.right-content .right-content-menu>li:first-child{padding-left:0}.header .header-top div.right-content .right-content-menu>li:last-child{border-right:0;padding-right:0}.header .header-top div.right-content .right-content-menu>li .icon{vertical-align:middle}.header .header-top div.right-content .right-content-menu>li .icon:not(.arrow-down-icon){margin-right:5px}.header .header-top div.right-content .right-content-menu>li .arrow-down-icon{width:12px;height:6px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container{border-right:0;padding-right:0}.header .header-top div.right-content .right-content-menu .cart-link{pointer-events:none}.header .header-top div.right-content .right-content-menu ul.dropdown-list{display:none;margin-top:14px}.header .header-top div.right-content .right-content-menu ul.dropdown-list li{border-right:none;padding:5px 10px;display:block}.header .header-top div.right-content .right-content-menu ul.dropdown-list li a{color:#333}.header .header-top div.right-content .right-content-menu .currency{position:absolute;right:0;width:100px}.header .header-top div.right-content .right-content-menu .account{position:absolute;right:0}.header .header-top div.right-content .right-content-menu .account li{padding:20px!important}.header .header-top div.right-content .right-content-menu .account li ul{margin-top:5px}.header .header-top div.right-content .right-content-menu .account li ul>li{padding:5px 10px 5px 0!important}.header .header-top div.right-content .right-content-menu .guest{width:300px}.header .header-top div.right-content .right-content-menu .guest .btn.btn-sm{padding:9px 25px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list{width:387px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container{padding:0}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart{color:#242424}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header{width:100%;padding:8px 16px;border-bottom:1px solid #c7c7c7}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header p{display:inline;line-height:25px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header i{float:right;height:22px;width:22px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header p.heading{font-weight:lighter}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content{padding-top:8px;margin-bottom:55px;width:100%;max-height:329px;overflow-y:auto}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content .item{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;border-bottom:1px solid #c7c7c7;padding:8px 16px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content .item img{height:75px;width:75px;margin-right:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content .item-details{height:auto}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-name{font-size:16px;font-weight:700;margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-options{font-size:16px;margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-price{margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-qty{font-weight:lighter;margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:8px 16px;position:absolute;bottom:0;width:100%;background:#fff;border-top:1px solid #c7c7c7}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-footer .btn{margin:0;max-width:170px;text-align:center}.header .header-top div.right-content .menu-box,.header .header-top div.right-content .search-box{display:none}.header .header-bottom{height:47px;margin-left:auto;margin-right:auto;border-top:1px solid #c7c7c7;border-bottom:1px solid #c7c7c7;display:block}.header .header-bottom ul.nav{display:block;font-size:16px;max-width:100%;width:auto;margin-left:auto;margin-right:auto}.header .header-bottom .nav ul{margin:0;padding:0;-webkit-box-shadow:1px 1px 1px 0 rgba(0,0,0,.4);box-shadow:1px 1px 1px 0 rgba(0,0,0,.4)}.header .header-bottom .nav a{display:block;color:#242424;text-decoration:none;padding:.8em .3em .8em .5em;text-transform:capitalize;letter-spacing:-.38px;position:relative}.header .header-bottom .nav li>.icon{display:none}.header .header-bottom .nav{vertical-align:top;display:inline-block}.header .header-bottom .nav li{position:relative}.header .header-bottom .nav>li{float:left;margin-right:1px;height:45px}.header .header-bottom .nav>li>a{margin-bottom:1px}.header .header-bottom .nav>li>a .icon{display:none}.header .header-bottom .nav li li a{margin-top:1px;white-space:normal;word-break:break-word;width:200px}.header .header-bottom .nav li a:first-child:nth-last-child(2):before{content:"";position:absolute;height:0;width:0;border:5px solid transparent;top:50%;right:5px}.header .header-bottom .nav ul{position:absolute;white-space:nowrap;border:1px solid #c7c7c7;background-color:#fff;z-index:10000;left:-99999em}.header .header-bottom .nav>li:hover{background-color:#f2f2f2}.header .header-bottom .nav>li:hover>ul{left:auto;min-width:100%}.header .header-bottom .nav>li li:hover{background-color:#f2f2f2}.header .header-bottom .nav>li li:hover>ul{left:100%;margin-left:1px;top:-2px}.header .header-bottom .nav>li:hover>a:first-child:nth-last-child(2):before,.header .header-bottom .nav li li>a:first-child:nth-last-child(2):before{margin-top:-5px}.header .header-bottom .nav li li:hover>a:first-child:nth-last-child(2):before{right:10px}.header .search-responsive{display:none}.header .search-responsive .search-content{border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7;height:50px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.header .search-responsive .search-content .search{width:80%;border:none;font-size:16px}.header .search-responsive .search-content .right{float:right}@media (max-width:720px){.header .currency-switcher{display:none!important}.header .header-top div.right-content{display:inherit}.header .header-top div.right-content .menu-box{display:inline-block;margin-left:10px}.header .header-top div.right-content .search-box{display:inline-block;margin-right:10px;cursor:pointer}.header .header-top div.right-content .right-content-menu>li{border-right:none;padding:0 2px}.header .header-top div.right-content .right-content-menu>li .icon:not(.arrow-down-icon){margin-right:0}.header .header-top div.right-content .right-content-menu .cart-link{pointer-events:all}.header .header-top div.right-content .right-content-menu .arrow-down-icon,.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-container,.header .header-top div.right-content .right-content-menu .name{display:none}.header .header-bottom{height:auto;display:none}.header .header-bottom .nav a{display:inline-block}.header .header-bottom .nav li,.header .header-bottom ul.nav{height:auto}.header .header-bottom .nav>li{float:none}.header .header-bottom .nav li>.icon{float:right;display:block}.header .header-bottom .icon.icon-arrow-down{margin-right:5px}.header .header-bottom .nav li .left{height:16px;width:16px}.header .header-bottom .nav li a>.icon{display:none}.header .header-bottom .nav ul{position:unset;border:none;-webkit-box-shadow:none;box-shadow:none}.header .header-bottom .nav>li li:hover>ul{margin-left:0;top:0}ul.account-dropdown-container,ul.cart-dropdown-container,ul.search-container{display:none!important}}@media (max-width:400px){.header .header-top div.right-content .right-content-menu .guest{width:240px}.header .header-top div.right-content .right-content-menu .guest .btn.btn-sm{padding:7px 14px}}.footer{background-color:#f2f2f2;padding-left:10%;padding-right:10%;width:100%;display:inline-block}.footer .footer-content .footer-list-container{display:grid;padding:40px 10px;grid-template-columns:repeat(auto-fit,minmax(250px,1fr));grid-auto-rows:auto;grid-row-gap:1vh}.footer .footer-content .footer-list-container .list-container .list-heading{text-transform:uppercase;color:#a5a5a5}.footer .footer-content .footer-list-container .list-container .list-group{padding-top:25px}.footer .footer-content .footer-list-container .list-container .list-group a{color:#242424}.footer .footer-content .footer-list-container .list-container .list-group li{margin-bottom:12px;list-style-type:none;text-transform:uppercase}.footer .footer-content .footer-list-container .list-container .list-group li span.icon{display:inline-block;vertical-align:middle;margin-right:5px;height:24px;width:24px}.footer .footer-content .footer-list-container .list-container .form-container{padding-top:5px}.footer .footer-content .footer-list-container .list-container .form-container .control-group .subscribe-field{width:100%}.footer .footer-content .footer-list-container .list-container .form-container .control-group .btn-primary{background-color:#242424;margin-top:8px;border-radius:0;text-align:center}.footer .footer-content .footer-list-container .list-container .form-container .control-group .locale-switcher{width:100%}.footer .footer-content .footer-list-container .list-container .currency{display:none}@media (max-width:720px){.footer{padding-left:15px}.footer .footer-list-container{padding-left:0!important}.footer .currency{display:block!important}}.footer-bottom{width:100%;height:70px;font-size:16px;color:#a5a5a5;letter-spacing:-.26px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.footer-bottom p{padding:0 15px}.main .category-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;width:100%}.main .category-container .layered-filter-wrapper,.main .category-container .responsive-layred-filter{width:25%;float:left;padding-right:20px;min-height:1px}.main .category-container .layered-filter-wrapper .filter-title,.main .category-container .responsive-layred-filter .filter-title{border-bottom:1px solid #c7c7c7;color:#242424;padding:10px 0}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item{border-bottom:1px solid #c7c7c7;padding-bottom:10px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title{padding:10px 40px 0 10px;color:#5e5e5e;cursor:pointer;position:relative}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link{font-weight:400;color:#0031f0;margin-right:10px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .icon,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .icon{background-image:url("../images/icon-dropdown.svg")!important;width:10px;height:10px;position:absolute;right:15px;top:14px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content{padding:10px;display:none}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items{padding:0;margin:0;list-style:none none}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item{padding:8px 0;color:#5e5e5e}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox{margin:0}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view{height:16px;width:16px;background-image:url("../images/checkbox.svg")}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked+.checkbox-view,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked+.checkbox-view{background-image:url("../images/checkbox-checked.svg")}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .color-swatch,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .color-swatch{display:inline-block;margin-right:5px;min-width:20px;height:20px;border:1px solid #c7c7c7;border-radius:3px;float:right}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper{margin-top:21px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-content,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-content{display:block}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon{background-image:url("../images//arrow-up.svg")!important}.main .category-container .responsive-layred-filter{display:none;width:100%;float:none;padding-right:0;margin-top:-25px!important}.main .category-container .category-block{width:80%;display:block}.main .category-container .category-block .hero-image{display:inline-block;visibility:visible;width:100%}.main .category-container .category-block .hero-image img{height:400px;width:100%}.main .top-toolbar{width:100%;display:inline-block}.main .top-toolbar .page-info{float:left;color:#242424;line-height:45px}.main .top-toolbar .page-info span{display:none}.main .top-toolbar .page-info span:first-child{display:inline}.main .top-toolbar .pager{float:right}.main .top-toolbar .pager label{margin-right:5px}.main .top-toolbar .pager select{background:#f2f2f2;border:1px solid #c7c7c7;border-radius:3px;color:#242424;padding:10px}.main .top-toolbar .pager .view-mode{display:inline-block;margin-right:20px}.main .top-toolbar .pager .view-mode a,.main .top-toolbar .pager .view-mode span{display:inline-block;vertical-align:middle}.main .top-toolbar .pager .view-mode a.grid-view,.main .top-toolbar .pager .view-mode span.grid-view{margin-right:10px}.main .top-toolbar .pager .view-mode .sort-filter{display:none}.main .top-toolbar .pager .sorter{display:inline-block;margin-right:10px}.main .top-toolbar .pager .limiter{display:inline-block}.main .bottom-toolbar{display:block;margin-top:40px;margin-bottom:40px;text-align:center}@media only screen and (max-width:840px){.main .category-container .responsive-layred-filter,.main .layered-filter-wrapper{display:none}.main .category-block{width:100%!important}.main .category-block .top-toolbar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.main .category-block .top-toolbar .page-info{border-bottom:1px solid #c7c7c7;line-height:15px;margin-top:10px}.main .category-block .top-toolbar .page-info span{display:inline}.main .category-block .top-toolbar .page-info span:first-child{display:none}.main .category-block .top-toolbar .page-info .sort-filter{float:right;cursor:pointer}.main .category-block .top-toolbar .pager{margin-top:20px;display:none}.main .category-block .top-toolbar .pager .view-mode{display:none}.main .category-block .responsive-layred-filter{display:block}}section.product-detail{color:#242424}section.product-detail div.category-breadcrumbs{display:inline}section.product-detail div.layouter{display:block;margin-top:20px;margin-bottom:20px}section.product-detail div.layouter .form-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;width:100%}section.product-detail div.layouter .form-container div.product-image-group{margin-right:30px;width:604px;height:650px;max-width:604px;position:-webkit-sticky;position:sticky;top:10px}section.product-detail div.layouter .form-container div.product-image-group div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;cursor:pointer}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-right:4px;min-width:120px;overflow:hidden;position:relative;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;max-height:480px}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame{border:2px solid transparent;background:#f2f2f2;width:120px;max-height:120px}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame.active{border-color:#0031f0}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame img{height:100%;width:100%}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control{width:100%;position:absolute;text-align:center;cursor:pointer;z-index:1}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control .overlay{opacity:.3;background:#242424;width:100%;height:18px;position:absolute;left:0;z-index:-1}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control .icon{z-index:2}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control.top{top:0}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control.bottom{bottom:0}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image{display:block;position:relative;background:#f2f2f2;width:100%;max-height:480px;height:100%}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image img{width:100%;height:auto;max-height:480px}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .add-to-wishlist{background-image:url("../images/wishlist.svg");position:absolute;top:10px;right:12px;background-color:transparent;border:0;cursor:pointer;padding:0;width:32px;height:32px}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .add-to-wishlist:hover{background-image:url("../images/wishlist-added.svg")}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .share{position:absolute;top:10px;right:45px}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{display:none;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;margin-top:10px;width:79.5%;float:right;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons .addtocart{width:49%;background:#000;white-space:normal;text-transform:uppercase}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons .buynow{width:49%;white-space:nowrap;text-transform:uppercase}section.product-detail div.layouter .form-container .details{width:50%;overflow-wrap:break-word}section.product-detail div.layouter .form-container .details .product-price{margin-bottom:14px}section.product-detail div.layouter .form-container .details .product-price .sticker{display:none}section.product-detail div.layouter .form-container .details .product-ratings{margin-bottom:20px}section.product-detail div.layouter .form-container .details .product-ratings .icon{width:16px;height:16px}section.product-detail div.layouter .form-container .details .product-ratings .total-reviews{display:inline-block;margin-left:15px}section.product-detail div.layouter .form-container .details .product-heading{font-size:24px;color:#242424;margin-bottom:15px}section.product-detail div.layouter .form-container .details .product-price{margin-bottom:15px}section.product-detail div.layouter .form-container .details .product-price .special-price{font-size:24px}section.product-detail div.layouter .form-container .details .stock-status{margin-bottom:15px;font-weight:600;color:#fc6868}section.product-detail div.layouter .form-container .details .stock-status.active{color:#4caf50}section.product-detail div.layouter .form-container .details .description{margin-bottom:15px}section.product-detail div.layouter .form-container .details .description ul{padding-left:40px;list-style:disc}section.product-detail div.layouter .form-container .details .quantity{padding-top:15px;border-top:1px solid hsla(0,0%,64%,.2)}section.product-detail div.layouter .form-container .details .downloadable-container .sample-list{padding:15px 0;border-top:1px solid hsla(0,0%,64%,.2)}section.product-detail div.layouter .form-container .details .downloadable-container .sample-list h3{font-size:16px;margin-top:0}section.product-detail div.layouter .form-container .details .downloadable-container .sample-list ul li{margin-bottom:5px}section.product-detail div.layouter .form-container .details .downloadable-container .sample-list ul li:last-child{margin-bottom:0}section.product-detail div.layouter .form-container .details .downloadable-container .link-list{padding:15px 0;border-top:1px solid hsla(0,0%,64%,.2)}section.product-detail div.layouter .form-container .details .downloadable-container .link-list h3{font-size:16px;margin-top:0}section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li{margin-bottom:15px}section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li:last-child{margin-bottom:0}section.product-detail div.layouter .form-container .details .downloadable-container .link-list ul li a{float:right}section.product-detail div.layouter .form-container .details .full-description *{max-width:100%}section.product-detail div.layouter .form-container .details .full-description ul{padding-left:40px;list-style:disc}section.product-detail div.layouter .form-container .details .full-specifications td{padding:10px 0;color:#5e5e5e}section.product-detail div.layouter .form-container .details .full-specifications td:first-child{padding-right:40px}section.product-detail div.layouter .form-container .details .accordian .accordian-header{padding-left:0;font-weight:600}section.product-detail div.layouter .form-container .details .accordian .accordian-content{padding:20px 0}section.product-detail div.layouter .form-container .details .attributes{display:block;width:100%;border-bottom:1px solid hsla(0,0%,64%,.2)}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group{margin-bottom:20px}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container{margin-top:10px;display:inline-block}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch{display:inline-block;margin-right:5px;min-width:40px;height:40px}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch span{min-width:38px;height:38px;float:left;border:1px solid #c7c7c7;border-radius:3px;line-height:36px;text-align:center;cursor:pointer;padding:0 10px}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch img{width:38px;height:38px;border:1px solid #c7c7c7;border-radius:3px;cursor:pointer;background:#f2f2f2}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch input:checked+img,section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch input:checked+span{border:1px solid #242424}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch input{display:none}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .no-options{color:#ff6472}section.product-detail div.layouter .form-container .details .quantity-change{cursor:pointer;text-align:center}section.product-detail div.layouter .form-container .details .quantity-change:focus{border-color:#c7c7c7!important}.accordian .accordian-header,.accordian div[slot*=header],accordian .accordian-header,accordian div[slot*=header]{font-size:16px!important}@media only screen and (max-width:720px){section.product-detail div.layouter .form-container{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;max-width:none;width:auto;min-height:400px;height:auto;position:unset}section.product-detail div.layouter .form-container div.product-image-group .loader{margin-left:47%}section.product-detail div.layouter .form-container div.product-image-group div{-webkit-box-orient:vertical;-webkit-box-direction:reverse;-ms-flex-direction:column-reverse;flex-direction:column-reverse}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list{margin-top:5px;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;overflow-x:scroll;margin-right:0}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame img{height:100%;width:auto}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control{display:none}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image{display:-webkit-box;display:-ms-flexbox;display:flex}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image img{margin-left:auto;margin-right:auto;width:480px}section.product-detail div.layouter .form-container div.product-image-group div .wrap{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;width:100%!important}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{width:100%}section.product-detail div.layouter .form-container .details{width:100%;margin-top:20px}}@media only screen and (max-width:510px){section.product-detail div.layouter .form-container div.product-image-group .product-hero-image img{width:100%!important}}.rating-reviews .rating-header{padding:20px 0}.rating-reviews .stars .icon{width:16px;height:16px}.rating-reviews .overall{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.rating-reviews .overall .review-info .number{font-size:34px}.rating-reviews .overall .review-info .total-reviews{margin-top:10px}.rating-reviews .reviews{margin-top:40px;margin-bottom:40px}.rating-reviews .reviews .review{margin-bottom:25px}.rating-reviews .reviews .review .title{margin-bottom:5px}.rating-reviews .reviews .review .stars{margin-bottom:15px;display:inline-block}.rating-reviews .reviews .review .message{margin-bottom:10px}.rating-reviews .reviews .review .reviewer-details{color:#5e5e5e}.rating-reviews .reviews .view-all{margin-top:15px;color:#0031f0;margin-bottom:15px}section.cart{width:100%;color:#242424;margin-bottom:80px;margin-top:20px}section.cart .title{font-size:24px}section.cart .cart-content{margin-top:20px;width:100%;display:inline-block}section.cart .cart-content .left-side{width:70%;float:left}section.cart .cart-content .left-side .misc-controls{width:100%;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;margin-top:20px}section.cart .cart-content .left-side .misc-controls a.link,section.cart .cart-content .left-side .misc-controls div button{margin-right:15px}section.cart .cart-content .right-side{width:30%;display:inline-block;padding-left:40px}.cart-item-list .item{padding:10px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;border:1px solid #c7c7c7;border-radius:2px}.cart-item-list .item .item-image{margin-right:15px}.cart-item-list .item .item-image img{height:160px;width:160px}.cart-item-list .item .item-details{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.cart-item-list .item .item-details .item-title{font-size:18px;margin-bottom:10px;font-weight:600}.cart-item-list .item .item-details .item-title a{color:#242424}.cart-item-list .item .item-details .price{margin-bottom:10px;font-size:18px;font-weight:600}.cart-item-list .item .item-details .summary{margin-bottom:17px}.cart-item-list .item .item-details .misc{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.cart-item-list .item .item-details .misc .control-group{font-size:16px!important;width:220px;margin:0}.cart-item-list .item .item-details .misc .control-group .wrap{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cart-item-list .item .item-details .misc .control-group label{margin-right:15px}.cart-item-list .item .item-details .misc .control-group .control{height:38px;width:60px;border-radius:3px;text-align:center;line-height:38px}.cart-item-list .item .item-details .misc .remove,.cart-item-list .item .item-details .misc .towishlist{margin-top:18px;margin-right:15px}.cart-item-list .item .item-details .misc .quantity-change{cursor:pointer}.cart-item-list .item .item-details .misc .quantity-change:focus{border-color:#c7c7c7!important}.cart-item-list .item .error-message{color:#ff6472}.order-summary h3{font-size:16px;margin-top:0}.order-summary .item-detail{margin-top:12px}.order-summary .item-detail label.right{float:right}.order-summary .payable-amount{margin-top:17px;border-top:1px solid #c7c7c7;padding-top:12px}.order-summary .payable-amount label{font-weight:700}.order-summary .payable-amount label.right{float:right}@media only screen and (max-width:815px){section.cart .cart-content{display:block}section.cart .cart-content .left-side{width:100%;float:none}section.cart .cart-content .left-side .misc-controls{position:relative;top:180px;margin-top:0}section.cart .cart-content .right-side{width:100%;padding-left:0;position:relative;top:-20px}}@media only screen and (max-width:600px){section.cart .cart-content .left-side .cart-item-list .item{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}section.cart .cart-content .left-side .cart-item-list .item .item-details{margin-top:10px}section.cart .cart-content .left-side .cart-item-list .item .item-details .misc{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;line-height:40px}}@media only screen and (max-width:574px){section.cart .cart-content .left-side .misc-controls{display:block;top:160px}section.cart .cart-content .left-side .misc-controls div button{width:100%;margin-top:10px}section.cart .cart-content .left-side .misc-controls div a{margin-top:10px;width:100%;text-align:center}section.cart .cart-content .right-side{top:-100px}}.checkout-method-group .line-one{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.checkout-method-group .line-one .radio-container{padding-left:28px}.checkout-method-group .line-one .method-label{margin-top:4px}.checkout-method-group .line-two{margin-left:30px}.checkout-process{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;width:100%;margin-top:20px;margin-bottom:20px;font-size:16px;color:#242424}.checkout-process .col-main{width:70%;margin-right:5%}.checkout-process .col-main ul.checkout-steps{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100%;padding-bottom:15px;border-bottom:1px solid #c7c7c7}.checkout-process .col-main ul.checkout-steps li{height:48px;display:-webkit-box;display:-ms-flexbox;display:flex}.checkout-process .col-main ul.checkout-steps li .decorator{height:48px;width:48px;border:1px solid #000;border-radius:50%;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;border:1px solid #c7c7c7;background-repeat:no-repeat;background-position:50%}.checkout-process .col-main ul.checkout-steps li .decorator.address-info{background-image:url("../images/address.svg")}.checkout-process .col-main ul.checkout-steps li .decorator.shipping{background-image:url("../images/shipping.svg")}.checkout-process .col-main ul.checkout-steps li .decorator.payment{background-image:url("../images/payment.svg")}.checkout-process .col-main ul.checkout-steps li .decorator.review{background-image:url("../images/finish.svg")}.checkout-process .col-main ul.checkout-steps li.completed{cursor:pointer}.checkout-process .col-main ul.checkout-steps li.completed .decorator{background-image:url("../images/complete.svg")}.checkout-process .col-main ul.checkout-steps li span{margin-left:7px;margin-top:auto;margin-bottom:auto}.checkout-process .col-main ul.checkout-steps li.active{color:#2650ef}.checkout-process .col-main ul.checkout-steps li.active .decorator{border:1px solid #2650ef}.checkout-process .col-main .step-content{padding-top:20px}.checkout-process .col-main .step-content .form-header{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100%;height:30px}.checkout-process .col-main .step-content .form-header .checkout-step-heading{font-size:24px;font-weight:700;float:left}.checkout-process .col-main .step-content .form-header .btn{float:right;font-size:14px}.checkout-process .col-main .step-content .form-container{border-bottom:1px solid #c7c7c7;padding-top:20px;padding-bottom:20px}.checkout-process .col-main .step-content .shipping-methods{font-size:16px}.checkout-process .col-main .step-content .shipping-methods .ship-method-carrier{margin-bottom:15px;font-weight:700}.checkout-process .col-main .step-content .payment-methods .radio-container{padding-left:28px}.checkout-process .col-main .step-content .payment-methods .control-info{margin-left:28px}.checkout-process .col-main .step-content .address-summary{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%}.checkout-process .col-main .step-content .address-summary div.billing-address{margin-right:25%}.checkout-process .col-main .step-content .address-summary div.billing-address .horizontal-rule,.checkout-process .col-main .step-content .address-summary div.shipping-address .horizontal-rule{width:40px;background:#242424}.checkout-process .col-main .step-content .address-summary .label{width:10%}.checkout-process .col-main .step-content .address-summary .address-card-list{width:85%}.checkout-process .col-main .step-content .cart-item-list .item .row .title{width:100px;display:inline-block;color:#a5a5a5;font-weight:500;margin-bottom:10px}.checkout-process .col-main .step-content .cart-item-list .item .row .value{font-size:18px;font-weight:600}.checkout-process .col-main .step-content .order-description{display:inline-block;width:100%}.checkout-process .col-main .step-content .order-description .shipping{margin-bottom:25px}.checkout-process .col-main .step-content .order-description .decorator{height:48px;width:48px;border-radius:50%;border:1px solid #c7c7c7;vertical-align:middle;display:inline-block;text-align:center}.checkout-process .col-main .step-content .order-description .decorator .icon{margin-top:7px}.checkout-process .col-main .step-content .order-description .text{font-weight:600;vertical-align:middle;display:inline-block}.checkout-process .col-main .step-content .order-description .text .info{font-weight:500;margin-top:2px}.checkout-process .col-right{width:25%;padding-left:40px}@media only screen and (max-width:770px){.checkout-process .col-main{width:100%;padding-right:0}.checkout-process .col-main ul.checkout-steps{border-bottom:none;padding-bottom:0}.checkout-process .col-main ul.checkout-steps span{display:none}.checkout-process .col-main ul.checkout-steps .line{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;border-bottom:1px solid #c7c7c7;margin-left:5px;margin-right:5px}.checkout-process .step-content{padding-top:0}.checkout-process .step-content .control-group .control{width:100%}.checkout-process .col-right{display:none}}@media only screen and (max-width:480px){.checkout-process .col-main .step-content .address,.checkout-process .col-main .step-content .order-description{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.checkout-process .col-main .step-content .address .billing-address,.checkout-process .col-main .step-content .address .pull-left,.checkout-process .col-main .step-content .order-description .billing-address,.checkout-process .col-main .step-content .order-description .pull-left{width:100%!important}.checkout-process .col-main .step-content .address .pull-right,.checkout-process .col-main .step-content .address .shipping-address,.checkout-process .col-main .step-content .order-description .pull-right,.checkout-process .col-main .step-content .order-description .shipping-address{width:100%!important;margin-top:20px}}.attached-products-wrapper{margin-bottom:80px}.attached-products-wrapper .title{margin-bottom:40px;font-size:18px;color:#242424;text-align:center;position:relative}.attached-products-wrapper .title .border-bottom{border-bottom:1px solid hsla(0,0%,64%,.2);display:inline-block;width:100px;position:absolute;top:40px;left:50%;margin-left:-50px}.attached-products-wrapper .horizontal-rule{height:1px;background:#c7c7c7;width:148px;margin-bottom:24px;margin-left:auto;margin-right:auto}section.review .category-breadcrumbs{display:inline}section.review .review-layouter{display:-webkit-box;display:-ms-flexbox;display:flex}section.review .review-layouter .product-info{font-size:24px;max-width:25%}section.review .review-layouter .product-info .product-image img{height:280px;width:280px}section.review .review-layouter .product-info .product-name a{color:#242424}section.review .review-layouter .product-info .product-price .pro-price{color:#ff6472}section.review .review-layouter .product-info .product-price .pro-price-not{margin-left:10px;font-size:16px;color:#a5a5a5}section.review .review-layouter .product-info .product-price .offer{margin-left:10px;font-size:16px}section.review .review-layouter .review-form{margin-left:20px;width:55%}section.review .review-layouter .review-form .heading{color:#242424;font-weight:600}section.review .review-layouter .review-form .heading .right{float:right;margin-top:-10px}section.review .review-layouter .review-form .star{font-size:23px;color:#d4d4d4;-webkit-transition:all .2s;transition:all .2s}section.review .review-layouter .review-form .star:before{content:"\2605"}section.review .review-layouter .review-form .control-group .control{width:100%}section.review .review-layouter .review-form .review-detail{height:150px;border:1px solid #b22222;margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}section.review .review-layouter .review-form .review-detail .rating-review{margin-top:40px;margin-left:20px;width:48%}section.review .review-layouter .review-form .review-detail .rating-review .avg-rating-count span{font-size:34px;text-align:center}section.review .review-layouter .review-form .review-detail .rating-calculate .progress-only{width:20px;border:1px solid blue}section.review .review-layouter .ratings-reviews{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}section.review .review-layouter .ratings-reviews .left-side{padding:40px 20px;width:50%}section.review .review-layouter .ratings-reviews .left-side .rate{font-size:34px}section.review .review-layouter .ratings-reviews .left-side .stars .icon{height:16px;width:16px}section.review .review-layouter .ratings-reviews .right-side{width:50%}section.review .review-layouter .ratings-reviews .right-side .rater{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding-top:5px;width:100%}section.review .review-layouter .ratings-reviews .right-side .rater .star-name{margin-right:5px;width:35px}section.review .review-layouter .ratings-reviews .right-side .rater .rate-number{width:15px}section.review .review-layouter .ratings-reviews .right-side .rater .percentage{width:50px;margin-right:10px}section.review .review-layouter .ratings-reviews .right-side .rater .percentage span{float:right;white-space:nowrap}section.review .review-layouter .ratings-reviews .right-side .rater .line-bar{height:4px;width:calc(100% - 100px);margin-right:5px;margin-left:5px;background:#d8d8d8}section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .line-value{background-color:#0031f0}@media only screen and (max-width:770px){section.review .category-breadcrumbs{display:none}section.review .review-layouter{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}section.review .review-layouter .product-info{max-width:100%}section.review .review-layouter .product-info .product-image,section.review .review-layouter .product-info .product-name,section.review .review-layouter .product-info .product-price{max-width:280px;margin-left:auto;margin-right:auto}section.review .review-layouter .review-form{width:100%;margin-left:0}section.review .review-layouter .review-form .heading .right{margin-top:50px}section.review .review-layouter .review-form .ratings-reviews{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%}section.review .review-layouter .review-form .ratings-reviews .left-side{width:100%;padding:0 0 40px;margin-top:-30px}section.review .review-layouter .review-form .ratings-reviews .right-side{width:100%}section.review .review-layouter .review-form .ratings-reviews .right-side .rater .percentage{margin-right:0}}.auth-content{padding-top:5%;padding-bottom:5%}.auth-content .sign-up-text{margin-bottom:2%;margin-left:auto;margin-right:auto;font-size:18px;color:#a5a5a5;text-align:center}.auth-content .login-form{margin-left:auto;margin-right:auto;display:-webkit-box;display:-ms-flexbox;display:flex;border:1px solid #c7c7c7;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;max-width:500px;min-width:320px;padding:25px}.auth-content .login-form .login-text{font-size:24px;font-weight:600;margin-bottom:30px}.auth-content .login-form .control-group{margin-bottom:15px!important}.auth-content .login-form .control-group .control{width:100%!important}.auth-content .login-form .forgot-password-link{font-size:17px;color:#0031f0;margin-bottom:5%}.auth-content .login-form .signup-confirm{margin-bottom:5%}.auth-content .login-form .btn-primary{width:100%;text-transform:uppercase}.account-content{width:100%;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;margin-top:5.5%;margin-bottom:5.5%}.account-content,.account-content .sidebar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal}.account-content .sidebar{-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-ms-flex-line-pack:center;align-content:center;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:20%;height:100%}.account-content .menu-block{margin-bottom:30px}.account-content .menu-block:last-child{margin-bottom:0}.account-content .menu-block .menu-block-title{padding-bottom:10px;font-size:18px}.account-content .menu-block .menu-block-title .right{display:none}.account-content .menu-block .menubar{border:1px solid #c7c7c7;color:#a5a5a5;position:relative}.account-content .menu-block .menubar li{width:95%;height:50px;margin-left:5%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;border-bottom:1px solid #c7c7c7;text-align:center}.account-content .menu-block .menubar li a{color:#5e5e5e;width:100%;text-align:left}.account-content .menu-block .menubar li .icon{display:none;position:absolute;right:12px}.account-content .menu-block .menubar li:first-child{border-top:none}.account-content .menu-block .menubar li:last-child{border-bottom:none}.account-content .menu-block .menubar li.active a{color:#0031f0}.account-content .menu-block .menubar li.active .icon{display:inline-block}.account-content .account-layout{margin-left:40px;width:80%}.account-content .account-layout .account-head .back-icon,.account-content .account-layout .responsive-empty{display:none}.account-table-content{color:#242424;margin-top:1.4%}.account-table-content table{width:100%}.account-table-content table tbody tr{height:45px}.account-table-content table tbody tr td{width:250px}.address-holder{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-ms-flex-wrap:wrap;flex-wrap:wrap;width:100%}.address-card{width:260px;border:1px solid #c7c7c7;padding:15px;margin-right:15px;margin-bottom:15px}.address-card .control-group{width:15px;height:15px;margin-top:10px}.address-card .details{font-weight:lighter}.address-card .details span{display:block}.address-card .details .control-links{width:90%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.address-card .details .control-links .btn{height:30px}.edit-form{display:-webkit-box;display:-ms-flexbox;display:flex;border:1px solid #c7c7c7;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;min-height:345px;padding:25px}@media only screen and (max-width:770px){.account-content{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.account-content .sidebar{width:100%}.account-content .sidebar .menu-block .menu-block-title{height:50px;padding-top:13px;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7}.account-content .sidebar .menu-block .menu-block-title .right{display:block;float:right;-ms-flex-item-align:center;align-self:center}.account-content .sidebar .menu-block .menubar{border:0;display:none}.account-content .sidebar .menu-block .menubar>li{margin-left:0;width:100%}.account-content .sidebar .menu-block .menubar>li .icon{right:0}.account-content .sidebar .menu-block .menubar>li:last-child{border-bottom:1px solid #c7c7c7}.account-content .account-layout{margin-left:0;margin-top:20px;width:100%}.account-content .account-layout .account-head{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7;height:50px;margin-top:10px}.account-content .account-layout .account-head .account-action{margin-top:12px;margin-left:15px}.account-content .account-layout .account-head .back-icon{display:block}.account-content .account-layout .account-head span{margin-top:13px;font-size:18px}.account-content .account-layout .account-head .horizontal-rule{display:none}.account-content .account-layout .account-table-content{margin-top:2%}.account-content .account-layout .account-table-content table tbody tr{height:70px}.account-content .account-layout .account-table-content table tbody tr td{display:block}.account-content .account-layout .account-table-content .address-holder{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.account-content .account-items-list,.account-content .edit-form{margin-top:20px}.account-content .account-items-list .responsive-empty,.account-content .edit-form .responsive-empty{display:block}.account-content .control-group .control{width:100%}}.sale-container{color:#5e5e5e}.sale-container .sale-section .secton-title{font-size:18px;color:#8e8e8e;padding:15px 0;border-bottom:1px solid #c7c7c7}.sale-container .sale-section .section-content{display:block;padding:20px 0;border-bottom:1px solid #e8e8e8}.sale-container .sale-section .section-content .row{display:block;padding:7px 0}.sale-container .sale-section .section-content .row .title{width:200px;letter-spacing:-.26px;display:inline-block}.sale-container .sale-section .section-content .row .value{letter-spacing:-.26px;display:inline-block}.sale-container .sale-section .section-content .order-box-container{display:inline-block;width:100%}.sale-container .sale-section .section-content .order-box-container .box{float:left;width:25%}.sale-container .sale-section .section-content .order-box-container .box .box-title{padding:10px 0;font-size:18px;color:#8e8e8e}.sale-container .sale-section .section-content .order-box-container .box .box-content{color:#3a3a3a;padding-right:10px}.sale-container .sale-section .section-content .qty-row{display:block}.sale-container .totals{padding-top:20px;display:inline-block;width:100%;border-top:1px solid #e8e8e8}.sale-container .totals .sale-summary{height:130px;float:right;border-collapse:collapse}.sale-container .totals .sale-summary tr td{padding:5px 8px;width:auto;color:#3a3a3a}.sale-container .totals .sale-summary tr.bold{font-weight:600;font-size:15px}.sale-container .totals .sale-summary tr.border td{border-bottom:1px solid #c7c7c7}@media only screen and (max-width:770px){.sale-container .sale-section .section-content{border-bottom:none;padding:10px 0}.sale-container .sale-section .section-content .row{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.sale-container .sale-section .section-content .row .title{line-height:20px}.sale-container .sale-section .section-content .totals{border-top:none}.sale-container .sale-section .section-content .totals .sale-summary{width:100%}.sale-container .sale-section .section-content .totals .sale-summary tr td:nth-child(2){display:none}.sale-container .sale-section .section-content .order-box-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.sale-container .sale-section .section-content .order-box-container .box{width:100%;margin:10px auto}.sale-container .sale-section .section-content .qty-row{display:inline}}.verify-account{text-align:center;background:#204d74;width:200px;margin-right:auto;margin-left:auto;border-radius:4px}.verify-account a{color:#fff!important}.cp-spinner{position:absolute;left:calc(50% - 24px);margin-top:calc(40% - 24px)}@media only screen and (max-width:720px){.cp-spinner{left:50%;margin-left:-24px;top:50%;margin-top:-24px}}@media only screen and (max-width:720px){.error-container .wrapper{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important;margin:10px 0 20px!important;-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:start!important;height:100%!important}}@media only screen and (max-width:770px){.table table{width:100%}.table table thead{display:none}.table table tbody tr td:before{content:attr(data-value);font-size:15px;font-weight:600;display:inline-block;width:120px}.table table tbody td{border-bottom:none!important;display:block;width:100%!important}.table table tbody td div{position:relative;left:100px;top:-20px}.table table tbody tr{border:1px solid #c7c7c7}}.show-wishlist{z-index:-1!important}.filter-row-one .dropdown-filters{position:relative!important;right:1px!important}@media only screen and (max-width:770px){.table .grid-container{margin-top:10px;overflow-x:hidden}.table .grid-container .filter-row-one{display:block}.table .grid-container .filter-row-one .dropdown-filters{margin-top:10px}}.rtl{direction:rtl}.rtl .header .header-top div.left-content ul.logo-container{margin-right:0;margin-left:12px}.rtl .header .header-top div.left-content ul.search-container li.search-group .search-field{border:2px solid #c7c7c7;padding-right:12px;padding-left:0;border-radius:2px;border-top-left-radius:0;border-bottom-left-radius:0}.rtl .header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper{border:2px solid #c7c7c7;border-right:none;border-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0}.rtl .header .header-top div.right-content .right-content-menu>li{border-right:2px solid #c7c7c7;padding:0 15px}.rtl .header .header-top div.right-content .right-content-menu>li:last-child{padding-left:0}.rtl .header .header-top div.right-content .right-content-menu>li:first-child{border-right:0;padding-right:0}.rtl .header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list{left:0;right:unset!important}.rtl .header .header-top div.right-content .right-content-menu .cart-dropdown-container .count{display:inline-block}.rtl .header .header-top div.right-content .right-content-menu .account,.rtl .header .header-top div.right-content .right-content-menu .currency{right:unset;left:0}.rtl .header .header-top div.right-content .right-content-menu .guest div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.rtl .header .header-bottom .nav>li{float:right;margin-right:0;margin-left:1px}.rtl .header .header-bottom .nav a{padding:.8em .5em .8em .3em!important}.rtl .header .header-bottom .nav li a>.icon{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .header .header-bottom .nav>li li:hover>ul{left:unset!important;right:100%!important}.rtl .header .header-bottom .nav ul{left:99999em}.rtl .header .search-responsive .search-content .right{float:left}.rtl .dropdown-list{text-align:right}.rtl .dropdown-list.bottom-right{left:0;right:auto}@media only screen and (max-width:720px){.rtl .header .header-top div.right-content .menu-box{margin-left:0;margin-right:5px}.rtl .header .header-top div.right-content .right-content-menu .account{position:absolute;left:0;right:auto}.rtl .header .header-top div.right-content .right-content-menu>li{padding:0;border:0}.rtl .header .header-top div.right-content .search-box{margin-left:5px}.rtl .header .header-bottom .nav>li{float:none}.rtl .header .header-bottom .nav li>.icon{float:left;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .header .header-bottom .icon.icon-arrow-down{margin-left:5px}}.rtl section.slider-block div.slider-content div.slider-control{left:2%;right:auto}@media only screen and (max-width:720px){.rtl section.slider-block div.slider-content div.slider-control{left:0}}.rtl .main-container-wrapper .product-card .sticker{left:auto;right:20px}.rtl .main-container-wrapper .product-card .cart-wish-wrap .addtocart{margin-right:0;margin-left:10px}.rtl section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;margin-left:30px}.rtl section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{float:left!important}.rtl section.product-detail div.layouter .form-container div .thumb-list{margin-left:4px;margin-right:0}.rtl section.product-detail div.layouter .form-container .details .accordian .accordian-header{padding:20px 0 20px 15px}.rtl section.product-detail div.layouter .form-container .details .accordian .accordian-header .icon{float:left}.rtl section.product-detail div.layouter .form-container .details .accordian .accordian-header .expand-icon{margin-left:10px}.rtl section.product-detail div.layouter .form-container .details .full-specifications td:first-child{padding-right:0;padding-left:40px}.rtl section.product-detail div.layouter .form-container .details .product-ratings .total-reviews{margin-left:0;margin-right:15px}@media only screen and (max-width:720px){.rtl section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;margin-left:0}}.rtl .main .category-container .layered-filter-wrapper,.rtl .main .category-container .responsive-layred-filter{padding-right:0;padding-left:20px}.rtl .main .top-toolbar .pager{float:left}.rtl .main .top-toolbar .pager .view-mode{margin-right:0;margin-left:20px}.rtl .main .top-toolbar .pager .sorter{margin-right:0;margin-left:10px}.rtl .main .top-toolbar .pager label{margin-right:0;margin-left:5px}.rtl .main .top-toolbar .page-info{float:right}.rtl section.review .review-layouter .review-form{margin-left:0;margin-right:20px}.rtl section.review .review-layouter .review-form .heading .right{float:left}.rtl section.review .review-layouter .review-form .ratings-reviews .right-side .rater .star-name{margin-right:0;margin-left:5px}@media only screen and (max-width:770px){.rtl section.review .review-layouter .review-form{margin-right:0}}.rtl section.cart .cart-content .left-side{width:70%;float:right}.rtl section.cart .cart-content .left-side .misc-controls a.link{margin-left:15px;margin-right:0}.rtl section.cart .cart-content .right-side{width:30%;padding-right:40px;padding-left:0}.rtl .order-summary .item-detail label.right,.rtl .payable-amount label.right{float:left}.rtl .item div{margin-left:15px;margin-right:0!important}.rtl .cart-item-list .item .item-details .misc div.qty-text{margin-right:0;margin-left:10px}.rtl .cart-item-list .item .item-details .misc .remove,.rtl .cart-item-list .item .item-details .misc input.box{margin-right:0;margin-left:30px}.rtl .cart-item-list .item .item-details .misc .control-group label{margin-left:15px;margin-right:0}@media only screen and (max-width:770px){.rtl section.cart .cart-content .left-side{width:100%;float:none}.rtl section.cart .cart-content .left-side .misc-controls div button{margin-right:0}.rtl section.cart .cart-content .right-side{width:100%;padding-right:0}}.rtl .checkout-process .col-right{padding-left:0;padding-right:40px}.rtl .checkout-process .col-main{padding-left:40px;padding-right:0}.rtl .checkout-process .col-main ul.checkout-steps li span{margin-right:7px;margin-left:0}.rtl .checkout-process .col-main .step-content .form-header h1{float:right}.rtl .checkout-process .col-main .step-content .form-header .btn{float:left}.rtl .checkout-process .col-main .step-content .payment-methods .control-info{margin-right:28px;margin-left:0}.rtl .checkout-process .col-main .step-content .address .billing-address,.rtl .checkout-process .col-main .step-content .address .pull-left,.rtl .checkout-process .col-main .step-content .order-description .billing-address,.rtl .checkout-process .col-main .step-content .order-description .pull-left{float:right!important}.rtl .checkout-process .col-main .step-content .address .pull-right,.rtl .checkout-process .col-main .step-content .address .shipping-address,.rtl .checkout-process .col-main .step-content .order-description .pull-right,.rtl .checkout-process .col-main .step-content .order-description .shipping-address{float:left!important}.rtl .checkbox,.rtl .radio{margin:10px 0 5px 5px}.rtl .radio .radio-view{margin-left:5px;margin-right:0}.rtl .radio input{right:0;left:auto}@media only screen and (max-width:770px){.rtl .checkout-process .col-main{padding-left:0}}.rtl .account-content .account-layout{margin-left:0;margin-right:40px}.rtl .account-content .menu-block .menubar li{margin-left:0;margin-right:5%}.rtl .account-content .menu-block .menubar li a{text-align:right}.rtl .account-content .menu-block .menubar li .icon{right:unset;left:12px;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .account-head .account-action{float:left}.rtl .account-item-card .media-info .info{margin-right:20px;margin-left:0}.rtl .account-item-card .operations a span{float:left}.rtl .table table{text-align:right}.rtl .sale-container .totals .sale-summary{float:left}.rtl .sale-container .sale-section .section-content .order-box-container{display:-webkit-box;display:-ms-flexbox;display:flex}@media (max-width:770px){.rtl .account-content .account-layout{margin-right:0}.rtl .account-content .account-layout .account-head .account-action{margin-left:0}.rtl .account-content .sidebar .menu-block .menu-block-title .right{float:left}.rtl .account-content .sidebar .menu-block .menubar>li{margin-right:0}}.rtl .footer .footer-content .footer-list-container .list-container .list-group li span.icon{margin-left:5px;margin-right:0}@media (max-width:720px){.rtl .footer{padding-right:15px;padding-left:10%}.rtl .footer .footer-list-container{padding-right:0!important}}.rtl .cp-spinner{position:absolute;right:calc(50% - 24px);margin-top:calc(40% - 24px)}@media only screen and (max-width:720px){.rtl .cp-spinner{right:50%;margin-right:-24px;left:auto}}.rtl .product-list .product-card .product-information{padding-left:0;padding-right:30px;float:left}.rtl .zoom-image-direction{left:0;right:476px!important}.banner-container{width:100%;float:left;padding:0 18px;margin-bottom:40px}.banner-container .left-banner{padding-right:20px;width:60%;float:left}.banner-container .left-banner img{width:100%}.banner-container .right-banner{padding-left:20px;width:40%;float:left}.banner-container .right-banner img{width:100%}.banner-container .right-banner img:first-child{padding-bottom:20px;height:50%;display:block}.banner-container .right-banner img:last-child{padding-top:20px;height:50%;display:block}@media (max-width:720px){.banner-container .left-banner{padding-right:0;width:100%}.banner-container .right-banner{padding-left:0;width:100%}.banner-container .right-banner img:first-child{padding-bottom:0;padding-top:25px}.banner-container .right-banner img:last-child{padding-top:25px}}
\ No newline at end of file
+@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500);.icon{display:inline-block;background-size:cover}.dropdown-right-icon{background-image:URL("../images/icon-dropdown-left.svg");width:8px;height:8px;margin-left:auto;margin-bottom:2px}.icon-menu-close{background-image:URL("../images/icon-menu-close.svg");width:24px;height:24px;margin-left:auto}.icon-menu-close-adj{background-image:URL("../images/cross-icon-adj.svg");margin-left:auto}.grid-view-icon{background-image:URL("../images/icon-grid-view.svg");width:24px;height:24px}.list-view-icon{background-image:URL("../images/icon-list-view.svg");width:24px;height:24px}.sort-icon{background-image:URL("../images/icon-sort.svg");width:32px;height:32px}.filter-icon{background-image:URL("../images/icon-filter.svg");width:32px;height:32px}.whishlist-icon{background-image:URL("../images/wishlist.svg");width:24px;height:24px}.share-icon{background-image:URL("../images/icon-share.svg");width:24px;height:24px}.icon-menu{background-image:URL("../images/icon-menu.svg");width:24px;height:24px}.icon-search{background-image:URL("../images/icon-search.svg");width:24px;height:24px}.icon-menu-back{background-image:URL("../images/icon-menu-back.svg");width:24px;height:24px}.shipping-icon{background-image:url("../images/shipping.svg");width:32px;height:32px}.payment-icon{background-image:url("../images/payment.svg");width:32px;height:32px}.cart-icon{background-image:url("../images/icon-cart.svg");width:24px;height:24px}.wishlist-icon{background-image:url("../images/wishlist.svg");width:32px;height:32px}.icon-arrow-up{background-image:url("../images/arrow-up.svg");width:16px;height:16px}.icon-arrow-down{background-image:url("../images/arrow-down.svg");width:16px;height:16px}.expand-icon{background-image:url("../images/Expand-Light.svg");width:18px;height:18px}.expand-on-icon{background-image:url("../images/Expand-Light-On.svg");width:18px;height:18px}.icon-menu-close-adj{background-image:url("../images/cross-icon-adj.svg");width:32px;height:32px}.icon-facebook{background-image:url("../images/facebook.svg")}.icon-twitter{background-image:url("../images/twitter.svg")}.icon-google-plus{background-image:url("../images/google-plus.svg")}.icon-instagram{background-image:url("../images/instagram.svg")}.icon-linkedin{background-image:url("../images/linkedin.svg")}.icon-dropdown{background-image:url("../images/icon-dropdown.svg")}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}body{margin:0;padding:0;font-weight:500;max-width:100%;width:auto;color:#242424;font-size:16px}*{font-family:Montserrat,sans-serif}::-webkit-input-placeholder{font-family:Montserrat,sans-serif}textarea{resize:none}input{font-family:Montserrat,sans-serif}.btn{border-radius:0!important}.pagination.shop{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}@media only screen and (max-width:770px){.pagination.shop{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.pagination.shop .page-item{display:none}.pagination.shop .page-item.next,.pagination.shop .page-item.previous{display:block}}.bold{font-weight:700;color:#3a3a3a}.radio-container{display:block;position:relative;padding-left:35px;margin-bottom:12px;cursor:pointer;font-size:16px;user-select:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.radio-container input{position:absolute;opacity:0;cursor:pointer;top:0;left:0}.radio-container .checkmark{position:absolute;top:0;left:0;height:16px;width:16px;background-color:#fff;border:2px solid #ff6472;border-radius:50%}.radio-container .checkmark:after{content:"";position:absolute;display:none;top:2px;left:2px;width:8px;height:8px;border-radius:50%;background:#ff6472}.radio-container input:checked~.checkmark:after{display:block}.radio-container input:disabled~.checkmark{display:block;border:2px solid rgba(255,100,113,.4)}.cp-spinner{width:48px;height:48px;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box}.cp-round:before{border-radius:50%;border:6px solid #bababa}.cp-round:after,.cp-round:before{content:" ";width:48px;height:48px;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;position:absolute;top:0;left:0}.cp-round:after{border-radius:50%;border-top:6px solid #0031f0;border-right:6px solid transparent;border-bottom:6px solid transparent;border-left:6px solid transparent;-webkit-animation:spin 1s ease-in-out infinite;animation:spin 1s ease-in-out infinite}.pull-right{float:right}.add-to-wishlist .wishlist-icon:hover{background-image:url("../images/wishlist-added.svg")}.product-price{margin-bottom:14px;width:100%;font-weight:600}.product-price .price-label{font-size:14px;font-weight:400}.product-price .regular-price{color:#a5a5a5;text-decoration:line-through;margin-right:10px}.product-price .special-price{color:#ff6472}.horizontal-rule{display:block;width:100%;height:1px;background:#c7c7c7}.account-head .account-heading{font-size:28px;color:#242424;text-transform:capitalize;text-align:left}.account-head .account-action{font-size:17px;margin-top:1%;color:#0031f0;float:right}.account-head .horizontal-rule{margin-top:1.1%;width:100%;height:1px;vertical-align:middle;background:#c7c7c7}.account-item-card{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:125px}.account-item-card,.account-item-card .media-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.account-item-card .media-info .media{height:125px;width:110px}.account-item-card .media-info .info{margin-left:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly}.account-item-card .media-info .info .stars .icon{height:16px;width:16px}.account-item-card .operations{height:120px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.account-item-card .operations a{width:100%}.account-item-card .operations a span{float:right}.account-items-list{display:block;width:100%}.account-items-list .grid-container{margin-top:40px}.search-result-status{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.grid-container{margin-top:20px}.main-container-wrapper{max-width:1300px;width:auto;padding-left:15px;padding-right:15px;margin-left:auto;margin-right:auto}.main-container-wrapper .content-container{display:block;margin-bottom:40px}.main-container-wrapper .product-grid-4{grid-auto-rows:auto;grid-column-gap:30px;grid-row-gap:15px}.main-container-wrapper .product-grid-3,.main-container-wrapper .product-grid-4{display:grid;grid-template-columns:repeat(auto-fill,minmax(235px,1fr));justify-items:center}.main-container-wrapper .product-grid-3{grid-gap:27px;grid-auto-rows:auto}.main-container-wrapper .product-card{position:relative}.main-container-wrapper .product-card .product-image{max-height:350px;max-width:280px;margin-bottom:10px;background:#f2f2f2}.main-container-wrapper .product-card .product-image img{display:block;height:100%}.main-container-wrapper .product-card .product-name{margin-bottom:14px;width:100%;color:#242424}.main-container-wrapper .product-card .product-name a{color:#242424}.main-container-wrapper .product-card .product-description{display:none}.main-container-wrapper .product-card .product-ratings{width:100%}.main-container-wrapper .product-card .product-ratings .icon{width:16px;height:16px}.main-container-wrapper .product-card .cart-wish-wrap{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:40px}.main-container-wrapper .product-card .cart-wish-wrap .addtocart{margin-right:10px;text-transform:uppercase;text-align:left;-webkit-box-shadow:1px 1px 0 #ccc;box-shadow:1px 1px 0 #ccc}.main-container-wrapper .product-card .cart-wish-wrap .add-to-wishlist{margin-top:5px;background:transparent;border:0;cursor:pointer;padding:0}.main-container-wrapper .product-card .sticker{border-radius:100px;position:absolute;top:20px;left:20px;text-transform:uppercase;padding:4px 13px;font-size:14px;color:#fff;-webkit-box-shadow:1px 1px 1px #ccc;box-shadow:1px 1px 1px #ccc}.main-container-wrapper .product-card .sticker.sale{background:#ff6472}.main-container-wrapper .product-card .sticker.new{background:#2ed04c}.main-container-wrapper .product-card:hover{box-shadow:0 1px 2px rgba(0,0,0,.05);-webkit-box-shadow:0 2px 16px 4px rgba(40,44,63,.07);box-shadow:0 2px 16px 4px rgba(40,44,63,.07);padding:10px;-webkit-transition:.3s;transition:.3s;outline:1px solid #eaeaec}@media only screen and (max-width:580px){.main-container-wrapper .main-container-wrapper{padding:0}}@media only screen and (max-width:551px){.main-container-wrapper .product-grid-3{grid-template-columns:48.5% 48.5%;grid-column-gap:20px}}@media only screen and (max-width:854px){.main-container-wrapper .product-image img{display:block;width:100%}.main-container-wrapper .product-grid-4{grid-template-columns:29.5% 29.5% 29.5%;grid-column-gap:35px}.main-container-wrapper .product-card:hover{padding:5px}}@media only screen and (max-width:653px){.main-container-wrapper .product-image img{display:block;width:100%}.main-container-wrapper .product-grid-4{grid-template-columns:48.5% 48.5%;grid-column-gap:17px}}@media only screen and (max-width:425px){.main-container-wrapper .product-card{font-size:90%}.main-container-wrapper .product-card .product-image img{display:block;width:100%}.main-container-wrapper .product-card .btn.btn-md{padding:5px}.main-container-wrapper .product-grid-4{grid-template-columns:48.5% 48.5%;grid-column-gap:10px}}.main-container-wrapper .product-list{min-height:200px}.main-container-wrapper .product-list .product-card{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px}.main-container-wrapper .product-list .product-card .product-image{float:left;width:30%;height:350px}.main-container-wrapper .product-list .product-card .product-image img{height:100%}.main-container-wrapper .product-list .product-card .product-information{float:right;width:70%;padding-left:30px}.main-container-wrapper .product-list .product-card:last-child{margin-bottom:0}.main-container-wrapper .product-list.empty h2{font-size:20px}.main-container-wrapper section.featured-products{display:block;margin-bottom:5%}.main-container-wrapper section.featured-products .featured-heading{width:100%;text-align:center;text-transform:uppercase;font-size:18px;margin-bottom:20px}.main-container-wrapper section.featured-products .featured-heading .featured-separator{color:#d3d3d3}.main-container-wrapper section.news-update{display:block;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%;margin-bottom:5%}.main-container-wrapper section.news-update .news-update-grid{display:grid;grid-template-columns:58.5% 40%;grid-gap:20px}.main-container-wrapper section.news-update .news-update-grid .block1{display:block;-webkit-box-sizing:border-box;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block1 img{display:-webkit-box;display:-ms-flexbox;display:flex;height:100%;width:100%}.main-container-wrapper section.news-update .news-update-grid .block2{display:block;-webkit-box-sizing:border-box;box-sizing:border-box;display:grid;grid-template-rows:repeat(2,minmax(50%,1fr));grid-row-gap:20px}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block1{display:block;-webkit-box-sizing:border-box;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block1 img{width:100%}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block2{display:block;-webkit-box-sizing:border-box;box-sizing:border-box}.main-container-wrapper section.news-update .news-update-grid .block2 .sub-block2 img{width:100%}section.slider-block{display:block;margin-left:auto;margin-right:auto;margin-bottom:5%}section.slider-block div.slider-content{position:relative;height:500px;margin-left:auto;margin-right:auto}section.slider-block div.slider-content ul.slider-images .show-content{display:none}section.slider-block div.slider-content ul.slider-images li{position:absolute;visibility:hidden}section.slider-block div.slider-content ul.slider-images li.show{display:block;position:relative;visibility:visible;width:100%;-webkit-animation-name:example;animation-name:example;-webkit-animation-duration:4s;animation-duration:4s}section.slider-block div.slider-content ul.slider-images li.show .show-content{display:-webkit-box;display:-ms-flexbox;display:flex;position:absolute;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;color:#242424;height:100%;width:100%;top:0}@-webkit-keyframes example{0%{opacity:.1}to{opacity:1}}@keyframes example{0%{opacity:.1}to{opacity:1}}section.slider-block div.slider-content ul.slider-images li img{height:500px;width:100%}section.slider-block div.slider-content div.slider-control{display:block;cursor:pointer;position:absolute;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;bottom:2%;right:2%}section.slider-block div.slider-content div.slider-control .dark-left-icon{background-color:#f2f2f2;height:48px;width:48px;max-height:100%;max-width:100%}section.slider-block div.slider-content div.slider-control .light-right-icon{background-color:#242424;height:48px;width:48px;max-height:100%;max-width:100%}@media only screen and (max-width:770px){section.slider-block div.slider-content div.slider-control{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;bottom:46%;right:0;width:100%}}.header{margin-top:16px;margin-bottom:21px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.header .header-top{margin-bottom:16px;max-width:100%;width:auto;margin-left:auto;margin-right:auto;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.header .header-top,.header .header-top div.left-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.left-content{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.header .header-top div.left-content ul.logo-container{margin-right:12px}.header .header-top div.left-content ul.logo-container li{display:-webkit-box;display:-ms-flexbox;display:flex}.header .header-top div.left-content ul.logo-container li img{max-width:120px;max-height:40px}.header .header-top div.left-content ul.search-container li.search-group{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.header .header-top div.left-content ul.search-container li.search-group .search-field{height:38px;border:2px solid #c7c7c7;border-radius:3px;border-right:none;border-top-right-radius:0;border-bottom-right-radius:0;padding-left:12px;font-size:14px}.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper{-webkit-box-sizing:border-box;box-sizing:border-box;height:38px;width:38px;border:2px solid #c7c7c7;border-top-right-radius:3px;border-bottom-right-radius:3px}.header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper button{background:#fff;border:0;padding:3px 5px}.header .header-top div.right-content .right-content-menu>li{display:inline-block;border-right:2px solid #c7c7c7;padding:0 15px;min-height:15px;padding-top:3px}.header .header-top div.right-content .right-content-menu>li:first-child{padding-left:0}.header .header-top div.right-content .right-content-menu>li:last-child{border-right:0;padding-right:0}.header .header-top div.right-content .right-content-menu>li .icon{vertical-align:middle}.header .header-top div.right-content .right-content-menu>li .icon:not(.arrow-down-icon){margin-right:5px}.header .header-top div.right-content .right-content-menu>li .arrow-down-icon{width:12px;height:6px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container{border-right:0;padding-right:0}.header .header-top div.right-content .right-content-menu .cart-link{pointer-events:none}.header .header-top div.right-content .right-content-menu ul.dropdown-list{display:none;margin-top:14px}.header .header-top div.right-content .right-content-menu ul.dropdown-list li{border-right:none;padding:5px 10px;display:block}.header .header-top div.right-content .right-content-menu ul.dropdown-list li a{color:#333}.header .header-top div.right-content .right-content-menu .currency{position:absolute;right:0;width:100px}.header .header-top div.right-content .right-content-menu .account{position:absolute;right:0}.header .header-top div.right-content .right-content-menu .account li{padding:20px!important}.header .header-top div.right-content .right-content-menu .account li ul{margin-top:5px}.header .header-top div.right-content .right-content-menu .account li ul>li{padding:5px 10px 5px 0!important}.header .header-top div.right-content .right-content-menu .guest{width:300px}.header .header-top div.right-content .right-content-menu .guest .btn.btn-sm{padding:9px 25px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list{width:387px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container{padding:0}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart{color:#242424}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header{width:100%;padding:8px 16px;border-bottom:1px solid #c7c7c7}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header p{display:inline;line-height:25px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header i{float:right;height:22px;width:22px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-cart>.dropdown-header p.heading{font-weight:lighter}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content{padding-top:8px;margin-bottom:55px;width:100%;max-height:329px;overflow-y:auto}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content .item{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;border-bottom:1px solid #c7c7c7;padding:8px 16px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content .item img{height:75px;width:75px;margin-right:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-content .item-details{height:auto}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-name{font-size:16px;font-weight:700;margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-options{font-size:16px;margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-price{margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .item-details .item-qty{font-weight:lighter;margin-bottom:8px}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:8px 16px;position:absolute;bottom:0;width:100%;background:#fff;border-top:1px solid #c7c7c7}.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list .dropdown-container .dropdown-footer .btn{margin:0;max-width:170px;text-align:center}.header .header-top div.right-content .menu-box,.header .header-top div.right-content .search-box{display:none}.header .header-bottom{height:47px;margin-left:auto;margin-right:auto;border-top:1px solid #c7c7c7;border-bottom:1px solid #c7c7c7;display:block}.header .header-bottom ul.nav{display:block;font-size:16px;max-width:100%;width:auto;margin-left:auto;margin-right:auto}.header .header-bottom .nav ul{margin:0;padding:0;-webkit-box-shadow:1px 1px 1px 0 rgba(0,0,0,.4);box-shadow:1px 1px 1px 0 rgba(0,0,0,.4)}.header .header-bottom .nav a{display:block;color:#242424;text-decoration:none;padding:.8em .3em .8em .5em;text-transform:capitalize;letter-spacing:-.38px;position:relative}.header .header-bottom .nav li>.icon{display:none}.header .header-bottom .nav{vertical-align:top;display:inline-block}.header .header-bottom .nav li{position:relative}.header .header-bottom .nav>li{float:left;margin-right:1px;height:45px}.header .header-bottom .nav>li>a{margin-bottom:1px}.header .header-bottom .nav>li>a .icon{display:none}.header .header-bottom .nav li li a{margin-top:1px;white-space:normal;word-break:break-word;width:200px}.header .header-bottom .nav li a:first-child:nth-last-child(2):before{content:"";position:absolute;height:0;width:0;border:5px solid transparent;top:50%;right:5px}.header .header-bottom .nav ul{position:absolute;white-space:nowrap;border:1px solid #c7c7c7;background-color:#fff;z-index:10000;left:-99999em}.header .header-bottom .nav>li:hover{background-color:#f2f2f2}.header .header-bottom .nav>li:hover>ul{left:auto;min-width:100%}.header .header-bottom .nav>li li:hover{background-color:#f2f2f2}.header .header-bottom .nav>li li:hover>ul{left:100%;margin-left:1px;top:-2px}.header .header-bottom .nav>li:hover>a:first-child:nth-last-child(2):before,.header .header-bottom .nav li li>a:first-child:nth-last-child(2):before{margin-top:-5px}.header .header-bottom .nav li li:hover>a:first-child:nth-last-child(2):before{right:10px}.header .search-responsive{display:none}.header .search-responsive .search-content{border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7;height:50px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.header .search-responsive .search-content .search{width:80%;border:none;font-size:16px}.header .search-responsive .search-content .right{float:right}@media (max-width:720px){.header .currency-switcher{display:none!important}.header .header-top div.right-content{display:inherit}.header .header-top div.right-content .menu-box{display:inline-block;margin-left:10px}.header .header-top div.right-content .search-box{display:inline-block;margin-right:10px;cursor:pointer}.header .header-top div.right-content .right-content-menu>li{border-right:none;padding:0 2px}.header .header-top div.right-content .right-content-menu>li .icon:not(.arrow-down-icon){margin-right:0}.header .header-top div.right-content .right-content-menu .cart-link{pointer-events:all}.header .header-top div.right-content .right-content-menu .arrow-down-icon,.header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-container,.header .header-top div.right-content .right-content-menu .name{display:none}.header .header-bottom{height:auto;display:none}.header .header-bottom .nav a{display:inline-block}.header .header-bottom .nav li,.header .header-bottom ul.nav{height:auto}.header .header-bottom .nav>li{float:none}.header .header-bottom .nav li>.icon{float:right;display:block}.header .header-bottom .icon.icon-arrow-down{margin-right:5px}.header .header-bottom .nav li .left{height:16px;width:16px}.header .header-bottom .nav li a>.icon{display:none}.header .header-bottom .nav ul{position:unset;border:none;-webkit-box-shadow:none;box-shadow:none}.header .header-bottom .nav>li li:hover>ul{margin-left:0;top:0}ul.account-dropdown-container,ul.cart-dropdown-container,ul.search-container{display:none!important}}@media (max-width:400px){.header .header-top div.right-content .right-content-menu .guest{width:240px}.header .header-top div.right-content .right-content-menu .guest .btn.btn-sm{padding:7px 14px}}.footer{background-color:#f2f2f2;padding-left:10%;padding-right:10%;width:100%;display:inline-block}.footer .footer-content .footer-list-container{display:grid;padding:40px 10px;grid-template-columns:repeat(auto-fit,minmax(250px,1fr));grid-auto-rows:auto;grid-row-gap:1vh}.footer .footer-content .footer-list-container .list-container .list-heading{text-transform:uppercase;color:#a5a5a5}.footer .footer-content .footer-list-container .list-container .list-group{padding-top:25px}.footer .footer-content .footer-list-container .list-container .list-group a{color:#242424}.footer .footer-content .footer-list-container .list-container .list-group li{margin-bottom:12px;list-style-type:none;text-transform:uppercase}.footer .footer-content .footer-list-container .list-container .list-group li span.icon{display:inline-block;vertical-align:middle;margin-right:5px;height:24px;width:24px}.footer .footer-content .footer-list-container .list-container .form-container{padding-top:5px}.footer .footer-content .footer-list-container .list-container .form-container .control-group .subscribe-field{width:100%}.footer .footer-content .footer-list-container .list-container .form-container .control-group .btn-primary{background-color:#242424;margin-top:8px;border-radius:0;text-align:center}.footer .footer-content .footer-list-container .list-container .form-container .control-group .locale-switcher{width:100%}.footer .footer-content .footer-list-container .list-container .currency{display:none}@media (max-width:720px){.footer{padding-left:15px}.footer .footer-list-container{padding-left:0!important}.footer .currency{display:block!important}}.footer-bottom{width:100%;height:70px;font-size:16px;color:#a5a5a5;letter-spacing:-.26px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.footer-bottom p{padding:0 15px}.main .category-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;width:100%}.main .category-container .layered-filter-wrapper,.main .category-container .responsive-layred-filter{width:25%;float:left;padding-right:20px;min-height:1px}.main .category-container .layered-filter-wrapper .filter-title,.main .category-container .responsive-layred-filter .filter-title{border-bottom:1px solid #c7c7c7;color:#242424;padding:10px 0}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item{border-bottom:1px solid #c7c7c7;padding-bottom:10px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title{padding:10px 40px 0 10px;color:#5e5e5e;cursor:pointer;position:relative}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link{font-weight:400;color:#0031f0;margin-right:10px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .icon,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .icon{background-image:url("../images/icon-dropdown.svg")!important;width:10px;height:10px;position:absolute;right:15px;top:14px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content{padding:10px;display:none}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items{padding:0;margin:0;list-style:none none}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item{padding:8px 0;color:#5e5e5e}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox{margin:0}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view{height:16px;width:16px;background-image:url("../images/checkbox.svg")}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked+.checkbox-view,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked+.checkbox-view{background-image:url("../images/checkbox-checked.svg")}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .color-swatch,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .color-swatch{display:inline-block;margin-right:5px;min-width:20px;height:20px;border:1px solid #c7c7c7;border-radius:3px;float:right}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper{margin-top:21px}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-content,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-content{display:block}.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon,.main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon{background-image:url("../images//arrow-up.svg")!important}.main .category-container .responsive-layred-filter{display:none;width:100%;float:none;padding-right:0;margin-top:-25px!important}.main .category-container .category-block{width:80%;display:block}.main .category-container .category-block .hero-image{display:inline-block;visibility:visible;width:100%}.main .category-container .category-block .hero-image img{height:400px;width:100%}.main .top-toolbar{width:100%;display:inline-block}.main .top-toolbar .page-info{float:left;color:#242424;line-height:45px}.main .top-toolbar .page-info span{display:none}.main .top-toolbar .page-info span:first-child{display:inline}.main .top-toolbar .pager{float:right}.main .top-toolbar .pager label{margin-right:5px}.main .top-toolbar .pager select{background:#f2f2f2;border:1px solid #c7c7c7;border-radius:3px;color:#242424;padding:10px}.main .top-toolbar .pager .view-mode{display:inline-block;margin-right:20px}.main .top-toolbar .pager .view-mode a,.main .top-toolbar .pager .view-mode span{display:inline-block;vertical-align:middle}.main .top-toolbar .pager .view-mode a.grid-view,.main .top-toolbar .pager .view-mode span.grid-view{margin-right:10px}.main .top-toolbar .pager .view-mode .sort-filter{display:none}.main .top-toolbar .pager .sorter{display:inline-block;margin-right:10px}.main .top-toolbar .pager .limiter{display:inline-block}.main .bottom-toolbar{display:block;margin-top:40px;margin-bottom:40px;text-align:center}@media only screen and (max-width:840px){.main .category-container .responsive-layred-filter,.main .layered-filter-wrapper{display:none}.main .category-block{width:100%!important}.main .category-block .top-toolbar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.main .category-block .top-toolbar .page-info{border-bottom:1px solid #c7c7c7;line-height:15px;margin-top:10px}.main .category-block .top-toolbar .page-info span{display:inline}.main .category-block .top-toolbar .page-info span:first-child{display:none}.main .category-block .top-toolbar .page-info .sort-filter{float:right;cursor:pointer}.main .category-block .top-toolbar .pager{margin-top:20px;display:none}.main .category-block .top-toolbar .pager .view-mode{display:none}.main .category-block .responsive-layred-filter{display:block}}section.product-detail{color:#242424}section.product-detail div.category-breadcrumbs{display:inline}section.product-detail div.layouter{display:block;margin-top:20px;margin-bottom:20px}section.product-detail div.layouter .form-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;width:100%}section.product-detail div.layouter .form-container div.product-image-group{margin-right:30px;width:604px;height:650px;max-width:604px;position:-webkit-sticky;position:sticky;top:10px}section.product-detail div.layouter .form-container div.product-image-group div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;cursor:pointer}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-right:4px;min-width:120px;overflow:hidden;position:relative;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;max-height:480px}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame{border:2px solid transparent;background:#f2f2f2;width:120px;max-height:120px}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame.active{border-color:#0031f0}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame img{height:100%;width:100%}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control{width:100%;position:absolute;text-align:center;cursor:pointer;z-index:1}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control .overlay{opacity:.3;background:#242424;width:100%;height:18px;position:absolute;left:0;z-index:-1}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control .icon{z-index:2}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control.top{top:0}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control.bottom{bottom:0}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image{display:block;position:relative;background:#f2f2f2;width:100%;max-height:480px;height:100%}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image img{width:100%;height:auto;max-height:480px}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .add-to-wishlist{background-image:url("../images/wishlist.svg");position:absolute;top:10px;right:12px;background-color:transparent;border:0;cursor:pointer;padding:0;width:32px;height:32px}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .add-to-wishlist:hover{background-image:url("../images/wishlist-added.svg")}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image .share{position:absolute;top:10px;right:45px}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{display:none;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;margin-top:10px;width:79.5%;float:right;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons .addtocart{width:49%;background:#000;white-space:normal;text-transform:uppercase}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons .buynow{width:49%;white-space:nowrap;text-transform:uppercase}section.product-detail div.layouter .form-container .details{width:50%;overflow-wrap:break-word}section.product-detail div.layouter .form-container .details .product-price{margin-bottom:14px}section.product-detail div.layouter .form-container .details .product-price .sticker{display:none}section.product-detail div.layouter .form-container .details .product-ratings{margin-bottom:20px}section.product-detail div.layouter .form-container .details .product-ratings .icon{width:16px;height:16px}section.product-detail div.layouter .form-container .details .product-ratings .total-reviews{display:inline-block;margin-left:15px}section.product-detail div.layouter .form-container .details .product-heading{font-size:24px;color:#242424;margin-bottom:15px}section.product-detail div.layouter .form-container .details .product-price{margin-bottom:15px}section.product-detail div.layouter .form-container .details .product-price .special-price{font-size:24px}section.product-detail div.layouter .form-container .details .stock-status{margin-bottom:15px;font-weight:600;color:#fc6868}section.product-detail div.layouter .form-container .details .stock-status.active{color:#4caf50}section.product-detail div.layouter .form-container .details .description{margin-bottom:15px}section.product-detail div.layouter .form-container .details .description ul{padding-left:40px;list-style:disc}section.product-detail div.layouter .form-container .details .quantity{padding-top:15px;border-top:1px solid hsla(0,0%,64%,.2)}section.product-detail div.layouter .form-container .details .full-description *{max-width:100%}section.product-detail div.layouter .form-container .details .full-description ul{padding-left:40px;list-style:disc}section.product-detail div.layouter .form-container .details .full-specifications td{padding:10px 0;color:#5e5e5e}section.product-detail div.layouter .form-container .details .full-specifications td:first-child{padding-right:40px}section.product-detail div.layouter .form-container .details .accordian .accordian-header{padding-left:0;font-weight:600}section.product-detail div.layouter .form-container .details .accordian .accordian-content{padding:20px 0}section.product-detail div.layouter .form-container .details .attributes{display:block;width:100%;border-bottom:1px solid hsla(0,0%,64%,.2)}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group{margin-bottom:20px}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container{margin-top:10px;display:inline-block}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch{display:inline-block;margin-right:5px;min-width:40px;height:40px}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch span{min-width:38px;height:38px;float:left;border:1px solid #c7c7c7;border-radius:3px;line-height:36px;text-align:center;cursor:pointer;padding:0 10px}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch img{width:38px;height:38px;border:1px solid #c7c7c7;border-radius:3px;cursor:pointer;background:#f2f2f2}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch input:checked+img,section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch input:checked+span{border:1px solid #242424}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .swatch input{display:none}section.product-detail div.layouter .form-container .details .attributes .attribute.control-group .swatch-container .no-options{color:#fb3949}section.product-detail div.layouter .form-container .details .quantity-change{cursor:pointer;text-align:center}section.product-detail div.layouter .form-container .details .quantity-change:focus{border-color:#c7c7c7!important}@media only screen and (max-width:720px){section.product-detail div.layouter .form-container{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;max-width:none;width:auto;min-height:400px;height:auto;position:unset}section.product-detail div.layouter .form-container div.product-image-group .loader{margin-left:47%}section.product-detail div.layouter .form-container div.product-image-group div{-webkit-box-orient:vertical;-webkit-box-direction:reverse;-ms-flex-direction:column-reverse;flex-direction:column-reverse}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list{margin-top:5px;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;overflow-x:scroll;margin-right:0}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .thumb-frame img{height:100%;width:auto}section.product-detail div.layouter .form-container div.product-image-group div .thumb-list .gallery-control{display:none}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image{display:-webkit-box;display:-ms-flexbox;display:flex}section.product-detail div.layouter .form-container div.product-image-group div .product-hero-image img{margin-left:auto;margin-right:auto;width:480px}section.product-detail div.layouter .form-container div.product-image-group div .wrap{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;width:100%!important}section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{width:100%}section.product-detail div.layouter .form-container .details{width:100%;margin-top:20px}}@media only screen and (max-width:510px){section.product-detail div.layouter .form-container div.product-image-group .product-hero-image img{width:100%!important}}.rating-reviews .rating-header{padding:20px 0}.rating-reviews .stars .icon{width:16px;height:16px}.rating-reviews .overall{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.rating-reviews .overall .review-info .number{font-size:34px}.rating-reviews .overall .review-info .total-reviews{margin-top:10px}.rating-reviews .reviews{margin-top:40px;margin-bottom:40px}.rating-reviews .reviews .review{margin-bottom:25px}.rating-reviews .reviews .review .title{margin-bottom:5px}.rating-reviews .reviews .review .stars{margin-bottom:15px;display:inline-block}.rating-reviews .reviews .review .message{margin-bottom:10px}.rating-reviews .reviews .review .reviewer-details{color:#5e5e5e}.rating-reviews .reviews .view-all{margin-top:15px;color:#0031f0;margin-bottom:15px}section.cart{width:100%;color:#242424;margin-bottom:80px;margin-top:20px}section.cart .title{font-size:24px}section.cart .cart-content{margin-top:20px;width:100%;display:inline-block}section.cart .cart-content .left-side{width:70%;float:left}section.cart .cart-content .left-side .misc-controls{width:100%;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;margin-top:20px}section.cart .cart-content .left-side .misc-controls a.link,section.cart .cart-content .left-side .misc-controls div button{margin-right:15px}section.cart .cart-content .right-side{width:30%;display:inline-block;padding-left:40px}.cart-item-list .item{padding:10px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;border:1px solid #c7c7c7;border-radius:2px}.cart-item-list .item .item-image{margin-right:15px}.cart-item-list .item .item-image img{height:160px;width:160px}.cart-item-list .item .item-details{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.cart-item-list .item .item-details .item-title{font-size:18px;margin-bottom:10px;font-weight:600}.cart-item-list .item .item-details .item-title a{color:#242424}.cart-item-list .item .item-details .price{margin-bottom:10px;font-size:18px;font-weight:600}.cart-item-list .item .item-details .summary{margin-bottom:17px}.cart-item-list .item .item-details .misc{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.cart-item-list .item .item-details .misc .control-group{font-size:16px!important;width:220px;margin:0}.cart-item-list .item .item-details .misc .control-group .wrap{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cart-item-list .item .item-details .misc .control-group label{margin-right:15px}.cart-item-list .item .item-details .misc .control-group .control{height:38px;width:60px;border-radius:3px;text-align:center;line-height:38px}.cart-item-list .item .item-details .misc .remove,.cart-item-list .item .item-details .misc .towishlist{margin-top:18px;margin-right:15px}.cart-item-list .item .item-details .misc .quantity-change{cursor:pointer}.cart-item-list .item .item-details .misc .quantity-change:focus{border-color:#c7c7c7!important}.cart-item-list .item .error-message{color:#ff6472}.order-summary h3{font-size:16px;margin-top:0}.order-summary .item-detail{margin-top:12px}.order-summary .item-detail label.right{float:right}.order-summary .payable-amount{margin-top:17px;border-top:1px solid #c7c7c7;padding-top:12px}.order-summary .payable-amount label{font-weight:700}.order-summary .payable-amount label.right{float:right}@media only screen and (max-width:815px){section.cart .cart-content{display:block}section.cart .cart-content .left-side{width:100%;float:none}section.cart .cart-content .left-side .misc-controls{position:relative;top:180px;margin-top:0}section.cart .cart-content .right-side{width:100%;padding-left:0;position:relative;top:-20px}}@media only screen and (max-width:600px){section.cart .cart-content .left-side .cart-item-list .item{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}section.cart .cart-content .left-side .cart-item-list .item .item-details{margin-top:10px}section.cart .cart-content .left-side .cart-item-list .item .item-details .misc{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;line-height:40px}}@media only screen and (max-width:574px){section.cart .cart-content .left-side .misc-controls{display:block;top:160px}section.cart .cart-content .left-side .misc-controls div button{width:100%;margin-top:10px}section.cart .cart-content .left-side .misc-controls div a{margin-top:10px;width:100%;text-align:center}section.cart .cart-content .right-side{top:-100px}}.checkout-method-group .line-one{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.checkout-method-group .line-one .radio-container{padding-left:28px}.checkout-method-group .line-one .method-label{margin-top:4px}.checkout-method-group .line-two{margin-left:30px}.checkout-process{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;width:100%;margin-top:20px;margin-bottom:20px;font-size:16px;color:#242424}.checkout-process .col-main{width:70%;margin-right:5%}.checkout-process .col-main ul.checkout-steps{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100%;padding-bottom:15px;border-bottom:1px solid #c7c7c7}.checkout-process .col-main ul.checkout-steps li{height:48px;display:-webkit-box;display:-ms-flexbox;display:flex}.checkout-process .col-main ul.checkout-steps li .decorator{height:48px;width:48px;border:1px solid #000;border-radius:50%;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;border:1px solid #c7c7c7;background-repeat:no-repeat;background-position:50%}.checkout-process .col-main ul.checkout-steps li .decorator.address-info{background-image:url("../images/address.svg")}.checkout-process .col-main ul.checkout-steps li .decorator.shipping{background-image:url("../images/shipping.svg")}.checkout-process .col-main ul.checkout-steps li .decorator.payment{background-image:url("../images/payment.svg")}.checkout-process .col-main ul.checkout-steps li .decorator.review{background-image:url("../images/finish.svg")}.checkout-process .col-main ul.checkout-steps li.completed{cursor:pointer}.checkout-process .col-main ul.checkout-steps li.completed .decorator{background-image:url("../images/complete.svg")}.checkout-process .col-main ul.checkout-steps li span{margin-left:7px;margin-top:auto;margin-bottom:auto}.checkout-process .col-main ul.checkout-steps li.active{color:#2650ef}.checkout-process .col-main ul.checkout-steps li.active .decorator{border:1px solid #2650ef}.checkout-process .col-main .step-content{padding-top:20px}.checkout-process .col-main .step-content .form-header{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100%;height:30px}.checkout-process .col-main .step-content .form-header .checkout-step-heading{font-size:24px;font-weight:700;float:left}.checkout-process .col-main .step-content .form-header .btn{float:right;font-size:14px}.checkout-process .col-main .step-content .form-container{border-bottom:1px solid #c7c7c7;padding-top:20px;padding-bottom:20px}.checkout-process .col-main .step-content .shipping-methods{font-size:16px}.checkout-process .col-main .step-content .shipping-methods .ship-method-carrier{margin-bottom:15px;font-weight:700}.checkout-process .col-main .step-content .payment-methods .radio-container{padding-left:28px}.checkout-process .col-main .step-content .payment-methods .control-info{margin-left:28px}.checkout-process .col-main .step-content .address-summary{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%}.checkout-process .col-main .step-content .address-summary div.billing-address{margin-right:25%}.checkout-process .col-main .step-content .address-summary div.billing-address .horizontal-rule,.checkout-process .col-main .step-content .address-summary div.shipping-address .horizontal-rule{width:40px;background:#242424}.checkout-process .col-main .step-content .address-summary .label{width:10%}.checkout-process .col-main .step-content .address-summary .address-card-list{width:85%}.checkout-process .col-main .step-content .cart-item-list .item .row .title{width:100px;display:inline-block;color:#a5a5a5;font-weight:500;margin-bottom:10px}.checkout-process .col-main .step-content .cart-item-list .item .row .value{font-size:18px;font-weight:600}.checkout-process .col-main .step-content .order-description{display:inline-block;width:100%}.checkout-process .col-main .step-content .order-description .shipping{margin-bottom:25px}.checkout-process .col-main .step-content .order-description .decorator{height:48px;width:48px;border-radius:50%;border:1px solid #c7c7c7;vertical-align:middle;display:inline-block;text-align:center}.checkout-process .col-main .step-content .order-description .decorator .icon{margin-top:7px}.checkout-process .col-main .step-content .order-description .text{font-weight:600;vertical-align:middle;display:inline-block}.checkout-process .col-main .step-content .order-description .text .info{font-weight:500;margin-top:2px}.checkout-process .col-right{width:25%;padding-left:40px}@media only screen and (max-width:770px){.checkout-process .col-main{width:100%;padding-right:0}.checkout-process .col-main ul.checkout-steps{border-bottom:none;padding-bottom:0}.checkout-process .col-main ul.checkout-steps span{display:none}.checkout-process .col-main ul.checkout-steps .line{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;border-bottom:1px solid #c7c7c7;margin-left:5px;margin-right:5px}.checkout-process .step-content{padding-top:0}.checkout-process .step-content .control-group .control{width:100%}.checkout-process .col-right{display:none}}@media only screen and (max-width:480px){.checkout-process .col-main .step-content .address,.checkout-process .col-main .step-content .order-description{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.checkout-process .col-main .step-content .address .billing-address,.checkout-process .col-main .step-content .address .pull-left,.checkout-process .col-main .step-content .order-description .billing-address,.checkout-process .col-main .step-content .order-description .pull-left{width:100%!important}.checkout-process .col-main .step-content .address .pull-right,.checkout-process .col-main .step-content .address .shipping-address,.checkout-process .col-main .step-content .order-description .pull-right,.checkout-process .col-main .step-content .order-description .shipping-address{width:100%!important;margin-top:20px}}.attached-products-wrapper{margin-bottom:80px}.attached-products-wrapper .title{margin-bottom:40px;font-size:18px;color:#242424;text-align:center;position:relative}.attached-products-wrapper .title .border-bottom{border-bottom:1px solid hsla(0,0%,64%,.2);display:inline-block;width:100px;position:absolute;top:40px;left:50%;margin-left:-50px}.attached-products-wrapper .horizontal-rule{height:1px;background:#c7c7c7;width:148px;margin-bottom:24px;margin-left:auto;margin-right:auto}section.review .category-breadcrumbs{display:inline}section.review .review-layouter{display:-webkit-box;display:-ms-flexbox;display:flex}section.review .review-layouter .product-info{font-size:24px;max-width:25%}section.review .review-layouter .product-info .product-image img{height:280px;width:280px}section.review .review-layouter .product-info .product-name a{color:#242424}section.review .review-layouter .product-info .product-price .pro-price{color:#ff6472}section.review .review-layouter .product-info .product-price .pro-price-not{margin-left:10px;font-size:16px;color:#a5a5a5}section.review .review-layouter .product-info .product-price .offer{margin-left:10px;font-size:16px}section.review .review-layouter .review-form{margin-left:20px;width:55%}section.review .review-layouter .review-form .heading{color:#242424;font-weight:600}section.review .review-layouter .review-form .heading .right{float:right;margin-top:-10px}section.review .review-layouter .review-form .star{font-size:23px;color:#d4d4d4;-webkit-transition:all .2s;transition:all .2s}section.review .review-layouter .review-form .star:before{content:"\2605"}section.review .review-layouter .review-form .control-group .control{width:100%}section.review .review-layouter .review-form .review-detail{height:150px;border:1px solid #b22222;margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}section.review .review-layouter .review-form .review-detail .rating-review{margin-top:40px;margin-left:20px;width:48%}section.review .review-layouter .review-form .review-detail .rating-review .avg-rating-count span{font-size:34px;text-align:center}section.review .review-layouter .review-form .review-detail .rating-calculate .progress-only{width:20px;border:1px solid blue}section.review .review-layouter .ratings-reviews{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}section.review .review-layouter .ratings-reviews .left-side{padding:40px 20px;width:50%}section.review .review-layouter .ratings-reviews .left-side .rate{font-size:34px}section.review .review-layouter .ratings-reviews .left-side .stars .icon{height:16px;width:16px}section.review .review-layouter .ratings-reviews .right-side{width:50%}section.review .review-layouter .ratings-reviews .right-side .rater{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding-top:5px;width:100%}section.review .review-layouter .ratings-reviews .right-side .rater .star-name{margin-right:5px;width:35px}section.review .review-layouter .ratings-reviews .right-side .rater .rate-number{width:15px}section.review .review-layouter .ratings-reviews .right-side .rater .percentage{width:50px;margin-right:10px}section.review .review-layouter .ratings-reviews .right-side .rater .percentage span{float:right;white-space:nowrap}section.review .review-layouter .ratings-reviews .right-side .rater .line-bar{height:4px;width:calc(100% - 100px);margin-right:5px;margin-left:5px;background:#d8d8d8}section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .line-value{background-color:#0031f0}@media only screen and (max-width:770px){section.review .category-breadcrumbs{display:none}section.review .review-layouter{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}section.review .review-layouter .product-info{max-width:100%}section.review .review-layouter .product-info .product-image,section.review .review-layouter .product-info .product-name,section.review .review-layouter .product-info .product-price{max-width:280px;margin-left:auto;margin-right:auto}section.review .review-layouter .review-form{width:100%;margin-left:0}section.review .review-layouter .review-form .heading .right{margin-top:50px}section.review .review-layouter .review-form .ratings-reviews{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%}section.review .review-layouter .review-form .ratings-reviews .left-side{width:100%;padding:0 0 40px;margin-top:-30px}section.review .review-layouter .review-form .ratings-reviews .right-side{width:100%}section.review .review-layouter .review-form .ratings-reviews .right-side .rater .percentage{margin-right:0}}.auth-content{padding-top:5%;padding-bottom:5%}.auth-content .sign-up-text{margin-bottom:2%;margin-left:auto;margin-right:auto;font-size:18px;color:#a5a5a5;text-align:center}.auth-content .login-form{margin-left:auto;margin-right:auto;display:-webkit-box;display:-ms-flexbox;display:flex;border:1px solid #c7c7c7;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;max-width:500px;min-width:320px;padding:25px}.auth-content .login-form .login-text{font-size:24px;font-weight:600;margin-bottom:30px}.auth-content .login-form .control-group{margin-bottom:15px!important}.auth-content .login-form .control-group .control{width:100%!important}.auth-content .login-form .forgot-password-link{font-size:17px;color:#0031f0;margin-bottom:5%}.auth-content .login-form .signup-confirm{margin-bottom:5%}.auth-content .login-form .btn-primary{width:100%;text-transform:uppercase}.account-content{width:100%;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;margin-top:5.5%;margin-bottom:5.5%}.account-content,.account-content .sidebar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal}.account-content .sidebar{-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-ms-flex-line-pack:center;align-content:center;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:20%;height:100%}.account-content .menu-block{margin-bottom:30px}.account-content .menu-block:last-child{margin-bottom:0}.account-content .menu-block .menu-block-title{padding-bottom:10px;font-size:18px}.account-content .menu-block .menu-block-title .right{display:none}.account-content .menu-block .menubar{border:1px solid #c7c7c7;color:#a5a5a5;position:relative}.account-content .menu-block .menubar li{width:95%;height:50px;margin-left:5%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;border-bottom:1px solid #c7c7c7;text-align:center}.account-content .menu-block .menubar li a{color:#5e5e5e;width:100%;text-align:left}.account-content .menu-block .menubar li .icon{display:none;position:absolute;right:12px}.account-content .menu-block .menubar li:first-child{border-top:none}.account-content .menu-block .menubar li:last-child{border-bottom:none}.account-content .menu-block .menubar li.active a{color:#0031f0}.account-content .menu-block .menubar li.active .icon{display:inline-block}.account-content .account-layout{margin-left:40px;width:80%}.account-content .account-layout .account-head .back-icon,.account-content .account-layout .responsive-empty{display:none}.account-table-content{color:#242424;margin-top:1.4%}.account-table-content table{width:100%}.account-table-content table tbody tr{height:45px}.account-table-content table tbody tr td{width:250px}.address-holder{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-ms-flex-wrap:wrap;flex-wrap:wrap;width:100%}.address-card{width:260px;border:1px solid #c7c7c7;padding:15px;margin-right:15px;margin-bottom:15px}.address-card .control-group{width:15px;height:15px;margin-top:10px}.address-card .details{font-weight:lighter}.address-card .details span{display:block}.address-card .details .control-links{width:90%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.address-card .details .control-links .btn{height:30px}.edit-form{display:-webkit-box;display:-ms-flexbox;display:flex;border:1px solid #c7c7c7;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;min-height:345px;padding:25px}@media only screen and (max-width:770px){.account-content{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.account-content .sidebar{width:100%}.account-content .sidebar .menu-block .menu-block-title{height:50px;padding-top:13px;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7}.account-content .sidebar .menu-block .menu-block-title .right{display:block;float:right;-ms-flex-item-align:center;align-self:center}.account-content .sidebar .menu-block .menubar{border:0;display:none}.account-content .sidebar .menu-block .menubar>li{margin-left:0;width:100%}.account-content .sidebar .menu-block .menubar>li .icon{right:0}.account-content .sidebar .menu-block .menubar>li:last-child{border-bottom:1px solid #c7c7c7}.account-content .account-layout{margin-left:0;margin-top:20px;width:100%}.account-content .account-layout .account-head{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7;height:50px;margin-top:10px}.account-content .account-layout .account-head .account-action{margin-top:12px;margin-left:15px}.account-content .account-layout .account-head .back-icon{display:block}.account-content .account-layout .account-head span{margin-top:13px;font-size:18px}.account-content .account-layout .account-head .horizontal-rule{display:none}.account-content .account-layout .account-table-content{margin-top:2%}.account-content .account-layout .account-table-content table tbody tr{height:70px}.account-content .account-layout .account-table-content table tbody tr td{display:block}.account-content .account-layout .account-table-content .address-holder{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.account-content .account-items-list,.account-content .edit-form{margin-top:20px}.account-content .account-items-list .responsive-empty,.account-content .edit-form .responsive-empty{display:block}.account-content .control-group .control{width:100%}}.sale-container{color:#5e5e5e}.sale-container .sale-section .secton-title{font-size:18px;color:#8e8e8e;padding:15px 0;border-bottom:1px solid #c7c7c7}.sale-container .sale-section .section-content{display:block;padding:20px 0;border-bottom:1px solid #e8e8e8}.sale-container .sale-section .section-content .row{display:block;padding:7px 0}.sale-container .sale-section .section-content .row .title{width:200px;letter-spacing:-.26px;display:inline-block}.sale-container .sale-section .section-content .row .value{letter-spacing:-.26px;display:inline-block}.sale-container .sale-section .section-content .order-box-container{display:inline-block;width:100%}.sale-container .sale-section .section-content .order-box-container .box{float:left;width:25%}.sale-container .sale-section .section-content .order-box-container .box .box-title{padding:10px 0;font-size:18px;color:#8e8e8e}.sale-container .sale-section .section-content .order-box-container .box .box-content{color:#3a3a3a;padding-right:10px}.sale-container .sale-section .section-content .qty-row{display:block}.sale-container .totals{padding-top:20px;display:inline-block;width:100%;border-top:1px solid #e8e8e8}.sale-container .totals .sale-summary{height:130px;float:right;border-collapse:collapse}.sale-container .totals .sale-summary tr td{padding:5px 8px;width:auto;color:#3a3a3a}.sale-container .totals .sale-summary tr.bold{font-weight:600;font-size:15px}.sale-container .totals .sale-summary tr.border td{border-bottom:1px solid #c7c7c7}@media only screen and (max-width:770px){.sale-container .sale-section .section-content{border-bottom:none;padding:10px 0}.sale-container .sale-section .section-content .row{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.sale-container .sale-section .section-content .row .title{line-height:20px}.sale-container .sale-section .section-content .totals{border-top:none}.sale-container .sale-section .section-content .totals .sale-summary{width:100%}.sale-container .sale-section .section-content .totals .sale-summary tr td:nth-child(2){display:none}.sale-container .sale-section .section-content .order-box-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.sale-container .sale-section .section-content .order-box-container .box{width:100%;margin:10px auto}.sale-container .sale-section .section-content .qty-row{display:inline}}.verify-account{text-align:center;background:#204d74;width:200px;margin-right:auto;margin-left:auto;border-radius:4px}.verify-account a{color:#fff!important}.cp-spinner{position:absolute;left:calc(50% - 24px);margin-top:calc(40% - 24px)}@media only screen and (max-width:720px){.cp-spinner{left:50%;margin-left:-24px;top:50%;margin-top:-24px}}@media only screen and (max-width:720px){.error-container .wrapper{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important;margin:10px 0 20px!important;-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:start!important;height:100%!important}}@media only screen and (max-width:770px){.table table{width:100%}.table table thead{display:none}.table table tbody tr td:before{content:attr(data-value);font-size:15px;font-weight:600;display:inline-block;width:120px}.table table tbody td{border-bottom:none!important;display:block;width:100%!important}.table table tbody td div{position:relative;left:100px;top:-20px}.table table tbody tr{border:1px solid #c7c7c7}}.show-wishlist{z-index:-1!important}.filter-row-one .dropdown-filters{position:relative!important;right:1px!important}@media only screen and (max-width:770px){.table .grid-container{margin-top:10px;overflow-x:hidden}.table .grid-container .filter-row-one{display:block}.table .grid-container .filter-row-one .dropdown-filters{margin-top:10px}}.rtl{direction:rtl}.rtl .header .header-top div.left-content ul.logo-container{margin-right:0;margin-left:12px}.rtl .header .header-top div.left-content ul.search-container li.search-group .search-field{border:2px solid #c7c7c7;padding-right:12px;padding-left:0;border-radius:2px;border-top-left-radius:0;border-bottom-left-radius:0}.rtl .header .header-top div.left-content ul.search-container li.search-group .search-icon-wrapper{border:2px solid #c7c7c7;border-right:none;border-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0}.rtl .header .header-top div.right-content .right-content-menu>li{border-right:2px solid #c7c7c7;padding:0 15px}.rtl .header .header-top div.right-content .right-content-menu>li:last-child{padding-left:0}.rtl .header .header-top div.right-content .right-content-menu>li:first-child{border-right:0;padding-right:0}.rtl .header .header-top div.right-content .right-content-menu .cart-dropdown-container .dropdown-list{left:0;right:unset!important}.rtl .header .header-top div.right-content .right-content-menu .cart-dropdown-container .count{display:inline-block}.rtl .header .header-top div.right-content .right-content-menu .account,.rtl .header .header-top div.right-content .right-content-menu .currency{right:unset;left:0}.rtl .header .header-top div.right-content .right-content-menu .guest div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.rtl .header .header-bottom .nav>li{float:right;margin-right:0;margin-left:1px}.rtl .header .header-bottom .nav a{padding:.8em .5em .8em .3em!important}.rtl .header .header-bottom .nav li a>.icon{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .header .header-bottom .nav>li li:hover>ul{left:unset!important;right:100%!important}.rtl .header .header-bottom .nav ul{left:99999em}.rtl .header .search-responsive .search-content .right{float:left}.rtl .dropdown-list{text-align:right}.rtl .dropdown-list.bottom-right{left:0;right:auto}@media only screen and (max-width:720px){.rtl .header .header-top div.right-content .menu-box{margin-left:0;margin-right:5px}.rtl .header .header-top div.right-content .right-content-menu .account{position:absolute;left:0;right:auto}.rtl .header .header-top div.right-content .right-content-menu>li{padding:0;border:0}.rtl .header .header-top div.right-content .search-box{margin-left:5px}.rtl .header .header-bottom .nav>li{float:none}.rtl .header .header-bottom .nav li>.icon{float:left;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .header .header-bottom .icon.icon-arrow-down{margin-left:5px}}.rtl section.slider-block div.slider-content div.slider-control{left:2%;right:auto}.rtl section.slider-block div.slider-content div.slider-control .slider-left{float:left}.rtl section.slider-block div.slider-content div.slider-control .slider-right{margin-left:5px}@media only screen and (max-width:720px){.rtl section.slider-block div.slider-content div.slider-control{left:0}}.rtl .main-container-wrapper .product-card .sticker{left:auto;right:20px}.rtl .main-container-wrapper .product-card .cart-wish-wrap .addtocart{margin-right:0;margin-left:10px}.rtl section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;margin-left:30px}.rtl section.product-detail div.layouter .form-container div.product-image-group .add-to-buttons{float:left!important}.rtl section.product-detail div.layouter .form-container div .thumb-list{margin-left:4px;margin-right:0}.rtl section.product-detail div.layouter .form-container .details .accordian .accordian-header{padding:20px 0 20px 15px}.rtl section.product-detail div.layouter .form-container .details .accordian .accordian-header .icon{float:left}.rtl section.product-detail div.layouter .form-container .details .accordian .accordian-header .expand-icon{margin-left:10px}.rtl section.product-detail div.layouter .form-container .details .full-specifications td:first-child{padding-right:0;padding-left:40px}.rtl section.product-detail div.layouter .form-container .details .product-ratings .total-reviews{margin-left:0;margin-right:15px}@media only screen and (max-width:720px){.rtl section.product-detail div.layouter .form-container div.product-image-group{margin-right:0;margin-left:0}}.rtl .main .category-container .layered-filter-wrapper,.rtl .main .category-container .responsive-layred-filter{padding-right:0;padding-left:20px}.rtl .main .top-toolbar .pager{float:left}.rtl .main .top-toolbar .pager .view-mode{margin-right:0;margin-left:20px}.rtl .main .top-toolbar .pager .sorter{margin-right:0;margin-left:10px}.rtl .main .top-toolbar .pager label{margin-right:0;margin-left:5px}.rtl .main .top-toolbar .page-info{float:right}.rtl section.review .review-layouter .review-form{margin-left:0;margin-right:20px}.rtl section.review .review-layouter .review-form .heading .right{float:left}.rtl section.review .review-layouter .review-form .ratings-reviews .right-side .rater .star-name{margin-right:0;margin-left:5px}@media only screen and (max-width:770px){.rtl section.review .review-layouter .review-form{margin-right:0}}.rtl section.cart .cart-content .left-side{width:70%;float:right}.rtl section.cart .cart-content .left-side .misc-controls a.link{margin-left:15px;margin-right:0}.rtl section.cart .cart-content .right-side{width:30%;padding-right:40px;padding-left:0}.rtl .order-summary .item-detail label.right,.rtl .payable-amount label.right{float:left}.rtl .item div{margin-left:15px;margin-right:0!important}.rtl .cart-item-list .item .item-details .misc div.qty-text{margin-right:0;margin-left:10px}.rtl .cart-item-list .item .item-details .misc .remove,.rtl .cart-item-list .item .item-details .misc input.box{margin-right:0;margin-left:30px}.rtl .cart-item-list .item .item-details .misc .control-group label{margin-left:15px;margin-right:0}@media only screen and (max-width:770px){.rtl section.cart .cart-content .left-side{width:100%;float:none}.rtl section.cart .cart-content .left-side .misc-controls div button{margin-right:0}.rtl section.cart .cart-content .right-side{width:100%;padding-right:0}}.rtl .checkout-process .col-right{padding-left:0;padding-right:40px}.rtl .checkout-process .col-main{padding-left:40px;padding-right:0}.rtl .checkout-process .col-main ul.checkout-steps li span{margin-right:7px;margin-left:0}.rtl .checkout-process .col-main .step-content .form-header h1{float:right}.rtl .checkout-process .col-main .step-content .form-header .btn{float:left}.rtl .checkout-process .col-main .step-content .payment-methods .control-info{margin-right:28px;margin-left:0}.rtl .checkout-process .col-main .step-content .address .billing-address,.rtl .checkout-process .col-main .step-content .address .pull-left,.rtl .checkout-process .col-main .step-content .order-description .billing-address,.rtl .checkout-process .col-main .step-content .order-description .pull-left{float:right!important}.rtl .checkout-process .col-main .step-content .address .pull-right,.rtl .checkout-process .col-main .step-content .address .shipping-address,.rtl .checkout-process .col-main .step-content .order-description .pull-right,.rtl .checkout-process .col-main .step-content .order-description .shipping-address{float:left!important}.rtl .checkbox,.rtl .radio{margin:10px 0 5px 5px}.rtl .radio .radio-view{margin-left:5px;margin-right:0}.rtl .radio input{right:0;left:auto}@media only screen and (max-width:770px){.rtl .checkout-process .col-main{padding-left:0}}.rtl .account-content .account-layout{margin-left:0;margin-right:40px}.rtl .account-content .menu-block .menubar li{margin-left:0;margin-right:5%}.rtl .account-content .menu-block .menubar li a{text-align:right}.rtl .account-content .menu-block .menubar li .icon{right:unset;left:12px;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.rtl .account-head .account-action{float:left}.rtl .account-item-card .media-info .info{margin-right:20px;margin-left:0}.rtl .account-item-card .operations a span{float:left}.rtl .table table{text-align:right}.rtl .sale-container .totals .sale-summary{float:left}.rtl .sale-container .sale-section .section-content .order-box-container{display:-webkit-box;display:-ms-flexbox;display:flex}@media (max-width:770px){.rtl .account-content .account-layout{margin-right:0}.rtl .account-content .account-layout .account-head .account-action{margin-left:0}.rtl .account-content .sidebar .menu-block .menu-block-title .right{float:left}.rtl .account-content .sidebar .menu-block .menubar>li{margin-right:0}}.rtl .footer .footer-content .footer-list-container .list-container .list-group li span.icon{margin-left:5px;margin-right:0}@media (max-width:720px){.rtl .footer{padding-right:15px;padding-left:10%}.rtl .footer .footer-list-container{padding-right:0!important}}.rtl .cp-spinner{position:absolute;right:calc(50% - 24px);margin-top:calc(40% - 24px)}@media only screen and (max-width:720px){.rtl .cp-spinner{right:50%;margin-right:-24px;left:auto}}.rtl .product-list .product-card .product-information{padding-left:0;padding-right:30px;float:left}.rtl .zoom-image-direction{left:0;right:476px!important}.banner-container{width:100%;float:left;padding:0 18px;margin-bottom:40px}.banner-container .left-banner{padding-right:20px;width:60%;float:left}.banner-container .left-banner img{width:100%}.banner-container .right-banner{padding-left:20px;width:40%;float:left}.banner-container .right-banner img{width:100%}.banner-container .right-banner img:first-child{padding-bottom:20px;height:50%;display:block}.banner-container .right-banner img:last-child{padding-top:20px;height:50%;display:block}@media (max-width:720px){.banner-container .left-banner{padding-right:0;width:100%}.banner-container .right-banner{padding-left:0;width:100%}.banner-container .right-banner img:first-child{padding-bottom:0;padding-top:25px}.banner-container .right-banner img:last-child{padding-top:25px}}
diff --git a/packages/Webkul/Shop/publishable/assets/js/shop.js b/packages/Webkul/Shop/publishable/assets/js/shop.js
index bbf143d57..850b2bb66 100755
--- a/packages/Webkul/Shop/publishable/assets/js/shop.js
+++ b/packages/Webkul/Shop/publishable/assets/js/shop.js
@@ -1 +1 @@
-!function(e){var t={};function n(i){if(t[i])return t[i].exports;var r=t[i]={i:i,l:!1,exports:{}};return e[i].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=t,n.d=function(e,t,i){n.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:i})},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/",n(n.s=0)}({0:function(e,t,n){n("J66Q"),e.exports=n("MT9B")},"162o":function(e,t,n){(function(e){var i=void 0!==e&&e||"undefined"!=typeof self&&self||window,r=Function.prototype.apply;function o(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new o(r.call(setTimeout,i,arguments),clearTimeout)},t.setInterval=function(){return new o(r.call(setInterval,i,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},o.prototype.unref=o.prototype.ref=function(){},o.prototype.close=function(){this._clearFn.call(i,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n("mypn"),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(t,n("DuR2"))},"21It":function(e,t,n){"use strict";var i=n("FtD3");e.exports=function(e,t,n){var r=n.config.validateStatus;n.status&&r&&!r(n.status)?t(i("Request failed with status code "+n.status,n.config,null,n.request,n)):e(n)}},"4TI/":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={props:{slides:{type:Array,required:!0,default:function(){return[]}},public_path:{type:String,required:!0}},data:function(){return{images:[],currentIndex:-1,content:[],current:!1,images_loaded:!1}},mounted:function(){this.getProps()},methods:{getProps:function(){this.setProps()},setProps:function(){var e=this;this.slides.forEach(function(t){e.images.push(e.public_path+"/storage/"+t.path),e.content.push(t.content)}),this.currentIndex=0,0==this.images.length?this.images.push="vendor/webkul/shop/assets/images/banner.png":this.images_loaded=!0},changeIndexLeft:function(){this.currentIndex>0?this.currentIndex--:0==this.currentIndex&&(this.currentIndex=this.images.length-1)},changeIndexRight:function(){this.currentIndex0&&t-1 in e)}_.fn=_.prototype={jquery:"3.4.1",constructor:_,length:0,toArray:function(){return l.call(this)},get:function(e){return null==e?l.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=_.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return _.each(this,e)},map:function(e){return this.pushStack(_.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(l.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n+~]|"+j+")"+j+"*"),V=new RegExp(j+"|>"),U=new RegExp(H),Y=new RegExp("^"+F+"$"),Z={ID:new RegExp("^#("+F+")"),CLASS:new RegExp("^\\.("+F+")"),TAG:new RegExp("^("+F+"|[*])"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+H),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+j+"*(even|odd|(([+-]|)(\\d*)n|)"+j+"*(?:([+-]|)"+j+"*(\\d+)|))"+j+"*\\)|)","i"),bool:new RegExp("^(?:"+N+")$","i"),needsContext:new RegExp("^"+j+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+j+"*((?:-\\d)?\\d*)"+j+"*\\)|)(?=[^-]|$)","i")},G=/HTML$/i,X=/^(?:input|select|textarea|button)$/i,K=/^h\d$/i,J=/^[^{]+\{\s*\[native \w/,Q=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+j+"?|("+j+")|.)","ig"),ne=function(e,t,n){var i="0x"+t-65536;return i!=i||n?t:i<0?String.fromCharCode(i+65536):String.fromCharCode(i>>10|55296,1023&i|56320)},ie=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,re=function(e,t){return t?"\0"===e?"�":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){f()},se=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{E.apply(D=W.call(x.childNodes),x.childNodes),D[x.childNodes.length].nodeType}catch(e){E={apply:D.length?function(e,t){L.apply(e,W.call(t))}:function(e,t){for(var n=e.length,i=0;e[n++]=t[i++];);e.length=n-1}}}function ae(e,t,i,r){var o,a,u,c,d,p,g,y=t&&t.ownerDocument,T=t?t.nodeType:9;if(i=i||[],"string"!=typeof e||!e||1!==T&&9!==T&&11!==T)return i;if(!r&&((t?t.ownerDocument||t:x)!==h&&f(t),t=t||h,v)){if(11!==T&&(d=Q.exec(e)))if(o=d[1]){if(9===T){if(!(u=t.getElementById(o)))return i;if(u.id===o)return i.push(u),i}else if(y&&(u=y.getElementById(o))&&w(t,u)&&u.id===o)return i.push(u),i}else{if(d[2])return E.apply(i,t.getElementsByTagName(e)),i;if((o=d[3])&&n.getElementsByClassName&&t.getElementsByClassName)return E.apply(i,t.getElementsByClassName(o)),i}if(n.qsa&&!$[e+" "]&&(!m||!m.test(e))&&(1!==T||"object"!==t.nodeName.toLowerCase())){if(g=e,y=t,1===T&&V.test(e)){for((c=t.getAttribute("id"))?c=c.replace(ie,re):t.setAttribute("id",c=b),a=(p=s(e)).length;a--;)p[a]="#"+c+" "+we(p[a]);g=p.join(","),y=ee.test(e)&&ge(t.parentNode)||t}try{return E.apply(i,y.querySelectorAll(g)),i}catch(t){$(e,!0)}finally{c===b&&t.removeAttribute("id")}}}return l(e.replace(P,"$1"),t,i,r)}function le(){var e=[];return function t(n,r){return e.push(n+" ")>i.cacheLength&&delete t[e.shift()],t[n+" "]=r}}function ue(e){return e[b]=!0,e}function ce(e){var t=h.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function de(e,t){for(var n=e.split("|"),r=n.length;r--;)i.attrHandle[n[r]]=t}function fe(e,t){var n=t&&e,i=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(i)return i;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function he(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ve(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&se(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function me(e){return ue(function(t){return t=+t,ue(function(n,i){for(var r,o=e([],n.length,t),s=o.length;s--;)n[r=o[s]]&&(n[r]=!(i[r]=n[r]))})})}function ge(e){return e&&void 0!==e.getElementsByTagName&&e}for(t in n=ae.support={},o=ae.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!G.test(t||n&&n.nodeName||"HTML")},f=ae.setDocument=function(e){var t,r,s=e?e.ownerDocument||e:x;return s!==h&&9===s.nodeType&&s.documentElement?(p=(h=s).documentElement,v=!o(h),x!==h&&(r=h.defaultView)&&r.top!==r&&(r.addEventListener?r.addEventListener("unload",oe,!1):r.attachEvent&&r.attachEvent("onunload",oe)),n.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ce(function(e){return e.appendChild(h.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=J.test(h.getElementsByClassName),n.getById=ce(function(e){return p.appendChild(e).id=b,!h.getElementsByName||!h.getElementsByName(b).length}),n.getById?(i.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},i.find.ID=function(e,t){if(void 0!==t.getElementById&&v){var n=t.getElementById(e);return n?[n]:[]}}):(i.filter.ID=function(e){var t=e.replace(te,ne);return function(e){var n=void 0!==e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},i.find.ID=function(e,t){if(void 0!==t.getElementById&&v){var n,i,r,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];for(r=t.getElementsByName(e),i=0;o=r[i++];)if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),i.find.TAG=n.getElementsByTagName?function(e,t){return void 0!==t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,i=[],r=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[r++];)1===n.nodeType&&i.push(n);return i}return o},i.find.CLASS=n.getElementsByClassName&&function(e,t){if(void 0!==t.getElementsByClassName&&v)return t.getElementsByClassName(e)},g=[],m=[],(n.qsa=J.test(h.querySelectorAll))&&(ce(function(e){p.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&m.push("[*^$]="+j+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||m.push("\\["+j+"*(?:value|"+N+")"),e.querySelectorAll("[id~="+b+"-]").length||m.push("~="),e.querySelectorAll(":checked").length||m.push(":checked"),e.querySelectorAll("a#"+b+"+*").length||m.push(".#.+[+~]")}),ce(function(e){e.innerHTML="";var t=h.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&m.push("name"+j+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&m.push(":enabled",":disabled"),p.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&m.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),m.push(",.*:")})),(n.matchesSelector=J.test(y=p.matches||p.webkitMatchesSelector||p.mozMatchesSelector||p.oMatchesSelector||p.msMatchesSelector))&&ce(function(e){n.disconnectedMatch=y.call(e,"*"),y.call(e,"[s!='']:x"),g.push("!=",H)}),m=m.length&&new RegExp(m.join("|")),g=g.length&&new RegExp(g.join("|")),t=J.test(p.compareDocumentPosition),w=t||J.test(p.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,i=t&&t.parentNode;return e===i||!(!i||1!==i.nodeType||!(n.contains?n.contains(i):e.compareDocumentPosition&&16&e.compareDocumentPosition(i)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},A=t?function(e,t){if(e===t)return d=!0,0;var i=!e.compareDocumentPosition-!t.compareDocumentPosition;return i||(1&(i=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===i?e===h||e.ownerDocument===x&&w(x,e)?-1:t===h||t.ownerDocument===x&&w(x,t)?1:c?M(c,e)-M(c,t):0:4&i?-1:1)}:function(e,t){if(e===t)return d=!0,0;var n,i=0,r=e.parentNode,o=t.parentNode,s=[e],a=[t];if(!r||!o)return e===h?-1:t===h?1:r?-1:o?1:c?M(c,e)-M(c,t):0;if(r===o)return fe(e,t);for(n=e;n=n.parentNode;)s.unshift(n);for(n=t;n=n.parentNode;)a.unshift(n);for(;s[i]===a[i];)i++;return i?fe(s[i],a[i]):s[i]===x?-1:a[i]===x?1:0},h):h},ae.matches=function(e,t){return ae(e,null,null,t)},ae.matchesSelector=function(e,t){if((e.ownerDocument||e)!==h&&f(e),n.matchesSelector&&v&&!$[t+" "]&&(!g||!g.test(t))&&(!m||!m.test(t)))try{var i=y.call(e,t);if(i||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return i}catch(e){$(t,!0)}return ae(t,h,null,[e]).length>0},ae.contains=function(e,t){return(e.ownerDocument||e)!==h&&f(e),w(e,t)},ae.attr=function(e,t){(e.ownerDocument||e)!==h&&f(e);var r=i.attrHandle[t.toLowerCase()],o=r&&k.call(i.attrHandle,t.toLowerCase())?r(e,t,!v):void 0;return void 0!==o?o:n.attributes||!v?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},ae.escape=function(e){return(e+"").replace(ie,re)},ae.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},ae.uniqueSort=function(e){var t,i=[],r=0,o=0;if(d=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(A),d){for(;t=e[o++];)t===e[o]&&(r=i.push(o));for(;r--;)e.splice(i[r],1)}return c=null,e},r=ae.getText=function(e){var t,n="",i=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=r(e)}else if(3===o||4===o)return e.nodeValue}else for(;t=e[i++];)n+=r(t);return n},(i=ae.selectors={cacheLength:50,createPseudo:ue,match:Z,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||ae.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&ae.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return Z.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&U.test(n)&&(t=s(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=S[e+" "];return t||(t=new RegExp("(^|"+j+")"+e+"("+j+"|$)"))&&S(e,function(e){return t.test("string"==typeof e.className&&e.className||void 0!==e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(i){var r=ae.attr(i,e);return null==r?"!="===t:!t||(r+="","="===t?r===n:"!="===t?r!==n:"^="===t?n&&0===r.indexOf(n):"*="===t?n&&r.indexOf(n)>-1:"$="===t?n&&r.slice(-n.length)===n:"~="===t?(" "+r.replace(R," ")+" ").indexOf(n)>-1:"|="===t&&(r===n||r.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,i,r){var o="nth"!==e.slice(0,3),s="last"!==e.slice(-4),a="of-type"===t;return 1===i&&0===r?function(e){return!!e.parentNode}:function(t,n,l){var u,c,d,f,h,p,v=o!==s?"nextSibling":"previousSibling",m=t.parentNode,g=a&&t.nodeName.toLowerCase(),y=!l&&!a,w=!1;if(m){if(o){for(;v;){for(f=t;f=f[v];)if(a?f.nodeName.toLowerCase()===g:1===f.nodeType)return!1;p=v="only"===e&&!p&&"nextSibling"}return!0}if(p=[s?m.firstChild:m.lastChild],s&&y){for(w=(h=(u=(c=(d=(f=m)[b]||(f[b]={}))[f.uniqueID]||(d[f.uniqueID]={}))[e]||[])[0]===T&&u[1])&&u[2],f=h&&m.childNodes[h];f=++h&&f&&f[v]||(w=h=0)||p.pop();)if(1===f.nodeType&&++w&&f===t){c[e]=[T,h,w];break}}else if(y&&(w=h=(u=(c=(d=(f=t)[b]||(f[b]={}))[f.uniqueID]||(d[f.uniqueID]={}))[e]||[])[0]===T&&u[1]),!1===w)for(;(f=++h&&f&&f[v]||(w=h=0)||p.pop())&&((a?f.nodeName.toLowerCase()!==g:1!==f.nodeType)||!++w||(y&&((c=(d=f[b]||(f[b]={}))[f.uniqueID]||(d[f.uniqueID]={}))[e]=[T,w]),f!==t)););return(w-=r)===i||w%i==0&&w/i>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||ae.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ue(function(e,n){for(var i,o=r(e,t),s=o.length;s--;)e[i=M(e,o[s])]=!(n[i]=o[s])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ue(function(e){var t=[],n=[],i=a(e.replace(P,"$1"));return i[b]?ue(function(e,t,n,r){for(var o,s=i(e,null,r,[]),a=e.length;a--;)(o=s[a])&&(e[a]=!(t[a]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),t[0]=null,!n.pop()}}),has:ue(function(e){return function(t){return ae(e,t).length>0}}),contains:ue(function(e){return e=e.replace(te,ne),function(t){return(t.textContent||r(t)).indexOf(e)>-1}}),lang:ue(function(e){return Y.test(e||"")||ae.error("unsupported lang: "+e),e=e.replace(te,ne).toLowerCase(),function(t){var n;do{if(n=v?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===p},focus:function(e){return e===h.activeElement&&(!h.hasFocus||h.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ve(!1),disabled:ve(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return K.test(e.nodeName)},input:function(e){return X.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:me(function(){return[0]}),last:me(function(e,t){return[t-1]}),eq:me(function(e,t,n){return[n<0?n+t:n]}),even:me(function(e,t){for(var n=0;nt?t:n;--i>=0;)e.push(i);return e}),gt:me(function(e,t,n){for(var i=n<0?n+t:n;++i1?function(t,n,i){for(var r=e.length;r--;)if(!e[r](t,n,i))return!1;return!0}:e[0]}function Te(e,t,n,i,r){for(var o,s=[],a=0,l=e.length,u=null!=t;a-1&&(o[u]=!(s[u]=d))}}else g=Te(g===s?g.splice(p,g.length):g),r?r(null,s,g,l):E.apply(s,g)})}function Se(e){for(var t,n,r,o=e.length,s=i.relative[e[0].type],a=s||i.relative[" "],l=s?1:0,c=be(function(e){return e===t},a,!0),d=be(function(e){return M(t,e)>-1},a,!0),f=[function(e,n,i){var r=!s&&(i||n!==u)||((t=n).nodeType?c(e,n,i):d(e,n,i));return t=null,r}];l1&&xe(f),l>1&&we(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(P,"$1"),n,l0,r=e.length>0,o=function(o,s,a,l,c){var d,p,m,g=0,y="0",w=o&&[],b=[],x=u,_=o||r&&i.find.TAG("*",c),S=T+=null==x?1:Math.random()||.1,C=_.length;for(c&&(u=s===h||s||c);y!==C&&null!=(d=_[y]);y++){if(r&&d){for(p=0,s||d.ownerDocument===h||(f(d),a=!v);m=e[p++];)if(m(d,s||h,a)){l.push(d);break}c&&(T=S)}n&&((d=!m&&d)&&g--,o&&w.push(d))}if(g+=y,n&&y!==g){for(p=0;m=t[p++];)m(w,b,s,a);if(o){if(g>0)for(;y--;)w[y]||b[y]||(b[y]=O.call(l));b=Te(b)}E.apply(l,b),c&&!o&&b.length>0&&g+t.length>1&&ae.uniqueSort(l)}return c&&(T=S,u=x),w};return n?ue(o):o}(o,r))).selector=e}return a},l=ae.select=function(e,t,n,r){var o,l,u,c,d,f="function"==typeof e&&e,h=!r&&s(e=f.selector||e);if(n=n||[],1===h.length){if((l=h[0]=h[0].slice(0)).length>2&&"ID"===(u=l[0]).type&&9===t.nodeType&&v&&i.relative[l[1].type]){if(!(t=(i.find.ID(u.matches[0].replace(te,ne),t)||[])[0]))return n;f&&(t=t.parentNode),e=e.slice(l.shift().value.length)}for(o=Z.needsContext.test(e)?0:l.length;o--&&(u=l[o],!i.relative[c=u.type]);)if((d=i.find[c])&&(r=d(u.matches[0].replace(te,ne),ee.test(l[0].type)&&ge(t.parentNode)||t))){if(l.splice(o,1),!(e=r.length&&we(l)))return E.apply(n,r),n;break}}return(f||a(e,h))(r,t,!v,n,!t||ee.test(e)&&ge(t.parentNode)||t),n},n.sortStable=b.split("").sort(A).join("")===b,n.detectDuplicates=!!d,f(),n.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(h.createElement("fieldset"))}),ce(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||de("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ce(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||de("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||de(N,function(e,t,n){var i;if(!n)return!0===e[t]?t.toLowerCase():(i=e.getAttributeNode(t))&&i.specified?i.value:null}),ae}(n);_.find=z,_.expr=z.selectors,_.expr[":"]=_.expr.pseudos,_.uniqueSort=_.unique=z.uniqueSort,_.text=z.getText,_.isXMLDoc=z.isXML,_.contains=z.contains,_.escapeSelector=z.escape;var $=function(e,t,n){for(var i=[],r=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(r&&_(e).is(n))break;i.push(e)}return i},A=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=_.expr.match.needsContext;function D(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var O=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function L(e,t,n){return y(t)?_.grep(e,function(e,i){return!!t.call(e,i,e)!==n}):t.nodeType?_.grep(e,function(e){return e===t!==n}):"string"!=typeof t?_.grep(e,function(e){return d.call(t,e)>-1!==n}):_.filter(t,e,n)}_.filter=function(e,t,n){var i=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===i.nodeType?_.find.matchesSelector(i,e)?[i]:[]:_.find.matches(e,_.grep(t,function(e){return 1===e.nodeType}))},_.fn.extend({find:function(e){var t,n,i=this.length,r=this;if("string"!=typeof e)return this.pushStack(_(e).filter(function(){for(t=0;t1?_.uniqueSort(n):n},filter:function(e){return this.pushStack(L(this,e||[],!1))},not:function(e){return this.pushStack(L(this,e||[],!0))},is:function(e){return!!L(this,"string"==typeof e&&k.test(e)?_(e):e||[],!1).length}});var E,W=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(_.fn.init=function(e,t,n){var i,r;if(!e)return this;if(n=n||E,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:W.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof _?t[0]:t,_.merge(this,_.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:s,!0)),O.test(i[1])&&_.isPlainObject(t))for(i in t)y(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(r=s.getElementById(i[2]))&&(this[0]=r,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):y(e)?void 0!==n.ready?n.ready(e):e(_):_.makeArray(e,this)}).prototype=_.fn,E=_(s);var M=/^(?:parents|prev(?:Until|All))/,N={children:!0,contents:!0,next:!0,prev:!0};function j(e,t){for(;(e=e[t])&&1!==e.nodeType;);return e}_.fn.extend({has:function(e){var t=_(e,this),n=t.length;return this.filter(function(){for(var e=0;e-1:1===n.nodeType&&_.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?_.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?d.call(_(e),this[0]):d.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(_.uniqueSort(_.merge(this.get(),_(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),_.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return $(e,"parentNode")},parentsUntil:function(e,t,n){return $(e,"parentNode",n)},next:function(e){return j(e,"nextSibling")},prev:function(e){return j(e,"previousSibling")},nextAll:function(e){return $(e,"nextSibling")},prevAll:function(e){return $(e,"previousSibling")},nextUntil:function(e,t,n){return $(e,"nextSibling",n)},prevUntil:function(e,t,n){return $(e,"previousSibling",n)},siblings:function(e){return A((e.parentNode||{}).firstChild,e)},children:function(e){return A(e.firstChild)},contents:function(e){return void 0!==e.contentDocument?e.contentDocument:(D(e,"template")&&(e=e.content||e),_.merge([],e.childNodes))}},function(e,t){_.fn[e]=function(n,i){var r=_.map(this,t,n);return"Until"!==e.slice(-5)&&(i=n),i&&"string"==typeof i&&(r=_.filter(i,r)),this.length>1&&(N[e]||_.uniqueSort(r),M.test(e)&&r.reverse()),this.pushStack(r)}});var F=/[^\x20\t\r\n\f]+/g;function I(e){return e}function H(e){throw e}function R(e,t,n,i){var r;try{e&&y(r=e.promise)?r.call(e).done(t).fail(n):e&&y(r=e.then)?r.call(e,t,n):t.apply(void 0,[e].slice(i))}catch(e){n.apply(void 0,[e])}}_.Callbacks=function(e){e="string"==typeof e?function(e){var t={};return _.each(e.match(F)||[],function(e,n){t[n]=!0}),t}(e):_.extend({},e);var t,n,i,r,o=[],s=[],a=-1,l=function(){for(r=r||e.once,i=t=!0;s.length;a=-1)for(n=s.shift();++a-1;)o.splice(n,1),n<=a&&a--}),this},has:function(e){return e?_.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return r=s=[],o=n="",this},disabled:function(){return!o},lock:function(){return r=s=[],n||t||(o=n=""),this},locked:function(){return!!r},fireWith:function(e,n){return r||(n=[e,(n=n||[]).slice?n.slice():n],s.push(n),t||l()),this},fire:function(){return u.fireWith(this,arguments),this},fired:function(){return!!i}};return u},_.extend({Deferred:function(e){var t=[["notify","progress",_.Callbacks("memory"),_.Callbacks("memory"),2],["resolve","done",_.Callbacks("once memory"),_.Callbacks("once memory"),0,"resolved"],["reject","fail",_.Callbacks("once memory"),_.Callbacks("once memory"),1,"rejected"]],i="pending",r={state:function(){return i},always:function(){return o.done(arguments).fail(arguments),this},catch:function(e){return r.then(null,e)},pipe:function(){var e=arguments;return _.Deferred(function(n){_.each(t,function(t,i){var r=y(e[i[4]])&&e[i[4]];o[i[1]](function(){var e=r&&r.apply(this,arguments);e&&y(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[i[0]+"With"](this,r?[e]:arguments)})}),e=null}).promise()},then:function(e,i,r){var o=0;function s(e,t,i,r){return function(){var a=this,l=arguments,u=function(){var n,u;if(!(e=o&&(i!==H&&(a=void 0,l=[n]),t.rejectWith(a,l))}};e?c():(_.Deferred.getStackHook&&(c.stackTrace=_.Deferred.getStackHook()),n.setTimeout(c))}}return _.Deferred(function(n){t[0][3].add(s(0,n,y(r)?r:I,n.notifyWith)),t[1][3].add(s(0,n,y(e)?e:I)),t[2][3].add(s(0,n,y(i)?i:H))}).promise()},promise:function(e){return null!=e?_.extend(e,r):r}},o={};return _.each(t,function(e,n){var s=n[2],a=n[5];r[n[1]]=s.add,a&&s.add(function(){i=a},t[3-e][2].disable,t[3-e][3].disable,t[0][2].lock,t[0][3].lock),s.add(n[3].fire),o[n[0]]=function(){return o[n[0]+"With"](this===o?void 0:this,arguments),this},o[n[0]+"With"]=s.fireWith}),r.promise(o),e&&e.call(o,o),o},when:function(e){var t=arguments.length,n=t,i=Array(n),r=l.call(arguments),o=_.Deferred(),s=function(e){return function(n){i[e]=this,r[e]=arguments.length>1?l.call(arguments):n,--t||o.resolveWith(i,r)}};if(t<=1&&(R(e,o.done(s(n)).resolve,o.reject,!t),"pending"===o.state()||y(r[n]&&r[n].then)))return o.then();for(;n--;)R(r[n],s(n),o.reject);return o.promise()}});var P=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;_.Deferred.exceptionHook=function(e,t){n.console&&n.console.warn&&e&&P.test(e.name)&&n.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},_.readyException=function(e){n.setTimeout(function(){throw e})};var B=_.Deferred();function q(){s.removeEventListener("DOMContentLoaded",q),n.removeEventListener("load",q),_.ready()}_.fn.ready=function(e){return B.then(e).catch(function(e){_.readyException(e)}),this},_.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--_.readyWait:_.isReady)||(_.isReady=!0,!0!==e&&--_.readyWait>0||B.resolveWith(s,[_]))}}),_.ready.then=B.then,"complete"===s.readyState||"loading"!==s.readyState&&!s.documentElement.doScroll?n.setTimeout(_.ready):(s.addEventListener("DOMContentLoaded",q),n.addEventListener("load",q));var V=function(e,t,n,i,r,o,s){var a=0,l=e.length,u=null==n;if("object"===T(n))for(a in r=!0,n)V(e,t,a,n[a],!0,o,s);else if(void 0!==i&&(r=!0,y(i)||(s=!0),u&&(s?(t.call(e,i),t=null):(u=t,t=function(e,t,n){return u.call(_(e),n)})),t))for(;a1,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),_.extend({queue:function(e,t,n){var i;if(e)return t=(t||"fx")+"queue",i=J.get(e,t),n&&(!i||Array.isArray(n)?i=J.access(e,t,_.makeArray(n)):i.push(n)),i||[]},dequeue:function(e,t){t=t||"fx";var n=_.queue(e,t),i=n.length,r=n.shift(),o=_._queueHooks(e,t);"inprogress"===r&&(r=n.shift(),i--),r&&("fx"===t&&n.unshift("inprogress"),delete o.stop,r.call(e,function(){_.dequeue(e,t)},o)),!i&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return J.get(e,n)||J.access(e,n,{empty:_.Callbacks("once memory").add(function(){J.remove(e,[t+"queue",n])})})}}),_.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length\x20\t\r\n\f]*)/i,ge=/^$|^module$|\/(?:java|ecma)script/i,ye={option:[1,""],thead:[1,""],col:[2,""],tr:[2,""],td:[3,""],_default:[0,"",""]};function we(e,t){var n;return n=void 0!==e.getElementsByTagName?e.getElementsByTagName(t||"*"):void 0!==e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&D(e,t)?_.merge([e],n):n}function be(e,t){for(var n=0,i=e.length;n-1)r&&r.push(o);else if(u=ae(o),s=we(d.appendChild(o),"script"),u&&be(s),n)for(c=0;o=s[c++];)ge.test(o.type||"")&&n.push(o);return d}xe=s.createDocumentFragment().appendChild(s.createElement("div")),(Te=s.createElement("input")).setAttribute("type","radio"),Te.setAttribute("checked","checked"),Te.setAttribute("name","t"),xe.appendChild(Te),g.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="",g.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue;var Ce=/^key/,ze=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,$e=/^([^.]*)(?:\.(.+)|)/;function Ae(){return!0}function ke(){return!1}function De(e,t){return e===function(){try{return s.activeElement}catch(e){}}()==("focus"===t)}function Oe(e,t,n,i,r,o){var s,a;if("object"==typeof t){for(a in"string"!=typeof n&&(i=i||n,n=void 0),t)Oe(e,a,n,i,t[a],o);return e}if(null==i&&null==r?(r=n,i=n=void 0):null==r&&("string"==typeof n?(r=i,i=void 0):(r=i,i=n,n=void 0)),!1===r)r=ke;else if(!r)return e;return 1===o&&(s=r,(r=function(e){return _().off(e),s.apply(this,arguments)}).guid=s.guid||(s.guid=_.guid++)),e.each(function(){_.event.add(this,t,r,i,n)})}function Le(e,t,n){n?(J.set(e,t,!1),_.event.add(e,t,{namespace:!1,handler:function(e){var i,r,o=J.get(this,t);if(1&e.isTrigger&&this[t]){if(o.length)(_.event.special[t]||{}).delegateType&&e.stopPropagation();else if(o=l.call(arguments),J.set(this,t,o),i=n(this,t),this[t](),o!==(r=J.get(this,t))||i?J.set(this,t,!1):r={},o!==r)return e.stopImmediatePropagation(),e.preventDefault(),r.value}else o.length&&(J.set(this,t,{value:_.event.trigger(_.extend(o[0],_.Event.prototype),o.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===J.get(e,t)&&_.event.add(e,t,Ae)}_.event={global:{},add:function(e,t,n,i,r){var o,s,a,l,u,c,d,f,h,p,v,m=J.get(e);if(m)for(n.handler&&(n=(o=n).handler,r=o.selector),r&&_.find.matchesSelector(se,r),n.guid||(n.guid=_.guid++),(l=m.events)||(l=m.events={}),(s=m.handle)||(s=m.handle=function(t){return void 0!==_&&_.event.triggered!==t.type?_.event.dispatch.apply(e,arguments):void 0}),u=(t=(t||"").match(F)||[""]).length;u--;)h=v=(a=$e.exec(t[u])||[])[1],p=(a[2]||"").split(".").sort(),h&&(d=_.event.special[h]||{},h=(r?d.delegateType:d.bindType)||h,d=_.event.special[h]||{},c=_.extend({type:h,origType:v,data:i,handler:n,guid:n.guid,selector:r,needsContext:r&&_.expr.match.needsContext.test(r),namespace:p.join(".")},o),(f=l[h])||((f=l[h]=[]).delegateCount=0,d.setup&&!1!==d.setup.call(e,i,p,s)||e.addEventListener&&e.addEventListener(h,s)),d.add&&(d.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),r?f.splice(f.delegateCount++,0,c):f.push(c),_.event.global[h]=!0)},remove:function(e,t,n,i,r){var o,s,a,l,u,c,d,f,h,p,v,m=J.hasData(e)&&J.get(e);if(m&&(l=m.events)){for(u=(t=(t||"").match(F)||[""]).length;u--;)if(h=v=(a=$e.exec(t[u])||[])[1],p=(a[2]||"").split(".").sort(),h){for(d=_.event.special[h]||{},f=l[h=(i?d.delegateType:d.bindType)||h]||[],a=a[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),s=o=f.length;o--;)c=f[o],!r&&v!==c.origType||n&&n.guid!==c.guid||a&&!a.test(c.namespace)||i&&i!==c.selector&&("**"!==i||!c.selector)||(f.splice(o,1),c.selector&&f.delegateCount--,d.remove&&d.remove.call(e,c));s&&!f.length&&(d.teardown&&!1!==d.teardown.call(e,p,m.handle)||_.removeEvent(e,h,m.handle),delete l[h])}else for(h in l)_.event.remove(e,h+t[u],n,i,!0);_.isEmptyObject(l)&&J.remove(e,"handle events")}},dispatch:function(e){var t,n,i,r,o,s,a=_.event.fix(e),l=new Array(arguments.length),u=(J.get(this,"events")||{})[a.type]||[],c=_.event.special[a.type]||{};for(l[0]=a,t=1;t=1))for(;u!==this;u=u.parentNode||this)if(1===u.nodeType&&("click"!==e.type||!0!==u.disabled)){for(o=[],s={},n=0;n-1:_.find(r,this,null,[u]).length),s[r]&&o.push(i);o.length&&a.push({elem:u,handlers:o})}return u=this,l\x20\t\r\n\f]*)[^>]*)\/>/gi,We=/\s*$/g;function je(e,t){return D(e,"table")&&D(11!==t.nodeType?t:t.firstChild,"tr")&&_(e).children("tbody")[0]||e}function Fe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Ie(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function He(e,t){var n,i,r,o,s,a,l,u;if(1===t.nodeType){if(J.hasData(e)&&(o=J.access(e),s=J.set(t,o),u=o.events))for(r in delete s.handle,s.events={},u)for(n=0,i=u[r].length;n1&&"string"==typeof p&&!g.checkClone&&Me.test(p))return e.each(function(r){var o=e.eq(r);v&&(t[0]=p.call(this,r,o.html())),Re(o,t,n,i)});if(f&&(o=(r=Se(t,e[0].ownerDocument,!1,e,i)).firstChild,1===r.childNodes.length&&(r=o),o||i)){for(a=(s=_.map(we(r,"script"),Fe)).length;d")},clone:function(e,t,n){var i,r,o,s,a,l,u,c=e.cloneNode(!0),d=ae(e);if(!(g.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||_.isXMLDoc(e)))for(s=we(c),i=0,r=(o=we(e)).length;i0&&be(s,!d&&we(e,"script")),c},cleanData:function(e){for(var t,n,i,r=_.event.special,o=0;void 0!==(n=e[o]);o++)if(X(n)){if(t=n[J.expando]){if(t.events)for(i in t.events)r[i]?_.event.remove(n,i):_.removeEvent(n,i,t.handle);n[J.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),_.fn.extend({detach:function(e){return Pe(this,e,!0)},remove:function(e){return Pe(this,e)},text:function(e){return V(this,function(e){return void 0===e?_.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||je(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=je(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(_.cleanData(we(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return _.clone(this,e,t)})},html:function(e){return V(this,function(e){var t=this[0]||{},n=0,i=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!We.test(e)&&!ye[(me.exec(e)||["",""])[1].toLowerCase()]){e=_.htmlPrefilter(e);try{for(;n=0&&(l+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-l-a-.5))||0),l}function rt(e,t,n){var i=qe(e),r=(!g.boxSizingReliable()||n)&&"border-box"===_.css(e,"boxSizing",!1,i),o=r,s=Ue(e,t,i),a="offset"+t[0].toUpperCase()+t.slice(1);if(Be.test(s)){if(!n)return s;s="auto"}return(!g.boxSizingReliable()&&r||"auto"===s||!parseFloat(s)&&"inline"===_.css(e,"display",!1,i))&&e.getClientRects().length&&(r="border-box"===_.css(e,"boxSizing",!1,i),(o=a in e)&&(s=e[a])),(s=parseFloat(s)||0)+it(e,t,n||(r?"border":"content"),o,i,s)+"px"}function ot(e,t,n,i,r){return new ot.prototype.init(e,t,n,i,r)}_.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Ue(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var r,o,s,a=G(t),l=Qe.test(t),u=e.style;if(l||(t=Ke(a)),s=_.cssHooks[t]||_.cssHooks[a],void 0===n)return s&&"get"in s&&void 0!==(r=s.get(e,!1,i))?r:u[t];"string"===(o=typeof n)&&(r=re.exec(n))&&r[1]&&(n=de(e,t,r),o="number"),null!=n&&n==n&&("number"!==o||l||(n+=r&&r[3]||(_.cssNumber[a]?"":"px")),g.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),s&&"set"in s&&void 0===(n=s.set(e,n,i))||(l?u.setProperty(t,n):u[t]=n))}},css:function(e,t,n,i){var r,o,s,a=G(t);return Qe.test(t)||(t=Ke(a)),(s=_.cssHooks[t]||_.cssHooks[a])&&"get"in s&&(r=s.get(e,!0,n)),void 0===r&&(r=Ue(e,t,i)),"normal"===r&&t in tt&&(r=tt[t]),""===n||n?(o=parseFloat(r),!0===n||isFinite(o)?o||0:r):r}}),_.each(["height","width"],function(e,t){_.cssHooks[t]={get:function(e,n,i){if(n)return!Je.test(_.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?rt(e,t,i):ce(e,et,function(){return rt(e,t,i)})},set:function(e,n,i){var r,o=qe(e),s=!g.scrollboxSize()&&"absolute"===o.position,a=(s||i)&&"border-box"===_.css(e,"boxSizing",!1,o),l=i?it(e,t,i,a,o):0;return a&&s&&(l-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-it(e,t,"border",!1,o)-.5)),l&&(r=re.exec(n))&&"px"!==(r[3]||"px")&&(e.style[t]=n,n=_.css(e,t)),nt(0,n,l)}}}),_.cssHooks.marginLeft=Ye(g.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Ue(e,"marginLeft"))||e.getBoundingClientRect().left-ce(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),_.each({margin:"",padding:"",border:"Width"},function(e,t){_.cssHooks[e+t]={expand:function(n){for(var i=0,r={},o="string"==typeof n?n.split(" "):[n];i<4;i++)r[e+oe[i]+t]=o[i]||o[i-2]||o[0];return r}},"margin"!==e&&(_.cssHooks[e+t].set=nt)}),_.fn.extend({css:function(e,t){return V(this,function(e,t,n){var i,r,o={},s=0;if(Array.isArray(t)){for(i=qe(e),r=t.length;s1)}}),_.Tween=ot,ot.prototype={constructor:ot,init:function(e,t,n,i,r,o){this.elem=e,this.prop=n,this.easing=r||_.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=i,this.unit=o||(_.cssNumber[n]?"":"px")},cur:function(){var e=ot.propHooks[this.prop];return e&&e.get?e.get(this):ot.propHooks._default.get(this)},run:function(e){var t,n=ot.propHooks[this.prop];return this.options.duration?this.pos=t=_.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):ot.propHooks._default.set(this),this}},ot.prototype.init.prototype=ot.prototype,ot.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=_.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){_.fx.step[e.prop]?_.fx.step[e.prop](e):1!==e.elem.nodeType||!_.cssHooks[e.prop]&&null==e.elem.style[Ke(e.prop)]?e.elem[e.prop]=e.now:_.style(e.elem,e.prop,e.now+e.unit)}}},ot.propHooks.scrollTop=ot.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},_.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},_.fx=ot.prototype.init,_.fx.step={};var st,at,lt=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function ct(){at&&(!1===s.hidden&&n.requestAnimationFrame?n.requestAnimationFrame(ct):n.setTimeout(ct,_.fx.interval),_.fx.tick())}function dt(){return n.setTimeout(function(){st=void 0}),st=Date.now()}function ft(e,t){var n,i=0,r={height:e};for(t=t?1:0;i<4;i+=2-t)r["margin"+(n=oe[i])]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function ht(e,t,n){for(var i,r=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),o=0,s=r.length;o1)},removeAttr:function(e){return this.each(function(){_.removeAttr(this,e)})}}),_.extend({attr:function(e,t,n){var i,r,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return void 0===e.getAttribute?_.prop(e,t,n):(1===o&&_.isXMLDoc(e)||(r=_.attrHooks[t.toLowerCase()]||(_.expr.match.bool.test(t)?vt:void 0)),void 0!==n?null===n?void _.removeAttr(e,t):r&&"set"in r&&void 0!==(i=r.set(e,n,t))?i:(e.setAttribute(t,n+""),n):r&&"get"in r&&null!==(i=r.get(e,t))?i:null==(i=_.find.attr(e,t))?void 0:i)},attrHooks:{type:{set:function(e,t){if(!g.radioValue&&"radio"===t&&D(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,i=0,r=t&&t.match(F);if(r&&1===e.nodeType)for(;n=r[i++];)e.removeAttribute(n)}}),vt={set:function(e,t,n){return!1===t?_.removeAttr(e,n):e.setAttribute(n,n),n}},_.each(_.expr.match.bool.source.match(/\w+/g),function(e,t){var n=mt[t]||_.find.attr;mt[t]=function(e,t,i){var r,o,s=t.toLowerCase();return i||(o=mt[s],mt[s]=r,r=null!=n(e,t,i)?s:null,mt[s]=o),r}});var gt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function wt(e){return(e.match(F)||[]).join(" ")}function bt(e){return e.getAttribute&&e.getAttribute("class")||""}function xt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(F)||[]}_.fn.extend({prop:function(e,t){return V(this,_.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[_.propFix[e]||e]})}}),_.extend({prop:function(e,t,n){var i,r,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&_.isXMLDoc(e)||(t=_.propFix[t]||t,r=_.propHooks[t]),void 0!==n?r&&"set"in r&&void 0!==(i=r.set(e,n,t))?i:e[t]=n:r&&"get"in r&&null!==(i=r.get(e,t))?i:e[t]},propHooks:{tabIndex:{get:function(e){var t=_.find.attr(e,"tabindex");return t?parseInt(t,10):gt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),g.optSelected||(_.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),_.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){_.propFix[this.toLowerCase()]=this}),_.fn.extend({addClass:function(e){var t,n,i,r,o,s,a,l=0;if(y(e))return this.each(function(t){_(this).addClass(e.call(this,t,bt(this)))});if((t=xt(e)).length)for(;n=this[l++];)if(r=bt(n),i=1===n.nodeType&&" "+wt(r)+" "){for(s=0;o=t[s++];)i.indexOf(" "+o+" ")<0&&(i+=o+" ");r!==(a=wt(i))&&n.setAttribute("class",a)}return this},removeClass:function(e){var t,n,i,r,o,s,a,l=0;if(y(e))return this.each(function(t){_(this).removeClass(e.call(this,t,bt(this)))});if(!arguments.length)return this.attr("class","");if((t=xt(e)).length)for(;n=this[l++];)if(r=bt(n),i=1===n.nodeType&&" "+wt(r)+" "){for(s=0;o=t[s++];)for(;i.indexOf(" "+o+" ")>-1;)i=i.replace(" "+o+" "," ");r!==(a=wt(i))&&n.setAttribute("class",a)}return this},toggleClass:function(e,t){var n=typeof e,i="string"===n||Array.isArray(e);return"boolean"==typeof t&&i?t?this.addClass(e):this.removeClass(e):y(e)?this.each(function(n){_(this).toggleClass(e.call(this,n,bt(this),t),t)}):this.each(function(){var t,r,o,s;if(i)for(r=0,o=_(this),s=xt(e);t=s[r++];)o.hasClass(t)?o.removeClass(t):o.addClass(t);else void 0!==e&&"boolean"!==n||((t=bt(this))&&J.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":J.get(this,"__className__")||""))})},hasClass:function(e){var t,n,i=0;for(t=" "+e+" ";n=this[i++];)if(1===n.nodeType&&(" "+wt(bt(n))+" ").indexOf(t)>-1)return!0;return!1}});var Tt=/\r/g;_.fn.extend({val:function(e){var t,n,i,r=this[0];return arguments.length?(i=y(e),this.each(function(n){var r;1===this.nodeType&&(null==(r=i?e.call(this,n,_(this).val()):e)?r="":"number"==typeof r?r+="":Array.isArray(r)&&(r=_.map(r,function(e){return null==e?"":e+""})),(t=_.valHooks[this.type]||_.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,r,"value")||(this.value=r))})):r?(t=_.valHooks[r.type]||_.valHooks[r.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(r,"value"))?n:"string"==typeof(n=r.value)?n.replace(Tt,""):null==n?"":n:void 0}}),_.extend({valHooks:{option:{get:function(e){var t=_.find.attr(e,"value");return null!=t?t:wt(_.text(e))}},select:{get:function(e){var t,n,i,r=e.options,o=e.selectedIndex,s="select-one"===e.type,a=s?null:[],l=s?o+1:r.length;for(i=o<0?l:s?o:0;i-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),_.each(["radio","checkbox"],function(){_.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=_.inArray(_(e).val(),t)>-1}},g.checkOn||(_.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),g.focusin="onfocusin"in n;var _t=/^(?:focusinfocus|focusoutblur)$/,St=function(e){e.stopPropagation()};_.extend(_.event,{trigger:function(e,t,i,r){var o,a,l,u,c,d,f,h,v=[i||s],m=p.call(e,"type")?e.type:e,g=p.call(e,"namespace")?e.namespace.split("."):[];if(a=h=l=i=i||s,3!==i.nodeType&&8!==i.nodeType&&!_t.test(m+_.event.triggered)&&(m.indexOf(".")>-1&&(m=(g=m.split(".")).shift(),g.sort()),c=m.indexOf(":")<0&&"on"+m,(e=e[_.expando]?e:new _.Event(m,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=g.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=i),t=null==t?[e]:_.makeArray(t,[e]),f=_.event.special[m]||{},r||!f.trigger||!1!==f.trigger.apply(i,t))){if(!r&&!f.noBubble&&!w(i)){for(u=f.delegateType||m,_t.test(u+m)||(a=a.parentNode);a;a=a.parentNode)v.push(a),l=a;l===(i.ownerDocument||s)&&v.push(l.defaultView||l.parentWindow||n)}for(o=0;(a=v[o++])&&!e.isPropagationStopped();)h=a,e.type=o>1?u:f.bindType||m,(d=(J.get(a,"events")||{})[e.type]&&J.get(a,"handle"))&&d.apply(a,t),(d=c&&a[c])&&d.apply&&X(a)&&(e.result=d.apply(a,t),!1===e.result&&e.preventDefault());return e.type=m,r||e.isDefaultPrevented()||f._default&&!1!==f._default.apply(v.pop(),t)||!X(i)||c&&y(i[m])&&!w(i)&&((l=i[c])&&(i[c]=null),_.event.triggered=m,e.isPropagationStopped()&&h.addEventListener(m,St),i[m](),e.isPropagationStopped()&&h.removeEventListener(m,St),_.event.triggered=void 0,l&&(i[c]=l)),e.result}},simulate:function(e,t,n){var i=_.extend(new _.Event,n,{type:e,isSimulated:!0});_.event.trigger(i,null,t)}}),_.fn.extend({trigger:function(e,t){return this.each(function(){_.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return _.event.trigger(e,t,n,!0)}}),g.focusin||_.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){_.event.simulate(t,e.target,_.event.fix(e))};_.event.special[t]={setup:function(){var i=this.ownerDocument||this,r=J.access(i,t);r||i.addEventListener(e,n,!0),J.access(i,t,(r||0)+1)},teardown:function(){var i=this.ownerDocument||this,r=J.access(i,t)-1;r?J.access(i,t,r):(i.removeEventListener(e,n,!0),J.remove(i,t))}}});var Ct=n.location,zt=Date.now(),$t=/\?/;_.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new n.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||_.error("Invalid XML: "+e),t};var At=/\[\]$/,kt=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,Ot=/^(?:input|select|textarea|keygen)/i;function Lt(e,t,n,i){var r;if(Array.isArray(t))_.each(t,function(t,r){n||At.test(e)?i(e,r):Lt(e+"["+("object"==typeof r&&null!=r?t:"")+"]",r,n,i)});else if(n||"object"!==T(t))i(e,t);else for(r in t)Lt(e+"["+r+"]",t[r],n,i)}_.param=function(e,t){var n,i=[],r=function(e,t){var n=y(t)?t():t;i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!_.isPlainObject(e))_.each(e,function(){r(this.name,this.value)});else for(n in e)Lt(n,e[n],t,r);return i.join("&")},_.fn.extend({serialize:function(){return _.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=_.prop(this,"elements");return e?_.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!_(this).is(":disabled")&&Ot.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!ve.test(e))}).map(function(e,t){var n=_(this).val();return null==n?null:Array.isArray(n)?_.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var Et=/%20/g,Wt=/#.*$/,Mt=/([?&])_=[^&]*/,Nt=/^(.*?):[ \t]*([^\r\n]*)$/gm,jt=/^(?:GET|HEAD)$/,Ft=/^\/\//,It={},Ht={},Rt="*/".concat("*"),Pt=s.createElement("a");function Bt(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var i,r=0,o=t.toLowerCase().match(F)||[];if(y(n))for(;i=o[r++];)"+"===i[0]?(i=i.slice(1)||"*",(e[i]=e[i]||[]).unshift(n)):(e[i]=e[i]||[]).push(n)}}function qt(e,t,n,i){var r={},o=e===Ht;function s(a){var l;return r[a]=!0,_.each(e[a]||[],function(e,a){var u=a(t,n,i);return"string"!=typeof u||o||r[u]?o?!(l=u):void 0:(t.dataTypes.unshift(u),s(u),!1)}),l}return s(t.dataTypes[0])||!r["*"]&&s("*")}function Vt(e,t){var n,i,r=_.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((r[n]?e:i||(i={}))[n]=t[n]);return i&&_.extend(!0,e,i),e}Pt.href=Ct.href,_.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Rt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":_.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Vt(Vt(e,_.ajaxSettings),t):Vt(_.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Ht),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var i,r,o,a,l,u,c,d,f,h,p=_.ajaxSetup({},t),v=p.context||p,m=p.context&&(v.nodeType||v.jquery)?_(v):_.event,g=_.Deferred(),y=_.Callbacks("once memory"),w=p.statusCode||{},b={},x={},T="canceled",S={readyState:0,getResponseHeader:function(e){var t;if(c){if(!a)for(a={};t=Nt.exec(o);)a[t[1].toLowerCase()+" "]=(a[t[1].toLowerCase()+" "]||[]).concat(t[2]);t=a[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return c?o:null},setRequestHeader:function(e,t){return null==c&&(e=x[e.toLowerCase()]=x[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==c&&(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)S.always(e[S.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||T;return i&&i.abort(t),C(0,t),this}};if(g.promise(S),p.url=((e||p.url||Ct.href)+"").replace(Ft,Ct.protocol+"//"),p.type=t.method||t.type||p.method||p.type,p.dataTypes=(p.dataType||"*").toLowerCase().match(F)||[""],null==p.crossDomain){u=s.createElement("a");try{u.href=p.url,u.href=u.href,p.crossDomain=Pt.protocol+"//"+Pt.host!=u.protocol+"//"+u.host}catch(e){p.crossDomain=!0}}if(p.data&&p.processData&&"string"!=typeof p.data&&(p.data=_.param(p.data,p.traditional)),qt(It,p,t,S),c)return S;for(f in(d=_.event&&p.global)&&0==_.active++&&_.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!jt.test(p.type),r=p.url.replace(Wt,""),p.hasContent?p.data&&p.processData&&0===(p.contentType||"").indexOf("application/x-www-form-urlencoded")&&(p.data=p.data.replace(Et,"+")):(h=p.url.slice(r.length),p.data&&(p.processData||"string"==typeof p.data)&&(r+=($t.test(r)?"&":"?")+p.data,delete p.data),!1===p.cache&&(r=r.replace(Mt,"$1"),h=($t.test(r)?"&":"?")+"_="+zt+++h),p.url=r+h),p.ifModified&&(_.lastModified[r]&&S.setRequestHeader("If-Modified-Since",_.lastModified[r]),_.etag[r]&&S.setRequestHeader("If-None-Match",_.etag[r])),(p.data&&p.hasContent&&!1!==p.contentType||t.contentType)&&S.setRequestHeader("Content-Type",p.contentType),S.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Rt+"; q=0.01":""):p.accepts["*"]),p.headers)S.setRequestHeader(f,p.headers[f]);if(p.beforeSend&&(!1===p.beforeSend.call(v,S,p)||c))return S.abort();if(T="abort",y.add(p.complete),S.done(p.success),S.fail(p.error),i=qt(Ht,p,t,S)){if(S.readyState=1,d&&m.trigger("ajaxSend",[S,p]),c)return S;p.async&&p.timeout>0&&(l=n.setTimeout(function(){S.abort("timeout")},p.timeout));try{c=!1,i.send(b,C)}catch(e){if(c)throw e;C(-1,e)}}else C(-1,"No Transport");function C(e,t,s,a){var u,f,h,b,x,T=t;c||(c=!0,l&&n.clearTimeout(l),i=void 0,o=a||"",S.readyState=e>0?4:0,u=e>=200&&e<300||304===e,s&&(b=function(e,t,n){for(var i,r,o,s,a=e.contents,l=e.dataTypes;"*"===l[0];)l.shift(),void 0===i&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(r in a)if(a[r]&&a[r].test(i)){l.unshift(r);break}if(l[0]in n)o=l[0];else{for(r in n){if(!l[0]||e.converters[r+" "+l[0]]){o=r;break}s||(s=r)}o=o||s}if(o)return o!==l[0]&&l.unshift(o),n[o]}(p,S,s)),b=function(e,t,n,i){var r,o,s,a,l,u={},c=e.dataTypes.slice();if(c[1])for(s in e.converters)u[s.toLowerCase()]=e.converters[s];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&i&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(!(s=u[l+" "+o]||u["* "+o]))for(r in u)if((a=r.split(" "))[1]===o&&(s=u[l+" "+a[0]]||u["* "+a[0]])){!0===s?s=u[r]:!0!==u[r]&&(o=a[0],c.unshift(a[1]));break}if(!0!==s)if(s&&e.throws)t=s(t);else try{t=s(t)}catch(e){return{state:"parsererror",error:s?e:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}(p,b,S,u),u?(p.ifModified&&((x=S.getResponseHeader("Last-Modified"))&&(_.lastModified[r]=x),(x=S.getResponseHeader("etag"))&&(_.etag[r]=x)),204===e||"HEAD"===p.type?T="nocontent":304===e?T="notmodified":(T=b.state,f=b.data,u=!(h=b.error))):(h=T,!e&&T||(T="error",e<0&&(e=0))),S.status=e,S.statusText=(t||T)+"",u?g.resolveWith(v,[f,T,S]):g.rejectWith(v,[S,T,h]),S.statusCode(w),w=void 0,d&&m.trigger(u?"ajaxSuccess":"ajaxError",[S,p,u?f:h]),y.fireWith(v,[S,T]),d&&(m.trigger("ajaxComplete",[S,p]),--_.active||_.event.trigger("ajaxStop")))}return S},getJSON:function(e,t,n){return _.get(e,t,n,"json")},getScript:function(e,t){return _.get(e,void 0,t,"script")}}),_.each(["get","post"],function(e,t){_[t]=function(e,n,i,r){return y(n)&&(r=r||i,i=n,n=void 0),_.ajax(_.extend({url:e,type:t,dataType:r,data:n,success:i},_.isPlainObject(e)&&e))}}),_._evalUrl=function(e,t){return _.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){_.globalEval(e,t)}})},_.fn.extend({wrapAll:function(e){var t;return this[0]&&(y(e)&&(e=e.call(this[0])),t=_(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstElementChild;)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return y(e)?this.each(function(t){_(this).wrapInner(e.call(this,t))}):this.each(function(){var t=_(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=y(e);return this.each(function(n){_(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){_(this).replaceWith(this.childNodes)}),this}}),_.expr.pseudos.hidden=function(e){return!_.expr.pseudos.visible(e)},_.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},_.ajaxSettings.xhr=function(){try{return new n.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Yt=_.ajaxSettings.xhr();g.cors=!!Yt&&"withCredentials"in Yt,g.ajax=Yt=!!Yt,_.ajaxTransport(function(e){var t,i;if(g.cors||Yt&&!e.crossDomain)return{send:function(r,o){var s,a=e.xhr();if(a.open(e.type,e.url,e.async,e.username,e.password),e.xhrFields)for(s in e.xhrFields)a[s]=e.xhrFields[s];for(s in e.mimeType&&a.overrideMimeType&&a.overrideMimeType(e.mimeType),e.crossDomain||r["X-Requested-With"]||(r["X-Requested-With"]="XMLHttpRequest"),r)a.setRequestHeader(s,r[s]);t=function(e){return function(){t&&(t=i=a.onload=a.onerror=a.onabort=a.ontimeout=a.onreadystatechange=null,"abort"===e?a.abort():"error"===e?"number"!=typeof a.status?o(0,"error"):o(a.status,a.statusText):o(Ut[a.status]||a.status,a.statusText,"text"!==(a.responseType||"text")||"string"!=typeof a.responseText?{binary:a.response}:{text:a.responseText},a.getAllResponseHeaders()))}},a.onload=t(),i=a.onerror=a.ontimeout=t("error"),void 0!==a.onabort?a.onabort=i:a.onreadystatechange=function(){4===a.readyState&&n.setTimeout(function(){t&&i()})},t=t("abort");try{a.send(e.hasContent&&e.data||null)}catch(e){if(t)throw e}},abort:function(){t&&t()}}}),_.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),_.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return _.globalEval(e),e}}}),_.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),_.ajaxTransport("script",function(e){var t,n;if(e.crossDomain||e.scriptAttrs)return{send:function(i,r){t=_("
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
index ba90253ee..7d90a8096 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
@@ -47,6 +47,7 @@
border-left: solid 1px #d3d3d3;
color: $font-color;
vertical-align: middle;
+ font-family: DejaVu Sans; sans-serif;
}
.table tbody td p {
@@ -64,6 +65,7 @@
.sale-summary tr td {
padding: 3px 5px;
+ font-family: DejaVu Sans; sans-serif;
}
.sale-summary tr.bold {
@@ -74,7 +76,7 @@
color: #000;
font-weight: 600;
}
-
+
@@ -115,7 +117,7 @@
{{ $invoice->order->billing_address->city }}
{{ $invoice->order->billing_address->state }}
{{ core()->country_name($invoice->order->billing_address->country) }} {{ $invoice->order->billing_address->postcode }}
- {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->billing_address->phone }}
+ {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->billing_address->phone }}
{{ $invoice->order->shipping_address->name }}
@@ -123,7 +125,7 @@
{{ $invoice->order->shipping_address->city }}
{{ $invoice->order->shipping_address->state }}
{{ core()->country_name($invoice->order->shipping_address->country) }} {{ $invoice->order->shipping_address->postcode }}
- {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->shipping_address->phone }}
+ {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->shipping_address->phone }}
|
@@ -151,7 +153,7 @@
+This project is on [Open Collective](https://opencollective.com/bagisto) and it exists thanks to this people who contribute.
+
+Thank you to all our backers! 🙏
+
-
-
-
-
-
-
-
-
-
+
diff --git a/composer.json b/composer.json
index 8c75fbb5f..b97e6c745 100755
--- a/composer.json
+++ b/composer.json
@@ -10,6 +10,7 @@
"require": {
"php": "^7.1.3",
"ext-curl": "*",
+ "ext-intl": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-pdo": "*",
@@ -20,6 +21,7 @@
"doctrine/dbal": "^2.9@dev",
"fideloper/proxy": "^4.0",
"flynsarmy/db-blade-compiler": "*",
+ "guzzlehttp/guzzle": "~6.0",
"intervention/image": "^2.4",
"intervention/imagecache": "^2.3",
"kalnoy/nestedset": "^4.3",
@@ -87,7 +89,8 @@
"Webkul\\Sales\\": "packages/Webkul/Sales/src",
"Webkul\\Tax\\": "packages/Webkul/Tax/src",
"Webkul\\API\\": "packages/Webkul/API",
- "Webkul\\Discount\\": "packages/Webkul/Discount/src"
+ "Webkul\\Discount\\": "packages/Webkul/Discount/src",
+ "Webkul\\CMS\\": "packages/Webkul/CMS/src"
}
},
"autoload-dev": {
@@ -97,7 +100,9 @@
},
"extra": {
"laravel": {
- "dont-discover": []
+ "dont-discover": [
+ "barryvdh/laravel-debugbar"
+ ]
}
},
"scripts": {
diff --git a/config/app.php b/config/app.php
index 311097a28..2082420ef 100755
--- a/config/app.php
+++ b/config/app.php
@@ -245,7 +245,8 @@ return [
Webkul\Sales\Providers\SalesServiceProvider::class,
Webkul\Tax\Providers\TaxServiceProvider::class,
Webkul\API\Providers\APIServiceProvider::class,
- Webkul\Discount\Providers\DiscountServiceProvider::class
+ Webkul\Discount\Providers\DiscountServiceProvider::class,
+ Webkul\CMS\Providers\CMSServiceProvider::class
],
/*
diff --git a/config/concord.php b/config/concord.php
index 1d64533c6..311ede347 100755
--- a/config/concord.php
+++ b/config/concord.php
@@ -19,6 +19,7 @@ return [
\Webkul\Sales\Providers\ModuleServiceProvider::class,
\Webkul\Tax\Providers\ModuleServiceProvider::class,
\Webkul\User\Providers\ModuleServiceProvider::class,
- \Webkul\Discount\Providers\ModuleServiceProvider::class
+ \Webkul\Discount\Providers\ModuleServiceProvider::class,
+ \Webkul\CMS\Providers\ModuleServiceProvider::class
]
];
\ No newline at end of file
diff --git a/config/mail.php b/config/mail.php
index bb92224c5..e458fefce 100755
--- a/config/mail.php
+++ b/config/mail.php
@@ -56,8 +56,8 @@ return [
*/
'from' => [
- 'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
- 'name' => env('MAIL_FROM_NAME', 'Example'),
+ 'address' => env('SHOP_MAIL_FROM'),
+ 'name' => env('MAIL_FROM_NAME')
],
/*
diff --git a/config/services.php b/config/services.php
index aa1f7f82c..22a2286f8 100755
--- a/config/services.php
+++ b/config/services.php
@@ -29,10 +29,18 @@ return [
'secret' => env('SPARKPOST_SECRET'),
],
+ 'exchange-api' => [
+ 'default' => 'fixer',
+ 'fixer' => [
+ 'paid_account' => false,
+ 'key' => env('fixer_api_key'),
+ 'class' => 'Webkul\Core\Helpers\Exchange\FixerExchange'
+ ]
+ ],
+
'stripe' => [
'model' => App\User::class,
'key' => env('STRIPE_KEY'),
'secret' => env('STRIPE_SECRET'),
- ],
-
+ ]
];
diff --git a/packages/Webkul/Admin/publishable/assets/css/admin.css b/packages/Webkul/Admin/publishable/assets/css/admin.css
index 7bcad4151..44882449d 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%;width: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:fixed;left:0;top:60px;width:90px;padding-top:20px;border-right:1px solid hsla(0,0%,64%,.2);height:auto;bottom:0;z-index:2}.navbar-left ul.menubar li.menu-item{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}.navbar-left ul.menubar li.menu-item span{display:block;margin:auto}.content-container{padding-left:90px;position:absolute;margin-top:60px;top:0;right:0;left:0;bottom:0;height:calc(100% - 60px);width:100%}.content-container .inner-section{height:100%}.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;padding-bottom:10px;z-index:4}.content-container .aside-nav ul{overflow-y:auto;height:90%}.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;margin-left: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;line-height:normal}.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-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:750px}.control-container .control{background:#fff;border:2px solid #c7c7c7;border-radius:3px;width:150px;height:36px;display:inline-block;vertical-align:middle;-webkit-transition:.2s cubic-bezier(.4,0,.2,1);transition:.2s cubic-bezier(.4,0,.2,1);padding:0 10px;font-size:15px}.control-container .control:focus{border-color:#0041ff}.control-container .icon:hover{cursor:pointer}.control-container .control-group::last-child{margin-right:0}.boolean-control-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:750px}.boolean-control-container .control-group{width:200px}.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;overflow:auto}.dashboard .card .card-title{font-size:14px;color:#a2a2a2;letter-spacing:-.26px;text-transform:uppercase}.dashboard .card .card-info{width: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:13px;font-size:32px;color:#0041ff}.dashboard .dashboard-stats .dashboard-card .data .progress{font-size:14px;color:#8e8e8e;float:right;margin-top:-2px}.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-import{cursor:pointer}.export-import .export-icon,.export-import .import-icon{position:relative;top:10px}.export-import span{margin-left:2px}.configuration-image{position:relative;height:33px;width:33px;top:15px;border-radius:3px;margin-right:5px}.download{position:relative;height:24px!important;width:24px!important;top:12px;margin-right:10px}.aside-nav-toggle{height:48px;width:100%;padding-top:15px;border-top:1px solid hsla(0,0%,64%,.2)}.aside-nav-toggle .close-icon,.aside-nav-toggle .open-icon{position:absolute;cursor:pointer;left:45%}.aside-nav-toggle.open{display:none}.linked-product-search-result{-webkit-box-shadow:0 2px 4px 0 rgba(0,0,0,.16),0 0 9px 0 rgba(0,0,0,.16);box-shadow:0 2px 4px 0 rgba(0,0,0,.16),0 0 9px 0 rgba(0,0,0,.16);z-index:10;text-align:left;border-radius:3px;background-color:#fff;width:70%;max-height:200px;overflow-y:auto}.linked-product-search-result li{padding:10px;border-bottom:1px solid #e8e8e8;cursor:pointer}.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;left:calc(100% - 90px)}.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 .page-action a{margin-left:0}.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;margin-left:0}.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-row-one .search-filter{border:2px solid #c7c7c7;border-radius:2px}.rtl .grid-container .filter-row-one .search-filter .control{border:none;padding-right:10px}.rtl .grid-container .filter-row-one .search-filter .icon-wrapper{border:none;padding-top:2px;padding-right:5px;border-right:2px solid #c7c7c7;border-radius:0}.rtl .grid-container .filter-row-two .filter-tag .icon.cross-icon,.rtl .grid-container .filter-row-two .filter-tag .wrapper{margin-right:10px;margin-left:0}.rtl .grid-container .filter-row-one .dropdown-filters{right:unset;left:25px}.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 .table table .massaction-remove{margin-right:5px!important;margin-left:10px}.rtl .table table .btn.btn-primary{margin-right:10px!important}.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)}.pagination{margin-top:30px}
\ 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%;width: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:fixed;left:0;top:60px;width:90px;padding-top:20px;border-right:1px solid hsla(0,0%,64%,.2);height:auto;bottom:0;z-index:2}.navbar-left ul.menubar li.menu-item{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}.navbar-left ul.menubar li.menu-item span{display:block;margin:auto}.content-container{padding-left:90px;position:absolute;margin-top:60px;top:0;right:0;left:0;bottom:0;height:calc(100% - 60px);width:100%}.content-container .inner-section{height:100%}.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;padding-bottom:10px;z-index:4}.content-container .aside-nav ul{overflow-y:auto;height:90%}.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;margin-left: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;line-height:normal}.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-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;width:750px}.control-container .control{background:#fff;border:2px solid #c7c7c7;border-radius:3px;width:150px;height:36px;display:inline-block;vertical-align:middle;-webkit-transition:.2s cubic-bezier(.4,0,.2,1);transition:.2s cubic-bezier(.4,0,.2,1);padding:0 10px;font-size:15px}.control-container .control:focus{border-color:#0041ff}.control-container .icon:hover{cursor:pointer}.control-container .control-group::last-child{margin-right:0}.boolean-control-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:750px}.boolean-control-container .control-group{width:200px}.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;overflow:auto}.dashboard .card .card-title{font-size:14px;color:#a2a2a2;letter-spacing:-.26px;text-transform:uppercase}.dashboard .card .card-info{width: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:13px;font-size:32px;color:#0041ff}.dashboard .dashboard-stats .dashboard-card .data .progress{font-size:14px;color:#8e8e8e;float:right;margin-top:-2px}.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-import{cursor:pointer}.export-import .export-icon,.export-import .import-icon{position:relative;top:10px}.export-import span{margin-left:2px}.configuration-image{position:relative;height:33px;width:33px;top:15px;border-radius:3px;margin-right:5px}.download{position:relative;height:24px!important;width:24px!important;top:12px;margin-right:10px}.aside-nav-toggle{height:48px;width:100%;padding-top:15px;border-top:1px solid hsla(0,0%,64%,.2)}.aside-nav-toggle .close-icon,.aside-nav-toggle .open-icon{position:absolute;cursor:pointer;left:45%}.aside-nav-toggle.open{display:none}.linked-product-search-result{-webkit-box-shadow:0 2px 4px 0 rgba(0,0,0,.16),0 0 9px 0 rgba(0,0,0,.16);box-shadow:0 2px 4px 0 rgba(0,0,0,.16),0 0 9px 0 rgba(0,0,0,.16);z-index:10;text-align:left;border-radius:3px;background-color:#fff;width:70%;max-height:200px;overflow-y:auto}.linked-product-search-result li{padding:10px;border-bottom:1px solid #e8e8e8;cursor:pointer}.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;left:calc(100% - 90px)}.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 .page-action a{margin-left:0}.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;margin-left:0}.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-row-one .search-filter{border:2px solid #c7c7c7;border-radius:2px}.rtl .grid-container .filter-row-one .search-filter .control{border:none;padding-right:10px}.rtl .grid-container .filter-row-one .search-filter .icon-wrapper{border:none;padding-top:2px;padding-right:5px;border-right:2px solid #c7c7c7;border-radius:0}.rtl .grid-container .filter-row-two .filter-tag .icon.cross-icon,.rtl .grid-container .filter-row-two .filter-tag .wrapper{margin-right:10px;margin-left:0}.rtl .grid-container .filter-row-one .dropdown-filters{right:unset;left:25px}.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 .table table .massaction-remove{margin-right:5px!important;margin-left:10px}.rtl .table table .btn.btn-primary{margin-right:10px!important}.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)}.fixed-action{position:fixed;top:108px;right:32px}.fixed-action-slight{position:fixed;top:94px;right:32px}.pagination{margin-top:30px}
\ No newline at end of file
diff --git a/packages/Webkul/Admin/publishable/assets/js/admin.js b/packages/Webkul/Admin/publishable/assets/js/admin.js
index 78ee09537..cffce8df0 100755
--- a/packages/Webkul/Admin/publishable/assets/js/admin.js
+++ b/packages/Webkul/Admin/publishable/assets/js/admin.js
@@ -1 +1 @@
-!function(e){var t={};function n(r){if(t[r])return t[r].exports;var i=t[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:r})},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/",n(n.s=0)}({0:function(e,t,n){n("J66Q"),e.exports=n("MT9B")},"162o":function(e,t,n){(function(e){var r=void 0!==e&&e||"undefined"!=typeof self&&self||window,i=Function.prototype.apply;function o(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new o(i.call(setTimeout,r,arguments),clearTimeout)},t.setInterval=function(){return new o(i.call(setInterval,r,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},o.prototype.unref=o.prototype.ref=function(){},o.prototype.close=function(){this._clearFn.call(r,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n("mypn"),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(t,n("DuR2"))},"21It":function(e,t,n){"use strict";var r=n("FtD3");e.exports=function(e,t,n){var i=n.config.validateStatus;n.status&&i&&!i(n.status)?t(r("Request failed with status code "+n.status,n.config,null,n.request,n)):e(n)}},"3IRH":function(e,t){e.exports=function(e){return e.webpackPolyfill||(e.deprecate=function(){},e.paths=[],e.children||(e.children=[]),Object.defineProperty(e,"loaded",{enumerable:!0,get:function(){return e.l}}),Object.defineProperty(e,"id",{enumerable:!0,get:function(){return e.i}}),e.webpackPolyfill=1),e}},"5VQ+":function(e,t,n){"use strict";var r=n("cGG2");e.exports=function(e,t){r.forEach(e,function(n,r){r!==t&&r.toUpperCase()===t.toUpperCase()&&(e[t]=n,delete e[r])})}},"7GwW":function(e,t,n){"use strict";var r=n("cGG2"),i=n("21It"),o=n("DQCr"),a=n("oJlt"),u=n("GHBc"),s=n("FtD3");e.exports=function(e){return new Promise(function(t,c){var l=e.data,f=e.headers;r.isFormData(l)&&delete f["Content-Type"];var d=new XMLHttpRequest;if(e.auth){var p=e.auth.username||"",h=e.auth.password||"";f.Authorization="Basic "+btoa(p+":"+h)}if(d.open(e.method.toUpperCase(),o(e.url,e.params,e.paramsSerializer),!0),d.timeout=e.timeout,d.onreadystatechange=function(){if(d&&4===d.readyState&&(0!==d.status||d.responseURL&&0===d.responseURL.indexOf("file:"))){var n="getAllResponseHeaders"in d?a(d.getAllResponseHeaders()):null,r={data:e.responseType&&"text"!==e.responseType?d.response:d.responseText,status:d.status,statusText:d.statusText,headers:n,config:e,request:d};i(t,c,r),d=null}},d.onerror=function(){c(s("Network Error",e,null,d)),d=null},d.ontimeout=function(){c(s("timeout of "+e.timeout+"ms exceeded",e,"ECONNABORTED",d)),d=null},r.isStandardBrowserEnv()){var v=n("p1b6"),m=(e.withCredentials||u(e.url))&&e.xsrfCookieName?v.read(e.xsrfCookieName):void 0;m&&(f[e.xsrfHeaderName]=m)}if("setRequestHeader"in d&&r.forEach(f,function(e,t){void 0===l&&"content-type"===t.toLowerCase()?delete f[t]:d.setRequestHeader(t,e)}),e.withCredentials&&(d.withCredentials=!0),e.responseType)try{d.responseType=e.responseType}catch(t){if("json"!==e.responseType)throw t}"function"==typeof e.onDownloadProgress&&d.addEventListener("progress",e.onDownloadProgress),"function"==typeof e.onUploadProgress&&d.upload&&d.upload.addEventListener("progress",e.onUploadProgress),e.cancelToken&&e.cancelToken.promise.then(function(e){d&&(d.abort(),c(e),d=null)}),void 0===l&&(l=null),d.send(l)})}},"7t+N":function(e,t,n){var r;!function(t,n){"use strict";"object"==typeof e&&"object"==typeof e.exports?e.exports=t.document?n(t,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return n(e)}:n(t)}("undefined"!=typeof window?window:this,function(n,i){"use strict";var o=[],a=n.document,u=Object.getPrototypeOf,s=o.slice,c=o.concat,l=o.push,f=o.indexOf,d={},p=d.toString,h=d.hasOwnProperty,v=h.toString,m=v.call(Object),g={},y=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},b=function(e){return null!=e&&e===e.window},_={type:!0,src:!0,nonce:!0,noModule:!0};function w(e,t,n){var r,i,o=(n=n||a).createElement("script");if(o.text=e,t)for(r in _)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?d[p.call(e)]||"object":typeof e}var T=function(e,t){return new T.fn.init(e,t)},C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function $(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!y(e)&&!b(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}T.fn=T.prototype={jquery:"3.4.1",constructor:T,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=T.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return T.each(this,e)},map:function(e){return this.pushStack(T.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n