From 283922a44ccd1cbfd3125b94f2e1c9c8a34a4713 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 17 Apr 2019 11:20:48 +0530 Subject: [PATCH 01/89] Some syntax issue fixes --- .../views/products/add-buttons.blade.php | 39 +++++++++---------- .../Resources/views/products/index.blade.php | 8 ++-- .../Resources/views/products/price.blade.php | 4 -- .../Resources/views/products/view.blade.php | 2 - .../views/products/view/gallery.blade.php | 14 ------- .../views/products/wishlist.blade.php | 2 +- 6 files changed, 25 insertions(+), 44 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-buttons.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-buttons.blade.php index 22c22ef3a..1df4f75dd 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/add-buttons.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/add-buttons.blade.php @@ -1,22 +1,21 @@ +@if ($product->type == "configurable") +
+ + {{ __('shop::app.products.add-to-cart') }} + - @if ($product->type == "configurable") -
- - {{ __('shop::app.products.add-to-cart') }} - + @include('shop::products.wishlist') +
+@else +
+
+ @csrf + + + + +
- @include('shop::products.wishlist') -
- @else -
-
- @csrf - - - - -
- - @include('shop::products.wishlist') -
- @endif \ No newline at end of file + @include('shop::products.wishlist') +
+@endif \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php index 95a1b6cc0..24ec87752 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php @@ -70,9 +70,7 @@ {!! view_render_event('bagisto.shop.products.index.pagination.after') !!} - @else -

{{ __('shop::app.products.whoops') }}

@@ -80,7 +78,6 @@ {{ __('shop::app.products.empty') }}

- @endif @endif @@ -94,13 +91,16 @@ @@ -133,36 +176,81 @@ inject: ['$validator'], - data() { + data () { return { - criteria: @json($criteria[0]), attributes: @json($criteria[1]), attribute: null, - attribute_families: null, - name: null, - description: null, + attribute_families: @json($criteria[2]), + attribute_family: null, + cart_attribute: null, channels: [], + criteria: @json($criteria[0]), + conditions: [], + cart_attr: { + cart_attribute : null, + condition_one: null, + value_one: null, + condition_two: null, + value_two: null + }, + attr_family: { + attribute_family : null, + condition_one: null, + value_one: null, + condition_two: null, + value_two: null + }, + attr: { + attribute : null, + condition_one: null, + value_one: null, + condition_two: null, + value_two: null + }, customer_groups: [], - criteria: null, - priority: 0, - starts_from: null, + description: null, ends_till: null, enableAttribute: false, - enableCartAttribute: false + enableCartAttribute: false, + enableAttributeFamily: false, + enableCartAttrLine: false, + enableAttrLine: false, + enableAttrFamLine: false, + name: null, + priority: 0, + starts_from: null } }, - mounted() { - console.log(this.attribute); + mounted () { + console.log(this.criteria.cart); + + for(index in this.criteria.cart) { + console.log(this.criteria.cart[index]); + } }, methods: { - addCondition() { - if (this.criteria == "attribute_family") { + addCondition () { + if (this.criteria == "attribute" || this.criteria == "attribute_family" || this.criteria == "cart_attribute") { + this.condition_on = this.criteria; + } else { + alert('please try again'); + } + + if (this.condition_on == "attribute") { + this.attr.push(); + this.enableAttribute = true; this.enableCartAttribute = false; - } else if (this.criteria == "cart_attribute") { + this.enableAttributeFamily = false; + } else if (this.condition_on == "attribute_family") { + this.enableAttributeFamily = true; + this.enableAttribute = false; + this.enableCartAttribute = false; + } else { this.enableCartAttribute = true; + this.enableAttributeFamily = false; this.enableAttribute = false; } } diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php index 3deb198de..fdc933d52 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php @@ -153,6 +153,23 @@ class AttributeFamilyRepository extends Repository return $family; } + public function getNameAndId() + { + $attributeFamilies = $this->model->all(); + $trimmed = array(); + + foreach($attributeFamilies as $key => $attributeFamily) { + if ($attributeFamily->name != null || $attributeFamily->name != "") { + $trimmed[$key] = [ + 'id' => $attributeFamily->id, + 'name' => $attributeFamily->name + ]; + } + } + + return $trimmed; + } + /** * @param $id * @return void diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php index 7ac578dab..8ad18a1ed 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php @@ -222,10 +222,12 @@ class AttributeRepository extends Repository $trimmed = array(); foreach($attributes as $key => $attribute) { - $trimmed[$key] = [ - 'id' => $attribute->id, - 'name' => $attribute->name - ]; + if ($attribute->name != null || $attribute->name != "") { + $trimmed[$key] = [ + 'id' => $attribute->id, + 'name' => $attribute->name + ]; + } } return $trimmed; diff --git a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php index 64b7b583c..4155adf31 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php @@ -7,6 +7,7 @@ use Illuminate\Http\Response; use Illuminate\Routing\Controller; use Webkul\Attribute\Repositories\AttributeRepository as Attribute; +use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily; /** * Catalog Rule controller @@ -18,11 +19,13 @@ class CatalogRuleController extends Controller { protected $_config; protected $attribute; + protected $attributeFamily; - public function __construct(Attribute $attribute) + public function __construct(Attribute $attribute, AttributeFamily $attributeFamily) { $this->_config = request('_config'); $this->attribute = $attribute; + $this->attributeFamily = $attributeFamily; } public function index() @@ -39,14 +42,22 @@ class CatalogRuleController extends Controller 2 => 'grand_total' ], - 'product' => [ + 'attribute' => [ 0 => 'attribute', 1 => 'attribute_groups', 2 => 'attribute_familes' ] ]; - return view($this->_config['view'])->with('criteria', [$ruleCriterias, $this->attribute->getNameAndId()]); + $arr = array(); + + foreach($ruleCriterias as $key => $ruleCriteria) { + array_push($arr, $ruleCriteria); + } + + $arr; + + return view($this->_config['view'])->with('criteria', [$ruleCriterias, $this->attribute->getNameAndId(), $this->attributeFamily->getNameAndId()]); } public function store() diff --git a/packages/Webkul/Shipping/src/Config/carriers.php b/packages/Webkul/Shipping/src/Config/carriers.php index 8c4524da0..5562a3f53 100755 --- a/packages/Webkul/Shipping/src/Config/carriers.php +++ b/packages/Webkul/Shipping/src/Config/carriers.php @@ -16,6 +16,7 @@ return [ 'title' => 'Free Shipping', 'description' => 'This is a free shipping', 'active' => true, + 'default_rate' => '0', 'class' => 'Webkul\Shipping\Carriers\Free', ] ]; \ No newline at end of file From a03d7521856d8d3bdf3c4cdd1a222da6fe9d2d1a Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 6 May 2019 10:32:46 +0530 Subject: [PATCH 09/89] catalog rule --- .../promotions/cart-rule/create.blade.php | 18 ++- .../promotions/catalog-rule/create.blade.php | 137 ++++-------------- .../src/Repositories/AttributeRepository.php | 2 - .../src/Repositories/CategoryRepository.php | 17 +++ ...019_04_30_020321_alter_discounts_table.php | 1 + .../Controllers/CatalogRuleController.php | 29 +--- 6 files changed, 63 insertions(+), 141 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index 3629680c3..6e4c1de02 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -31,10 +31,20 @@
@csrf() -
- - - @{{ errors.first('first_name') }} +
+
+ + + + + + + + +
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php index 9a656836c..e92f70085 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php @@ -97,9 +97,8 @@ @{{ errors.first('criteria') }} @@ -107,64 +106,25 @@ Select Condition -
-
- - - @{{ errors.first('attribute') }} -
- -
- - - @{{ errors.first('attribute_family') }} -
- -
- - - @{{ errors.first('cart_attribute') }} -
-
-
-
- - - - - - - @{{ errors.first('cart_attr') }} +
+
+ Attribute is + +
-
- - - - - - - @{{ errors.first('attr') }} -
- -
- - - - - - - @{{ errors.first('attr_fam') }} +
+
+ Category is + +
@@ -178,44 +138,11 @@ data () { return { - attributes: @json($criteria[1]), - attribute: null, - attribute_families: @json($criteria[2]), - attribute_family: null, - cart_attribute: null, + attributes: @json($criteria[0]), + categories: @json($criteria[1]), channels: [], - criteria: @json($criteria[0]), conditions: [], - cart_attr: { - cart_attribute : null, - condition_one: null, - value_one: null, - condition_two: null, - value_two: null - }, - attr_family: { - attribute_family : null, - condition_one: null, - value_one: null, - condition_two: null, - value_two: null - }, - attr: { - attribute : null, - condition_one: null, - value_one: null, - condition_two: null, - value_two: null - }, - customer_groups: [], - description: null, - ends_till: null, - enableAttribute: false, - enableCartAttribute: false, - enableAttributeFamily: false, - enableCartAttrLine: false, - enableAttrLine: false, - enableAttrFamLine: false, + attrs_count: 0, name: null, priority: 0, starts_from: null @@ -223,11 +150,6 @@ }, mounted () { - console.log(this.criteria.cart); - - for(index in this.criteria.cart) { - console.log(this.criteria.cart[index]); - } }, methods: { @@ -239,19 +161,12 @@ } if (this.condition_on == "attribute") { - this.attr.push(); + if (this.attrs_count == 0) { + // this.enableAttrLine = true; + } - this.enableAttribute = true; - this.enableCartAttribute = false; - this.enableAttributeFamily = false; - } else if (this.condition_on == "attribute_family") { - this.enableAttributeFamily = true; - this.enableAttribute = false; - this.enableCartAttribute = false; - } else { - this.enableCartAttribute = true; - this.enableAttributeFamily = false; - this.enableAttribute = false; + this.attrs_count++; + this.attrs.push(this.attr); } } } diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php index 8ad18a1ed..3a857d330 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php @@ -216,8 +216,6 @@ class AttributeRepository extends Repository */ public function getNameAndId() { - $static = []; - $attributes = $this->model->all(); $trimmed = array(); diff --git a/packages/Webkul/Category/src/Repositories/CategoryRepository.php b/packages/Webkul/Category/src/Repositories/CategoryRepository.php index 7a2f43536..b91516070 100755 --- a/packages/Webkul/Category/src/Repositories/CategoryRepository.php +++ b/packages/Webkul/Category/src/Repositories/CategoryRepository.php @@ -212,4 +212,21 @@ class CategoryRepository extends Repository $category->save(); } } + + public function getNameAndId() + { + $categories = $this->model->all(); + $trimmed = array(); + + foreach ($categories as $key => $category) { + if ($category->name != null || $category->name != "") { + $trimmed[$key] = [ + 'id' => $category->id, + 'name' => $category->name + ]; + } + } + + return $trimmed; + } } \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_04_30_020321_alter_discounts_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_04_30_020321_alter_discounts_table.php index 806d39a2b..4bffd7225 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_04_30_020321_alter_discounts_table.php +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_04_30_020321_alter_discounts_table.php @@ -22,6 +22,7 @@ class AlterDiscountsTable extends Migration $table->dateTime('ends_till'); $table->integer( 'priority')->unsigned(); $table->boolean('ends_subsequent')->default(false); + $table->boolean('is_all')->default(1); }); Schema::table('discount_channels', function (Blueprint $table) { diff --git a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php index 4155adf31..ff1696a5d 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php @@ -8,6 +8,7 @@ use Illuminate\Routing\Controller; use Webkul\Attribute\Repositories\AttributeRepository as Attribute; use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily; +use Webkul\Category\Repositories\CategoryRepository as Category; /** * Catalog Rule controller @@ -20,12 +21,14 @@ class CatalogRuleController extends Controller protected $_config; protected $attribute; protected $attributeFamily; + protected $category; - public function __construct(Attribute $attribute, AttributeFamily $attributeFamily) + public function __construct(Attribute $attribute, AttributeFamily $attributeFamily, Category $category) { $this->_config = request('_config'); $this->attribute = $attribute; $this->attributeFamily = $attributeFamily; + $this->category = $category; } public function index() @@ -35,29 +38,7 @@ class CatalogRuleController extends Controller public function create() { - $ruleCriterias = [ - 'cart' => [ - 0 => 'sub_total', - 1 => 'shipping_total', - 2 => 'grand_total' - ], - - 'attribute' => [ - 0 => 'attribute', - 1 => 'attribute_groups', - 2 => 'attribute_familes' - ] - ]; - - $arr = array(); - - foreach($ruleCriterias as $key => $ruleCriteria) { - array_push($arr, $ruleCriteria); - } - - $arr; - - return view($this->_config['view'])->with('criteria', [$ruleCriterias, $this->attribute->getNameAndId(), $this->attributeFamily->getNameAndId()]); + return view($this->_config['view'])->with('criteria', [$this->attribute->getNameAndId(), $this->category->getNameAndId()]); } public function store() From 5a2405c135ba69905ff329d115d07a9811b071e8 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 6 May 2019 19:14:02 +0530 Subject: [PATCH 10/89] Made some dynamic form fields in catalog rule create form --- packages/Webkul/Admin/src/Http/routes.php | 2 + .../promotions/catalog-rule/create.blade.php | 84 ++++++++++++++----- .../Controllers/CatalogRuleController.php | 4 + 3 files changed, 70 insertions(+), 20 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index a2ba11306..e88c98088 100755 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -621,6 +621,8 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.catalog-rule.create' ])->name('admin.catalog-rule.store'); + Route::post('/fetch/attribute', 'Webkul\Discount\Controllers\CatalogRuleController@fetchAttribute'); + Route::get('/cart-rule', 'Webkul\Discount\Http\Controllers\CartRuleController@index')->defaults('_config', [ 'view' => 'admin::promotions.cart-rule.index' ])->name('admin.cart-rule.index'); diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php index e92f70085..f13b108cc 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php @@ -95,11 +95,11 @@
+ + @{{ errors.first('criteria') }}
@@ -108,22 +108,42 @@
-
- Attribute is - - + + + + + + +
-
-
- Category is - - + + + + + + +
@@ -143,9 +163,26 @@ channels: [], conditions: [], attrs_count: 0, + cats_count: 0, name: null, priority: 0, - starts_from: null + starts_from: null, + ends_till: null, + description: null, + customer_groups: [], + criteria: null, + attr: { + attribute: null, + condition: null, + value: null + }, + cat: { + category: null, + condition: null, + value: null + }, + attrs: [], + cats: [] } }, @@ -154,20 +191,27 @@ methods: { addCondition () { - if (this.criteria == "attribute" || this.criteria == "attribute_family" || this.criteria == "cart_attribute") { + if (this.criteria == 'attribute' || this.criteria == 'category') { this.condition_on = this.criteria; } else { alert('please try again'); + + return false; } - if (this.condition_on == "attribute") { - if (this.attrs_count == 0) { - // this.enableAttrLine = true; - } - - this.attrs_count++; + if (this.condition_on == 'attribute') { this.attrs.push(this.attr); + } else if (this.condition_on == 'category') { + this.cats.push(this.cat); } + }, + + removeAttr(index) { + this.attrs.splice(index, 1); + }, + + removeCat(index) { + this.cats.splice(index, 1); } } }); diff --git a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php index ff1696a5d..ffd1a539f 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php @@ -45,4 +45,8 @@ class CatalogRuleController extends Controller { dd(request()->all()); } + + public function fetchAttribute() { + return request()->all(); + } } \ No newline at end of file From 2a2bcdb1624fe947a43c2442eb7e3b38c9ca731e Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 6 May 2019 19:26:54 +0530 Subject: [PATCH 11/89] made some changes for custom validations used in ProductForm request class --- .../catalog/products/accordians/product-links.blade.php | 2 +- .../src/Resources/views/catalog/products/index.blade.php | 3 --- .../views/promotions/catalog-rule/create.blade.php | 6 +++--- packages/Webkul/Product/src/Http/Requests/ProductForm.php | 8 ++++++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/product-links.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/product-links.blade.php index ace543f39..0a9bc844c 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/product-links.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/product-links.blade.php @@ -22,7 +22,7 @@ {{ __('admin::app.catalog.products.related-products') }} - +
    diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php index 68b38f13c..495cb0196 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php @@ -21,9 +21,6 @@ {!! view_render_event('bagisto.admin.catalog.products.list.before') !!}
    - {{-- @inject('product','Webkul\Admin\DataGrids\ProductDataGrid') - {!! $product->render() !!} --}} - @inject('products', 'Webkul\Admin\DataGrids\ProductDataGrid') {!! $products->render() !!}
    diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php index f13b108cc..27bca147d 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php @@ -108,7 +108,7 @@
    -
    +
    Attribute is - +
    -
    +
    Category is + - - + - +
    -
    +
    Category is - - - +
    diff --git a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php index ffd1a539f..6871d8d1f 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php @@ -9,6 +9,7 @@ use Illuminate\Routing\Controller; use Webkul\Attribute\Repositories\AttributeRepository as Attribute; use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily; use Webkul\Category\Repositories\CategoryRepository as Category; +use Webkul\Product\Repositories\ProductFlatRepository as Product; /** * Catalog Rule controller @@ -22,13 +23,15 @@ class CatalogRuleController extends Controller protected $attribute; protected $attributeFamily; protected $category; + protected $product; - public function __construct(Attribute $attribute, AttributeFamily $attributeFamily, Category $category) + public function __construct(Attribute $attribute, AttributeFamily $attributeFamily, Category $category, Product $product) { $this->_config = request('_config'); $this->attribute = $attribute; $this->attributeFamily = $attributeFamily; $this->category = $category; + $this->product = $product; } public function index() @@ -46,7 +49,8 @@ class CatalogRuleController extends Controller dd(request()->all()); } - public function fetchAttribute() { + public function fetchAttribute() + { return request()->all(); } } \ No newline at end of file From 8a7a142414609dc91025bf04d1f4dcca2759c057 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Tue, 7 May 2019 01:42:15 +0530 Subject: [PATCH 13/89] need another revisit on discount rules tables and then prepare for actions --- .../promotions/cart-rule/create.blade.php | 223 ++++++++++++++++-- .../promotions/catalog-rule/create.blade.php | 42 ++-- 2 files changed, 226 insertions(+), 39 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index 6e4c1de02..2c9ecb987 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -6,48 +6,225 @@ @section('content')
    -
    + + @csrf

    - {{ __('admin::app.promotion.create-cart-rule') }} - - {{ Config::get('carrier.social.facebook.url') }} + {{ __('admin::app.promotion.add-catalog-rule') }}

    -
    - @csrf() - -
    -
    - - - - - - - - -
    -
    +
    + + @push('scripts') + + + + @endpush @stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php index a76d12230..74319f8f9 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php @@ -7,6 +7,7 @@ @section('content')
    + @csrf
    @@ -98,6 +99,7 @@ @{{ errors.first('criteria') }} @@ -107,21 +109,21 @@
    -
    +
    Attribute is - - + + - +
    @@ -129,20 +131,18 @@
    - Category is + Category - + + + + + - - - -
    @@ -179,7 +179,6 @@ cat: { category: null, condition: null, - value: null }, attrs: [], cats: [] @@ -201,8 +200,19 @@ if (this.condition_on == 'attribute') { this.attrs.push(this.attr); + + this.attr = { + attribute: null, + condition: null, + value: null + }; } else if (this.condition_on == 'category') { this.cats.push(this.cat); + + this.cat = { + category: null, + condition: null + }; } }, From a36776732be61f23f312f157f968ce8ccdb50b8f Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Tue, 7 May 2019 20:47:23 +0530 Subject: [PATCH 14/89] removed discounts table --- ...5_07_184255_create_catalog_rules_table.php | 6 +- ..._07_184334_create_checkout_rules_table.php | 6 +- ...7_184348_create_catalog_products_table.php | 6 +- .../promotions/catalog-rule/create.blade.php | 6 +- ...019_04_30_020321_alter_discounts_table.php | 62 ------------------- ...2019_04_30_224332_create_coupons_table.php | 50 --------------- ...921_add_column_in_discount_rules_table.php | 46 -------------- ...05_07_184021_drop_all_discounts_table.php} | 14 ++--- 8 files changed, 19 insertions(+), 177 deletions(-) rename packages/Webkul/Discount/src/Database/Migrations/2019_03_28_105855_create_discounts_table.php => database/migrations/2019_05_07_184255_create_catalog_rules_table.php (72%) rename packages/Webkul/Discount/src/Database/Migrations/2019_03_28_105910_create_discount_rules_table.php => database/migrations/2019_05_07_184334_create_checkout_rules_table.php (73%) rename packages/Webkul/Discount/src/Database/Migrations/2019_03_28_120827_create_discount_channels_table.php => database/migrations/2019_05_07_184348_create_catalog_products_table.php (71%) delete mode 100644 packages/Webkul/Discount/src/Database/Migrations/2019_04_30_020321_alter_discounts_table.php delete mode 100644 packages/Webkul/Discount/src/Database/Migrations/2019_04_30_224332_create_coupons_table.php delete mode 100644 packages/Webkul/Discount/src/Database/Migrations/2019_05_01_020921_add_column_in_discount_rules_table.php rename packages/Webkul/Discount/src/Database/Migrations/{2019_03_28_120843_create_discount_customer_groups_table.php => 2019_05_07_184021_drop_all_discounts_table.php} (65%) diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_03_28_105855_create_discounts_table.php b/database/migrations/2019_05_07_184255_create_catalog_rules_table.php similarity index 72% rename from packages/Webkul/Discount/src/Database/Migrations/2019_03_28_105855_create_discounts_table.php rename to database/migrations/2019_05_07_184255_create_catalog_rules_table.php index 32a994e04..a5a76b82b 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_03_28_105855_create_discounts_table.php +++ b/database/migrations/2019_05_07_184255_create_catalog_rules_table.php @@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -class CreateDiscountsTable extends Migration +class CreateCatalogRulesTable extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class CreateDiscountsTable extends Migration */ public function up() { - Schema::create('discounts', function (Blueprint $table) { + Schema::create('catalog_rules', function (Blueprint $table) { $table->increments('id'); $table->timestamps(); }); @@ -26,6 +26,6 @@ class CreateDiscountsTable extends Migration */ public function down() { - Schema::dropIfExists('discounts'); + Schema::dropIfExists('catalog_rules'); } } diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_03_28_105910_create_discount_rules_table.php b/database/migrations/2019_05_07_184334_create_checkout_rules_table.php similarity index 73% rename from packages/Webkul/Discount/src/Database/Migrations/2019_03_28_105910_create_discount_rules_table.php rename to database/migrations/2019_05_07_184334_create_checkout_rules_table.php index bd8d8e890..aadd54b70 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_03_28_105910_create_discount_rules_table.php +++ b/database/migrations/2019_05_07_184334_create_checkout_rules_table.php @@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -class CreateDiscountRulesTable extends Migration +class CreateCheckoutRulesTable extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class CreateDiscountRulesTable extends Migration */ public function up() { - Schema::create('discount_rules', function (Blueprint $table) { + Schema::create('checkout_rules', function (Blueprint $table) { $table->increments('id'); $table->timestamps(); }); @@ -26,6 +26,6 @@ class CreateDiscountRulesTable extends Migration */ public function down() { - Schema::dropIfExists('discount_rules'); + Schema::dropIfExists('checkout_rules'); } } diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_03_28_120827_create_discount_channels_table.php b/database/migrations/2019_05_07_184348_create_catalog_products_table.php similarity index 71% rename from packages/Webkul/Discount/src/Database/Migrations/2019_03_28_120827_create_discount_channels_table.php rename to database/migrations/2019_05_07_184348_create_catalog_products_table.php index b294609d2..bc73ae349 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_03_28_120827_create_discount_channels_table.php +++ b/database/migrations/2019_05_07_184348_create_catalog_products_table.php @@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -class CreateDiscountChannelsTable extends Migration +class CreateCatalogProductsTable extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class CreateDiscountChannelsTable extends Migration */ public function up() { - Schema::create('discount_channels', function (Blueprint $table) { + Schema::create('catalog_products', function (Blueprint $table) { $table->increments('id'); $table->timestamps(); }); @@ -26,6 +26,6 @@ class CreateDiscountChannelsTable extends Migration */ public function down() { - Schema::dropIfExists('discount_channels'); + Schema::dropIfExists('catalog_products'); } } diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php index 74319f8f9..b434cd91b 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php @@ -113,7 +113,7 @@
    Attribute is - @@ -131,9 +131,9 @@
    - Category + Category - diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_04_30_020321_alter_discounts_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_04_30_020321_alter_discounts_table.php deleted file mode 100644 index 4bffd7225..000000000 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_04_30_020321_alter_discounts_table.php +++ /dev/null @@ -1,62 +0,0 @@ -string('name'); - $table->string('type'); - $table->text('description')->nullable(); - $table->boolean('status')->default(0); - $table->dateTime('starts_from'); - $table->dateTime('ends_till'); - $table->integer( 'priority')->unsigned(); - $table->boolean('ends_subsequent')->default(false); - $table->boolean('is_all')->default(1); - }); - - Schema::table('discount_channels', function (Blueprint $table) { - $table->integer('discount_id')->unsigned(); - $table->foreign('discount_id')->references('id')->on('discounts')->onDelete('cascade'); - $table->integer('channel_id')->unsigned(); - $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade'); - }); - - Schema::table('discount_customer_group', function (Blueprint $table) { - $table->integer('discount_id')->unsigned(); - $table->foreign('discount_id')->references('id')->on('discounts')->onDelete('cascade'); - $table->integer('customer_group_id')->unsigned(); - $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('discounts', function (Blueprint $table) { - $table->dropColumn('name'); - $table->dropColumn('type'); - $table->dropColumn('description'); - $table->dropColumn( 'status'); - $table->dropColumn( 'starts_from'); - }); - - Schema::dropIfExists('discount_channels'); - - Schema::dropIfExists('discount_customer_group'); - } -} diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_04_30_224332_create_coupons_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_04_30_224332_create_coupons_table.php deleted file mode 100644 index 7dc40f9e9..000000000 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_04_30_224332_create_coupons_table.php +++ /dev/null @@ -1,50 +0,0 @@ -increments('id'); - $table->boolean('auto_generate')->default(0); - $table->string('prefix')->nullable(); - $table->string('suffix')->nullable(); - $table->integer('spaces_per_characters')->default(4); - $table->integer('discount_id')->unsigned(); - $table->foreign('discount_id')->references('id')->on('discounts')->onDelete('cascade'); - $table->integer('allowed_uses')->unsigned(); - $table->integer('allowed_uses_per_customer')->unsigned(); - $table->timestamps(); - }); - - Schema::create('coupon_codes', function (Blueprint $table) { - $table->increments('id'); - $table->string('code'); - $table->boolean('status')->default(0); - $table->integer('coupon_id')->unsigned(); - $table->foreign('coupon_id')->references('id')->on('coupons')->onDelete('cascade'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('coupons'); - - Schema::dropIfExists('coupon_codes'); - } -} diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_01_020921_add_column_in_discount_rules_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_01_020921_add_column_in_discount_rules_table.php deleted file mode 100644 index 2f09b76d9..000000000 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_01_020921_add_column_in_discount_rules_table.php +++ /dev/null @@ -1,46 +0,0 @@ -json('conditions'); - $table->json('actions'); - $table->integer('discount_id')->unsigned(); - $table->foreign('discount_id')->references('id')->on('discounts'); - $table->integer('coupon_id')->unsigned()->nullable(); - $table->foreign('coupon_id')->references('id')->on('coupons'); - $table->json('label')->nullable(); - }); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('discount_rules', function (Blueprint $table) { - $table->dropColumn('conditions'); - $table->dropColumn('actions'); - $table->dropForeign('discount_id'); - $table->dropColumn('discount_id'); - $table->dropForeign('coupon_id'); - $table->dropColumn('coupon_id'); - $table->dropColumn('label'); - }); - } -} diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_03_28_120843_create_discount_customer_groups_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184021_drop_all_discounts_table.php similarity index 65% rename from packages/Webkul/Discount/src/Database/Migrations/2019_03_28_120843_create_discount_customer_groups_table.php rename to packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184021_drop_all_discounts_table.php index 3f1f39a5c..a660b1b81 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_03_28_120843_create_discount_customer_groups_table.php +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184021_drop_all_discounts_table.php @@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -class CreateDiscountCustomerGroupsTable extends Migration +class DropAllDiscountsTable extends Migration { /** * Run the migrations. @@ -13,10 +13,10 @@ class CreateDiscountCustomerGroupsTable extends Migration */ public function up() { - Schema::create('discount_customer_group', function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - }); + Schema::dropIfExists('discount_customer_group'); + Schema::dropIfExists('discount_channels'); + Schema::dropIfExists('discount_rules'); + Schema::dropIfExists('discounts'); } /** @@ -26,6 +26,6 @@ class CreateDiscountCustomerGroupsTable extends Migration */ public function down() { - Schema::dropIfExists('discount_customer_group'); + // } -} \ No newline at end of file +} From 3115722fc8a5bbb2dc0c0324e88d63e1575c4f73 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 8 May 2019 05:46:00 +0530 Subject: [PATCH 15/89] catalog rule form changed to muliti attribute set for single condition --- .../Admin/src/Resources/assets/sass/app.scss | 38 +++--- .../promotions/catalog-rule/create.blade.php | 75 +++++++----- .../views/tax/tax-rates/edit.blade.php | 44 ++++++- .../Shop/src/Resources/assets/sass/app.scss | 110 ------------------ .../Ui/src/Resources/assets/sass/app.scss | 110 ++++++++++++++++++ 5 files changed, 218 insertions(+), 159 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss index 2620e6a70..f47e484e7 100755 --- a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss @@ -173,23 +173,6 @@ body { height: 90%; } - // .close-nav-aside { - // width: 100%; - // padding: 20px; - // text-align: center; - // border: 1px solid $border-color; - - // .icon { - // height: 24px; - // width: 24px; - // } - // } - - // .close-nav-aside:hover { - // background: white; - // cursor: pointer; - // } - a { padding: 15px; display: block; @@ -277,6 +260,27 @@ body { } } +.control-container { + border: 1px solid #c7c7c7; + padding: 20px; + width: 50%; + + .control-group { + display: flex; + flex-direction: row; + align-content: center; + justify-content: flex-start; + padding: 10px; + border: 1px solid #c7c7c7; + border-radius: 2px; + margin-right: 15px; + } + + .control-group::last-child { + margin-right: 0px; + } +} + .control-group { label { width: 70%; diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php index b434cd91b..901cc56d9 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php @@ -40,30 +40,34 @@ {{-- --}}
    + @{{ errors.first('name') }}
    + @{{ errors.first('description') }}
    + + @{{ errors.first('customer_groups') }}
    - @foreach(app('Webkul\Core\Repositories\ChannelRepository')->all() as $channel) @@ -109,41 +113,50 @@
    +
    -
    - Attribute is - - - - - - +
    + Attribute is + +
    + + + + + +
    +
    +
    -
    - Category +
    + Category - + - +
    + - + +
    @@ -164,11 +177,11 @@ conditions: [], attrs_count: 0, cats_count: 0, - name: null, - priority: 0, - starts_from: null, - ends_till: null, - description: null, + name: '10% OFF', + priority: 1, + starts_from: 'a', + ends_till: 'b', + description: 'something', customer_groups: [], criteria: null, attr: { diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php index 55168330a..53ebef1f9 100755 --- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php @@ -24,7 +24,49 @@
    - +
    + @method('PUT') + + @csrf() + +
    + + + + @{{ errors.first('identifier') }} +
    + + @include ('admin::customers.country-state', ['countryCode' => old('country') ?? $taxRate->country, 'stateCode' => old('state') ?? $taxRate->state]) + + @if ($taxRate->is_zip) + + +
    + + + @{{ errors.first('zip_from') }} +
    + +
    + + + @{{ errors.first('zip_to') }} +
    + @else +
    + + + @{{ errors.first('zip_code') }} +
    + @endif + +
    + + + @{{ errors.first('tax_rate') }} +
    + +
    diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 251b91c8d..6188762b3 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -38,116 +38,6 @@ input { border-radius: 0px !important; } -//margin bottom classes -.mb-10 { - margin-bottom: 10px; -} - -.mb-15 { - margin-bottom: 15px; -} - -.mb-20 { - margin-bottom: 20px; -} - -.mb-25 { - margin-bottom: 25px; -} - -.mb-30 { - margin-bottom: 30px; -} - -.mb-35 { - margin-bottom: 35px; -} - -.mb-40 { - margin-bottom: 40px; -} - -.mb-45 { - margin-bottom: 45px; -} - -.mb-50 { - margin-bottom: 50px; -} - -.mb-60 { - margin-bottom: 60px; -} - -.mb-70 { - margin-bottom: 70px; -} - -.mb-80 { - margin-bottom: 80px; -} - -.mb-90 { - margin-bottom: 90px; -} - -//margin-top -.mt-5 { - margin-top: 5px; -} - -.mt-10 { - margin-top: 10px; -} - -.mt-15 { - margin-top: 15px; -} - -.mt-20 { - margin-top: 20px; -} - -.mt-25 { - margin-top: 25px; -} - -.mt-30 { - margin-top: 30px; -} - -.mt-35 { - margin-top: 35px; -} - -.mt-40 { - margin-top: 40px; -} - -.mt-45 { - margin-top: 45px; -} - -.mt-50 { - margin-top: 50px; -} - -.mt-60 { - margin-top: 60px; -} - -.mt-70 { - margin-top: 70px; -} - -.mt-80 { - margin-top: 80px; -} - -.mt-90 { - margin-top: 90px; -} - //pagination .pagination.shop{ display: flex; diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index 1d8ca2938..873cb32bd 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -15,6 +15,116 @@ outline: none; } +//margin bottom classes +.mb-10 { + margin-bottom: 10px; +} + +.mb-15 { + margin-bottom: 15px; +} + +.mb-20 { + margin-bottom: 20px; +} + +.mb-25 { + margin-bottom: 25px; +} + +.mb-30 { + margin-bottom: 30px; +} + +.mb-35 { + margin-bottom: 35px; +} + +.mb-40 { + margin-bottom: 40px; +} + +.mb-45 { + margin-bottom: 45px; +} + +.mb-50 { + margin-bottom: 50px; +} + +.mb-60 { + margin-bottom: 60px; +} + +.mb-70 { + margin-bottom: 70px; +} + +.mb-80 { + margin-bottom: 80px; +} + +.mb-90 { + margin-bottom: 90px; +} + +//margin-top +.mt-5 { + margin-top: 5px; +} + +.mt-10 { + margin-top: 10px; +} + +.mt-15 { + margin-top: 15px; +} + +.mt-20 { + margin-top: 20px; +} + +.mt-25 { + margin-top: 25px; +} + +.mt-30 { + margin-top: 30px; +} + +.mt-35 { + margin-top: 35px; +} + +.mt-40 { + margin-top: 40px; +} + +.mt-45 { + margin-top: 45px; +} + +.mt-50 { + margin-top: 50px; +} + +.mt-60 { + margin-top: 60px; +} + +.mt-70 { + margin-top: 70px; +} + +.mt-80 { + margin-top: 80px; +} + +.mt-90 { + margin-top: 90px; +} + body { letter-spacing: -0.26px; line-height: 19px; From 19f4de9489ccde7e9b1f79718a7d93a50466516e Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 8 May 2019 16:11:43 +0530 Subject: [PATCH 16/89] new icons added for promotion and customer note. new action for customer added to take notes on the customers --- packages/Webkul/Admin/src/Config/menu.php | 2 +- .../Admin/src/DataGrids/CustomerDataGrid.php | 14 +++++- .../Customer/CustomerController.php | 38 ++++++++++++++++ packages/Webkul/Admin/src/Http/routes.php | 8 ++++ .../Admin/src/Resources/lang/en/app.php | 9 ++++ .../Admin/src/Resources/lang/pt_BR/app.php | 8 ++++ .../Resources/views/customers/index.blade.php | 2 +- .../Resources/views/customers/note.blade.php | 45 +++++++++++++++++++ .../Webkul/Customer/src/Models/Customer.php | 6 +-- ..._05_07_184021_drop_all_discounts_table.php | 2 +- ...5_07_184255_create_catalog_rules_table.php | 0 ..._07_184334_create_checkout_rules_table.php | 0 ...7_184348_create_catalog_products_table.php | 0 .../src/Resources/assets/images/icon-note.svg | 13 ++++++ .../assets/images/icon-promotion-active.svg | 18 ++++++++ .../assets/images/icon-promotion.svg | 18 ++++++++ .../Ui/src/Resources/assets/sass/icons.scss | 15 +++++++ .../Resources/views/datagrid/body.blade.php | 6 ++- 18 files changed, 195 insertions(+), 9 deletions(-) create mode 100644 packages/Webkul/Admin/src/Resources/views/customers/note.blade.php rename {database/migrations => packages/Webkul/Discount/src/Database/Migrations}/2019_05_07_184255_create_catalog_rules_table.php (100%) rename {database/migrations => packages/Webkul/Discount/src/Database/Migrations}/2019_05_07_184334_create_checkout_rules_table.php (100%) rename {database/migrations => packages/Webkul/Discount/src/Database/Migrations}/2019_05_07_184348_create_catalog_products_table.php (100%) create mode 100644 packages/Webkul/Ui/src/Resources/assets/images/icon-note.svg create mode 100644 packages/Webkul/Ui/src/Resources/assets/images/icon-promotion-active.svg create mode 100644 packages/Webkul/Ui/src/Resources/assets/images/icon-promotion.svg diff --git a/packages/Webkul/Admin/src/Config/menu.php b/packages/Webkul/Admin/src/Config/menu.php index 45bc30184..e88d1e783 100755 --- a/packages/Webkul/Admin/src/Config/menu.php +++ b/packages/Webkul/Admin/src/Config/menu.php @@ -181,7 +181,7 @@ return [ 'name' => 'admin::app.layouts.promotion', 'route' => 'admin.catalog-rule.index', 'sort' => 7, - 'icon-class' => 'settings-icon', + 'icon-class' => 'promotion-icon', ], [ 'key' => 'promotion.cart-rule', 'name' => 'admin::app.promotion.cart-rule', diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index 4d8407eab..732e8f64a 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -76,14 +76,24 @@ class CustomerDataGrid extends DataGrid 'type' => 'Edit', 'method' => 'GET', // use GET request only for redirect purposes 'route' => 'admin.customer.edit', - 'icon' => 'icon pencil-lg-icon' + 'icon' => 'icon pencil-lg-icon', + 'title' => trans('admin::app.customers.customers.edit-help-title') ]); $this->addAction([ 'type' => 'Delete', 'method' => 'POST', // use GET request only for redirect purposes 'route' => 'admin.customer.delete', - 'icon' => 'icon trash-icon' + 'icon' => 'icon trash-icon', + 'title' => trans('admin::app.customers.customers.delete-help-title') + ]); + + $this->addAction([ + 'type' => 'Add Note', + 'method' => 'GET', + 'route' => 'admin.customer.note.create', + 'icon' => 'icon note-icon', + 'title' => trans('admin::app.customers.note.help-title') ]); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php index 4cdc204cf..476256f76 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php @@ -186,4 +186,42 @@ class CustomerController extends Controller return response()->json(['message' => false], 400); } + + /** + * To load the note taking screen for the customers + * + * @return View + */ + public function createNote($id) + { + $customer = $this->customer->find($id); + + return view($this->_config['view'])->with('customer', $customer); + } + + /** + * To store the response of the note in storage + * + * @return Redirect + */ + public function storeNote() + { + $this->validate(request(), [ + 'notes' => 'required|string' + ]); + + $customer = $this->customer->find(request()->input('_customer')); + + $noteTaken = $customer->update([ + 'notes' => request()->input('notes') + ]); + + if ($noteTaken) { + session()->flash('success', 'Note taken'); + } else { + session()->flash('error', 'Note cannot be taken'); + } + + return redirect()->route($this->_config['redirect']); + } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index e88c98088..c1a57922d 100755 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -60,6 +60,14 @@ Route::group(['middleware' => ['web']], function () { 'view' => 'admin::customers.edit' ])->name('admin.customer.edit'); + Route::get('customers/note/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@createNote')->defaults('_config',[ + 'view' => 'admin::customers.note' + ])->name('admin.customer.note.create'); + + Route::put('customers/note/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@storeNote')->defaults('_config',[ + 'redirect' => 'admin.customer.index' + ])->name('admin.customer.note.store'); + Route::put('customers/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@update')->defaults('_config', [ 'redirect' => 'admin.customer.index' ])->name('admin.customer.update'); diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 31da14d13..0b4db3f6e 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -711,6 +711,13 @@ return [ 'yes' => 'Yes' ], + 'note' => [ + 'title' => 'Add Note', + 'save-note' => 'Save Note', + 'enter-note' => 'Enter Note', + 'help-title' => 'Add Note On This Customer' + ], + 'customers' => [ 'add-title' => 'Add Customer', 'edit-title' => 'Edit Customer', @@ -731,6 +738,8 @@ return [ 'female' => 'Female', 'phone' => 'Phone', 'group-default' => 'Cannot delete the default group.', + 'edit-help-title' => 'Edit Customer', + 'delete-help-title' => 'Delete Customer' ], 'reviews' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php index 30655d0d3..a6e627776 100755 --- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php @@ -675,6 +675,14 @@ return [ 'is_user_defined' => 'Usuário Definido', 'yes' => 'Sim' ], + + 'note' => [ + 'title' => 'Add Note', + 'save-note' => 'Save Note', + 'enter-note' => 'Enter Note', + 'help-title' => 'Add Note On This Customer' + ], + 'customers' => [ 'add-title' => 'Add Cliente', 'edit-title' => 'Editar Cliente', diff --git a/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php index 86714f9d5..675790a7a 100755 --- a/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php @@ -27,7 +27,7 @@
    @inject('customerGrid','Webkul\Admin\DataGrids\CustomerDataGrid') - + {!! $customerGrid->render() !!}
    diff --git a/packages/Webkul/Admin/src/Resources/views/customers/note.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/note.blade.php new file mode 100644 index 000000000..efe07fbb7 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/customers/note.blade.php @@ -0,0 +1,45 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.customers.note.title') }} +@stop + +@section('content') +
    +
    +
    +
    +

    + + + {{ __('admin::app.customers.note.title') }} +

    +
    + +
    + +
    +
    + +
    +
    + @csrf() + + + + + +
    + + + + + @{{ errors.first('notes') }} +
    +
    +
    +
    +
    +@stop \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php index b49329a39..8922e60de 100755 --- a/packages/Webkul/Customer/src/Models/Customer.php +++ b/packages/Webkul/Customer/src/Models/Customer.php @@ -17,7 +17,7 @@ class Customer extends Authenticatable implements CustomerContract, JWTSubject protected $table = 'customers'; - protected $fillable = ['first_name', 'channel_id', 'last_name', 'gender', 'date_of_birth', 'email', 'password', 'customer_group_id', 'subscribed_to_news_letter', 'is_verified', 'token']; + protected $fillable = ['first_name', 'channel_id', 'last_name', 'gender', 'date_of_birth', 'email', 'password', 'customer_group_id', 'subscribed_to_news_letter', 'is_verified', 'token', 'notes']; protected $hidden = ['password', 'remember_token']; @@ -104,7 +104,7 @@ class Customer extends Authenticatable implements CustomerContract, JWTSubject public function all_orders() { return $this->hasMany(OrderProxy::modelClass(), 'customer_id'); } - + /** * Get the identifier that will be stored in the subject claim of the JWT. * @@ -114,7 +114,7 @@ class Customer extends Authenticatable implements CustomerContract, JWTSubject { return $this->getKey(); } - + /** * Return a key value array, containing any custom claims to be added to the JWT. * diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184021_drop_all_discounts_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184021_drop_all_discounts_table.php index a660b1b81..72f1d9fd9 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184021_drop_all_discounts_table.php +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184021_drop_all_discounts_table.php @@ -28,4 +28,4 @@ class DropAllDiscountsTable extends Migration { // } -} +} \ No newline at end of file diff --git a/database/migrations/2019_05_07_184255_create_catalog_rules_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184255_create_catalog_rules_table.php similarity index 100% rename from database/migrations/2019_05_07_184255_create_catalog_rules_table.php rename to packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184255_create_catalog_rules_table.php diff --git a/database/migrations/2019_05_07_184334_create_checkout_rules_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184334_create_checkout_rules_table.php similarity index 100% rename from database/migrations/2019_05_07_184334_create_checkout_rules_table.php rename to packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184334_create_checkout_rules_table.php diff --git a/database/migrations/2019_05_07_184348_create_catalog_products_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184348_create_catalog_products_table.php similarity index 100% rename from database/migrations/2019_05_07_184348_create_catalog_products_table.php rename to packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184348_create_catalog_products_table.php diff --git a/packages/Webkul/Ui/src/Resources/assets/images/icon-note.svg b/packages/Webkul/Ui/src/Resources/assets/images/icon-note.svg new file mode 100644 index 000000000..fb6fbbfef --- /dev/null +++ b/packages/Webkul/Ui/src/Resources/assets/images/icon-note.svg @@ -0,0 +1,13 @@ + + + + Icon-Note-Large + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/images/icon-promotion-active.svg b/packages/Webkul/Ui/src/Resources/assets/images/icon-promotion-active.svg new file mode 100644 index 000000000..f3543efd0 --- /dev/null +++ b/packages/Webkul/Ui/src/Resources/assets/images/icon-promotion-active.svg @@ -0,0 +1,18 @@ + + + + Icon-Promition-Active + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/images/icon-promotion.svg b/packages/Webkul/Ui/src/Resources/assets/images/icon-promotion.svg new file mode 100644 index 000000000..f3329e941 --- /dev/null +++ b/packages/Webkul/Ui/src/Resources/assets/images/icon-promotion.svg @@ -0,0 +1,18 @@ + + + + Icon-Promition + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss index 9a506cd4c..b4cd4286b 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss @@ -34,6 +34,11 @@ background-image: url("../images/Icon-Settings.svg"); } +.promotion-icon { + @extend %menu-properties; + background-image: url("../images/icon-promotion.svg"); +} + .angle-right-icon { background-image: url("../images/Angle-Right.svg"); width: 17px; @@ -220,6 +225,12 @@ height: 47px; } +.note-icon { + background-image: url("../images/icon-note.svg"); + width: 24px; + height: 24px; +} + .active { .dashboard-icon { background-image: url("../images/Icon-Dashboard-Active.svg"); @@ -245,6 +256,10 @@ background-image: url("../images/Icon-Configure-Active.svg"); } + .promotion-icon { + background-image: url("../images/icon-promotion-active.svg"); + } + > .arrow-down-icon { background-image: url("../images/Arrow-Down.svg"); width: 14px; diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php index ba5d14a84..38a19c527 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php @@ -53,7 +53,11 @@ data-method="{{ $action['method'] }}" data-action="{{ route($action['route'], $record->{$index}) }}" - data-token="{{ csrf_token() }}"> + data-token="{{ csrf_token() }}" + + @if (isset($action['title'])) + title="{{ $action['title'] }}" + @endif> @endforeach From a2a629637f99784dba1f5b3c8807336d6b954702 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 8 May 2019 18:45:34 +0530 Subject: [PATCH 17/89] catalog and cart rule designs stable, now moving towards validations on client side and backend --- .../Admin/src/Resources/assets/sass/app.scss | 18 +- .../promotions/cart-rule/create.blade.php | 254 +++++++++++------- .../promotions/catalog-rule/create.blade.php | 253 ++++++++++------- 3 files changed, 324 insertions(+), 201 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss index f47e484e7..01e185627 100755 --- a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss @@ -262,9 +262,24 @@ body { .control-container { border: 1px solid #c7c7c7; - padding: 20px; + padding: 10px; width: 50%; + .title-bar { + display: inline-flex; + justify-content: space-between; + width: 100%; + + .icon { + cursor: pointer; + } + + .icon.cross-icon { + height: 24px; + width: 24px; + } + } + .control-group { display: flex; flex-direction: row; @@ -274,6 +289,7 @@ body { border: 1px solid #c7c7c7; border-radius: 2px; margin-right: 15px; + margin-bottom: 0px; } .control-group::last-child { diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index 2c9ecb987..9d3203099 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -1,7 +1,7 @@ @extends('admin::layouts.content') @section('page_title') - {{ __('admin::app.promotion.add-cart-rule') }} + {{ __('admin::app.promotion.add-catalog-rule') }} @stop @section('content') @@ -37,116 +37,176 @@ @@ -164,11 +224,11 @@ conditions: [], attrs_count: 0, cats_count: 0, - name: null, - priority: 0, - starts_from: null, - ends_till: null, - description: null, + name: '10% OFF', + priority: 1, + starts_from: 'a', + ends_till: 'b', + description: 'something', customer_groups: [], criteria: null, attr: { diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php index 901cc56d9..9d3203099 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php @@ -37,129 +37,176 @@ From f891bf5bc8057174e87af8accb96ba7c223a9999 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Thu, 9 May 2019 14:31:08 +0530 Subject: [PATCH 18/89] catalog rules migrations added --- packages/Webkul/Admin/src/Http/routes.php | 4 ++ .../Admin/src/Resources/lang/en/app.php | 4 +- .../promotions/cart-rule/create.blade.php | 27 +++------- .../promotions/catalog-rule/create.blade.php | 49 +++++++++++-------- .../Discount/src/Contracts/CatalogRule.php | 7 +++ ..._05_07_184021_drop_all_discounts_table.php | 31 ------------ ...5_07_184255_create_catalog_rules_table.php | 15 ++++++ ...7_184348_create_catalog_products_table.php | 5 ++ ...ate_catalog_rule_customer_groups_table.php | 33 +++++++++++++ ...01_create_catalog_rule_channels_table.php} | 8 +-- .../Http/Controllers/CartRuleController.php | 17 ++++++- .../Discount/src/Models/CatalogRule.php | 11 +++++ .../src/Models/CatalogRuleChannels.php | 10 ++++ .../src/Models/CatalogRuleCustomerGroups.php | 10 ++++ .../Discount/src/Models/CatalogRuleProxy.php | 10 ++++ 15 files changed, 163 insertions(+), 78 deletions(-) create mode 100644 packages/Webkul/Discount/src/Contracts/CatalogRule.php delete mode 100644 packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184021_drop_all_discounts_table.php create mode 100644 packages/Webkul/Discount/src/Database/Migrations/2019_05_09_125143_create_catalog_rule_customer_groups_table.php rename packages/Webkul/Discount/src/Database/Migrations/{2019_05_07_184334_create_checkout_rules_table.php => 2019_05_09_125201_create_catalog_rule_channels_table.php} (56%) create mode 100644 packages/Webkul/Discount/src/Models/CatalogRuleChannels.php create mode 100644 packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroups.php create mode 100644 packages/Webkul/Discount/src/Models/CatalogRuleProxy.php diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index c1a57922d..db09c41f5 100755 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -638,6 +638,10 @@ Route::group(['middleware' => ['web']], function () { Route::get('/cart-rule/create', 'Webkul\Discount\Http\Controllers\CartRuleController@create')->defaults('_config', [ 'view' => 'admin::promotions.cart-rule.create' ])->name('admin.cart-rule.create'); + + Route::post('/cart-rule/store', 'Webkul\Discount\Http\Controllers\CartRuleController@store')->defaults('_config', [ + 'view' => 'admin.cart-rule.index' + ])->name('admin.cart-rule.store'); }); }); }); diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 0b4db3f6e..966ad0e9c 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -785,7 +785,9 @@ return [ 'channels' => 'Channels', 'cust-groups' => 'Customer Groups', 'priority' => 'Priority', - 'add-condition' => 'Add Conditions' + 'add-condition' => 'Add Conditions', + 'disc_amt' => 'Discount Amount', + 'disc_percent' => 'Discount Percentage' ], 'catalog' => [ 'name' => 'Name', diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index 9d3203099..0421bfc00 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -1,12 +1,12 @@ @extends('admin::layouts.content') @section('page_title') - {{ __('admin::app.promotion.add-catalog-rule') }} + {{ __('admin::app.promotion.add-cart-rule') }} @stop @section('content')
    -
    + @csrf
    @@ -14,7 +14,7 @@

    - {{ __('admin::app.promotion.add-catalog-rule') }} + {{ __('admin::app.promotion.add-cart-rule') }}

    @@ -27,14 +27,14 @@
    - +
    @push('scripts') - @@ -297,8 +265,10 @@ apply: null, apply_amt: false, apply_prct: false, + applied_config: @json($criteria[3]), attributes_list: [], attrs_input: @json($criteria[0]), + attrs_options: @json($criteria[2]), attr_object: { attribute: null, condition: null, @@ -331,6 +301,7 @@ }, mounted () { + console.log(this.attrs_options); }, methods: { @@ -370,25 +341,19 @@ var this_this = this; if (this.attrs_input[event.target.selectedIndex - 1].type == 'select' || this.attrs_input[event.target.selectedIndex - 1].type == 'multiselect') { - axios.post('{{ route('admin.catalog-rule.options') }}', { - 'attribute' : this.attrs_input[event.target.selectedIndex - 1].attribute - }) - .then(function (response) { - console.log(response); + console.log(this.attrs_input[event.target.selectedIndex - 1].name); - this.attributes_list[index].value = null; - }) - .catch(function (error) { - console.log(error); - }); + this.attributes_list[index].options = this.attrs_options[this.attrs_input[event.target.selectedIndex - 1].name]; + + this.attributes_list[index].value = []; } }, detectApply() { - if (this.apply == 1 || this.apply == 3) { + if (this.apply == 0 || this.apply == 2) { this.apply_prct = true; this.apply_amt = false; - } else if (this.apply == 2 || this.apply == 4) { + } else if (this.apply == 1 || this.apply == 3) { this.apply_prct = false; this.apply_amt = true; } @@ -402,8 +367,38 @@ this.cats.splice(index, 1); }, - beforeOnSubmit() { + onSubmit: function (e) { + for (index in this.attributes_list) { + if (this.attributes_list[index].condition == null || this.attributes_list[index].condition == "" || this.attributes_list[index].condition == undefined) { + window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('admin::app.promotion.catalog.condition-missing') }}" }]; + + this.$root.addFlashMessages(); + + return false; + } else if (this.attributes_list[index].value == null || this.attributes_list[index].value == "" || this.attributes_list[index].value == undefined) { + window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('admin::app.promotion.catalog.condition-missing') }}" }]; + + this.$root.addFlashMessages(); + + return false; + } + } + this.all_conditions = JSON.stringify(this.attributes_list); + + this.$validator.validateAll().then(result => { + if (result) { + e.target.submit(); + } + }); + }, + + addFlashMessages() { + const flashes = this.$refs.flashes; + + flashMessages.forEach(function(flash) { + flashes.addFlash(flash); + }, this); } } }); diff --git a/packages/Webkul/Discount/src/Config/cart-attributes.php b/packages/Webkul/Discount/src/Config/cart-attributes.php deleted file mode 100644 index 96bdbfbfc..000000000 --- a/packages/Webkul/Discount/src/Config/cart-attributes.php +++ /dev/null @@ -1,58 +0,0 @@ - [ - 0 => 'Apply as percentage', - 1 => 'Apply as fixed amount', - 2 => 'Adjust to percentage', - 3 => 'Adjust to discount value' - ], - - 'cart' => [ - 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' - ] - ], - - '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' - ], - ] -]; \ 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 new file mode 100644 index 000000000..22fd1af3a --- /dev/null +++ b/packages/Webkul/Discount/src/Config/rule-conditions.php @@ -0,0 +1,105 @@ + [ + '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', + ] + ], + + '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' + ], + + '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' + ] + ] + ], + + 'cart' => [ + 'actions' => [ + 0 => 'Apply as percentage', + 1 => 'Apply as fixed amount', + 2 => 'Adjust to percentage', + 3 => 'Adjust to discount value' + ], + + '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' + ] + ] + ], +]; \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184255_create_catalog_rules_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184255_create_catalog_rules_table.php index b485a26a1..c4b9fd2f8 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184255_create_catalog_rules_table.php +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184255_create_catalog_rules_table.php @@ -26,12 +26,14 @@ class CreateCatalogRulesTable extends Migration $table->datetime('starts_from')->nullable(); $table->datetime('ends_till')->nullable(); $table->boolean('status')->default(1); + $table->integer('priority')->unsigned(); $table->json('conditions')->nullable(); $table->json('actions')->nullable(); $table->boolean('end_other_rules')->default(1); $table->integer('sort_order')->unsigned()->default(0); $table->string('action_type')->nullable(); - $table->decimal('discount_amount', 12, 4)->default(0.0000); + $table->decimal('dis_amt', 12, 4)->default(0.0000); + $table->decimal('dis_qty', 12, 4)->nullable(); $table->timestamps(); }); } diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184348_create_catalog_products_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184348_create_catalog_rule_products_table.php similarity index 88% rename from packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184348_create_catalog_products_table.php rename to packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184348_create_catalog_rule_products_table.php index 21e086208..4a5ddbbed 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184348_create_catalog_products_table.php +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184348_create_catalog_rule_products_table.php @@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -class CreateCatalogProductsTable extends Migration +class CreateCatalogRuleProductsTable extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class CreateCatalogProductsTable extends Migration */ public function up() { - Schema::create('catalog_products', function (Blueprint $table) { + Schema::create('catalog_rule_products', function (Blueprint $table) { $table->increments('id'); $table->integer('catalog_rule_id')->unsigned()->unique(); $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade'); diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php index 0b72e240e..e165d033d 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php @@ -21,6 +21,7 @@ class CreateCartRuleTable extends Migration $table->datetime('ends_till')->nullable(); $table->json('conditions')->nullable(); $table->json('actions')->nullable(); + $table->integer('priority')->unsigned()->default(0); $table->longtext('product_ids')->nullable(); $table->boolean('status')->default(1); $table->boolean('end_other_rules')->default(1); diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index fcfadd196..249db6c1c 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -70,12 +70,7 @@ class CartRuleController extends Controller $this->product = $product; $this->CartRule = $cartRule; $this->cart = $cart; - $this->appliedConfig = [ - 0 => trans('admin::app.promotion.Cart.apply-percent'), - 1 => trans('admin::app.promotion.Cart.apply-fixed'), - 2 => trans('admin::app.promotion.Cart.adjust-to-percent'), - 3 => trans('admin::app.promotion.Cart.adjust-to-value') - ]; + $this->appliedConfig = config('pricerules.catalog'); } public function index() @@ -85,7 +80,7 @@ class CartRuleController extends Controller public function create() { - return view($this->_config['view'])->with('criteria', [config('pricerules'), $this->fetchOptionableAttributes(), $this->getStatesAndCountries()]); + return view($this->_config['view'])->with('criteria', [$this->appliedConfig, $this->fetchOptionableAttributes(), $this->getStatesAndCountries()]); } public function store() diff --git a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php index e53d2b633..9fc8427ad 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php @@ -49,6 +49,11 @@ class CatalogRuleController extends Controller */ protected $appliedConfig; + /** + * Property for catalog rule application + */ + protected $appliedConditions; + /** * To hold the catalog repository instance */ @@ -62,6 +67,8 @@ class CatalogRuleController extends Controller $this->category = $category; $this->product = $product; $this->catalogRule = $catalogRule; + $this->appliedConfig = config('pricerules.catalog'); + $this->appliedConditions = config('pricerules.conditions'); } public function index() @@ -71,7 +78,7 @@ class CatalogRuleController extends Controller public function create() { - return view($this->_config['view'])->with('criteria', [$this->attribute->getPartial(), $this->category->getPartial()]); + return view($this->_config['view'])->with('criteria', [$this->attribute->getPartial(), $this->category->getPartial(), $this->fetchOptionableAttributes(), $this->appliedConfig, $this->appliedConditions]); } public function store() @@ -87,15 +94,28 @@ class CatalogRuleController extends Controller 'ends_till' => 'required|date', 'priority' => 'required|numeric', 'criteria' => 'required', - 'apply' => 'required|numeric|min:1|max:4' + 'all_conditions' => 'required|array', + 'apply' => 'required|numeric|min:0|max:3' ]); - dd(request()->all()); - $catalogRule = $this->catalogRule->create(request()->all()); + $data = request()->all(); + $data['status'] = 1; + + dd($data); + + $catalogRule = $this->catalogRule->create($data); } - public function fetchAttributeOptions() + public function fetchOptionableAttributes() { - return [request()->all()]; + $attributesWithOptions = array(); + + foreach($this->attribute->all() as $attribute) { + if (($attribute->type == 'select' || $attribute->type == 'multiselect') && $attribute->code != 'tax_category_id') { + $attributesWithOptions[$attribute->admin_name] = $attribute->options->toArray(); + } + } + + return $attributesWithOptions; } } \ 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 a2e1bbec7..a51ba75b1 100644 --- a/packages/Webkul/Discount/src/Providers/DiscountServiceProvider.php +++ b/packages/Webkul/Discount/src/Providers/DiscountServiceProvider.php @@ -33,7 +33,7 @@ class DiscountServiceProvider extends ServiceProvider protected function registerConfig() { $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/cart-attributes.php', 'pricerules' + dirname(__DIR__) . '/Config/rule-conditions.php', 'pricerules' ); } } \ No newline at end of file From 1e96a6bf360d0bc2b2e91f9f2487307d7ee0d7b0 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 22 May 2019 03:56:06 +0530 Subject: [PATCH 35/89] catalog rule create complete, migrations changes, translations added --- .../src/DataGrids/CatalogRuleDataGrid.php | 77 +++- packages/Webkul/Admin/src/Http/routes.php | 8 + .../Admin/src/Resources/lang/en/app.php | 12 +- .../promotions/cart-rule/create.blade.php | 1 + .../views/promotions/cart-rule/edit.blade.php | 363 ++++++++++++++++++ .../promotions/catalog-rule/create.blade.php | 27 +- .../promotions/catalog-rule/index.blade.php | 4 +- .../Controllers/CatalogRuleController.php | 90 ++++- .../CartRuleChannelsRepository.php | 24 ++ .../CartRuleCustomerGroupsRepository.php | 24 ++ .../CatalogRuleChannelsRepository.php | 24 ++ .../CatalogRuleCustomerGroupsRepository.php | 24 ++ .../src/Repositories/CatalogRuleProducts.php | 24 ++ .../Repositories/CatalogRuleProductsPrice.php | 24 ++ 14 files changed, 696 insertions(+), 30 deletions(-) create mode 100644 packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php create mode 100644 packages/Webkul/Discount/src/Repositories/CartRuleCustomerGroupsRepository.php create mode 100644 packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php create mode 100644 packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php create mode 100644 packages/Webkul/Discount/src/Repositories/CatalogRuleProducts.php create mode 100644 packages/Webkul/Discount/src/Repositories/CatalogRuleProductsPrice.php diff --git a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php index d26814f6b..2eccbb5fc 100644 --- a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php @@ -21,7 +21,7 @@ class CatalogRuleDataGrid extends DataGrid { $queryBuilder = DB::table('catalog_rules') ->select('id') - ->addSelect('id', 'name', 'description', 'status', 'end_other_rules', 'action_type'); + ->addSelect('id', 'name', 'starts_from', 'ends_till', 'priority', 'status', 'end_other_rules', 'action_type'); $this->setQueryBuilder($queryBuilder); } @@ -47,9 +47,27 @@ class CatalogRuleDataGrid extends DataGrid ]); $this->addColumn([ - 'index' => 'description', - 'label' => trans('admin::app.datagrid.desc'), - 'type' => 'string', + 'index' => 'starts_from', + 'label' => trans('admin::app.datagrid.starts_from'), + 'type' => 'date', + 'searchable' => false, + 'sortable' => true, + 'filterable' => true + ]); + + $this->addColumn([ + 'index' => 'ends_till', + 'label' => trans('admin::app.datagrid.ends_till'), + 'type' => 'date', + 'searchable' => false, + 'sortable' => true, + 'filterable' => true + ]); + + $this->addColumn([ + 'index' => 'priority', + 'label' => trans('admin::app.datagrid.priority'), + 'type' => 'number', 'searchable' => false, 'sortable' => true, 'filterable' => true @@ -61,7 +79,13 @@ class CatalogRuleDataGrid extends DataGrid 'type' => 'boolean', 'searchable' => false, 'sortable' => true, - 'filterable' => true + 'filterable' => true, + 'wrapper' => function ($value) { + if ($value->status == 1) + return 'True'; + else + return 'False'; + } ]); $this->addColumn([ @@ -70,7 +94,13 @@ class CatalogRuleDataGrid extends DataGrid 'type' => 'boolean', 'searchable' => false, 'sortable' => true, - 'filterable' => true + 'filterable' => true, + 'wrapper' => function ($value) { + if ($value->end_other_rules == 1) + return 'True'; + else + return 'False'; + } ]); $this->addColumn([ @@ -79,34 +109,41 @@ class CatalogRuleDataGrid extends DataGrid 'type' => 'string', 'searchable' => false, 'sortable' => true, - 'filterable' => true + 'filterable' => true, + 'wrapper' => function ($value) { + foreach(config('pricerules.catalog.actions') as $key => $action) { + if ($value->action_type == $key) { + return trans($action); + } + } + } ]); } public function prepareActions() { - // $this->addAction([ - // 'type' => 'Edit', - // 'method' => 'GET', //use post only for redirects only - // 'route' => 'admin.catalog.attributes.edit', - // 'icon' => 'icon pencil-lg-icon' - // ]); + $this->addAction([ + 'type' => 'Edit', + 'method' => 'GET', //use post only for redirects only + 'route' => 'admin.catalog-rule.edit', + 'icon' => 'icon pencil-lg-icon' + ]); // $this->addAction([ // 'type' => 'Delete', // 'method' => 'POST', //use post only for requests other than redirects - // 'route' => 'admin.catalog.attributes.delete', + // 'route' => 'admin.catalog-rule.delete', // 'icon' => 'icon trash-icon' // ]); } public function prepareMassActions() { - $this->addMassAction([ - 'type' => 'delete', - 'action' => route('admin.catalog.attributes.massdelete'), - 'label' => 'Delete', - 'method' => 'DELETE' - ]); + // $this->addMassAction([ + // 'type' => 'delete', + // 'action' => route('admin.catalog.attributes.massdelete'), + // 'label' => 'Delete', + // 'method' => 'DELETE' + // ]); } } diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index a90fe8c15..b998ca69b 100755 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -629,6 +629,14 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.catalog-rule.create' ])->name('admin.catalog-rule.store'); + Route::get('/catalog-rule/edit/{id}', 'Webkul\Discount\Http\Controllers\CatalogRuleController@edit')->defaults('_config', [ + 'view' => 'admin::promotions.catalog-rule.edit' + ])->name('admin.catalog-rule.edit'); + + Route::post('/catalog-rule/edit/{id}', 'Webkul\Discount\Http\Controllers\CatalogRuleController@update')->defaults('_config', [ + 'redirect' => 'admin.catalog-rule.edit' + ])->name('admin.catalog-rule.update'); + Route::post('fetch/options', 'Webkul\Discount\Http\Controllers\CatalogRuleController@fetchAttributeOptions')->name('admin.catalog-rule.options'); Route::get('/cart-rule', 'Webkul\Discount\Http\Controllers\CartRuleController@index')->defaults('_config', [ diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 924d459df..21ededad4 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -771,6 +771,8 @@ return [ 'cart-rule' => 'Cart Rule', 'add-catalog-rule' => 'Add Catalog Rule', 'add-cart-rule' => 'Add Cart Rule', + 'edit-cart-rule' => 'Edit Cart Rule', + 'edit-catalog-rule' => 'Edit Catalog Rule', 'create-catalog-rule' => 'Create Catalog Rule', 'create-cart-rule' => 'Create Cart Rule', 'save-btn-title' => 'Create', @@ -793,8 +795,16 @@ return [ 'is-coupon-no' => 'No', 'uses-per-cust' => 'Uses per customer', 'all' => 'All', - 'any' => 'Any' + 'any' => 'Any', + 'end_other_rules' => 'End other rules', + 'status' => 'Is Active', ], + + 'status' => [ + 'success' => 'Success! rule created', + 'failed' => 'Error! failed to create rule' + ], + 'catalog' => [ 'name' => 'Name', 'description' => 'Description', diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index 0e782711a..beb2a5627 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -298,6 +298,7 @@ priority: 0, starts_from: null, uses_per_cust: 0, + status: null } }, diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php index e69de29bb..7468e6041 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php @@ -0,0 +1,363 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.promotion.edit-cart-rule') }} +@stop + +@section('content') +
    +
    + @csrf + +
    +
    +

    + + + {{ __('admin::app.promotion.edit-cart-rule') }} +

    +
    + +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + + @push('scripts') + + + + @endpush +@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php index 9350680ad..8f46cf40f 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php @@ -79,6 +79,30 @@ @{{ errors.first('channels[]') }}
    +
    + + + + + @{{ errors.first('status') }} +
    + +
    + + + + + @{{ errors.first('end_other_rules') }} +
    +
    @@ -262,6 +286,7 @@ data () { return { + all_conditions: [], apply: null, apply_amt: false, apply_prct: false, @@ -296,7 +321,7 @@ name: null, priority: 0, starts_from: null, - all_conditions: [] + status: null, } }, diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php index 8920d87c9..2c5ab574a 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php @@ -24,8 +24,8 @@
    - @inject('customerGrid','Webkul\Admin\DataGrids\CustomerDataGrid') - {!! $customerGrid->render() !!} + @inject('catalogRuleGrid','Webkul\Admin\DataGrids\CatalogRuleDataGrid') + {!! $catalogRuleGrid->render() !!}
    @endsection \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php index 9fc8427ad..a2dfb69c3 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php @@ -10,6 +10,8 @@ use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily; use Webkul\Category\Repositories\CategoryRepository as Category; 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; /** * Catalog Rule controller @@ -54,12 +56,22 @@ class CatalogRuleController extends Controller */ protected $appliedConditions; + /** + * Property to hold Catalog Rule Channels Repository + */ + protected $catalogRuleChannels; + + /** + * Property to hold Catalog Rule Customer Groups Repository + */ + protected $catalogRuleCustomerGroups; + /** * To hold the catalog repository instance */ protected $catalogRule; - public function __construct(Attribute $attribute, AttributeFamily $attributeFamily, Category $category, Product $product, CatalogRule $catalogRule) + public function __construct(Attribute $attribute, AttributeFamily $attributeFamily, Category $category, Product $product, CatalogRule $catalogRule, CatalogRuleChannels $catalogRuleChannels, CatalogRuleCustomerGroups $catalogRuleCustomerGroups) { $this->_config = request('_config'); $this->attribute = $attribute; @@ -67,6 +79,8 @@ class CatalogRuleController extends Controller $this->category = $category; $this->product = $product; $this->catalogRule = $catalogRule; + $this->catalogRuleChannels = $catalogRuleChannels; + $this->catalogRuleCustomerGroups = $catalogRuleCustomerGroups; $this->appliedConfig = config('pricerules.catalog'); $this->appliedConditions = config('pricerules.conditions'); } @@ -92,18 +106,82 @@ class CatalogRuleController extends Controller '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' + 'apply' => 'required|numeric|min:0|max:3', + 'disc_amount' => 'sometimes', + 'disc_percent' => 'sometimes', ]); - $data = request()->all(); - $data['status'] = 1; + $catalog_rule = request()->all(); - dd($data); + $catalog_rule_channels = array(); + $catalog_rule_customer_groups = array(); - $catalogRule = $this->catalogRule->create($data); + $catalog_rule_channels = $catalog_rule['channels']; + $catalog_rule_customer_groups = $catalog_rule['customer_groups']; + unset($catalog_rule['channels']); unset($catalog_rule['customer_groups']); + + unset($catalog_rule['criteria']); + + $catalog_rule['conditions'] = $catalog_rule['all_conditions']; + unset($catalog_rule['all_conditions']); + + if (isset($catalog_rule['disc_amt'])) { + $catalog_rule['action_type'] = $catalog_rule['apply']; + $catalog_rule['actions'] = [ + 'action_type' => $catalog_rule['apply'], + 'disc_amt' => $catalog_rule['disc_amt'] + ]; + } else if (isset($catalog_rule['disc_percent'])) { + $catalog_rule['action_type'] = $catalog_rule['apply']; + $catalog_rule['actions'] = [ + 'action_type' => $catalog_rule['apply'], + 'disc_percent' => $catalog_rule['disc_percent'], + ]; + } + + 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); + + foreach($catalog_rule_channels as $catalog_rule_channel) { + $catalog_rule_channels['catalog_rule_id'] = $catalog_rule_channel; + $catalog_rule_channels['channel_id'] = $catalog_rule_channel; + $catalogRuleChannels = $this->catalogRuleChannels->create($catalog_rule_channels); + } + + foreach ($catalog_rule_customer_groups as $catalog_rule_channel) { + $catalog_rule_customer_groups['catalog_rule_id'] = $catalogRule['id']; + $catalog_rule_customer_groups['customer_group_id'] = $catalog_rule_channel; + $catalogRuleCustomerGroups = $this->catalogRuleCustomerGroups->create($catalog_rule_customer_groups); + } + + if($catalogRule && $catalogRuleChannels && $catalogRuleCustomerGroups) { + session()->flash('success', trans('admin::app.promotion.status.success')); + } else { + session()->flash('error', trans('admin::app.promotion.status.failed')); + } + + return redirect()->back(); + } + + 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); + + dd($catalog_rule, $catalog_rule_channels, $catalog_rule_customer_groups); } public function fetchOptionableAttributes() diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php new file mode 100644 index 000000000..da5b31a99 --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php @@ -0,0 +1,24 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CartRuleRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Discount\Contracts\CartRule'; + } +} diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleCustomerGroupsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleCustomerGroupsRepository.php new file mode 100644 index 000000000..a2038e507 --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CartRuleCustomerGroupsRepository.php @@ -0,0 +1,24 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CartRuleCustomerGroupsRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Discount\Contracts\CartRuleCustomerGroups'; + } +} diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php new file mode 100644 index 000000000..dbdf996ec --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php @@ -0,0 +1,24 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CatalogRuleChannelsRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Discount\Contracts\CatalogRuleChannels'; + } +} diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php new file mode 100644 index 000000000..76323d394 --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php @@ -0,0 +1,24 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CatalogRuleCustomerGroupsRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Discount\Contracts\CatalogRuleCustomerGroups'; + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleProducts.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleProducts.php new file mode 100644 index 000000000..142179ddc --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleProducts.php @@ -0,0 +1,24 @@ + + * @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 new file mode 100644 index 000000000..f330516dc --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsPrice.php @@ -0,0 +1,24 @@ + + * @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 From 725b70ea19fbbdb82cd825944262460fdf03dc2c Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 22 May 2019 04:42:24 +0530 Subject: [PATCH 36/89] catalog rule edit form complete --- packages/Webkul/Admin/src/Http/routes.php | 2 +- .../Admin/src/Resources/lang/en/app.php | 1 + .../promotions/catalog-rule/edit.blade.php | 464 ++++++++++++++++++ .../Controllers/CatalogRuleController.php | 16 +- 4 files changed, 474 insertions(+), 9 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index b998ca69b..b48410e72 100755 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -626,7 +626,7 @@ Route::group(['middleware' => ['web']], function () { ])->name('admin.catalog-rule.create'); Route::post('/catalog-rule/create', 'Webkul\Discount\Http\Controllers\CatalogRuleController@store')->defaults('_config', [ - 'redirect' => 'admin.catalog-rule.create' + 'redirect' => 'admin.catalog-rule.index' ])->name('admin.catalog-rule.store'); Route::get('/catalog-rule/edit/{id}', 'Webkul\Discount\Http\Controllers\CatalogRuleController@edit')->defaults('_config', [ diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 21ededad4..a84f3ae5a 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -776,6 +776,7 @@ return [ 'create-catalog-rule' => 'Create Catalog Rule', 'create-cart-rule' => 'Create Cart Rule', 'save-btn-title' => 'Create', + 'edit-btn-title' => 'Edit', 'select-attr' => 'Select Attribute', 'select-attr-fam' => 'Select Attribute Family', 'select-cart-attr' => 'Select Cart Attribute', diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php index e69de29bb..8c7938c52 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php @@ -0,0 +1,464 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.promotion.edit-catalog-rule') }} +@stop + +@section('content') +
    + +
    + + @push('scripts') + + + + @endpush +@stop \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php index a2dfb69c3..84346e821 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php @@ -97,8 +97,6 @@ class CatalogRuleController extends Controller public function store() { - // dd(request()->all()); - $this->validate(request(), [ 'name' => 'required|string', 'description' => 'string', @@ -130,11 +128,11 @@ class CatalogRuleController extends Controller $catalog_rule['conditions'] = $catalog_rule['all_conditions']; unset($catalog_rule['all_conditions']); - if (isset($catalog_rule['disc_amt'])) { + if (isset($catalog_rule['disc_amount'])) { $catalog_rule['action_type'] = $catalog_rule['apply']; $catalog_rule['actions'] = [ 'action_type' => $catalog_rule['apply'], - 'disc_amt' => $catalog_rule['disc_amt'] + 'disc_amount' => $catalog_rule['disc_amount'] ]; } else if (isset($catalog_rule['disc_percent'])) { $catalog_rule['action_type'] = $catalog_rule['apply']; @@ -155,7 +153,7 @@ class CatalogRuleController extends Controller $catalogRule = $this->catalogRule->create($catalog_rule); foreach($catalog_rule_channels as $catalog_rule_channel) { - $catalog_rule_channels['catalog_rule_id'] = $catalog_rule_channel; + $catalog_rule_channels['catalog_rule_id'] = $catalogRule['id']; $catalog_rule_channels['channel_id'] = $catalog_rule_channel; $catalogRuleChannels = $this->catalogRuleChannels->create($catalog_rule_channels); } @@ -168,11 +166,13 @@ class CatalogRuleController extends Controller if($catalogRule && $catalogRuleChannels && $catalogRuleCustomerGroups) { session()->flash('success', trans('admin::app.promotion.status.success')); + + return redirect()->route('admin.catalog-rule.index'); } else { session()->flash('error', trans('admin::app.promotion.status.failed')); - } - return redirect()->back(); + return redirect()->back(); + } } public function edit($id) @@ -181,7 +181,7 @@ class CatalogRuleController extends Controller $catalog_rule_channels = $this->catalogRuleChannels->findByField('catalog_rule_id', $id); $catalog_rule_customer_groups = $this->catalogRuleCustomerGroups->findByField('catalog_rule_id', $id); - dd($catalog_rule, $catalog_rule_channels, $catalog_rule_customer_groups); + 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]); } public function fetchOptionableAttributes() From 57dcce236694c0d39c9c910ca77bffae874f47d1 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 22 May 2019 17:21:31 +0530 Subject: [PATCH 37/89] catalog rule form complete, now moving towards catalog rule products --- .../src/DataGrids/CatalogRuleDataGrid.php | 4 +- packages/Webkul/Admin/src/Http/routes.php | 2 +- .../Admin/src/Resources/lang/en/app.php | 8 +- .../promotions/catalog-rule/edit.blade.php | 3 +- ...5_07_184255_create_catalog_rules_table.php | 6 +- .../Controllers/CatalogRuleController.php | 75 +++++++++++- .../Discount/src/Models/CatalogRule.php | 12 ++ .../src/Models/CatalogRuleChannels.php | 6 + .../src/Models/CatalogRuleCustomerGroups.php | 6 + .../CartRuleChannelsRepository.php | 2 +- .../Repositories/CatalogRuleRepository.php | 113 ++++++++++++++++++ 11 files changed, 224 insertions(+), 13 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php index 2eccbb5fc..6346713d6 100644 --- a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php @@ -48,7 +48,7 @@ class CatalogRuleDataGrid extends DataGrid $this->addColumn([ 'index' => 'starts_from', - 'label' => trans('admin::app.datagrid.starts_from'), + 'label' => trans('admin::app.datagrid.starts-from'), 'type' => 'date', 'searchable' => false, 'sortable' => true, @@ -57,7 +57,7 @@ class CatalogRuleDataGrid extends DataGrid $this->addColumn([ 'index' => 'ends_till', - 'label' => trans('admin::app.datagrid.ends_till'), + 'label' => trans('admin::app.datagrid.ends-till'), 'type' => 'date', 'searchable' => false, 'sortable' => true, diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index b48410e72..85e008d8b 100755 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -634,7 +634,7 @@ Route::group(['middleware' => ['web']], function () { ])->name('admin.catalog-rule.edit'); Route::post('/catalog-rule/edit/{id}', 'Webkul\Discount\Http\Controllers\CatalogRuleController@update')->defaults('_config', [ - 'redirect' => 'admin.catalog-rule.edit' + 'redirect' => 'admin.catalog-rule.index' ])->name('admin.catalog-rule.update'); Route::post('fetch/options', 'Webkul\Discount\Http\Controllers\CatalogRuleController@fetchAttributeOptions')->name('admin.catalog-rule.options'); diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index a84f3ae5a..861cac5d5 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -153,7 +153,9 @@ return [ 'role' => 'Role', 'sub-total' => 'Sub Total', 'no-of-products' => 'Number of Products', - 'attribute-family' => 'Attribute Family' + 'attribute-family' => 'Attribute Family', + 'starts-from' => 'Starts From', + 'ends-till' => 'Ends Till', ], 'account' => [ @@ -803,7 +805,9 @@ return [ 'status' => [ 'success' => 'Success! rule created', - 'failed' => 'Error! failed to create rule' + 'failed' => 'Error! failed to create rule', + 'update-success' => 'Success! rule updated', + 'update-failed' => 'Error! cannot update' ], 'catalog' => [ diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php index 8c7938c52..0cced58b5 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php @@ -12,8 +12,7 @@ @push('scripts') + @endpush \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php b/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php index 05dcffea9..8c6448ac5 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php @@ -6,4 +6,4 @@ {!! view_render_event('bagisto.shop.products.wishlist.after') !!} -@endauth \ No newline at end of file +@endauth From 6f14ad7a42f759e5e100b542c4de7b9cef33a4b6 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 27 May 2019 03:59:37 +0530 Subject: [PATCH 45/89] cart rule form completed --- .../Admin/src/Resources/lang/en/app.php | 3 +- .../promotions/cart-rule/create.blade.php | 91 ++--- .../views/promotions/cart-rule/edit.blade.php | 223 +++++++----- .../Discount/src/Config/rule-conditions.php | 7 + ...5_07_184255_create_catalog_rules_table.php | 9 +- ...19_05_13_024326_create_cart_rule_table.php | 7 +- .../Webkul/Discount/src/Helpers/Discount.php | 89 ++++- .../Http/Controllers/CartRuleController.php | 337 +++++++++++------- .../Webkul/Discount/src/Models/CartRule.php | 14 + .../Discount/src/Models/CartRuleCoupons.php | 5 + .../src/Models/CartRuleCouponsUsage.php | 5 - .../src/Models/CartRuleCouponsUsageProxy.php | 1 - ...{CartRuleLables.php => CartRuleLabels.php} | 14 + .../src/Repositories/CartRuleRepository.php | 5 + .../src/Http/Controllers/HomeController.php | 78 +--- 15 files changed, 529 insertions(+), 359 deletions(-) rename packages/Webkul/Discount/src/Models/{CartRuleLables.php => CartRuleLabels.php} (57%) diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 06dab7d1d..3967ef6a1 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -815,7 +815,8 @@ return [ 'false' => 'false', 'limit' => 'Usage Limit', 'specific-coupon' => 'Specific Coupon(Check) / Auto Generated(Unheck)', - 'free-shipping' => 'Free Shipping' + 'free-shipping' => 'Free Shipping', + 'is-guest' => 'For Guests' ], 'status' => [ diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index ee41dfd35..d8340e6b9 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -77,7 +77,7 @@
    - @foreach(app('Webkul\Customer\Repositories\CustomerGroupRepository')->all() as $channel) @@ -90,7 +90,7 @@
    - @foreach(app('Webkul\Core\Repositories\ChannelRepository')->all() as $channel) @@ -140,6 +140,17 @@ @{{ errors.first('per_customer') }}
    +
    + + + + + @{{ errors.first('is_guest') }} +
    +
    @@ -161,14 +172,12 @@
    -
    +
    - - - @{{ errors.first('criteria') }}
    Add Condition @@ -185,18 +194,18 @@
    -
    -
    - @@ -205,7 +214,7 @@
    - @@ -215,7 +224,7 @@
    - @@ -289,7 +298,7 @@
    - + @@ -297,7 +306,7 @@
    - + @@ -305,7 +314,7 @@
    -
    +
    @@ -323,7 +332,7 @@
    - + @{{ errors.first('label') }}
    @@ -335,7 +344,7 @@
    - + @{{ errors.first('label') }}
    @@ -358,8 +367,8 @@ data () { return { - name: 'somethign', - description: 'Enter Some Description', + name: null, + description: null, conditions_list: [], channels: [], customer_groups: [], @@ -369,7 +378,9 @@ per_customer: 0, status: null, use_coupon: null, - auto_generation: null, + auto_generation: 1, + usage_limit: 0, + is_guest: 0, action_type: null, apply: null, @@ -383,7 +394,6 @@ end_other_rules: null, coupon_type: null, free_shipping: null, - auto_generated: null, all_conditions: null, @@ -391,9 +401,7 @@ suffix: null, prefix: null, dedicated_label: true, - usage_limit: null, - global_label: null, label: { global: null, @foreach(core()->getAllChannels() as $channel) @@ -421,7 +429,6 @@ }, mounted () { - this.use_coupon = 0; }, methods: { @@ -471,9 +478,9 @@ }, useCoupon() { - if (this.use_coupon == 1) { - this.auto_generation = 1; - } + // if (this.use_coupon == 1) { + // this.auto_generation = 1; + // } }, removeCartAttr(index) { @@ -491,29 +498,29 @@ } }); - for (index in this.conditions_list) { - if (this.conditions_list[index].condition == null || this.conditions_list[index].condition == "" || this.conditions_list[index].condition == undefined) { - window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('admin::app.promotion.catalog.condition-missing') }}" }]; + // for (index in this.conditions_list) { + // if (this.conditions_list[index].condition == null || this.conditions_list[index].condition == "" || this.conditions_list[index].condition == undefined) { + // window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('admin::app.promotion.catalog.condition-missing') }}" }]; - this.$root.addFlashMessages(); + // this.$root.addFlashMessages(); - return false; - } else if (this.conditions_list[index].value == null || this.conditions_list[index].value == "" || this.conditions_list[index].value == undefined) { - window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('admin::app.promotion.catalog.condition-missing') }}" }]; + // return false; + // } else if (this.conditions_list[index].value == null || this.conditions_list[index].value == "" || this.conditions_list[index].value == undefined) { + // window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('admin::app.promotion.catalog.condition-missing') }}" }]; - this.$root.addFlashMessages(); + // this.$root.addFlashMessages(); - return false; - } - } + // return false; + // } + // } - if (this.conditions_list.length == 0) { - window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('admin::app.promotion.catalog.condition-missing') }}" }]; + // if (this.conditions_list.length == 0) { + // window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('admin::app.promotion.catalog.condition-missing') }}" }]; - this.$root.addFlashMessages(); + // this.$root.addFlashMessages(); - return false; - } + // return false; + // } this.all_conditions = JSON.stringify(this.conditions_list); }, diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php index f408a9073..88399c936 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php @@ -1,7 +1,7 @@ @extends('admin::layouts.content') @section('page_title') - {{ __('admin::app.promotion.add-cart-rule') }} + {{ __('admin::app.promotion.edit-cart-rule') }} @stop @section('content') @@ -12,7 +12,7 @@ @push('scripts') diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index 3befaa793..b7f09ba67 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -33,7 +33,13 @@
    @inject('cart_rule', 'Webkul\Discount\Helpers\Discount') - {{ $cart_rule->findAllRules() }} +
    +
    + + + +
    +
    \ No newline at end of file From 62a7954c330e7390d7c19b15920ca447ee9bac70 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 27 May 2019 18:49:09 +0530 Subject: [PATCH 48/89] cart rules working --- packages/Webkul/Checkout/src/Cart.php | 5 -- .../Webkul/Discount/src/Helpers/Discount.php | 7 -- .../src/Http/Controllers/CartController.php | 69 +++++++++++++++++-- 3 files changed, 64 insertions(+), 17 deletions(-) diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index e6a81b875..04db42ed0 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1240,9 +1240,4 @@ class Cart { public function setCouponAble() { return $this->discount->checkCouponConditions($this->getCart()); } - - public function setCoupon() { - $couponRules = $this->setCouponAble(); - return $couponRules; - } } \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index 268a82e8b..b7c4e63e0 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -16,13 +16,6 @@ class Discount $this->cartRule = $cartRule; } - public function checkCoupon() - { - foreach($this->cartRule->all() as $rule) { - return $rule->name; - } - } - public function getGuestEndRules() { $rules = $this->cartRule->findWhere(['status' => 1, 'end_other_rules' => 1, 'is_guest' => 1]); diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index f436267f8..1fb168379 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -261,20 +261,79 @@ class CartController extends Controller $code = request()->input('code'); $rules = Cart::setCoupon(); + $impacts = array(); + $appliedRule; foreach($rules['id'] as $rule) { if ($rule->use_coupon && $rule->auto_generation == 0) { - // dump($rule->coupons->code, $rule->id); - if ($rule->coupons->code == $code) { - return $rule->id; + $appliedRule = $rule; + + break; } } else { - dump($rule->coupons->prefix, $rule->coupons->suffix, $rule->id); + dd('auto_generation in next version'); } } - die; + $cart = Cart::getCart(); + // check all the conditions associated with the rule + if ($appliedRule->starts_from == null) { + $action_type = $appliedRule->action_type; + $disc_threshold = $appliedRule->disc_threshold; + $disc_amount = $appliedRule->disc_amount; + $disc_quantity = $appliedRule->disc_quantity; + + $newBaseSubTotal = 0; + $newQuantity = 0; + if ($cart->items_qty >= $disc_threshold) { + if ($action_type == config('pricerules.cart.validation.0')) { + //CART + $newBaseSubTotal = ($cart->base_sub_total * $disc_amount) / 100; + } else if ($action_type == config('pricerules.cart.validation.1')) { + $newBaseSubTotal = $cart->base_sub_total - $disc_amount; + } else if ($action_type == config('pricerules.cart.validation.2')) { + //CART + $newQuantity = $cart->items()->first()->quantity + $disc_amount; + } else if ($action_type == config('pricerules.cart.validation.3')) { + $newBaseSubTotal = $disc_amount ; + } + + if ($action_type == config('pricerules.cart.validation.2')) { + dd($newQuantity); + } else { + dd($newBaseSubTotal); + } + } + } else { + //time based rules + $action_type = $appliedRule->action_type; + $disc_threshold = $appliedRule->disc_threshold; + $disc_amount = $appliedRule->disc_amount; + $disc_quantity = $appliedRule->disc_quantity; + + $newBaseSubTotal = 0; + $newQuantity = 0; + if ($cart->items_qty >= $disc_threshold) { + if ($action_type == config('pricerules.cart.validation.0')) { + //CART + $newBaseSubTotal = ($cart->base_sub_total * $disc_amount) / 100; + } else if ($action_type == config('pricerules.cart.validation.1')) { + $newBaseSubTotal = $cart->base_sub_total - $disc_amount; + } else if ($action_type == config('pricerules.cart.validation.2')) { + //CART + $newQuantity = $cart->items()->first()->quantity + $disc_amount; + } else if ($action_type == config('pricerules.cart.validation.3')) { + $newBaseSubTotal = $disc_amount ; + } + + if ($action_type == config('pricerules.cart.validation.2')) { + dd($newQuantity); + } else { + dd($newBaseSubTotal); + } + } + } } } \ No newline at end of file From 5ca9e67cad6242d6268fae202b6366cf38fa8268 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Tue, 28 May 2019 09:09:17 +0530 Subject: [PATCH 49/89] added coupon box on checkout screen --- .../Admin/src/Resources/lang/en/app.php | 8 +++- .../promotions/cart-rule/create.blade.php | 2 +- .../views/promotions/cart-rule/edit.blade.php | 4 +- packages/Webkul/Checkout/src/Cart.php | 17 +++++++++ .../src/Http/Controllers/CartController.php | 37 +++++++++++++++---- .../views/checkout/onepage.blade.php | 19 +++++++--- .../views/checkout/total/summary.blade.php | 8 +++- 7 files changed, 73 insertions(+), 22 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 2827774eb..8e11b3d45 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -817,7 +817,7 @@ return [ 'specific-coupon' => 'Specific Coupon(Check) / Auto Generated(Unheck)', 'free-shipping' => 'Free Shipping', 'is-guest' => 'For Guests', - 'disc_qty' => 'Max. Quantity Allowed To Be Discounted' + 'disc_qty' => 'Max. Quantity Allowed To Be Discounted', ], 'status' => [ @@ -828,7 +828,11 @@ return [ 'update-coupon-success' => 'Success! rule updated along with coupon', 'update-failed' => 'Error! cannot update', 'delete-success' => 'Sucess! rule deleted', - 'delete-failed' => 'Error! cannot delete' + 'delete-failed' => 'Error! cannot delete', + 'coupon-applied' => 'Coupon Applied', + 'no-coupon' => '* Coupon not applicable', + 'coupon-expired' => 'Coupon expired', + 'coupon-failed' => 'Invalid coupon' ], 'catalog' => [ diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index 254e510e8..f8d4e4f56 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -405,7 +405,7 @@ coupon_type: null, free_shipping: null, - all_conditions: null, + all_conditions: [], code: null, suffix: null, diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php index bdac14d0b..0a156ef62 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php @@ -377,7 +377,6 @@ return { name: 'Name of rule', description: 'Enter Some Description', - conditions_list: [], channels: [], customer_groups: [], ends_till: null, @@ -439,7 +438,6 @@ mounted () { data = @json($cart_rule[3]); - console.log(data); this.name = data.name; this.description = data.description; this.conditions_list = []; @@ -491,6 +489,7 @@ this.free_shipping = data.free_shipping; this.all_conditions = null; + this.conditions_list = JSON.parse(JSON.parse(data.conditions)); this.dedicated_label = false; global_label = null; @@ -569,7 +568,6 @@ }, onSubmit: function (e) { - console.log(this.$validator); this.$validator.validateAll().then(result => { if (result) { e.target.submit(); diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 04db42ed0..fb52b5ca9 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1240,4 +1240,21 @@ class Cart { public function setCouponAble() { return $this->discount->checkCouponConditions($this->getCart()); } + + public function setCoupon() + { + return $this->setCouponAble(); + } + + public function leastWorthItem() + { + $cart = $this->getCart(); + $leastSubTotal = 0; + + foreach ($cart->items as $item) { + if ($item->sub_total > $leastSubTotal) { + $leastSubTotal = $item->sub_total; + } + } + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 1fb168379..6cffaa8b9 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -254,6 +254,7 @@ class CartController extends Controller */ public function applyCoupons() { + // dd(request()->all()); $this->validate(request(), [ 'code' => 'string|required' ]); @@ -262,24 +263,29 @@ class CartController extends Controller $rules = Cart::setCoupon(); - $impacts = array(); - $appliedRule; - + $appliedRule = null; + $coupons = []; foreach($rules['id'] as $rule) { + array_push($coupons, $rule->coupons->code); if ($rule->use_coupon && $rule->auto_generation == 0) { if ($rule->coupons->code == $code) { $appliedRule = $rule; break; + } else { + continue; } - } else { - dd('auto_generation in next version'); } } + if(! isset($appliedRule)) { + return response()->json(['message' => trans('admin::app.promotion.status.no-coupon'), 'coupons' => $coupons], 200); + } + $cart = Cart::getCart(); // check all the conditions associated with the rule - if ($appliedRule->starts_from == null) { + if (isset($appliedRule->starts_from) && $appliedRule->starts_from == null) { + $action_type = $appliedRule->action_type; $disc_threshold = $appliedRule->disc_threshold; $disc_amount = $appliedRule->disc_amount; @@ -329,10 +335,25 @@ class CartController extends Controller } if ($action_type == config('pricerules.cart.validation.2')) { - dd($newQuantity); + return response()->json([ + 'message' => 'Success', + 'amount_given' => false, + 'amount' => $newQuantity + ]); } else { - dd($newBaseSubTotal); + return response()->json([ + 'message' => 'Success', + 'amount_given' => true, + 'amount' => $newBaseSubTotal + ]); } + } else { + return response()->json([ + 'message' => 'failed', + 'amount_given' => null, + 'amount' => null, + 'least_value_item' => Cart::leastWorthItem() + ]); } } } diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index 28846f987..d665f8d5d 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -469,7 +469,8 @@ data: function() { return { templateRender: null, - code: null + code: null, + message: null } }, @@ -493,15 +494,21 @@ methods: { onSubmit: function() { - console.log(this.code); + var this_this = this; axios.post('{{ route('shop.checkout.check.coupons') }}', { - code: this.code + code: this_this.code }).then(function(response) { - console.log(response); - }).catch(function (error) { - console.log(error); + console.log(response.data.message); + this_this.message = response.data.message; }); + }, + + codeChange: function() { + if (this.code.length == 0 || this.code.length == 1) + { + this.message = null; + } } } }) diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index b7f09ba67..38c8368d8 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -35,11 +35,15 @@
    - + + + @{{ message }} + + @{{ message }}
    -
    \ No newline at end of file +
    From 088bccf7ab01763ddff50264d49593ac58d74dd2 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Tue, 28 May 2019 14:20:16 +0530 Subject: [PATCH 50/89] removed the conditions empty bug --- .../promotions/cart-rule/create.blade.php | 52 ++++-------------- .../views/promotions/cart-rule/edit.blade.php | 18 +++--- packages/Webkul/Checkout/src/Cart.php | 21 ++++--- .../Discount/src/Config/rule-conditions.php | 11 +++- .../Webkul/Discount/src/Helpers/Discount.php | 6 +- .../Http/Controllers/CartRuleController.php | 24 +++++--- .../src/Http/Controllers/CartController.php | 55 ++++++++++++++----- .../views/checkout/onepage.blade.php | 4 +- .../views/checkout/total/summary.blade.php | 9 +-- 9 files changed, 111 insertions(+), 89 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index f8d4e4f56..92cb756b1 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -259,14 +259,6 @@ @{{ errors.first('disc_amount') }}
    -
    - - - - - @{{ errors.first('disc_quantity') }} -
    -
    @@ -275,6 +267,14 @@ @{{ errors.first('disc_threshold') }}
    +
    + + + + + @{{ errors.first('disc_quantity') }} +
    +
    @@ -338,7 +338,7 @@
    - +
    @@ -398,9 +398,9 @@ apply_prct: false, apply_to_shipping: null, buy_atleast: null, - disc_amount: 0.0, - disc_threshold: 0, - disc_quantity: 0, + disc_amount: null, + disc_threshold: null, + disc_quantity: null, end_other_rules: null, coupon_type: null, free_shipping: null, @@ -510,37 +510,9 @@ } }); - // for (index in this.conditions_list) { - // if (this.conditions_list[index].condition == null || this.conditions_list[index].condition == "" || this.conditions_list[index].condition == undefined) { - // window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('admin::app.promotion.catalog.condition-missing') }}" }]; - - // this.$root.addFlashMessages(); - - // return false; - // } else if (this.conditions_list[index].value == null || this.conditions_list[index].value == "" || this.conditions_list[index].value == undefined) { - // window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('admin::app.promotion.catalog.condition-missing') }}" }]; - - // this.$root.addFlashMessages(); - - // return false; - // } - // } - - // if (this.conditions_list.length == 0) { - // window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('admin::app.promotion.catalog.condition-missing') }}" }]; - - // this.$root.addFlashMessages(); - - // return false; - // } - this.all_conditions = JSON.stringify(this.conditions_list); }, - // genericGroupCondition() { - // this.generic_condition = false; - // }, - addFlashMessages() { const flashes = this.$refs.flashes; diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php index 0a156ef62..3c26c66b6 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php @@ -267,10 +267,10 @@ @{{ errors.first('disc_threshold') }}
    -
    +
    - + @{{ errors.first('disc_quantity') }}
    @@ -338,7 +338,7 @@
    - +
    @@ -395,9 +395,9 @@ apply_prct: false, apply_to_shipping: null, buy_atleast: null, - disc_amount: 0.0, - disc_threshold: 0, - disc_quantity: 0, + disc_amount: null, + disc_threshold: null, + disc_quantity: null, end_other_rules: null, coupon_type: null, free_shipping: null, @@ -489,7 +489,10 @@ this.free_shipping = data.free_shipping; this.all_conditions = null; - this.conditions_list = JSON.parse(JSON.parse(data.conditions)); + + if (data.conditions != null) { + this.conditions_list = JSON.parse(JSON.parse(data.conditions)); + } this.dedicated_label = false; global_label = null; @@ -517,6 +520,7 @@ } if (this.condition_on == 'cart') { + console.log(this.conditions_list); this.conditions_list.push(this.cart_object); this.cart_object = { diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index fb52b5ca9..94fd38472 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1233,28 +1233,31 @@ class Cart { } } - public function setNonCouponAble() { + public function setNonCoupon() { return $this->discount->checkNonCouponConditions($this->getCart()); } - public function setCouponAble() { - return $this->discount->checkCouponConditions($this->getCart()); - } - public function setCoupon() { - return $this->setCouponAble(); + return $this->discount->checkCouponConditions($this->getCart()); } public function leastWorthItem() { $cart = $this->getCart(); - $leastSubTotal = 0; + $leastValue = 999999999999; + $leastSubTotal = []; foreach ($cart->items as $item) { - if ($item->sub_total > $leastSubTotal) { - $leastSubTotal = $item->sub_total; + if ($item->base_total < $leastValue) { + $leastValue = $item->total; + $leastSubTotal = [ + 'id' => $item->id, + 'base_total' => $leastValue + ]; } } + + return $leastSubTotal; } } \ 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 b5190e06e..02be38310 100644 --- a/packages/Webkul/Discount/src/Config/rule-conditions.php +++ b/packages/Webkul/Discount/src/Config/rule-conditions.php @@ -126,21 +126,26 @@ return [ 'type' => 'numeric' ], 3 => [ + 'code' => 'shipping_method', + 'name' => 'Shipping Method', + 'type' => 'string' + ], + 4 => [ 'code' => 'payement_method', 'name' => 'Payment Method', 'type' => 'string' ], - 4 => [ + 5 => [ 'code' => 'shipping_postcode', 'name' => 'Shipping Postcode', 'type' => 'string' ], - 5 => [ + 6 => [ 'code' => 'shipping_state', 'name' => 'Shipping State', 'type' => 'string' ], - 6 => [ + 7 => [ 'code' => 'shipping_country', 'name' => 'Shipping Country', 'type' => 'string' diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index b7c4e63e0..2baee2c79 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -52,7 +52,7 @@ class Discount public function getGuestBestRules() { - $rules = $this->cartRule->findWhere(['status' => 1, 'is_guest' => 1]); + $rules = $this->cartRule->findWhere(['status' => 1, 'end_other_rules' => 0, 'is_guest' => 1]); $currentChannel = core()->getCurrentChannel(); $guestRules = array(); @@ -234,11 +234,13 @@ class Discount if (count($id)) { return [ + 'end_rule' => false, 'noncouponable' => true, 'id' => $id ]; } else { return [ + 'end_rule' => false, 'noncouponable' => false, 'id' => null ]; @@ -256,11 +258,13 @@ class Discount if (!$rule->use_coupon) { return [ + 'end_rule' => true, 'noncouponable' => true, 'id' => $id ]; } else { return [ + 'end_rule' => true, 'noncouponable' => false, 'id' => null ]; diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index 95da60aad..022a9ea8e 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -115,12 +115,12 @@ class CartRuleController extends Controller 'per_customer' => 'numeric|min:0', 'action_type' => 'required|string', 'disc_amount' => 'required|numeric', - 'discount_quantity' => 'numeric|required_if:action_type,buy_a_get_b', - 'disc_threshold' => 'numeric|required_if:action_type,buy_a_get_b', + 'disc_quantity' => 'numeric', + 'disc_threshold' => 'numeric', 'free_shipping' => 'required|boolean', 'apply_to_shipping' => 'required|boolean', 'code' => 'string|required_if:auto_generation,0', - 'all_conditions' => 'array', + 'all_conditions' => 'required', 'label' => 'array|nullable' ]); @@ -152,7 +152,11 @@ class CartRuleController extends Controller unset($data['cart_attributes']); unset($data['attributes']); - $data['conditions'] = $data['all_conditions']; + if (count(json_decode($data['all_conditions'])) == 0) { + $data['conditions'] = null; + } else { + $data['conditions'] = $data['all_conditions']; + } unset($data['all_conditions']); if (isset($data['disc_amount']) && $data['action_type'] == config('pricerules.cart.validations.2')) { @@ -264,12 +268,12 @@ class CartRuleController extends Controller 'per_customer' => 'numeric|min:0', 'action_type' => 'required|string', 'disc_amount' => 'required|numeric', - 'discount_quantity' => 'numeric|required_if:action_type,buy_a_get_b', - 'disc_threshold' => 'numeric|required_if:action_type,buy_a_get_b', + 'disc_quantity' => 'required|numeric', + 'disc_threshold' => 'required|numeric', 'free_shipping' => 'required|boolean', 'apply_to_shipping' => 'required|boolean', 'code' => 'string|required_if:auto_generation,0', - 'all_conditions' => 'array', + 'all_conditions' => 'required', 'label' => 'array|nullable' ]); @@ -304,7 +308,11 @@ class CartRuleController extends Controller unset($data['cart_attributes']); unset($data['attributes']); - $data['conditions'] = $data['all_conditions']; + if (count(json_decode($data['all_conditions'])) == 0) { + $data['conditions'] = null; + } else { + $data['conditions'] = $data['all_conditions']; + } unset($data['all_conditions']); if (isset($data['disc_amount']) && $data['action_type'] == config('pricerules.cart.validations.2')) { diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 6cffaa8b9..cc6020957 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -254,17 +254,15 @@ class CartController extends Controller */ public function applyCoupons() { - // dd(request()->all()); $this->validate(request(), [ 'code' => 'string|required' ]); $code = request()->input('code'); - $rules = Cart::setCoupon(); - $appliedRule = null; $coupons = []; + foreach($rules['id'] as $rule) { array_push($coupons, $rule->coupons->code); if ($rule->use_coupon && $rule->auto_generation == 0) { @@ -278,14 +276,18 @@ class CartController extends Controller } } - if(! isset($appliedRule)) { + if (! isset($appliedRule)) { return response()->json(['message' => trans('admin::app.promotion.status.no-coupon'), 'coupons' => $coupons], 200); } $cart = Cart::getCart(); - // check all the conditions associated with the rule - if (isset($appliedRule->starts_from) && $appliedRule->starts_from == null) { + if ($appliedRule->condititions != null) { + $conditions = json_decode($appliedRule->condtions); + } + + // check all the conditions associated with the rule + if (isset($appliedRule) && $appliedRule->starts_from == null) { $action_type = $appliedRule->action_type; $disc_threshold = $appliedRule->disc_threshold; $disc_amount = $appliedRule->disc_amount; @@ -294,25 +296,43 @@ class CartController extends Controller $newBaseSubTotal = 0; $newQuantity = 0; if ($cart->items_qty >= $disc_threshold) { + $leastWorthItem = Cart::leastWorthItem(); + if ($action_type == config('pricerules.cart.validation.0')) { - //CART - $newBaseSubTotal = ($cart->base_sub_total * $disc_amount) / 100; + $newBaseSubTotal = ($leastWorthItem['base_total'] * $disc_amount) / 100; } else if ($action_type == config('pricerules.cart.validation.1')) { - $newBaseSubTotal = $cart->base_sub_total - $disc_amount; + $newBaseSubTotal = $leastWorthItem['base_total'] - $disc_amount; } else if ($action_type == config('pricerules.cart.validation.2')) { - //CART - $newQuantity = $cart->items()->first()->quantity + $disc_amount; + $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; } else if ($action_type == config('pricerules.cart.validation.3')) { - $newBaseSubTotal = $disc_amount ; + $base_total = $disc_amount; } if ($action_type == config('pricerules.cart.validation.2')) { - dd($newQuantity); + return response()->json([ + 'message' => 'Success', + 'action' => $action_type, + 'amount_given' => false, + 'amount' => $newQuantity + ]); } else { - dd($newBaseSubTotal); + return response()->json([ + 'message' => 'Success', + 'action' => $action_type, + 'amount_given' => true, + 'amount' => $newBaseSubTotal + ]); } + } else { + return response()->json([ + 'message' => 'failed', + 'action' => $action_type, + 'amount_given' => null, + 'amount' => null, + 'least_value_item' => null + ]); } - } else { + } else if (isset($appliedRule) && $appliedRule->start_from != null) { //time based rules $action_type = $appliedRule->action_type; $disc_threshold = $appliedRule->disc_threshold; @@ -322,6 +342,8 @@ class CartController extends Controller $newBaseSubTotal = 0; $newQuantity = 0; if ($cart->items_qty >= $disc_threshold) { + $leastWorthItem = Cart::leastWorthItem(); + dd($leastWorthItem); if ($action_type == config('pricerules.cart.validation.0')) { //CART $newBaseSubTotal = ($cart->base_sub_total * $disc_amount) / 100; @@ -337,12 +359,14 @@ class CartController extends Controller if ($action_type == config('pricerules.cart.validation.2')) { return response()->json([ 'message' => 'Success', + 'action' => $action_type, 'amount_given' => false, 'amount' => $newQuantity ]); } else { return response()->json([ 'message' => 'Success', + 'action' => $action_type, 'amount_given' => true, 'amount' => $newBaseSubTotal ]); @@ -350,6 +374,7 @@ class CartController extends Controller } else { return response()->json([ 'message' => 'failed', + 'action' => $action_type, 'amount_given' => null, 'amount' => null, 'least_value_item' => Cart::leastWorthItem() diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index d665f8d5d..661e18343 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -470,7 +470,8 @@ return { templateRender: null, code: null, - message: null + message: null, + qtyRevealed: false } }, @@ -499,7 +500,6 @@ axios.post('{{ route('shop.checkout.check.coupons') }}', { code: this_this.code }).then(function(response) { - console.log(response.data.message); this_this.message = response.data.message; }); }, diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index 38c8368d8..790d04000 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -3,7 +3,8 @@
    @@ -35,11 +36,11 @@
    - + - @{{ message }} + @{{ message }} - @{{ message }} + @{{ message }}
    From 09afec0a8764cf307a3a286ae84325827dca9cf4 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Tue, 28 May 2019 18:25:20 +0530 Subject: [PATCH 51/89] Nearing to completion of coupon based rules --- .../Discount/src/Config/rule-conditions.php | 28 +- ...5_07_184255_create_catalog_rules_table.php | 1 + ...19_05_13_024326_create_cart_rule_table.php | 3 +- .../Webkul/Discount/src/Helpers/Discount.php | 60 +-- .../src/Http/Controllers/CartController.php | 479 ++++++++++++++++-- .../views/checkout/total/summary.blade.php | 26 +- 6 files changed, 476 insertions(+), 121 deletions(-) diff --git a/packages/Webkul/Discount/src/Config/rule-conditions.php b/packages/Webkul/Discount/src/Config/rule-conditions.php index 02be38310..9c927502a 100644 --- a/packages/Webkul/Discount/src/Config/rule-conditions.php +++ b/packages/Webkul/Discount/src/Config/rule-conditions.php @@ -103,6 +103,18 @@ return [ '!()' => 'Not is one of' ], + 'string' => [ + '=' => 'Equals', + '>=' => 'Greater or equals', + '<=' => 'Lesser or equals', + '>' => 'Greater than', + '<' => 'Lesser than', + '{}' => 'Contains', + '!{}' => 'Does not contains', + '()' => 'Is one of', + '!()' => 'Not is one of' + ], + 'boolean' => [ 0 => 'True/Yes', 1 => 'False/No', @@ -112,7 +124,7 @@ return [ 'attributes' => [ 0 => [ 'code' => 'sub_total', - 'name' => 'Sub-total', + 'name' => 'Sub Total', 'type' => 'numeric' ], 1 => [ @@ -131,7 +143,7 @@ return [ 'type' => 'string' ], 4 => [ - 'code' => 'payement_method', + 'code' => 'payment_method', 'name' => 'Payment Method', 'type' => 'string' ], @@ -149,7 +161,19 @@ return [ 'code' => 'shipping_country', 'name' => 'Shipping Country', 'type' => 'string' + ], + 8 => [ + 'code' => 'shipping_city', + 'name' => 'Shipping City', + 'type' => 'string' ] ] ], + + 'test_mode' => [ + 0 => 'all_are_true', + 1 => 'all_are_false', + 2 => 'any_of_true', + 3 => 'all_of_false' + ] ]; \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184255_create_catalog_rules_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184255_create_catalog_rules_table.php index 00ccb0048..179da6ef0 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184255_create_catalog_rules_table.php +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184255_create_catalog_rules_table.php @@ -29,6 +29,7 @@ class CreateCatalogRulesTable extends Migration $table->boolean('status')->default(0); $table->integer('priority')->unsigned()->default(0); $table->json('conditions')->nullable(); + $table->string('test_mode')->nullable(); $table->json('actions')->nullable(); $table->boolean('end_other_rules')->default(0); $table->integer('sort_order')->unsigned()->default(0); diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php index 4f4b32490..d581186ed 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php @@ -25,10 +25,11 @@ class CreateCartRuleTable extends Migration $table->boolean('use_coupon')->default(0); $table->integer('usage_limit')->unsigned()->default(0); $table->json('conditions')->nullable(); + $table->string('test_mode')->nullable(); $table->json('actions')->nullable(); $table->boolean('end_other_rules')->default(0); $table->integer('priority')->unsigned()->default(0); - $table->boolean('uses_attribute_conditions')->default(1); + $table->boolean('uses_attribute_conditions')->default(0); $table->longtext('product_ids')->nullable(); $table->integer('sort_order')->unsigned()->default(0); $table->string('action_type')->nullable(); diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index 2baee2c79..e9142c341 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -272,75 +272,19 @@ class Discount } } + // works on then basis of input from the coupon field public function checkCouponConditions($cart) { $rules = $this->applyCouponAble(); return $rules; - //non or null condtion based - - // condition based rules - } + // works automatically on the basis of no conditions public function checkNonCouponConditions($cart) { $rules = $this->applyNonCouponAble(); return $rules; - foreach($rules['id'] as $rule) { - $action_type = $rule->action_type; - $disc_amount = $rule->disc_amount; - $disc_quantity = $rule->disc_quantity; - $disc_threshold = $rule->disc_threshold; - - if($rule->conditions == null) { - // non or null condition based - if ($cart->items_qty >= $disc_threshold) { - if ($action_type == config('pricerules.cart.validations.0')) { - $itemBaseSubTotal = $cart->base_sub_total * ($disc_amount / 100); - //CART - // update disc amount - - //CART Item - //update disc percentage - //update disc amount - //update base disc amount - } else if ($action_type == config('pricerules.cart.validations.1')) { - $baseSubTotal = $disc_amount; - //CART - // update disc amount - - //CART Item - //update disc amount - //update base disc amount - } else if ($action_type == config('pricerules.cart.validations.2')) { - //CART - $quantity = $cart->items()->first()->quantity + 1; - // update disc amount - - //CART Item - //update disc percentage - //update disc amount - //update base disc amount - - } else if ($action_type == config('pricerules.cart.validations.3')) { - //CART - $cartBaseSubTotal = $disc_amount ; - // update disc amount - - //CART Item - //update disc percentage - //update disc amount - //update base disc amount - } - } - } else { - // condition based rules - dd('conditions found'); - - } - } - } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index cc6020957..ed3cd5902 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -277,17 +277,51 @@ class CartController extends Controller } if (! isset($appliedRule)) { - return response()->json(['message' => trans('admin::app.promotion.status.no-coupon'), 'coupons' => $coupons], 200); + return response()->json(['message' => trans('admin::app.promotion.status.no-coupon')], 200); } $cart = Cart::getCart(); - if ($appliedRule->condititions != null) { - $conditions = json_decode($appliedRule->condtions); + //all of conditions is/are true + $result = null; + if ($appliedRule->conditions) { + $conditions = json_decode(json_decode($appliedRule->conditions)); + + $shipping_address = $cart->getShippingAddressAttribute(); + + $shipping_method = $cart->shipping_method; + $shipping_country = $shipping_address->country; + $shipping_state = $shipping_address->state; + $shipping_postcode = $shipping_address->postcode; + $shipping_city = $shipping_address->city; + + $payment_method = $cart->payment->method; + $sub_total = $cart->base_sub_total; + + $total_items = $cart->items_qty; + $total_weight = 0; + + foreach($cart->items as $item) { + $total_weight = $total_weight + $item->base_total_weight; + } + + $test_mode = config('pricerules.test_mode.0'); + $test_conditions = config('pricerules.cart.conditions'); + + if ($test_mode == config('pricerules.test_mode.0')) { + $result = $this->testAllConditionAreTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.1')) { + $result = $this->testAllConditionAreFalse($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.2')) { + $result = $this->testAnyConditionIsTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.3')) { + $result = $this->testAbyConditionIsFalse($conditions, $cart); + } } // check all the conditions associated with the rule - if (isset($appliedRule) && $appliedRule->starts_from == null) { + if ($result) { + // if (isset($appliedRule) && $appliedRule->starts_from == null) { $action_type = $appliedRule->action_type; $disc_threshold = $appliedRule->disc_threshold; $disc_amount = $appliedRule->disc_amount; @@ -295,7 +329,9 @@ class CartController extends Controller $newBaseSubTotal = 0; $newQuantity = 0; + if ($cart->items_qty >= $disc_threshold) { + // add the time conditions if rule is expired and active then make it in active $leastWorthItem = Cart::leastWorthItem(); if ($action_type == config('pricerules.cart.validation.0')) { @@ -332,54 +368,397 @@ class CartController extends Controller 'least_value_item' => null ]); } - } else if (isset($appliedRule) && $appliedRule->start_from != null) { - //time based rules - $action_type = $appliedRule->action_type; - $disc_threshold = $appliedRule->disc_threshold; - $disc_amount = $appliedRule->disc_amount; - $disc_quantity = $appliedRule->disc_quantity; + // } else if (isset($appliedRule) && $appliedRule->start_from != null) { + // //time based rules + // $action_type = $appliedRule->action_type; + // $disc_threshold = $appliedRule->disc_threshold; + // $disc_amount = $appliedRule->disc_amount; + // $disc_quantity = $appliedRule->disc_quantity; - $newBaseSubTotal = 0; - $newQuantity = 0; - if ($cart->items_qty >= $disc_threshold) { - $leastWorthItem = Cart::leastWorthItem(); - dd($leastWorthItem); - if ($action_type == config('pricerules.cart.validation.0')) { - //CART - $newBaseSubTotal = ($cart->base_sub_total * $disc_amount) / 100; - } else if ($action_type == config('pricerules.cart.validation.1')) { - $newBaseSubTotal = $cart->base_sub_total - $disc_amount; - } else if ($action_type == config('pricerules.cart.validation.2')) { - //CART - $newQuantity = $cart->items()->first()->quantity + $disc_amount; - } else if ($action_type == config('pricerules.cart.validation.3')) { - $newBaseSubTotal = $disc_amount ; - } + // $newBaseSubTotal = 0; + // $newQuantity = 0; + // if ($cart->items_qty >= $disc_threshold) { + // $leastWorthItem = Cart::leastWorthItem(); - if ($action_type == config('pricerules.cart.validation.2')) { - return response()->json([ - 'message' => 'Success', - 'action' => $action_type, - 'amount_given' => false, - 'amount' => $newQuantity - ]); - } else { - return response()->json([ - 'message' => 'Success', - 'action' => $action_type, - 'amount_given' => true, - 'amount' => $newBaseSubTotal - ]); - } - } else { - return response()->json([ - 'message' => 'failed', - 'action' => $action_type, - 'amount_given' => null, - 'amount' => null, - 'least_value_item' => Cart::leastWorthItem() - ]); - } + // if ($action_type == config('pricerules.cart.validation.0')) { + // $newBaseSubTotal = ($leastWorthItem['base_total'] * $disc_amount) / 100; + // } else if ($action_type == config('pricerules.cart.validation.1')) { + // $newBaseSubTotal = $leastWorthItem['base_total'] - $disc_amount; + // } else if ($action_type == config('pricerules.cart.validation.2')) { + // $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; + // } else if ($action_type == config('pricerules.cart.validation.3')) { + // $base_total = $disc_amount; + // } + + // if ($action_type == config('pricerules.cart.validation.2')) { + // return response()->json([ + // 'message' => 'Success', + // 'action' => $action_type, + // 'amount_given' => false, + // 'amount' => $newQuantity + // ]); + // } else { + // return response()->json([ + // 'message' => 'Success', + // 'action' => $action_type, + // 'amount_given' => true, + // 'amount' => $newBaseSubTotal + // ]); + // } + // } else { + // return response()->json([ + // 'message' => 'failed', + // 'action' => $action_type, + // 'amount_given' => null, + // 'amount' => null, + // 'least_value_item' => Cart::leastWorthItem() + // ]); + // } + // } + } else { + return response()->json([ + 'message' => 'failed', + 'action' => null, + 'amount_given' => null, + 'amount' => null, + 'least_value_item' => null + ]); } } + + protected function testAllConditionAreTrue($conditions, $cart) { + $shipping_address = $cart->getShippingAddressAttribute(); + + $shipping_method = $cart->shipping_method; + $shipping_country = $shipping_address->country; + $shipping_state = $shipping_address->state; + $shipping_postcode = $shipping_address->postcode; + $shipping_city = $shipping_address->city; + + $payment_method = $cart->payment->method; + $sub_total = $cart->base_sub_total; + + $total_items = $cart->items_qty; + $total_weight = 0; + + foreach($cart->items as $item) { + $total_weight = $total_weight + $item->base_total_weight; + } + + $test_mode = config('pricerules.test_mode.0'); + $test_conditions = config('pricerules.cart.conditions'); + + $result = 1; + foreach ($conditions as $condition) { + $actual_value = ${$condition->attribute}; + $test_value = $condition->value; + $test_condition = $condition->condition; + + if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text') { + if ($test_condition == '=') { + if ($actual_value != $test_value) { + $result = 0; + + break; + } + } else if ($test_condition == '>=') { + if (! ($actual_value >= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<=') { + if (! ($actual_value <= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '>') { + if (! ($actual_value > $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<') { + if (! ($actual_value < $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '{}') { + if (! str_contains($actual_value, $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '!{}') { + if (str_contains($actual_value, $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '()') { + // dd($test_condition); + } else if ($test_condition == '!()') { + // dd($test_condition); + } + } + // else if ($condition->type == 'boolean') { + // if ($test_conditions[$condition->type][$test_condition]) { + // if ($test_condition == 0) { + // dd($test_condition); + // } else if ($test_condition == 1) { + // dd($test_condition); + // } + // } + // } + } + + return $result; + } + + protected function testAllConditionAreFalse($condition, $cart) { + $shipping_address = $cart->getShippingAddressAttribute(); + + $shipping_method = $cart->shipping_method; + $shipping_country = $shipping_address->country; + $shipping_state = $shipping_address->state; + $shipping_postcode = $shipping_address->postcode; + $shipping_city = $shipping_address->city; + + $payment_method = $cart->payment->method; + $sub_total = $cart->base_sub_total; + + $total_items = $cart->items_qty; + $total_weight = 0; + + foreach($cart->items as $item) { + $total_weight = $total_weight + $item->base_total_weight; + } + + $test_mode = config('pricerules.test_mode.0'); + $test_conditions = config('pricerules.cart.conditions'); + $result = 1; + + foreach ($conditions as $condition) { + $actual_value = ${$condition->attribute}; + $test_value = $condition->value; + $test_condition = $condition->condition; + + if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text') { + if ($test_condition == '=') { + if (! ($actual_value != $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '>=') { + if (($actual_value >= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<=') { + if (($actual_value <= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '>') { + if (($actual_value > $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<') { + if (($actual_value < $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '{}') { + if (str_contains($actual_value, $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '!{}') { + if (! str_contains($actual_value, $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '()') { + // dd($test_condition); + } else if ($test_condition == '!()') { + // dd($test_condition); + } + } + // else if ($condition->type == 'boolean') { + // if ($test_conditions[$condition->type][$test_condition]) { + // if ($test_condition == 0) { + // dd($test_condition); + // } else if ($test_condition == 1) { + // dd($test_condition); + // } + // } + // } + } + + return $result; + } + + protected function testAnyConditionIsTrue($condition, $cart) { + $shipping_address = $cart->getShippingAddressAttribute(); + + $shipping_method = $cart->shipping_method; + $shipping_country = $shipping_address->country; + $shipping_state = $shipping_address->state; + $shipping_postcode = $shipping_address->postcode; + $shipping_city = $shipping_address->city; + + $payment_method = $cart->payment->method; + $sub_total = $cart->base_sub_total; + + $total_items = $cart->items_qty; + $total_weight = 0; + + foreach($cart->items as $item) { + $total_weight = $total_weight + $item->base_total_weight; + } + + $test_mode = config('pricerules.test_mode.0'); + $test_conditions = config('pricerules.cart.conditions'); + $result = 1; + + foreach ($conditions as $condition) { + $actual_value = ${$condition->attribute}; + $test_value = $condition->value; + $test_condition = $condition->condition; + + if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text'){ + if ($test_condition == '=') { + if ($actual_value == $test_value) { + break; + } + } else if ($test_condition == '>=') { + if ($actual_value >= $test_value) { + break; + } + } else if ($test_condition == '<=') { + if ($actual_value <= $test_value) { + break; + } + } else if ($test_condition == '>') { + if ($actual_value > $test_value) { + break; + } + } else if ($test_condition == '<') { + if ($actual_value < $test_value) { + break; + } + } else if ($test_condition == '{}') { + if (str_contains($actual_value, $test_value)) { + break; + } + } else if ($test_condition == '!{}') { + if (! (! str_contains($actual_value, $test_value))) { + break; + } + } else if ($test_condition == '()') { + // dd($test_condition); + } else if ($test_condition == '!()') { + // dd($test_condition); + } else { + $result = 0; + } + } + } + + return $result; + } + + protected function testAnyConditionIsFalse($condition, $cart) { + $shipping_address = $cart->getShippingAddressAttribute(); + + $shipping_method = $cart->shipping_method; + $shipping_country = $shipping_address->country; + $shipping_state = $shipping_address->state; + $shipping_postcode = $shipping_address->postcode; + $shipping_city = $shipping_address->city; + + $payment_method = $cart->payment->method; + $sub_total = $cart->base_sub_total; + + $total_items = $cart->items_qty; + $total_weight = 0; + + foreach($cart->items as $item) { + $total_weight = $total_weight + $item->base_total_weight; + } + + $test_mode = config('pricerules.test_mode.0'); + $test_conditions = config('pricerules.cart.conditions'); + $result = 1; + + foreach ($conditions as $condition) { + $actual_value = ${$condition->attribute}; + $test_value = $condition->value; + $test_condition = $condition->condition; + + if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text'){ + if ($test_condition == '=') { + if ($actual_value != $test_value) { + $result = 0; + + break; + } + } else if ($test_condition == '>=') { + if (! ($actual_value >= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<=') { + if (! ($actual_value <= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '>') { + if (! ($actual_value > $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<') { + if ((! $actual_value < $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '{}') { + if (! (str_contains($actual_value, $test_value))) { + $result = 0; + + break; + } + } else if ($test_condition == '!{}') { + if (! (! str_contains($actual_value, $test_value))) { + $result = 0; + + break; + } + } else if ($test_condition == '()') { + // dd($test_condition); + } else if ($test_condition == '!()') { + // dd($test_condition); + } else { + $result = 0; + } + } + } + + return $result; + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index 790d04000..1ffbe7fcc 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -3,8 +3,12 @@
    @@ -34,17 +38,19 @@
    @inject('cart_rule', 'Webkul\Discount\Helpers\Discount') - -
    - + @if (! request()->is('checkout/cart')) + +
    + - @{{ message }} + @{{ message }} - @{{ message }} + @{{ message }} - -
    - + +
    + + @endif
    From 9068528c415fc3563a1a7efaf9863b5b2fb4218c Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Tue, 28 May 2019 20:04:32 +0530 Subject: [PATCH 52/89] made some changes in cart rule coupon application on checkout related to new designs --- .../Admin/src/Resources/lang/en/app.php | 5 +- packages/Webkul/Checkout/src/Cart.php | 29 +- .../Webkul/Discount/src/Helpers/Discount.php | 468 +++++++++++++++- .../src/Http/Controllers/CartController.php | 506 +----------------- packages/Webkul/Shop/src/Http/routes.php | 2 +- .../views/checkout/onepage.blade.php | 17 +- .../views/checkout/total/summary.blade.php | 28 +- .../Ui/src/Resources/assets/sass/app.scss | 9 + 8 files changed, 532 insertions(+), 532 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 8e11b3d45..fc49d3a1b 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -829,10 +829,9 @@ return [ 'update-failed' => 'Error! cannot update', 'delete-success' => 'Sucess! rule deleted', 'delete-failed' => 'Error! cannot delete', - 'coupon-applied' => 'Coupon Applied', + 'coupon-applied' => 'Coupon used', + 'coupon-failed' => 'Coupon failed to apply', 'no-coupon' => '* Coupon not applicable', - 'coupon-expired' => 'Coupon expired', - 'coupon-failed' => 'Invalid coupon' ], 'catalog' => [ diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 94fd38472..cd2e92019 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1233,13 +1233,11 @@ class Cart { } } - public function setNonCoupon() { - return $this->discount->checkNonCouponConditions($this->getCart()); - } - - public function setCoupon() + public function applyCoupon($code) { - return $this->discount->checkCouponConditions($this->getCart()); + $result = $this->discount->ruleCheck($code); + + return $result; } public function leastWorthItem() @@ -1260,4 +1258,23 @@ class Cart { return $leastSubTotal; } + + public function maxWorthItem() + { + $cart = $this->getCart(); + $maxValue = 0; + $maxSubTotal = []; + + foreach ($cart->items as $item) { + if ($item->base_total > $maxValue) { + $maxValue = $item->total; + $maxSubTotal = [ + 'id' => $item->id, + 'base_total' => $maxValue + ]; + } + } + + return $maxSubTotal; + } } \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index e9142c341..ecbf246da 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -272,19 +272,469 @@ class Discount } } - // works on then basis of input from the coupon field - public function checkCouponConditions($cart) - { - $rules = $this->applyCouponAble(); - - return $rules; - } - // works automatically on the basis of no conditions - public function checkNonCouponConditions($cart) + public function checkNonCouponConditions() { $rules = $this->applyNonCouponAble(); return $rules; } + + public function ruleCheck($code) + { + $rules = $this->applyCouponAble(); + $appliedRule = null; + $coupons = []; + + foreach($rules['id'] as $rule) { + array_push($coupons, $rule->coupons->code); + if ($rule->use_coupon && $rule->auto_generation == 0) { + if ($rule->coupons->code == $code) { + $appliedRule = $rule; + + break; + } else { + continue; + } + } + } + + if (! isset($appliedRule)) { + return response()->json(['message' => trans('admin::app.promotion.status.no-coupon')], 200); + } + + $cart = \Cart::getCart(); + + //all of conditions is/are true + $result = null; + if ($appliedRule->conditions) { + $conditions = json_decode(json_decode($appliedRule->conditions)); + + $shipping_address = $cart->getShippingAddressAttribute(); + + $shipping_method = $cart->shipping_method; + $shipping_country = $shipping_address->country; + $shipping_state = $shipping_address->state; + $shipping_postcode = $shipping_address->postcode; + $shipping_city = $shipping_address->city; + + $payment_method = $cart->payment->method; + $sub_total = $cart->base_sub_total; + + $total_items = $cart->items_qty; + $total_weight = 0; + + foreach($cart->items as $item) { + $total_weight = $total_weight + $item->base_total_weight; + } + + $test_mode = config('pricerules.test_mode.0'); + $test_conditions = config('pricerules.cart.conditions'); + + if ($test_mode == config('pricerules.test_mode.0')) { + $result = $this->testAllConditionAreTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.1')) { + $result = $this->testAllConditionAreFalse($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.2')) { + $result = $this->testAnyConditionIsTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.3')) { + $result = $this->testAbyConditionIsFalse($conditions, $cart); + } + } + + // check all the conditions associated with the rule + if ($result) { + // if (isset($appliedRule) && $appliedRule->starts_from == null) { + $action_type = $appliedRule->action_type; + $disc_threshold = $appliedRule->disc_threshold; + $disc_amount = $appliedRule->disc_amount; + $disc_quantity = $appliedRule->disc_quantity; + + $newBaseSubTotal = 0; + $newQuantity = 0; + + if ($cart->items_qty >= $disc_threshold) { + // add the time conditions if rule is expired and active then make it in active + $leastWorthItem = \Cart::leastWorthItem(); + + if ($action_type == config('pricerules.cart.validation.0')) { + $newBaseSubTotal = ($leastWorthItem['base_total'] * $disc_amount) / 100; + } else if ($action_type == config('pricerules.cart.validation.1')) { + $newBaseSubTotal = $leastWorthItem['base_total'] - $disc_amount; + } else if ($action_type == config('pricerules.cart.validation.2')) { + $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; + } else if ($action_type == config('pricerules.cart.validation.3')) { + $base_total = $disc_amount; + } + + if ($action_type == config('pricerules.cart.validation.2')) { + return response()->json([ + 'message' => trans('admin::app.promotion.status.coupon-applied'), + 'action' => $action_type, + 'amount_given' => false, + 'amount' => $newQuantity + ]); + } else { + return response()->json([ + 'message' => trans('admin::app.promotion.status.coupon-applied'), + 'action' => $action_type, + 'amount_given' => true, + 'amount' => core()->currency($newBaseSubTotal) + ]); + } + } else { + return response()->json([ + 'message' => trans('admin::app.promotion.status.coupon-failed'), + 'action' => $action_type, + 'amount_given' => null, + 'amount' => null, + 'least_value_item' => null + ]); + } + } else { + return response()->json([ + 'message' => trans('admin::app.promotion.status.coupon-failed'), + 'action' => null, + 'amount_given' => null, + 'amount' => null, + 'least_value_item' => null + ]); + } + } + + protected function testAllConditionAreTrue($conditions, $cart) { + $shipping_address = $cart->getShippingAddressAttribute(); + + $shipping_method = $cart->shipping_method; + $shipping_country = $shipping_address->country; + $shipping_state = $shipping_address->state; + $shipping_postcode = $shipping_address->postcode; + $shipping_city = $shipping_address->city; + + $payment_method = $cart->payment->method; + $sub_total = $cart->base_sub_total; + + $total_items = $cart->items_qty; + $total_weight = 0; + + foreach($cart->items as $item) { + $total_weight = $total_weight + $item->base_total_weight; + } + + $test_mode = config('pricerules.test_mode.0'); + $test_conditions = config('pricerules.cart.conditions'); + + $result = 1; + foreach ($conditions as $condition) { + $actual_value = ${$condition->attribute}; + $test_value = $condition->value; + $test_condition = $condition->condition; + + if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text') { + if ($test_condition == '=') { + if ($actual_value != $test_value) { + $result = 0; + + break; + } + } else if ($test_condition == '>=') { + if (! ($actual_value >= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<=') { + if (! ($actual_value <= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '>') { + if (! ($actual_value > $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<') { + if (! ($actual_value < $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '{}') { + if (! str_contains($actual_value, $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '!{}') { + if (str_contains($actual_value, $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '()') { + // dd($test_condition); + } else if ($test_condition == '!()') { + // dd($test_condition); + } + } + // else if ($condition->type == 'boolean') { + // if ($test_conditions[$condition->type][$test_condition]) { + // if ($test_condition == 0) { + // dd($test_condition); + // } else if ($test_condition == 1) { + // dd($test_condition); + // } + // } + // } + } + + return $result; + } + + protected function testAllConditionAreFalse($condition, $cart) { + $shipping_address = $cart->getShippingAddressAttribute(); + + $shipping_method = $cart->shipping_method; + $shipping_country = $shipping_address->country; + $shipping_state = $shipping_address->state; + $shipping_postcode = $shipping_address->postcode; + $shipping_city = $shipping_address->city; + + $payment_method = $cart->payment->method; + $sub_total = $cart->base_sub_total; + + $total_items = $cart->items_qty; + $total_weight = 0; + + foreach($cart->items as $item) { + $total_weight = $total_weight + $item->base_total_weight; + } + + $test_mode = config('pricerules.test_mode.0'); + $test_conditions = config('pricerules.cart.conditions'); + $result = 1; + + foreach ($conditions as $condition) { + $actual_value = ${$condition->attribute}; + $test_value = $condition->value; + $test_condition = $condition->condition; + + if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text') { + if ($test_condition == '=') { + if (! ($actual_value != $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '>=') { + if (($actual_value >= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<=') { + if (($actual_value <= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '>') { + if (($actual_value > $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<') { + if (($actual_value < $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '{}') { + if (str_contains($actual_value, $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '!{}') { + if (! str_contains($actual_value, $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '()') { + // dd($test_condition); + } else if ($test_condition == '!()') { + // dd($test_condition); + } + } + // else if ($condition->type == 'boolean') { + // if ($test_conditions[$condition->type][$test_condition]) { + // if ($test_condition == 0) { + // dd($test_condition); + // } else if ($test_condition == 1) { + // dd($test_condition); + // } + // } + // } + } + + return $result; + } + + protected function testAnyConditionIsTrue($condition, $cart) { + $shipping_address = $cart->getShippingAddressAttribute(); + + $shipping_method = $cart->shipping_method; + $shipping_country = $shipping_address->country; + $shipping_state = $shipping_address->state; + $shipping_postcode = $shipping_address->postcode; + $shipping_city = $shipping_address->city; + + $payment_method = $cart->payment->method; + $sub_total = $cart->base_sub_total; + + $total_items = $cart->items_qty; + $total_weight = 0; + + foreach($cart->items as $item) { + $total_weight = $total_weight + $item->base_total_weight; + } + + $test_mode = config('pricerules.test_mode.0'); + $test_conditions = config('pricerules.cart.conditions'); + $result = 1; + + foreach ($conditions as $condition) { + $actual_value = ${$condition->attribute}; + $test_value = $condition->value; + $test_condition = $condition->condition; + + if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text'){ + if ($test_condition == '=') { + if ($actual_value == $test_value) { + break; + } + } else if ($test_condition == '>=') { + if ($actual_value >= $test_value) { + break; + } + } else if ($test_condition == '<=') { + if ($actual_value <= $test_value) { + break; + } + } else if ($test_condition == '>') { + if ($actual_value > $test_value) { + break; + } + } else if ($test_condition == '<') { + if ($actual_value < $test_value) { + break; + } + } else if ($test_condition == '{}') { + if (str_contains($actual_value, $test_value)) { + break; + } + } else if ($test_condition == '!{}') { + if (! (! str_contains($actual_value, $test_value))) { + break; + } + } else if ($test_condition == '()') { + // dd($test_condition); + } else if ($test_condition == '!()') { + // dd($test_condition); + } else { + $result = 0; + } + } + } + + return $result; + } + + protected function testAnyConditionIsFalse($condition, $cart) { + $shipping_address = $cart->getShippingAddressAttribute(); + + $shipping_method = $cart->shipping_method; + $shipping_country = $shipping_address->country; + $shipping_state = $shipping_address->state; + $shipping_postcode = $shipping_address->postcode; + $shipping_city = $shipping_address->city; + + $payment_method = $cart->payment->method; + $sub_total = $cart->base_sub_total; + + $total_items = $cart->items_qty; + $total_weight = 0; + + foreach($cart->items as $item) { + $total_weight = $total_weight + $item->base_total_weight; + } + + $test_mode = config('pricerules.test_mode.0'); + $test_conditions = config('pricerules.cart.conditions'); + $result = 1; + + foreach ($conditions as $condition) { + $actual_value = ${$condition->attribute}; + $test_value = $condition->value; + $test_condition = $condition->condition; + + if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text'){ + if ($test_condition == '=') { + if ($actual_value != $test_value) { + $result = 0; + + break; + } + } else if ($test_condition == '>=') { + if (! ($actual_value >= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<=') { + if (! ($actual_value <= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '>') { + if (! ($actual_value > $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<') { + if ((! $actual_value < $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '{}') { + if (! (str_contains($actual_value, $test_value))) { + $result = 0; + + break; + } + } else if ($test_condition == '!{}') { + if (! (! str_contains($actual_value, $test_value))) { + $result = 0; + + break; + } + } else if ($test_condition == '()') { + // dd($test_condition); + } else if ($test_condition == '!()') { + // dd($test_condition); + } else { + $result = 0; + } + } + } + + return $result; + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index ed3cd5902..f848634dc 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -33,15 +33,10 @@ class CartController extends Controller * @param $productView */ protected $_config; - protected $cart; - protected $cartItem; - protected $customer; - protected $product; - protected $suppressFlash = false; /** @@ -252,512 +247,15 @@ class CartController extends Controller /** * To apply coupon rules */ - public function applyCoupons() + public function applyCoupon() { $this->validate(request(), [ 'code' => 'string|required' ]); $code = request()->input('code'); - $rules = Cart::setCoupon(); - $appliedRule = null; - $coupons = []; - foreach($rules['id'] as $rule) { - array_push($coupons, $rule->coupons->code); - if ($rule->use_coupon && $rule->auto_generation == 0) { - if ($rule->coupons->code == $code) { - $appliedRule = $rule; - - break; - } else { - continue; - } - } - } - - if (! isset($appliedRule)) { - return response()->json(['message' => trans('admin::app.promotion.status.no-coupon')], 200); - } - - $cart = Cart::getCart(); - - //all of conditions is/are true - $result = null; - if ($appliedRule->conditions) { - $conditions = json_decode(json_decode($appliedRule->conditions)); - - $shipping_address = $cart->getShippingAddressAttribute(); - - $shipping_method = $cart->shipping_method; - $shipping_country = $shipping_address->country; - $shipping_state = $shipping_address->state; - $shipping_postcode = $shipping_address->postcode; - $shipping_city = $shipping_address->city; - - $payment_method = $cart->payment->method; - $sub_total = $cart->base_sub_total; - - $total_items = $cart->items_qty; - $total_weight = 0; - - foreach($cart->items as $item) { - $total_weight = $total_weight + $item->base_total_weight; - } - - $test_mode = config('pricerules.test_mode.0'); - $test_conditions = config('pricerules.cart.conditions'); - - if ($test_mode == config('pricerules.test_mode.0')) { - $result = $this->testAllConditionAreTrue($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.1')) { - $result = $this->testAllConditionAreFalse($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.2')) { - $result = $this->testAnyConditionIsTrue($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.3')) { - $result = $this->testAbyConditionIsFalse($conditions, $cart); - } - } - - // check all the conditions associated with the rule - if ($result) { - // if (isset($appliedRule) && $appliedRule->starts_from == null) { - $action_type = $appliedRule->action_type; - $disc_threshold = $appliedRule->disc_threshold; - $disc_amount = $appliedRule->disc_amount; - $disc_quantity = $appliedRule->disc_quantity; - - $newBaseSubTotal = 0; - $newQuantity = 0; - - if ($cart->items_qty >= $disc_threshold) { - // add the time conditions if rule is expired and active then make it in active - $leastWorthItem = Cart::leastWorthItem(); - - if ($action_type == config('pricerules.cart.validation.0')) { - $newBaseSubTotal = ($leastWorthItem['base_total'] * $disc_amount) / 100; - } else if ($action_type == config('pricerules.cart.validation.1')) { - $newBaseSubTotal = $leastWorthItem['base_total'] - $disc_amount; - } else if ($action_type == config('pricerules.cart.validation.2')) { - $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; - } else if ($action_type == config('pricerules.cart.validation.3')) { - $base_total = $disc_amount; - } - - if ($action_type == config('pricerules.cart.validation.2')) { - return response()->json([ - 'message' => 'Success', - 'action' => $action_type, - 'amount_given' => false, - 'amount' => $newQuantity - ]); - } else { - return response()->json([ - 'message' => 'Success', - 'action' => $action_type, - 'amount_given' => true, - 'amount' => $newBaseSubTotal - ]); - } - } else { - return response()->json([ - 'message' => 'failed', - 'action' => $action_type, - 'amount_given' => null, - 'amount' => null, - 'least_value_item' => null - ]); - } - // } else if (isset($appliedRule) && $appliedRule->start_from != null) { - // //time based rules - // $action_type = $appliedRule->action_type; - // $disc_threshold = $appliedRule->disc_threshold; - // $disc_amount = $appliedRule->disc_amount; - // $disc_quantity = $appliedRule->disc_quantity; - - // $newBaseSubTotal = 0; - // $newQuantity = 0; - // if ($cart->items_qty >= $disc_threshold) { - // $leastWorthItem = Cart::leastWorthItem(); - - // if ($action_type == config('pricerules.cart.validation.0')) { - // $newBaseSubTotal = ($leastWorthItem['base_total'] * $disc_amount) / 100; - // } else if ($action_type == config('pricerules.cart.validation.1')) { - // $newBaseSubTotal = $leastWorthItem['base_total'] - $disc_amount; - // } else if ($action_type == config('pricerules.cart.validation.2')) { - // $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; - // } else if ($action_type == config('pricerules.cart.validation.3')) { - // $base_total = $disc_amount; - // } - - // if ($action_type == config('pricerules.cart.validation.2')) { - // return response()->json([ - // 'message' => 'Success', - // 'action' => $action_type, - // 'amount_given' => false, - // 'amount' => $newQuantity - // ]); - // } else { - // return response()->json([ - // 'message' => 'Success', - // 'action' => $action_type, - // 'amount_given' => true, - // 'amount' => $newBaseSubTotal - // ]); - // } - // } else { - // return response()->json([ - // 'message' => 'failed', - // 'action' => $action_type, - // 'amount_given' => null, - // 'amount' => null, - // 'least_value_item' => Cart::leastWorthItem() - // ]); - // } - // } - } else { - return response()->json([ - 'message' => 'failed', - 'action' => null, - 'amount_given' => null, - 'amount' => null, - 'least_value_item' => null - ]); - } - } - - protected function testAllConditionAreTrue($conditions, $cart) { - $shipping_address = $cart->getShippingAddressAttribute(); - - $shipping_method = $cart->shipping_method; - $shipping_country = $shipping_address->country; - $shipping_state = $shipping_address->state; - $shipping_postcode = $shipping_address->postcode; - $shipping_city = $shipping_address->city; - - $payment_method = $cart->payment->method; - $sub_total = $cart->base_sub_total; - - $total_items = $cart->items_qty; - $total_weight = 0; - - foreach($cart->items as $item) { - $total_weight = $total_weight + $item->base_total_weight; - } - - $test_mode = config('pricerules.test_mode.0'); - $test_conditions = config('pricerules.cart.conditions'); - - $result = 1; - foreach ($conditions as $condition) { - $actual_value = ${$condition->attribute}; - $test_value = $condition->value; - $test_condition = $condition->condition; - - if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text') { - if ($test_condition == '=') { - if ($actual_value != $test_value) { - $result = 0; - - break; - } - } else if ($test_condition == '>=') { - if (! ($actual_value >= $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '<=') { - if (! ($actual_value <= $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '>') { - if (! ($actual_value > $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '<') { - if (! ($actual_value < $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '{}') { - if (! str_contains($actual_value, $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '!{}') { - if (str_contains($actual_value, $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '()') { - // dd($test_condition); - } else if ($test_condition == '!()') { - // dd($test_condition); - } - } - // else if ($condition->type == 'boolean') { - // if ($test_conditions[$condition->type][$test_condition]) { - // if ($test_condition == 0) { - // dd($test_condition); - // } else if ($test_condition == 1) { - // dd($test_condition); - // } - // } - // } - } - - return $result; - } - - protected function testAllConditionAreFalse($condition, $cart) { - $shipping_address = $cart->getShippingAddressAttribute(); - - $shipping_method = $cart->shipping_method; - $shipping_country = $shipping_address->country; - $shipping_state = $shipping_address->state; - $shipping_postcode = $shipping_address->postcode; - $shipping_city = $shipping_address->city; - - $payment_method = $cart->payment->method; - $sub_total = $cart->base_sub_total; - - $total_items = $cart->items_qty; - $total_weight = 0; - - foreach($cart->items as $item) { - $total_weight = $total_weight + $item->base_total_weight; - } - - $test_mode = config('pricerules.test_mode.0'); - $test_conditions = config('pricerules.cart.conditions'); - $result = 1; - - foreach ($conditions as $condition) { - $actual_value = ${$condition->attribute}; - $test_value = $condition->value; - $test_condition = $condition->condition; - - if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text') { - if ($test_condition == '=') { - if (! ($actual_value != $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '>=') { - if (($actual_value >= $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '<=') { - if (($actual_value <= $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '>') { - if (($actual_value > $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '<') { - if (($actual_value < $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '{}') { - if (str_contains($actual_value, $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '!{}') { - if (! str_contains($actual_value, $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '()') { - // dd($test_condition); - } else if ($test_condition == '!()') { - // dd($test_condition); - } - } - // else if ($condition->type == 'boolean') { - // if ($test_conditions[$condition->type][$test_condition]) { - // if ($test_condition == 0) { - // dd($test_condition); - // } else if ($test_condition == 1) { - // dd($test_condition); - // } - // } - // } - } - - return $result; - } - - protected function testAnyConditionIsTrue($condition, $cart) { - $shipping_address = $cart->getShippingAddressAttribute(); - - $shipping_method = $cart->shipping_method; - $shipping_country = $shipping_address->country; - $shipping_state = $shipping_address->state; - $shipping_postcode = $shipping_address->postcode; - $shipping_city = $shipping_address->city; - - $payment_method = $cart->payment->method; - $sub_total = $cart->base_sub_total; - - $total_items = $cart->items_qty; - $total_weight = 0; - - foreach($cart->items as $item) { - $total_weight = $total_weight + $item->base_total_weight; - } - - $test_mode = config('pricerules.test_mode.0'); - $test_conditions = config('pricerules.cart.conditions'); - $result = 1; - - foreach ($conditions as $condition) { - $actual_value = ${$condition->attribute}; - $test_value = $condition->value; - $test_condition = $condition->condition; - - if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text'){ - if ($test_condition == '=') { - if ($actual_value == $test_value) { - break; - } - } else if ($test_condition == '>=') { - if ($actual_value >= $test_value) { - break; - } - } else if ($test_condition == '<=') { - if ($actual_value <= $test_value) { - break; - } - } else if ($test_condition == '>') { - if ($actual_value > $test_value) { - break; - } - } else if ($test_condition == '<') { - if ($actual_value < $test_value) { - break; - } - } else if ($test_condition == '{}') { - if (str_contains($actual_value, $test_value)) { - break; - } - } else if ($test_condition == '!{}') { - if (! (! str_contains($actual_value, $test_value))) { - break; - } - } else if ($test_condition == '()') { - // dd($test_condition); - } else if ($test_condition == '!()') { - // dd($test_condition); - } else { - $result = 0; - } - } - } - - return $result; - } - - protected function testAnyConditionIsFalse($condition, $cart) { - $shipping_address = $cart->getShippingAddressAttribute(); - - $shipping_method = $cart->shipping_method; - $shipping_country = $shipping_address->country; - $shipping_state = $shipping_address->state; - $shipping_postcode = $shipping_address->postcode; - $shipping_city = $shipping_address->city; - - $payment_method = $cart->payment->method; - $sub_total = $cart->base_sub_total; - - $total_items = $cart->items_qty; - $total_weight = 0; - - foreach($cart->items as $item) { - $total_weight = $total_weight + $item->base_total_weight; - } - - $test_mode = config('pricerules.test_mode.0'); - $test_conditions = config('pricerules.cart.conditions'); - $result = 1; - - foreach ($conditions as $condition) { - $actual_value = ${$condition->attribute}; - $test_value = $condition->value; - $test_condition = $condition->condition; - - if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text'){ - if ($test_condition == '=') { - if ($actual_value != $test_value) { - $result = 0; - - break; - } - } else if ($test_condition == '>=') { - if (! ($actual_value >= $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '<=') { - if (! ($actual_value <= $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '>') { - if (! ($actual_value > $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '<') { - if ((! $actual_value < $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '{}') { - if (! (str_contains($actual_value, $test_value))) { - $result = 0; - - break; - } - } else if ($test_condition == '!{}') { - if (! (! str_contains($actual_value, $test_value))) { - $result = 0; - - break; - } - } else if ($test_condition == '()') { - // dd($test_condition); - } else if ($test_condition == '!()') { - // dd($test_condition); - } else { - $result = 0; - } - } - } + $result = Cart::applyCoupon($code); return $result; } diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index ed7bce699..75a8e5834 100755 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -39,7 +39,7 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function 'view' => 'shop::checkout.cart.index' ])->name('shop.checkout.cart.index'); - Route::post('checkout/check/coupons', 'Webkul\Shop\Http\Controllers\CartController@applyCoupons')->name('shop.checkout.check.coupons'); + Route::post('checkout/check/coupons', 'Webkul\Shop\Http\Controllers\CartController@applyCoupon')->name('shop.checkout.check.coupons'); //Cart Items Add Route::post('checkout/cart/add/{id}', 'Webkul\Shop\Http\Controllers\CartController@add')->defaults('_config', [ diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index 661e18343..fa7d76277 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -471,7 +471,16 @@ templateRender: null, code: null, message: null, - qtyRevealed: false + qtyRevealed: false, + amount_given: null, + amount: null, + discounted: false, + discount: { + amount: null, + action: null, + amount_given: null, + message: null + } } }, @@ -501,6 +510,12 @@ code: this_this.code }).then(function(response) { this_this.message = response.data.message; + + this_this.discounted = true; + this_this.discount.amount = response.data.amount; + this_this.discount.amount_given = response.data.amount_given; + }).catch(function(error) { + this_this.discounted = false; }); }, diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index 1ffbe7fcc..7d207fc86 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -3,12 +3,7 @@
    @@ -39,7 +34,7 @@ @inject('cart_rule', 'Webkul\Discount\Helpers\Discount') @if (! request()->is('checkout/cart')) -
    +
    @@ -47,9 +42,26 @@ @{{ message }} - +
    + +
    +
    + Coupon used +
    + + + + + + + + + + + +
    @endif
    diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index 873cb32bd..fb3e64d5d 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -16,6 +16,10 @@ } //margin bottom classes +.mb-5 { + margin-bottom: 5px; +} + .mb-10 { margin-bottom: 10px; } @@ -228,6 +232,11 @@ h5 { color: #ffffff; } + &.btn-white { + background: #ffffff; + color: #000; + } + &:disabled, &[disabled="disabled"], &[disabled="disabled"]:hover, From 82293d5f7124df62da917922431ec699cc5f2d8a Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 29 May 2019 09:04:01 +0530 Subject: [PATCH 53/89] some bug fixes --- composer.json | 1 + packages/Webkul/Checkout/src/Cart.php | 11 +++- .../Webkul/Discount/src/Helpers/Discount.php | 58 ++++++------------- .../Http/Controllers/OnepageController.php | 6 +- .../views/checkout/onepage.blade.php | 4 +- .../views/checkout/total/summary.blade.php | 11 ++-- .../Ui/src/Resources/assets/sass/app.scss | 7 +++ 7 files changed, 47 insertions(+), 51 deletions(-) diff --git a/composer.json b/composer.json index e4e0e4b2f..0e268403b 100755 --- a/composer.json +++ b/composer.json @@ -39,6 +39,7 @@ "laravel/dusk": "^4.0", "mockery/mockery": "^1.0", "nunomaduro/collision": "^2.0", + "phploc/phploc": "^5.0@dev", "phpunit/phpunit": "^7.0" }, "replace": { diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index cd2e92019..678684279 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1240,6 +1240,13 @@ class Cart { return $result; } + public function applyNonCoupon() + { + $result = $this->discount->applyNonCouponAble(); + + return $result; + } + public function leastWorthItem() { $cart = $this->getCart(); @@ -1247,8 +1254,8 @@ class Cart { $leastSubTotal = []; foreach ($cart->items as $item) { - if ($item->base_total < $leastValue) { - $leastValue = $item->total; + if ($item->price < $leastValue) { + $leastValue = $item->price; $leastSubTotal = [ 'id' => $item->id, 'base_total' => $leastValue diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index ecbf246da..4e228dccb 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -78,8 +78,9 @@ class Discount if ($channel->channel_id == $currentChannel->id) { if (auth()->guard('customer')->check()) { foreach ($rule->customer_groups as $customerGroup) { - if (auth()->guard('customer')->user()->customer_group_id == $customerGroup->customer_group_id) + if (auth()->guard('customer')->user()->customer_group_id == $customerGroup->customer_group_id) { array_push($suitableRules, $rule); + } } } } @@ -100,8 +101,9 @@ class Discount if ($channel->channel_id == $currentChannel->id) { if (auth()->guard('customer')->check()) { foreach ($rule->customer_groups as $customerGroup) { - if (auth()->guard('customer')->user()->customer_group_id == $customerGroup->customer_group_id) + if (auth()->guard('customer')->user()->customer_group_id == $customerGroup->customer_group_id) { array_push($suitableRules, $rule); + } } } } @@ -272,14 +274,6 @@ class Discount } } - // works automatically on the basis of no conditions - public function checkNonCouponConditions() - { - $rules = $this->applyNonCouponAble(); - - return $rules; - } - public function ruleCheck($code) { $rules = $this->applyCouponAble(); @@ -306,33 +300,14 @@ class Discount $cart = \Cart::getCart(); //all of conditions is/are true - $result = null; - if ($appliedRule->conditions) { + $result = 1; + if ($appliedRule->conditions && $appliedRule->conditions != "null") { $conditions = json_decode(json_decode($appliedRule->conditions)); - - $shipping_address = $cart->getShippingAddressAttribute(); - - $shipping_method = $cart->shipping_method; - $shipping_country = $shipping_address->country; - $shipping_state = $shipping_address->state; - $shipping_postcode = $shipping_address->postcode; - $shipping_city = $shipping_address->city; - - $payment_method = $cart->payment->method; - $sub_total = $cart->base_sub_total; - - $total_items = $cart->items_qty; - $total_weight = 0; - - foreach($cart->items as $item) { - $total_weight = $total_weight + $item->base_total_weight; - } - $test_mode = config('pricerules.test_mode.0'); - $test_conditions = config('pricerules.cart.conditions'); - + // dd($conditions); if ($test_mode == config('pricerules.test_mode.0')) { $result = $this->testAllConditionAreTrue($conditions, $cart); + // dd($result); } else if ($test_mode == config('pricerules.test_mode.1')) { $result = $this->testAllConditionAreFalse($conditions, $cart); } else if ($test_mode == config('pricerules.test_mode.2')) { @@ -358,7 +333,7 @@ class Discount $leastWorthItem = \Cart::leastWorthItem(); if ($action_type == config('pricerules.cart.validation.0')) { - $newBaseSubTotal = ($leastWorthItem['base_total'] * $disc_amount) / 100; + $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * $disc_amount) / 100; } else if ($action_type == config('pricerules.cart.validation.1')) { $newBaseSubTotal = $leastWorthItem['base_total'] - $disc_amount; } else if ($action_type == config('pricerules.cart.validation.2')) { @@ -372,14 +347,16 @@ class Discount 'message' => trans('admin::app.promotion.status.coupon-applied'), 'action' => $action_type, 'amount_given' => false, - 'amount' => $newQuantity + 'amount_payable' => $newQuantity, + 'amount' => null ]); } else { return response()->json([ 'message' => trans('admin::app.promotion.status.coupon-applied'), 'action' => $action_type, 'amount_given' => true, - 'amount' => core()->currency($newBaseSubTotal) + 'amount_payable' => core()->currency($newBaseSubTotal), + 'amount' => core()->currency($cart->grand_total - $newBaseSubTotal) ]); } } else { @@ -489,11 +466,10 @@ class Discount // } // } } - return $result; } - protected function testAllConditionAreFalse($condition, $cart) { + protected function testAllConditionAreFalse($conditions, $cart) { $shipping_address = $cart->getShippingAddressAttribute(); $shipping_method = $cart->shipping_method; @@ -514,8 +490,8 @@ class Discount $test_mode = config('pricerules.test_mode.0'); $test_conditions = config('pricerules.cart.conditions'); - $result = 1; + $result = 1; foreach ($conditions as $condition) { $actual_value = ${$condition->attribute}; $test_value = $condition->value; @@ -584,7 +560,7 @@ class Discount return $result; } - protected function testAnyConditionIsTrue($condition, $cart) { + protected function testAnyConditionIsTrue($conditions, $cart) { $shipping_address = $cart->getShippingAddressAttribute(); $shipping_method = $cart->shipping_method; @@ -654,7 +630,7 @@ class Discount return $result; } - protected function testAnyConditionIsFalse($condition, $cart) { + protected function testAnyConditionIsFalse($conditions, $cart) { $shipping_address = $cart->getShippingAddressAttribute(); $shipping_method = $cart->shipping_method; diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index 5225e474a..de4c09dd7 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -15,7 +15,7 @@ use Webkul\Sales\Repositories\OrderRepository; /** * Chekout controller for the customer and guest for placing order * - * @author Jitendra Singh + * @author Jitendra Singh * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) */ class OnepageController extends Controller @@ -114,6 +114,10 @@ class OnepageController extends Controller $cart = Cart::getCart(); + $rules = Cart::applyNonCoupon($cart); + + dd($rules); + return response()->json([ 'jump_to_section' => 'review', 'html' => view('shop::checkout.onepage.review', compact('cart'))->render() diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index fa7d76277..6fa0add81 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -512,8 +512,8 @@ this_this.message = response.data.message; this_this.discounted = true; - this_this.discount.amount = response.data.amount; - this_this.discount.amount_given = response.data.amount_given; + this_this.discount.amount = response.data.amount_payable; + this_this.discount.amount_given = response.data.amount; }).catch(function(error) { this_this.discounted = false; }); diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index 7d207fc86..e1e99bb5d 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -47,17 +47,18 @@
    -
    +
    Coupon used
    - + - + - + + @@ -65,4 +66,4 @@ @endif
    -
    +
    \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index fb3e64d5d..8c83a391c 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -188,6 +188,13 @@ h5 { display: none !important; } +.row { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} + .btn { @include box-shadow( 0 1px 4px 0 rgba(0, 0, 0, 0.2), From d6101e1f826146efe1fdcfdf8da29d42bd046b2b Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 29 May 2019 13:26:17 +0530 Subject: [PATCH 54/89] calculation for automatic cart rules complete --- .env.example | 2 +- config/app.php | 2 +- packages/Webkul/Checkout/src/Cart.php | 8 +- .../Webkul/Discount/src/Helpers/Discount.php | 125 +++++++++++++++++- .../Http/Controllers/OnepageController.php | 2 - 5 files changed, 130 insertions(+), 9 deletions(-) diff --git a/.env.example b/.env.example index 39dc29756..2150f9b2c 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,6 @@ APP_NAME=Laravel APP_ENV=local -APP_VERSION=0.1.5 +APP_VERSION=0.1.6 APP_KEY= APP_DEBUG=true APP_URL=http://localhost diff --git a/config/app.php b/config/app.php index 06b68ff81..b15029bdc 100755 --- a/config/app.php +++ b/config/app.php @@ -138,7 +138,7 @@ return [ /* Application Version */ - 'version' => env('APP_VERSION', '0.1.5'), + 'version' => env('APP_VERSION', '0.1.6'), /** * Blacklisting attributes while debugging diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 678684279..1660d8f01 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1242,7 +1242,7 @@ class Cart { public function applyNonCoupon() { - $result = $this->discount->applyNonCouponAble(); + $result = $this->discount->nonCouponCheck(); return $result; } @@ -1258,7 +1258,8 @@ class Cart { $leastValue = $item->price; $leastSubTotal = [ 'id' => $item->id, - 'base_total' => $leastValue + 'base_total' => $leastValue, + 'quantity' => $item->quantity ]; } } @@ -1277,7 +1278,8 @@ class Cart { $maxValue = $item->total; $maxSubTotal = [ 'id' => $item->id, - 'base_total' => $maxValue + 'base_total' => $maxValue, + 'quantity' => $item->quantity ]; } } diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index 4e228dccb..2b03052b4 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -3,6 +3,7 @@ namespace Webkul\Discount\Helpers; use Webkul\Discount\Repositories\CartRuleRepository as CartRule; +use Carbon\Carbon; class Discount { @@ -11,9 +12,15 @@ class Discount */ protected $cartRule; + /** + * To hold if end rules are present or not. + */ + protected $endRuleActive; + public function __construct(CartRule $cartRule) { $this->cartRule = $cartRule; + $this->endRuleActive = false; } public function getGuestEndRules() @@ -136,6 +143,8 @@ class Discount $endRules = $this->getEndRules(); if (isset($endRules) && count($endRules)) { + $this->endRuleActive = true; + return [ 'end_rule' => true, 'rule' => $endRules, @@ -154,6 +163,8 @@ class Discount $endRules = $this->getGuestEndRules(); if (isset($endRules) && count($endRules)) { + $this->endRuleActive = true; + return [ 'end_rule' => true, 'rule' => $endRules, @@ -253,12 +264,12 @@ class Discount $id = array(); foreach ($rules as $rule) { - if ($rule->use_coupon) { + if (! $rule->use_coupon) { array_push($id, $rule); } } - if (!$rule->use_coupon) { + if (count($id)) { return [ 'end_rule' => true, 'noncouponable' => true, @@ -274,6 +285,116 @@ class Discount } } + public function nonCouponCheck() + { + $result = $this->applyNonCouponAble(); + $cart = \Cart::getCart(); + + if ($result['end_rule']) { + $this->endRuleActive = true; + } else { + $this->endRuleActive = false; + } + + $maxImpact = array(); + + if (isset($result['id']) && count($result['id'])) { + $rules = array(); + + if (count($result['id']) > 1) { + $leastPriority = 999999999999; + + foreach($result['id'] as $rule) { + if ($rule->priority < $leastPriority) { + array_push($rules, $rule); + } + } + } + + foreach ($rules as $rule) { + // All of conditions is/are true + $result = 1; + if ($rule->conditions && $rule->conditions != "null") { + if ($rule->starts_from != null && $rule->ends_till != null) { + if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) { + $conditions = json_decode(json_decode($rule->conditions)); + $test_mode = config('pricerules.test_mode.0'); + + if ($test_mode == config('pricerules.test_mode.0')) { + $result = $this->testAllConditionAreTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.1')) { + $result = $this->testAllConditionAreFalse($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.2')) { + $result = $this->testAnyConditionIsTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.3')) { + $result = $this->testAbyConditionIsFalse($conditions, $cart); + } + } + } + } + + // check all the conditions associated with the rule + if ($result) { + // if (isset($appliedRule) && $appliedRule->starts_from == null) { + $action_type = $rule->action_type; + $disc_threshold = $rule->disc_threshold; + $disc_amount = $rule->disc_amount; + $disc_quantity = $rule->disc_quantity; + + $newBaseSubTotal = 0; + $newQuantity = 0; + + if ($cart->items_qty >= $disc_threshold) { + // add the time conditions if rule is expired and active then make it in active + $leastWorthItem = \Cart::leastWorthItem(); + $realQty = $leastWorthItem['quantity']; + + if ($action_type == config('pricerules.cart.validation.0')) { + if ($realQty >= $disc_quantity) { + $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * ($disc_quantity * $disc_amount)) / 100; + } else { + $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * $disc_amount) / 100; + } + } else if ($action_type == config('pricerules.cart.validation.1')) { + $newBaseSubTotal = $leastWorthItem['base_total'] - $disc_amount; + } else if ($action_type == config('pricerules.cart.validation.2')) { + if ($realQty >= $disc_quantity) { + $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + ($disc_quantity * $disc_amount); + } else { + $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; + } + } else if ($action_type == config('pricerules.cart.validation.3')) { + $newBaseSubTotal = $disc_amount; + } + + //standard returns + if ($action_type == config('pricerules.cart.validation.2')) { + array_push($maxImpact, [ + 'id' => $rule->id, + 'item_id' => $leastWorthItem['id'], + 'amount_given' => false, + 'amount' => $newQuantity, + 'action_type' => $action_type + ]); + } else { + array_push($maxImpact, [ + 'id' => $rule->id, + 'item_id' => $leastWorthItem['id'], + 'amount_given' => true, + 'amount' => $newBaseSubTotal, + 'action_type' => $action_type + ]); + } + } + } + } + } + + dd($maxImpact); + + return $result; + } + public function ruleCheck($code) { $rules = $this->applyCouponAble(); diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index de4c09dd7..19a4da6af 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -116,8 +116,6 @@ class OnepageController extends Controller $rules = Cart::applyNonCoupon($cart); - dd($rules); - return response()->json([ 'jump_to_section' => 'review', 'html' => view('shop::checkout.onepage.review', compact('cart'))->render() From c6637d90b766d2c60723d105b4a278e338491aa5 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 29 May 2019 17:10:24 +0530 Subject: [PATCH 55/89] non couponable cart rules implemented, now moving on to binding them on frontend --- .../Webkul/Discount/src/Helpers/Discount.php | 71 ++++++++++++++----- .../Http/Controllers/OnepageController.php | 3 +- 2 files changed, 57 insertions(+), 17 deletions(-) diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index 2b03052b4..4245f5655 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -296,7 +296,7 @@ class Discount $this->endRuleActive = false; } - $maxImpact = array(); + $maxImpacts = array(); if (isset($result['id']) && count($result['id'])) { $rules = array(); @@ -330,6 +330,26 @@ class Discount $result = $this->testAbyConditionIsFalse($conditions, $cart); } } + } else { + $conditions = json_decode(json_decode($rule->conditions)); + $test_mode = config('pricerules.test_mode.0'); + + if ($test_mode == config('pricerules.test_mode.0')) { + $result = $this->testAllConditionAreTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.1')) { + $result = $this->testAllConditionAreFalse($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.2')) { + $result = $this->testAnyConditionIsTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.3')) { + $result = $this->testAbyConditionIsFalse($conditions, $cart); + } + } + } else { + if ($rule->starts_from != null && $rule->ends_till != null) { + if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) { + } else { + $result = 0; + } } } @@ -344,32 +364,31 @@ class Discount $newBaseSubTotal = 0; $newQuantity = 0; - if ($cart->items_qty >= $disc_threshold) { + if ($cart->items_qty >= $disc_threshold && $disc_quantity > 0) { + if ($disc_quantity > 1) { + $disc_amount = $disc_amount * $disc_quantity; + } // add the time conditions if rule is expired and active then make it in active $leastWorthItem = \Cart::leastWorthItem(); $realQty = $leastWorthItem['quantity']; if ($action_type == config('pricerules.cart.validation.0')) { - if ($realQty >= $disc_quantity) { - $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * ($disc_quantity * $disc_amount)) / 100; - } else { - $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * $disc_amount) / 100; - } + $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * $disc_amount) / 100; } else if ($action_type == config('pricerules.cart.validation.1')) { - $newBaseSubTotal = $leastWorthItem['base_total'] - $disc_amount; - } else if ($action_type == config('pricerules.cart.validation.2')) { - if ($realQty >= $disc_quantity) { - $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + ($disc_quantity * $disc_amount); + if ($disc_amount > ($disc_quantity * $leastWorthItem['base_total'])) { + $newBaseSubTotal = 0; } else { - $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; + $newBaseSubTotal = $cart->grand_total - $disc_amount; } + } else if ($action_type == config('pricerules.cart.validation.2')) { + $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; } else if ($action_type == config('pricerules.cart.validation.3')) { $newBaseSubTotal = $disc_amount; } //standard returns if ($action_type == config('pricerules.cart.validation.2')) { - array_push($maxImpact, [ + array_push($maxImpacts, [ 'id' => $rule->id, 'item_id' => $leastWorthItem['id'], 'amount_given' => false, @@ -377,7 +396,7 @@ class Discount 'action_type' => $action_type ]); } else { - array_push($maxImpact, [ + array_push($maxImpacts, [ 'id' => $rule->id, 'item_id' => $leastWorthItem['id'], 'amount_given' => true, @@ -390,9 +409,29 @@ class Discount } } - dd($maxImpact); + $leastItemAvg = 999999999999; + $leastId = 0; + foreach($maxImpacts as $maxImpact) { + $minItemPrice = array(); - return $result; + if ($maxImpact['action_type'] == config('pricerules.cart.validation.2')) { + $amount = $cart->base_grand_total / $maxImpact['amount']; + + if ($amount < $leastItemAvg) { + $leastItemAvg = $amount; + $leastId = $maxImpact['id']; + } + } else { + $amount = $maxImpact['amount'] / $cart->items_qty; + + if ($amount < $leastItemAvg) { + $leastItemAvg = $amount; + $leastId = $maxImpact['id']; + } + } + } + + return $leastId; } public function ruleCheck($code) diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index 19a4da6af..b5b057a42 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -114,7 +114,8 @@ class OnepageController extends Controller $cart = Cart::getCart(); - $rules = Cart::applyNonCoupon($cart); + $rules = Cart::applyNonCoupon(); + dd($rules); return response()->json([ 'jump_to_section' => 'review', From 751222828f25a9dc88edd886863da68325ae0045 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 29 May 2019 17:19:10 +0530 Subject: [PATCH 56/89] some conditions improvements in couponable cart rules --- .../Webkul/Discount/src/Helpers/Discount.php | 76 +++++++++++++------ 1 file changed, 53 insertions(+), 23 deletions(-) diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index 4245f5655..18ce94505 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -355,7 +355,6 @@ class Discount // check all the conditions associated with the rule if ($result) { - // if (isset($appliedRule) && $appliedRule->starts_from == null) { $action_type = $rule->action_type; $disc_threshold = $rule->disc_threshold; $disc_amount = $rule->disc_amount; @@ -431,7 +430,8 @@ class Discount } } - return $leastId; + if ($leastId != 0) + return $this->cartRule->find($leastId); } public function ruleCheck($code) @@ -459,47 +459,77 @@ class Discount $cart = \Cart::getCart(); - //all of conditions is/are true + // All of conditions is/are true $result = 1; if ($appliedRule->conditions && $appliedRule->conditions != "null") { - $conditions = json_decode(json_decode($appliedRule->conditions)); - $test_mode = config('pricerules.test_mode.0'); - // dd($conditions); - if ($test_mode == config('pricerules.test_mode.0')) { - $result = $this->testAllConditionAreTrue($conditions, $cart); - // dd($result); - } else if ($test_mode == config('pricerules.test_mode.1')) { - $result = $this->testAllConditionAreFalse($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.2')) { - $result = $this->testAnyConditionIsTrue($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.3')) { - $result = $this->testAbyConditionIsFalse($conditions, $cart); + if ($appliedRule->starts_from != null && $appliedRule->ends_till != null) { + if (Carbon::parse($appliedRule->starts_from) < now() && now() < Carbon::parse($appliedRule->ends_till)) { + $conditions = json_decode(json_decode($appliedRule->conditions)); + $test_mode = config('pricerules.test_mode.0'); + + if ($test_mode == config('pricerules.test_mode.0')) { + $result = $this->testAllConditionAreTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.1')) { + $result = $this->testAllConditionAreFalse($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.2')) { + $result = $this->testAnyConditionIsTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.3')) { + $result = $this->testAbyConditionIsFalse($conditions, $cart); + } + } + } else { + $conditions = json_decode(json_decode($rule->conditions)); + $test_mode = config('pricerules.test_mode.0'); + + if ($test_mode == config('pricerules.test_mode.0')) { + $result = $this->testAllConditionAreTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.1')) { + $result = $this->testAllConditionAreFalse($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.2')) { + $result = $this->testAnyConditionIsTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.3')) { + $result = $this->testAbyConditionIsFalse($conditions, $cart); + } + } + } else { + if ($appliedRule->starts_from != null && $appliedRule->ends_till != null) { + if (Carbon::parse($appliedRule->starts_from) < now() && now() < Carbon::parse($appliedRule->ends_till)) { + } else { + $result = 0; + } } } // check all the conditions associated with the rule if ($result) { - // if (isset($appliedRule) && $appliedRule->starts_from == null) { - $action_type = $appliedRule->action_type; - $disc_threshold = $appliedRule->disc_threshold; - $disc_amount = $appliedRule->disc_amount; - $disc_quantity = $appliedRule->disc_quantity; + $action_type = $rule->action_type; + $disc_threshold = $rule->disc_threshold; + $disc_amount = $rule->disc_amount; + $disc_quantity = $rule->disc_quantity; $newBaseSubTotal = 0; $newQuantity = 0; - if ($cart->items_qty >= $disc_threshold) { + if ($cart->items_qty >= $disc_threshold && $disc_quantity > 0) { + if ($disc_quantity > 1) { + $disc_amount = $disc_amount * $disc_quantity; + } // add the time conditions if rule is expired and active then make it in active $leastWorthItem = \Cart::leastWorthItem(); + $realQty = $leastWorthItem['quantity']; if ($action_type == config('pricerules.cart.validation.0')) { $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * $disc_amount) / 100; } else if ($action_type == config('pricerules.cart.validation.1')) { - $newBaseSubTotal = $leastWorthItem['base_total'] - $disc_amount; + if ($disc_amount > ($disc_quantity * $leastWorthItem['base_total'])) { + $newBaseSubTotal = 0; + } else { + $newBaseSubTotal = $cart->grand_total - $disc_amount; + } } else if ($action_type == config('pricerules.cart.validation.2')) { $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; } else if ($action_type == config('pricerules.cart.validation.3')) { - $base_total = $disc_amount; + $newBaseSubTotal = $disc_amount; } if ($action_type == config('pricerules.cart.validation.2')) { From 131c73ce04fd56a63b627c7874c805a4900a120a Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 29 May 2019 18:00:44 +0530 Subject: [PATCH 57/89] some bug fixes --- packages/Webkul/Checkout/src/Cart.php | 2 +- .../Webkul/Discount/src/Helpers/Discount.php | 28 ++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 1660d8f01..608482c00 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1242,7 +1242,7 @@ class Cart { public function applyNonCoupon() { - $result = $this->discount->nonCouponCheck(); + $result = $this->discount->nonRuleCheck(); return $result; } diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index 18ce94505..62a1d1a7d 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -23,6 +23,10 @@ class Discount $this->endRuleActive = false; } + /** + * Gets the end rules applicable for guests + * autocheck for customer group and channels + */ public function getGuestEndRules() { $rules = $this->cartRule->findWhere(['status' => 1, 'end_other_rules' => 1, 'is_guest' => 1]); @@ -57,6 +61,11 @@ class Discount return $guestRules; } + /** + * Get the non ending rules for the guest + * and completed auto check for guests and + * channels + */ public function getGuestBestRules() { $rules = $this->cartRule->findWhere(['status' => 1, 'end_other_rules' => 0, 'is_guest' => 1]); @@ -74,6 +83,10 @@ class Discount return $guestRules; } + + /** + * Gets the best rules for auth customers + */ public function getBestRules() { $rules = $this->cartRule->findWhere(['status' => 1, 'end_other_rules' => 0]); @@ -97,6 +110,9 @@ class Discount return $suitableRules; } + /** + * Gets the end rules for the auth customers + */ public function getEndRules() { $rules = $this->cartRule->findWhere(['status' => 1, 'end_other_rules' => 1]); @@ -137,6 +153,10 @@ class Discount return $suitableRules; } + /** + * Get the rules to applied automatically + * depending on user state + */ public function toApply() { if (auth()->guard('customer')->check()) { @@ -182,6 +202,9 @@ class Discount } } + /** + * To apply the coupon code based rules + */ public function applyCouponAble() { $rules = $this->toApply(); @@ -231,6 +254,9 @@ class Discount } } + /** + * To apply the non coupon based rules + */ public function applyNonCouponAble() { $rules = $this->toApply(); @@ -285,7 +311,7 @@ class Discount } } - public function nonCouponCheck() + public function nonRuleCheck() { $result = $this->applyNonCouponAble(); $cart = \Cart::getCart(); From 26270979fd58d0c9e6da12da16e14e0c13435754 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 29 May 2019 19:04:09 +0530 Subject: [PATCH 58/89] removed some bugs from summary blade for cart rule --- .../Webkul/Discount/src/Helpers/Discount.php | 15 ++-- .../Http/Controllers/OnepageController.php | 19 +++-- .../views/checkout/onepage/review.blade.php | 2 - .../views/checkout/total/summary.blade.php | 71 +++++++++++++------ 4 files changed, 66 insertions(+), 41 deletions(-) diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index 62a1d1a7d..65fa544b4 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -415,6 +415,7 @@ class Discount if ($action_type == config('pricerules.cart.validation.2')) { array_push($maxImpacts, [ 'id' => $rule->id, + 'rule' => $rule, 'item_id' => $leastWorthItem['id'], 'amount_given' => false, 'amount' => $newQuantity, @@ -423,6 +424,7 @@ class Discount } else { array_push($maxImpacts, [ 'id' => $rule->id, + 'rule' => $rule, 'item_id' => $leastWorthItem['id'], 'amount_given' => true, 'amount' => $newBaseSubTotal, @@ -435,8 +437,8 @@ class Discount } $leastItemAvg = 999999999999; - $leastId = 0; - foreach($maxImpacts as $maxImpact) { + $leastId = -1; + foreach ($maxImpacts as $key => $maxImpact) { $minItemPrice = array(); if ($maxImpact['action_type'] == config('pricerules.cart.validation.2')) { @@ -444,20 +446,21 @@ class Discount if ($amount < $leastItemAvg) { $leastItemAvg = $amount; - $leastId = $maxImpact['id']; + $leastId = $key; } } else { $amount = $maxImpact['amount'] / $cart->items_qty; if ($amount < $leastItemAvg) { $leastItemAvg = $amount; - $leastId = $maxImpact['id']; + $leastId = $key; } } } - if ($leastId != 0) - return $this->cartRule->find($leastId); + if ($leastId != -1) { + return $maxImpacts[$leastId]; + } } public function ruleCheck($code) diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index b5b057a42..dfdfc8609 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -114,13 +114,12 @@ class OnepageController extends Controller $cart = Cart::getCart(); - $rules = Cart::applyNonCoupon(); - dd($rules); + $rule = Cart::applyNonCoupon(); return response()->json([ - 'jump_to_section' => 'review', - 'html' => view('shop::checkout.onepage.review', compact('cart'))->render() - ]); + 'jump_to_section' => 'review', + 'html' => view('shop::checkout.onepage.review', compact('cart', 'rule'))->render() + ]); } /** @@ -141,9 +140,9 @@ class OnepageController extends Controller if ($redirectUrl = Payment::getRedirectUrl($cart)) { return response()->json([ - 'success' => true, - 'redirect_url' => $redirectUrl - ]); + 'success' => true, + 'redirect_url' => $redirectUrl + ]); } $order = $this->orderRepository->create(Cart::prepareDataForOrder()); @@ -153,8 +152,8 @@ class OnepageController extends Controller session()->flash('order', $order); return response()->json([ - 'success' => true, - ]); + 'success' => true, + ]); } /** diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php index a49052d8b..09f4bcfa4 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php @@ -167,7 +167,5 @@
    @include('shop::checkout.total.summary', ['cart' => $cart])
    -
    -
    \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index e1e99bb5d..308a96884 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -34,35 +34,60 @@ @inject('cart_rule', 'Webkul\Discount\Helpers\Discount') @if (! request()->is('checkout/cart')) -
    -
    - + @if (isset($rule['rule']) && ! $rule['rule']->end_other_rules) + +
    + - @{{ message }} + @{{ message }} - @{{ message }} + @{{ message }} - + +
    + + @endif + + @if($rule) +
    +
    + {{ $rule['rule']->name }} applied +
    + + + + + @if ($rule['amount_given']) + + + + @else + + + @endif +
    - + @endif -
    -
    - Coupon used + @if (! $rule['rule']->end_other_rules) +
    +
    + Coupon used +
    + + + + + + + + + + + +
    - - - - - - - - - - - - -
    + @endif @endif
    From 33774c4c4649b8eef5bd50ef21ba43dea4144166 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Thu, 30 May 2019 19:04:44 +0530 Subject: [PATCH 59/89] added the table for cart rule cart for managing rules with cart and removed various bug fixes --- README.md | 4 +- packages/Webkul/Checkout/src/Cart.php | 53 ++++++ .../Discount/src/Config/rule-conditions.php | 22 +-- .../Discount/src/Contracts/CartRuleCart.php | 7 + ...5_07_184255_create_catalog_rules_table.php | 52 ------ ...348_create_catalog_rule_products_table.php | 38 ---- ...ate_catalog_rule_customer_groups_table.php | 35 ---- ...201_create_catalog_rule_channels_table.php | 35 ---- ...eate_catalog_rule_products_price_table.php | 36 ---- ..._180457_create_cart_rule_coupons_table.php | 2 +- ...9_create_cart_rule_coupons_usage_table.php | 2 + ..._30_141207_create_cart_rule_cart_table.php | 35 ++++ .../Webkul/Discount/src/Helpers/Discount.php | 174 ++++++++++++++---- .../Discount/src/Models/CartRuleCart.php | 14 ++ .../Discount/src/Models/CartRuleCartProxy.php | 10 + .../src/Providers/ModuleServiceProvider.php | 3 +- .../Repositories/CartRuleCartRepository.php | 24 +++ .../Http/Controllers/OnepageController.php | 2 - .../Webkul/Shop/src/Resources/lang/en/app.php | 8 +- .../views/checkout/onepage.blade.php | 6 +- .../views/checkout/total/summary.blade.php | 30 ++- 21 files changed, 320 insertions(+), 272 deletions(-) create mode 100644 packages/Webkul/Discount/src/Contracts/CartRuleCart.php delete mode 100644 packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184255_create_catalog_rules_table.php delete mode 100644 packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184348_create_catalog_rule_products_table.php delete mode 100644 packages/Webkul/Discount/src/Database/Migrations/2019_05_09_125143_create_catalog_rule_customer_groups_table.php delete mode 100644 packages/Webkul/Discount/src/Database/Migrations/2019_05_09_125201_create_catalog_rule_channels_table.php delete mode 100644 packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024443_create_catalog_rule_products_price_table.php create mode 100644 packages/Webkul/Discount/src/Database/Migrations/2019_05_30_141207_create_cart_rule_cart_table.php create mode 100644 packages/Webkul/Discount/src/Models/CartRuleCart.php create mode 100644 packages/Webkul/Discount/src/Models/CartRuleCartProxy.php create mode 100644 packages/Webkul/Discount/src/Repositories/CartRuleCartRepository.php diff --git a/README.md b/README.md index e643fb5ac..4cdfa92e5 100755 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ 2. ### [Requirements](#2-requirements-) 3. ### [Installation & Configuration](#3-installation--configuration-) 4. ### [License](#4-license-) -5. ### [Miscellaneous](#5-miscellaneous-) +5. ### [Miscellaneous](#user-content-6-miscellaneous--) ### 1. Introduction : @@ -26,6 +26,8 @@ a progressive Javascript framework. **Bagisto is viable attempt to cut down your time, cost and workforce for building online stores or migrating from physical stores to the ever demanding online world. Your business whether small or huge it suits all and very simple to set it up.** +**Read our documentation: [Bagisto Docs](https://devdocs.bagisto.com/)** + **We are also having a forum for any type of your concern, feature request discussions. Please visit: [Bagisto Forums](https://forums.bagisto.com/)** # Visit our live [Demo](https://demo.bagisto.com) diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 608482c00..90c05c387 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1092,6 +1092,59 @@ class Cart { return $finalData; } + /** + * Save discount data for cart + */ + public function saveDiscount() + { + $rule = $impact['rule']; + + $cart = $this->getCart(); + + //update the cart items + foreach($cart->items as $item) { + if ($rule->use_coupon) { + if ($rule->action_type != config('pricerules.cart.validation.0')) { + $item->update([ + 'coupon_code' => $rule->coupon->code, + 'discount_amount' => core()->convertPrice($impact['amount'], $cart->channel_currency_code), + 'base_discount_amount' => $impact['amount'] + ]); + } else { + $item->update([ + 'coupon_code' => $rule->coupon->code, + 'discount_percent' => $rule->disc_amount + ]); + } + } else { + if ($rule->action_type != config('pricerules.cart.validation.0')) { + $item->update([ + 'discount_amount' => core()->convertPrice($impact['amount'], $cart->channel_currency_code), + 'base_discount_amount' => $impact['amount'] + ]); + } else { + $item->update([ + 'discount_percent' => $rule->disc_amount + ]); + } + } + } + + // update the cart + if ($rule->use_coupon) { + $cart->update([ + 'coupon_code' => $rule->coupons->code, + 'discount_amount' => core()->convertPrice($impact['amount'], $cart->channel_currency_code), + 'base_discount_amount' => $impact['amount'] + ]); + } else { + $cart->update([ + 'discount_amount' => core()->convertPrice($impact['amount'], $cart->channel_currency_code), + 'base_discount_amount' => $impact['amount'] + ]); + } + } + /** * Prepares data for order item * diff --git a/packages/Webkul/Discount/src/Config/rule-conditions.php b/packages/Webkul/Discount/src/Config/rule-conditions.php index 9c927502a..443699c5f 100644 --- a/packages/Webkul/Discount/src/Config/rule-conditions.php +++ b/packages/Webkul/Discount/src/Config/rule-conditions.php @@ -85,10 +85,10 @@ return [ '<=' => 'Lesser or equals', '>' => 'Greater than', '<' => 'Lesser than', - '{}' => 'Contains', - '!{}' => 'Does not contains', - '()' => 'Is one of', - '!()' => 'Not is one of' + '{}' => 'Contains' + // '!{}' => 'Does not contains', + // '()' => 'Is one of', + // '!()' => 'Not is one of' ], 'text' => [ @@ -98,9 +98,9 @@ return [ '>' => 'Greater than', '<' => 'Lesser than', '{}' => 'Contains', - '!{}' => 'Does not contains', - '()' => 'Is one of', - '!()' => 'Not is one of' + '!{}' => 'Does not contains' + // '()' => 'Is one of', + // '!()' => 'Not is one of' ], 'string' => [ @@ -110,14 +110,14 @@ return [ '>' => 'Greater than', '<' => 'Lesser than', '{}' => 'Contains', - '!{}' => 'Does not contains', - '()' => 'Is one of', - '!()' => 'Not is one of' + '!{}' => 'Does not contains' + // '()' => 'Is one of', + // '!()' => 'Not is one of' ], 'boolean' => [ 0 => 'True/Yes', - 1 => 'False/No', + 1 => 'False/No' ] ], diff --git a/packages/Webkul/Discount/src/Contracts/CartRuleCart.php b/packages/Webkul/Discount/src/Contracts/CartRuleCart.php new file mode 100644 index 000000000..d3c3107f1 --- /dev/null +++ b/packages/Webkul/Discount/src/Contracts/CartRuleCart.php @@ -0,0 +1,7 @@ +increments('id'); - $table->string('name')->nullable(); - $table->string('description')->nullable(); - $table->boolean('is_guest')->default(0); - $table->datetime('starts_from')->nullable(); - $table->datetime('ends_till')->nullable(); - $table->boolean('status')->default(0); - $table->integer('priority')->unsigned()->default(0); - $table->json('conditions')->nullable(); - $table->string('test_mode')->nullable(); - $table->json('actions')->nullable(); - $table->boolean('end_other_rules')->default(0); - $table->integer('sort_order')->unsigned()->default(0); - $table->string('action_type')->nullable(); - $table->decimal('disc_amount', 12, 4)->default(0); - $table->decimal('disc_percent', 12, 4)->default(0); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('catalog_rules'); - } -} diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184348_create_catalog_rule_products_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184348_create_catalog_rule_products_table.php deleted file mode 100644 index 4a5ddbbed..000000000 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_07_184348_create_catalog_rule_products_table.php +++ /dev/null @@ -1,38 +0,0 @@ -increments('id'); - $table->integer('catalog_rule_id')->unsigned()->unique(); - $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade'); - $table->integer('product_id')->unsigned(); - $table->foreign('product_id')->references('id')->on('products')->onDelete('cascade'); - $table->string('act_operator')->default('fixed'); - $table->decimal('act_amount', 12, 4)->default(0.0000); - $table->unsignedSmallInteger('act_stop')->default(0); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('catalog_products'); - } -} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_09_125143_create_catalog_rule_customer_groups_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_09_125143_create_catalog_rule_customer_groups_table.php deleted file mode 100644 index ada1be1dc..000000000 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_09_125143_create_catalog_rule_customer_groups_table.php +++ /dev/null @@ -1,35 +0,0 @@ -increments('id'); - $table->integer('catalog_rule_id')->unsigned(); - $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade'); - $table->integer('customer_group_id')->unsigned(); - $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('catalog_rule_customer_groups'); - } -} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_09_125201_create_catalog_rule_channels_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_09_125201_create_catalog_rule_channels_table.php deleted file mode 100644 index f558e36be..000000000 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_09_125201_create_catalog_rule_channels_table.php +++ /dev/null @@ -1,35 +0,0 @@ -increments('id'); - $table->integer('catalog_rule_id')->unsigned(); - $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade'); - $table->integer('channel_id')->unsigned(); - $table->foreign('channel_id')->references('id')->on('channels')->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_05_13_024443_create_catalog_rule_products_price_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024443_create_catalog_rule_products_price_table.php deleted file mode 100644 index 0c051fdc8..000000000 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024443_create_catalog_rule_products_price_table.php +++ /dev/null @@ -1,36 +0,0 @@ -increments('id'); - $table->integer('cart_rule_product_id')->unsigned(); - $table->foreign('cart_rule_product_id')->references('id')->on('cart_rules')->onDelete('cascade'); - $table->datetime('starts_from')->nullable(); - $table->datetime('ends_till')->nullable(); - $table->decimal('price', 12, 4)->default(0.0000); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('cart_rule_products_price'); - } -} diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_180457_create_cart_rule_coupons_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_180457_create_cart_rule_coupons_table.php index 2c442afb6..8c99d442c 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_180457_create_cart_rule_coupons_table.php +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_180457_create_cart_rule_coupons_table.php @@ -20,7 +20,7 @@ class CreateCartruleCouponsTable extends Migration $table->string('prefix')->nullable(); $table->string('suffix')->nullable(); $table->string('code')->nullable(); - $table->integer('limit')->unsigned()->default(0); + $table->integer('usage_limit')->unsigned()->default(0); $table->integer('usage_per_customer')->unsigned()->default(0); $table->integer('usage_throttle')->unsigned()->default(0); $table->integer('type')->unsigned()->default(0); diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_24_113949_create_cart_rule_coupons_usage_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_24_113949_create_cart_rule_coupons_usage_table.php index 4ab88d299..60f23900e 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_24_113949_create_cart_rule_coupons_usage_table.php +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_24_113949_create_cart_rule_coupons_usage_table.php @@ -19,6 +19,8 @@ class CreateCartRuleCouponsUsageTable extends Migration $table->foreign('coupon_id')->references('id')->on('cart_rules')->onDelete('cascade'); $table->integer('channel_id')->unsigned(); $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade'); + $table->integer('customer_id')->unsigned(); + $table->foreign('customer_id')->references('id')->on('customers')->onDelete('cascade'); $table->bigInteger('usage')->unsigned()->default(0); $table->date('expired_on'); $table->timestamps(); diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_30_141207_create_cart_rule_cart_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_30_141207_create_cart_rule_cart_table.php new file mode 100644 index 000000000..ec6fc70e8 --- /dev/null +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_30_141207_create_cart_rule_cart_table.php @@ -0,0 +1,35 @@ +increments('id'); + $table->integer('cart_rule_id')->unsigned()->nullable(); + $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade'); + $table->integer('cart_id')->unsigned()->nullable(); + $table->foreign('cart_id')->references('id')->on('cart')->onDelete('cascade'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cart_rule_order'); + } +} diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index 65fa544b4..cde226085 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -3,8 +3,10 @@ namespace Webkul\Discount\Helpers; use Webkul\Discount\Repositories\CartRuleRepository as CartRule; +use Webkul\Discount\Repositories\CartRuleCartRepository as CartRuleCart; use Carbon\Carbon; + class Discount { /** @@ -12,15 +14,26 @@ class Discount */ protected $cartRule; + /** + * To hold the cart rule cart repository instance + */ + protected $cartRuleCart; + /** * To hold if end rules are present or not. */ - protected $endRuleActive; + protected $endRuleActive = false; - public function __construct(CartRule $cartRule) + /** + * disable coupon + */ + protected $disableCoupon = false; + + public function __construct(CartRule $cartRule, CartRuleCart $cartRuleCart) { $this->cartRule = $cartRule; $this->endRuleActive = false; + $this->cartRuleCart = $cartRuleCart; } /** @@ -222,12 +235,14 @@ class Discount if (count($id)) { return [ 'couponable' => true, - 'id' => $id + 'id' => $id, + 'end_rule' => true ]; } else { return [ 'couponable' => false, - 'id' => null + 'id' => null, + 'end_rule' => null ]; } } else { @@ -243,12 +258,14 @@ class Discount if (count($id)) { return [ 'couponable' => true, - 'id' => $id + 'id' => $id, + 'end_rule' => false ]; } else { return [ 'couponable' => false, - 'id' => null + 'id' => null, + 'end_rule' => false ]; } } @@ -275,13 +292,15 @@ class Discount return [ 'end_rule' => false, 'noncouponable' => true, - 'id' => $id + 'id' => $id, + 'end_rule' => false ]; } else { return [ 'end_rule' => false, 'noncouponable' => false, - 'id' => null + 'id' => null, + 'end_rule' => false ]; } } else { @@ -299,13 +318,15 @@ class Discount return [ 'end_rule' => true, 'noncouponable' => true, - 'id' => $id + 'id' => $id, + 'end_rule' => true ]; } else { return [ 'end_rule' => true, 'noncouponable' => false, - 'id' => null + 'id' => null, + 'end_rule' => null ]; } } @@ -315,13 +336,6 @@ class Discount { $result = $this->applyNonCouponAble(); $cart = \Cart::getCart(); - - if ($result['end_rule']) { - $this->endRuleActive = true; - } else { - $this->endRuleActive = false; - } - $maxImpacts = array(); if (isset($result['id']) && count($result['id'])) { @@ -398,15 +412,31 @@ class Discount $realQty = $leastWorthItem['quantity']; if ($action_type == config('pricerules.cart.validation.0')) { - $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * $disc_amount) / 100; - } else if ($action_type == config('pricerules.cart.validation.1')) { - if ($disc_amount > ($disc_quantity * $leastWorthItem['base_total'])) { - $newBaseSubTotal = 0; + if ($realQty <= $disc_quantity) { + $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * ($disc_amount * $disc_quantity)) / 100; } else { - $newBaseSubTotal = $cart->grand_total - $disc_amount; + $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * $disc_amount) / 100; + } + } else if ($action_type == config('pricerules.cart.validation.1')) { + if ($realQty <= $disc_quantity) { + if ($disc_amount > ($disc_quantity * $leastWorthItem['base_total'])) { + $newBaseSubTotal = 0; + } else { + $newBaseSubTotal = $cart->grand_total - $disc_amount; + } + } else { + if ($disc_amount > $leastWorthItem['base_total']) { + $newBaseSubTotal = 0; + } else { + $newBaseSubTotal = $cart->grand_total - $disc_amount; + } } } else if ($action_type == config('pricerules.cart.validation.2')) { - $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; + if ($realQty <= $disc_quantity) { + $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; + } else { + $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_quantity; + } } else if ($action_type == config('pricerules.cart.validation.3')) { $newBaseSubTotal = $disc_amount; } @@ -459,7 +489,23 @@ class Discount } if ($leastId != -1) { - return $maxImpacts[$leastId]; + $cartRuleCart = $this->cartRuleCart->findWhere([ + 'cart_id' => $cart->id, + ]); + + if (count($cartRuleCart)) { + $this->cartRuleCart->update([ + 'cart_id' => $cart->id, + 'cart_rule_id' => $maxImpacts[$leastId]['rule']->id + ], $cartRuleCart->first()->id); + } else { + $this->cartRuleCart->create([ + 'cart_id' => $cart->id, + 'cart_rule_id' => $maxImpacts[$leastId]['rule']->id + ]); + } + + return ['rule' => $maxImpacts[$leastId]['rule'], 'impact' => $maxImpacts[$leastId], 'endRuleActive' => $this->endRuleActive]; } } @@ -467,11 +513,9 @@ class Discount { $rules = $this->applyCouponAble(); $appliedRule = null; - $coupons = []; foreach($rules['id'] as $rule) { - array_push($coupons, $rule->coupons->code); - if ($rule->use_coupon && $rule->auto_generation == 0) { + if ($rule->auto_generation == 0) { if ($rule->coupons->code == $code) { $appliedRule = $rule; @@ -517,7 +561,7 @@ class Discount } else if ($test_mode == config('pricerules.test_mode.2')) { $result = $this->testAnyConditionIsTrue($conditions, $cart); } else if ($test_mode == config('pricerules.test_mode.3')) { - $result = $this->testAbyConditionIsFalse($conditions, $cart); + $result = $this->testAnyConditionIsFalse($conditions, $cart); } } } else { @@ -548,34 +592,84 @@ class Discount $realQty = $leastWorthItem['quantity']; if ($action_type == config('pricerules.cart.validation.0')) { - $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * $disc_amount) / 100; - } else if ($action_type == config('pricerules.cart.validation.1')) { - if ($disc_amount > ($disc_quantity * $leastWorthItem['base_total'])) { - $newBaseSubTotal = 0; + if ($realQty <= $disc_quantity) { + $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * ($disc_amount * $disc_quantity)) / 100; } else { - $newBaseSubTotal = $cart->grand_total - $disc_amount; + $newBaseSubTotal = $cart->grand_total - ($leastWorthItem['base_total'] * $disc_amount) / 100; + } + } else if ($action_type == config('pricerules.cart.validation.1')) { + if ($realQty <= $disc_quantity) { + if ($disc_amount > ($disc_quantity * $leastWorthItem['base_total'])) { + $newBaseSubTotal = 0; + } else { + $newBaseSubTotal = $cart->grand_total - $disc_amount; + } + } else { + if ($disc_amount > $leastWorthItem['base_total']) { + $newBaseSubTotal = 0; + } else { + $newBaseSubTotal = $cart->grand_total - $disc_amount; + } } } else if ($action_type == config('pricerules.cart.validation.2')) { - $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; + if ($realQty <= $disc_quantity) { + $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; + } else { + $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_quantity; + } } else if ($action_type == config('pricerules.cart.validation.3')) { $newBaseSubTotal = $disc_amount; } if ($action_type == config('pricerules.cart.validation.2')) { + $cartRuleCart = $this->cartRuleCart->findWhere([ + 'cart_id' => $cart->id, + ]); + + if (count($cartRuleCart)) { + $this->cartRuleCart->update([ + 'cart_id' => $cart->id, + 'cart_rule_id' => $appliedRule->id + ], $cartRuleCart->first()->id); + } else { + $this->cartRuleCart->create([ + 'cart_id' => $cart->id, + 'cart_rule_id' => $appliedRule->id + ]); + } + return response()->json([ 'message' => trans('admin::app.promotion.status.coupon-applied'), 'action' => $action_type, 'amount_given' => false, 'amount_payable' => $newQuantity, - 'amount' => null + 'amount' => null, + 'success' => true ]); } else { + $cartRuleCart = $this->cartRuleCart->findWhere([ + 'cart_id' => $cart->id, + ]); + + if (count($cartRuleCart)) { + $this->cartRuleCart->update([ + 'cart_id' => $cart->id, + 'cart_rule_id' => $appliedRule->id + ], $cartRuleCart->first()->id); + } else { + $this->cartRuleCart->create([ + 'cart_id' => $cart->id, + 'cart_rule_id' => $appliedRule->id + ]); + } + return response()->json([ 'message' => trans('admin::app.promotion.status.coupon-applied'), 'action' => $action_type, 'amount_given' => true, - 'amount_payable' => core()->currency($newBaseSubTotal), - 'amount' => core()->currency($cart->grand_total - $newBaseSubTotal) + 'amount_payable' => core()->currency($newBaseSubTotal + $cart->tax_total), + 'amount' => core()->currency($cart->grand_total - $newBaseSubTotal), + 'success' => true ]); } } else { @@ -584,7 +678,8 @@ class Discount 'action' => $action_type, 'amount_given' => null, 'amount' => null, - 'least_value_item' => null + 'least_value_item' => null, + 'success' => false ]); } } else { @@ -593,7 +688,8 @@ class Discount 'action' => null, 'amount_given' => null, 'amount' => null, - 'least_value_item' => null + 'least_value_item' => null, + 'success' => false ]); } } diff --git a/packages/Webkul/Discount/src/Models/CartRuleCart.php b/packages/Webkul/Discount/src/Models/CartRuleCart.php new file mode 100644 index 000000000..d86d44be0 --- /dev/null +++ b/packages/Webkul/Discount/src/Models/CartRuleCart.php @@ -0,0 +1,14 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CartRuleCartRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Discount\Contracts\CartRuleCart'; + } +} \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index dfdfc8609..314c2d842 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -70,8 +70,6 @@ class OnepageController extends Controller { $data = request()->all(); - // dd($data); - $data['billing']['address1'] = implode(PHP_EOL, array_filter($data['billing']['address1'])); $data['shipping']['address1'] = implode(PHP_EOL, array_filter($data['shipping']['address1'])); diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 285f00df0..6320aa674 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -433,7 +433,13 @@ return [ 'contact' => 'Contact', 'place-order' => 'Place Order', 'new-address' => 'Add New Address', - 'save_as_address' => 'Save as Address' + 'save_as_address' => 'Save as Address', + 'apply-coupon' => 'Apply Coupon', + 'amt-payable' => 'Amount Payable', + 'got' => 'Got', + 'free' => 'Free', + 'coupon-used' => 'Coupon Used', + 'applied' => 'Applied' ], 'total' => [ diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index 6fa0add81..fc58ea4dd 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -511,8 +511,8 @@ }).then(function(response) { this_this.message = response.data.message; - this_this.discounted = true; - this_this.discount.amount = response.data.amount_payable; + this_this.discounted = response.data.success; + this_this.discount.amount = response.data.amount_payable, this_this.discount.amount_given = response.data.amount; }).catch(function(error) { this_this.discounted = false; @@ -526,7 +526,7 @@ } } } - }) + }); @endpush \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index 308a96884..976ddfbff 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -35,7 +35,7 @@ @if (! request()->is('checkout/cart')) @if (isset($rule['rule']) && ! $rule['rule']->end_other_rules) -
    +
    @@ -43,27 +43,25 @@ @{{ message }} - +
    @endif @if($rule) -
    +
    - {{ $rule['rule']->name }} applied + {{ $rule['rule']->name }} {{ __('shop::app.checkout.onepage.applied') }}
    - + + @if ($rule['impact']['amount_given']) + - - @if ($rule['amount_given']) - - - + @else - - + + @endif
    @@ -72,7 +70,7 @@ @if (! $rule['rule']->end_other_rules)
    - Coupon used + {{ __('shop::app.checkout.onepage.coupon-used') }}
    @@ -80,10 +78,8 @@ - - - - + +
    From fe347d345af465aa87abe01d0c8903311fae1b27 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 31 May 2019 11:58:06 +0530 Subject: [PATCH 60/89] some bug fixes --- .../promotions/cart-rule/create.blade.php | 47 +++++--- .../views/promotions/cart-rule/edit.blade.php | 61 ++++++---- .../Webkul/Discount/src/Helpers/Discount.php | 15 ++- .../Http/Controllers/CartRuleController.php | 112 ++++++++---------- .../views/checkout/onepage.blade.php | 2 +- .../views/checkout/total/summary.blade.php | 49 +++++--- 6 files changed, 155 insertions(+), 131 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index 92cb756b1..d7eb89af1 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -124,15 +124,15 @@ @{{ errors.first('use_coupon') }}
    -
    + {{--
    @{{ errors.first('auto_generation') }} -
    +
    --}} - + {{-- --}}
    @@ -173,6 +173,8 @@
    + +
    @@ -270,7 +272,7 @@
    - + @{{ errors.first('disc_quantity') }}
    @@ -299,14 +301,25 @@ @{{ errors.first('apply_to_shipping') }}
    + +
    + + + + + @{{ errors.first('end_other_rules') }} +
    - +
    -
    + {{--
    @@ -322,9 +335,9 @@ @{{ errors.first('suffix') }}
    -
    +
    --}} -
    +
    @@ -338,7 +351,6 @@
    -
    @@ -388,7 +400,7 @@ per_customer: 0, status: null, use_coupon: null, - auto_generation: null, + auto_generation: false, usage_limit: 0, is_guest: 0, @@ -397,7 +409,6 @@ apply_amt: false, apply_prct: false, apply_to_shipping: null, - buy_atleast: null, disc_amount: null, disc_threshold: null, disc_quantity: null, @@ -487,13 +498,13 @@ } }, - useCoupon() { - if (this.use_coupon == 0) { - this.auto_generation = null; - } else { - this.auto_generation = true; - } - }, + // useCoupon() { + // if (this.use_coupon == 0) { + // this.auto_generation = null; + // } else { + // this.auto_generation = true; + // } + // }, removeCartAttr(index) { this.conditions_list.splice(index, 1); diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php index 3c26c66b6..961709f71 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php @@ -124,15 +124,15 @@ @{{ errors.first('use_coupon') }}
    -
    + {{--
    @{{ errors.first('auto_generation') }} -
    +
    --}} - + {{-- --}}
    @@ -299,14 +299,24 @@ @{{ errors.first('apply_to_shipping') }}
    + +
    + + + + + @{{ errors.first('end_other_rules') }} +
    - +
    - -
    + {{--
    @@ -322,17 +332,17 @@ @{{ errors.first('suffix') }}
    +
    --}} + + {{--
    --}} +
    + + + + + @{{ errors.first('code') }}
    - -
    -
    - - - - - @{{ errors.first('code') }} -
    -
    + {{--
    --}}
    @@ -385,7 +395,7 @@ per_customer: 0, status: null, use_coupon: null, - auto_generation: 0, + // auto_generation: 0, usage_limit: 0, is_guest: 0, @@ -457,19 +467,19 @@ this.per_customer = data.per_customer; this.status = data.status; if (data.use_coupon == 0) { - this.auto_generation = null; + // this.auto_generation = null; this.use_coupon = 0; } else { this.use_coupon = 1; - this.auto_generation = data.auto_generation; + // this.auto_generation = data.auto_generation; this.code = data.coupons.code; - this.suffix = data.coupons.suffix; - this.prefix = data.coupons.prefix; + // this.suffix = data.coupons.suffix; + // this.prefix = data.coupons.prefix; - if (data.auto_generation == 0) - this.auto_generation = true; - else - this.auto_generation = false; + // if (data.auto_generation == 0) + // this.auto_generation = true; + // else + // this.auto_generation = false; } this.usage_limit = data.usage_limit; @@ -520,7 +530,6 @@ } if (this.condition_on == 'cart') { - console.log(this.conditions_list); this.conditions_list.push(this.cart_object); this.cart_object = { diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index cde226085..f57542acd 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -305,7 +305,6 @@ class Discount } } else { $rules = $rules['rule']; - $id = array(); foreach ($rules as $rule) { @@ -337,10 +336,10 @@ class Discount $result = $this->applyNonCouponAble(); $cart = \Cart::getCart(); $maxImpacts = array(); - + // dd($result); if (isset($result['id']) && count($result['id'])) { $rules = array(); - + // dd(2); if (count($result['id']) > 1) { $leastPriority = 999999999999; @@ -349,12 +348,14 @@ class Discount array_push($rules, $rule); } } + } else if (count($result['id'])) { + array_push($rules, $result['id'][0]); } foreach ($rules as $rule) { // All of conditions is/are true $result = 1; - if ($rule->conditions && $rule->conditions != "null") { + if ($rule->conditions && ($rule->conditions != "null" || $rule->conditions != "")) { if ($rule->starts_from != null && $rule->ends_till != null) { if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) { $conditions = json_decode(json_decode($rule->conditions)); @@ -505,7 +506,7 @@ class Discount ]); } - return ['rule' => $maxImpacts[$leastId]['rule'], 'impact' => $maxImpacts[$leastId], 'endRuleActive' => $this->endRuleActive]; + return ['rule' => $maxImpacts[$leastId]['rule'], 'impact' => $maxImpacts[$leastId], 'endRuleActive' => $this->endRuleActive, 'success' => true]; } } @@ -514,6 +515,10 @@ class Discount $rules = $this->applyCouponAble(); $appliedRule = null; + if (! isset($rules['id'])) { + return response()->json(['message' => trans('admin::app.promotion.status.no-coupon')], 200); + } + foreach($rules['id'] as $rule) { if ($rule->auto_generation == 0) { if ($rule->coupons->code == $code) { diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index 022a9ea8e..fefc93d80 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -96,12 +96,9 @@ class CartRuleController extends Controller public function store() { - // dd(request()->all()); required_if:use_coupon,1 + // dd(request()->all()); // required_if:use_coupon,1 $types = config('price_rules.cart.validations'); $data = request()->all(); - if (isset($data['auto_generation'])) { - $data['auto_generation'] = (boolean) $data['auto_generation']; - } $validated = Validator::make($data, [ 'name' => 'required|string', @@ -110,7 +107,7 @@ class CartRuleController extends Controller 'channels' => 'required|array', 'status' => 'required|boolean', 'use_coupon' => 'boolean|required', - 'auto_generation' => 'boolean|sometimes', + // 'auto_generation' => 'boolean|sometimes', 'usage_limit' => 'numeric|min:0', 'per_customer' => 'numeric|min:0', 'action_type' => 'required|string', @@ -120,19 +117,17 @@ class CartRuleController extends Controller 'free_shipping' => 'required|boolean', 'apply_to_shipping' => 'required|boolean', 'code' => 'string|required_if:auto_generation,0', - 'all_conditions' => 'required', + 'all_conditions' => 'sometimes|nullable', 'label' => 'array|nullable' ]); if ($validated->fails()) { session()->flash('error', 'Validation failed'); - dd($validated); return redirect()->route('admin.cart-rule.create') ->withErrors($validated) ->withInput(); } - // dd($data); if ($data['starts_from'] == "" || $data['ends_till'] == "") { $data['starts_from'] = null; $data['ends_till'] = null; @@ -152,12 +147,7 @@ class CartRuleController extends Controller unset($data['cart_attributes']); unset($data['attributes']); - if (count(json_decode($data['all_conditions'])) == 0) { - $data['conditions'] = null; - } else { - $data['conditions'] = $data['all_conditions']; - } - unset($data['all_conditions']); + // unset($data['all_conditions']); if (isset($data['disc_amount']) && $data['action_type'] == config('pricerules.cart.validations.2')) { $data['actions'] = [ @@ -176,26 +166,32 @@ class CartRuleController extends Controller } $data['actions'] = json_encode($data['actions']); - $data['conditions'] = json_encode($data['conditions']); + + if (! isset($data['all_conditions'])) { + $data['conditions'] = null; + } else { + $data['conditions'] = json_encode($data['all_conditions']); + } if ($data['use_coupon']) { - if (isset($data['auto_generation']) && $data['auto_generation']) { - $data['auto_generation'] = 0; - $coupons['code'] = $data['code']; - unset($data['code']); - } else { - $data['auto_generation'] = 1; - } + // if (isset($data['auto_generation']) && $data['auto_generation']) { + $data['auto_generation'] = 0; - if (isset($data['prefix'])) { - $coupons['prefix'] = $data['prefix']; - unset($data['prefix']); - } + $coupons['code'] = $data['code']; + unset($data['code']); + // } else { + // $data['auto_generation'] = 1; + // } - if (isset($data['suffix'])) { - $coupons['suffix'] = $data['suffix']; - unset($data['suffix']); - } + // if (isset($data['prefix'])) { + // $coupons['prefix'] = $data['prefix']; + // unset($data['prefix']); + // } + + // if (isset($data['suffix'])) { + // $coupons['suffix'] = $data['suffix']; + // unset($data['suffix']); + // } } if(isset($data['limit'])) { @@ -263,7 +259,6 @@ class CartRuleController extends Controller 'channels' => 'required|array', 'status' => 'required|boolean', 'use_coupon' => 'boolean|required', - 'auto_generation' => 'sometimes', 'usage_limit' => 'numeric|min:0', 'per_customer' => 'numeric|min:0', 'action_type' => 'required|string', @@ -272,8 +267,8 @@ class CartRuleController extends Controller 'disc_threshold' => 'required|numeric', 'free_shipping' => 'required|boolean', 'apply_to_shipping' => 'required|boolean', - 'code' => 'string|required_if:auto_generation,0', - 'all_conditions' => 'required', + 'code' => 'string|required_if:user_coupon,1', + 'all_conditions' => 'present', 'label' => 'array|nullable' ]); @@ -308,13 +303,6 @@ class CartRuleController extends Controller unset($data['cart_attributes']); unset($data['attributes']); - if (count(json_decode($data['all_conditions'])) == 0) { - $data['conditions'] = null; - } else { - $data['conditions'] = $data['all_conditions']; - } - unset($data['all_conditions']); - if (isset($data['disc_amount']) && $data['action_type'] == config('pricerules.cart.validations.2')) { $data['actions'] = [ 'action_type' => $data['action_type'], @@ -332,33 +320,33 @@ class CartRuleController extends Controller } $data['actions'] = json_encode($data['actions']); - $data['conditions'] = json_encode($data['conditions']); + if (! isset($data['all_conditions'])) { + $data['conditions'] = null; + } else { + $data['conditions'] = json_encode($data['all_conditions']); + } + + unset($data['all_conditions']); if ($data['use_coupon']) { - if (isset($data['auto_generation'])) { - if ($data['auto_generation'] == "true") { - $data['auto_generation'] = 0; - } else { - $data['auto_generation'] = 1; - } + // if (isset($data['auto_generation']) && $data['auto_generation']) { + $data['auto_generation'] = 0; - if(! $data['auto_generation']) { - $coupons['code'] = $data['code']; - unset($data['code']); - } - } else { + $coupons['code'] = $data['code']; + unset($data['code']); + // } else { + // $data['auto_generation'] = 1; + // } - } + // if (isset($data['prefix'])) { + // $coupons['prefix'] = $data['prefix']; + // unset($data['prefix']); + // } - if (isset($data['prefix'])) { - $coupons['prefix'] = $data['prefix']; - unset($data['prefix']); - } - - if (isset($data['suffix'])) { - $coupons['suffix'] = $data['suffix']; - unset($data['suffix']); - } + // if (isset($data['suffix'])) { + // $coupons['suffix'] = $data['suffix']; + // unset($data['suffix']); + // } } if (isset($data['limit'])) { diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index f3c3f60be..707329e18 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -489,7 +489,7 @@ qtyRevealed: false, amount_given: null, amount: null, - discounted: false, + discounted: null, discount: { amount: null, action: null, diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index 976ddfbff..a4deed7e3 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -30,26 +30,26 @@
    -
    +
    @inject('cart_rule', 'Webkul\Discount\Helpers\Discount') @if (! request()->is('checkout/cart')) - @if (isset($rule['rule']) && ! $rule['rule']->end_other_rules) -
    -
    - + +
    + + + @{{ errors.first('code') }} + + @{{ message }} - @{{ message }} + @{{ message }} - @{{ message }} + +
    + - -
    - - @endif - - @if($rule) -
    + @if(isset($rule)) + {{--
    {{ $rule['rule']->name }} {{ __('shop::app.checkout.onepage.applied') }}
    @@ -64,11 +64,22 @@ @endif -
    - @endif +
    --}} + @else + {{-- {{dd('2')}} --}} + {{--
    +
    + @{{ code }} {{ __('shop::app.checkout.onepage.applied') }} +
    - @if (! $rule['rule']->end_other_rules) -
    + + + + + +
    + +
    {{ __('shop::app.checkout.onepage.coupon-used') }}
    @@ -82,7 +93,7 @@ -
    +
    --}} @endif @endif
    From 42e346f4005332ed0f4298f5f4fdc25303dbec5b Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 31 May 2019 19:17:56 +0530 Subject: [PATCH 61/89] Removed bugs and added coupon based cart rule removal functionality --- .../Admin/src/Resources/lang/en/app.php | 2 + packages/Webkul/Checkout/src/Cart.php | 7 + ...19_05_13_024326_create_cart_rule_table.php | 1 - .../Webkul/Discount/src/Helpers/Discount.php | 154 +++++++++++++++++- .../Discount/src/Models/CartRuleCart.php | 12 +- .../src/Http/Controllers/CartController.php | 22 +++ .../Http/Controllers/OnepageController.php | 1 - packages/Webkul/Shop/src/Http/routes.php | 2 + .../views/checkout/onepage.blade.php | 18 +- .../views/checkout/total/summary.blade.php | 42 +++-- 10 files changed, 241 insertions(+), 20 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index b23742e1e..29fa8ef01 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -834,6 +834,8 @@ return [ 'coupon-applied' => 'Coupon used', 'coupon-failed' => 'Coupon failed to apply', 'no-coupon' => '* Coupon not applicable', + 'coupon-removed' => 'Coupon removed successfully', + 'coupon-remove-failed' => 'Coupon removal failed' ], 'catalog' => [ diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index e751a64ea..4eff4a250 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1300,6 +1300,13 @@ class Cart { return $result; } + public function removeCoupon() + { + $result = $this->discount->removeCoupon(); + + return $result; + } + public function leastWorthItem() { $cart = $this->getCart(); diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php index d581186ed..151a76602 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php @@ -25,7 +25,6 @@ class CreateCartRuleTable extends Migration $table->boolean('use_coupon')->default(0); $table->integer('usage_limit')->unsigned()->default(0); $table->json('conditions')->nullable(); - $table->string('test_mode')->nullable(); $table->json('actions')->nullable(); $table->boolean('end_other_rules')->default(0); $table->integer('priority')->unsigned()->default(0); diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index 6d4d0d08e..2c12c8cd5 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -535,6 +535,12 @@ class Discount return response()->json(['message' => trans('admin::app.promotion.status.no-coupon')], 200); } + $race = $this->endRace($appliedRule); + + if (! $race) { + return response()->json(['message' => trans('admin::app.promotion.status.no-coupon')], 200); + } + $cart = \Cart::getCart(); // All of conditions is/are true @@ -674,7 +680,7 @@ class Discount 'item_id' => $leastWorthItem['id'], 'message' => trans('admin::app.promotion.status.coupon-applied'), 'amount_given' => true, - 'amount' => $amountDiscounted, + 'amount' => core()->currency($amountDiscounted + $cart->tax_total), 'action_type' => $action_type, 'success' => true ]); @@ -707,6 +713,152 @@ class Discount } } + /** + * To remove the couponable rule + */ + public function removeCoupon() + { + $rule = $this->cartRuleCart->findWhere([ + 'cart_id' => \Cart::getCart()->id + ])->first(); + + if ($rule->cart_rule->use_coupon) { + if ($rule->delete()) { + return true; + } else { + return false; + } + } else { + return false; + } + } + + /** + * End race between two rules i.e the one already + * applied and one trying to be used + */ + protected function endRace($newRule) + { + $appliedRule = $this->cartRuleCart->findWhere([ + 'cart_id' => \Cart::getCart()->id + ]); + + if (! count($appliedRule)) { + return true; + } + + $appliedRule = $appliedRule->first()->cart_rule; + + if ($appliedRule->end_other_rules) { + return false; + } else { + if ($newRule->priority > $appliedRule->priority) { + return false; + } else if ($appliedRule->priority == $newRule->priority) { + $appliedRuleImpact = $this->analyzeImpact($appliedRule); + $newRuleImpact = $this->analyzeImpact($newRule); + + if ($newRuleImpact > $appliedRuleImpact) { + return true; + } else { + return false; + } + } else { + return true; + } + } + } + + public function analyzeImpact($rule) + { + $cart = \Cart::getCart(); + + $action_type = $rule->action_type; + $disc_threshold = $rule->disc_threshold; + $disc_amount = $rule->disc_amount; + $disc_quantity = $rule->disc_quantity; + + $amountDiscounted = 0; + $newQuantity = 0; + + $leastWorthItem = \Cart::leastWorthItem(); + $realQty = $leastWorthItem['quantity']; + + if ($cart->items_qty >= $disc_threshold && $disc_quantity > 0) { + if ($disc_quantity > 1) { + $disc_amount = $disc_amount * $disc_quantity; + } + + if ($action_type == config('pricerules.cart.validation.0')) { + if ($realQty <= $disc_quantity) { + $amountDiscounted = (($leastWorthItem['total'] / $realQty) * ($disc_amount / 100)) * $disc_quantity; + } else { + $amountDiscounted = ($leastWorthItem['total'] / $realQty) * ($disc_amount / 100); + } + } else if ($action_type == config('pricerules.cart.validation.1')) { + if ($realQty <= $disc_quantity) { + if ($disc_amount > ($disc_quantity * $leastWorthItem['total'])) { + $amountDiscounted = 0; + } else { + $amountDiscounted = $cart->sub_total - $disc_amount; + } + } else { + if ($disc_amount > $leastWorthItem['total']) { + $amountDiscounted = 0; + } else { + $amountDiscounted = $cart->sub_total - $disc_amount; + } + } + } else if ($action_type == config('pricerules.cart.validation.2')) { + if ($realQty <= $disc_quantity) { + $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; + } else { + $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_quantity; + } + } else if ($action_type == config('pricerules.cart.validation.3')) { + $amountDiscounted = $disc_amount; + } + + if ($action_type == config('pricerules.cart.validation.2')) { + // $cartRuleCart = $this->cartRuleCart->findWhere([ + // 'cart_id' => $cart->id, + // ]); + + // if (count($cartRuleCart)) { + // $this->cartRuleCart->update([ + // 'cart_id' => $cart->id, + // 'cart_rule_id' => $rule->id + // ], $cartRuleCart->first()->id); + // } else { + // $this->cartRuleCart->create([ + // 'cart_id' => $cart->id, + // 'cart_rule_id' => $rule->id + // ]); + // } + + return $newQuantity; + } else { + // $cartRuleCart = $this->cartRuleCart->findWhere([ + // 'cart_id' => $cart->id, + // ]); + + // if (count($cartRuleCart)) { + // $this->cartRuleCart->update([ + // 'cart_id' => $cart->id, + // 'cart_rule_id' => $rule->id + // ], $cartRuleCart->first()->id); + // } else { + // $this->cartRuleCart->create([ + // 'cart_id' => $cart->id, + // 'cart_rule_id' => $rule->id + // ]); + // } + + return $amountDiscounted; + } + } + } + protected function testAllConditionAreTrue($conditions, $cart) { $shipping_address = $cart->getShippingAddressAttribute(); diff --git a/packages/Webkul/Discount/src/Models/CartRuleCart.php b/packages/Webkul/Discount/src/Models/CartRuleCart.php index d86d44be0..66d2b503c 100644 --- a/packages/Webkul/Discount/src/Models/CartRuleCart.php +++ b/packages/Webkul/Discount/src/Models/CartRuleCart.php @@ -3,12 +3,20 @@ namespace Webkul\Discount\Models; use Illuminate\Database\Eloquent\Model; -use Webkul\Discount\Contracts\CartRuleCart as CartRuleContract; +use Webkul\Discount\Models\CartRuleProxy as CartRule; +use Webkul\Discount\Contracts\CartRuleCart as CartRuleCartContract; -class CartRuleCart extends Model implements CartRuleContract +class CartRuleCart extends Model implements CartRuleCartContract { protected $table = 'cart_rule_cart'; protected $guarded = ['created_at', 'updated_at']; + + protected $with = ['cart_rule']; + + public function cart_rule() + { + return $this->hasOne(CartRule::modelClass(), 'id', 'cart_rule_id'); + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index f848634dc..522daa806 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -259,4 +259,26 @@ class CartController extends Controller return $result; } + + /** + * To remove the currently active + * couponable rule + */ + public function removeCoupon() + { + dd('removing coupon'); + $result = Cart::removeCoupon(); + + if ($result) { + return response()->json([ + 'success' => true, + 'message' => trans('admin::app.promotion.status.coupon-removed') + ]); + } else { + return response()->json([ + 'success' => false, + 'message' => trans('admin::app.promotion.status.coupon-remove-failed') + ]); + } + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index 483c0b124..f1a0662b5 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -127,7 +127,6 @@ class OnepageController extends Controller $cart = Cart::getCart(); $rule = Cart::applyNonCoupon(); - // dd($rule); return response()->json([ 'jump_to_section' => 'review', diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index f302726fd..ac044d289 100755 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -41,6 +41,8 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function Route::post('checkout/check/coupons', 'Webkul\Shop\Http\Controllers\CartController@applyCoupon')->name('shop.checkout.check.coupons'); + Route::post('checkout/remove/coupon', 'Webkul\Shop\Http\Controllers\CartController@removeCoupon')->name('shop.checkout.remove.coupon'); + //Cart Items Add Route::post('checkout/cart/add/{id}', 'Webkul\Shop\Http\Controllers\CartController@add')->defaults('_config', [ 'redirect' => 'shop.checkout.cart.index' diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index 707329e18..2524de4b9 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -527,8 +527,8 @@ this_this.message = response.data.message; this_this.discounted = response.data.success; - this_this.discount.amount = response.data.amount_payable, - this_this.discount.amount_given = response.data.amount; + this_this.discount.amount = response.data.amount; + this_this.discount.amount_given = response.data.amount_given; }).catch(function(error) { this_this.discounted = false; }); @@ -539,6 +539,20 @@ { this.message = null; } + }, + + removeCoupon: function() { + var this_this = this; + + axios.post('{{ route('shop.checkout.remove.coupon') }}', { + code: this_this.code + }).then(function(response) { + this.discounted = null; + }).catch(function(error) { + this_this.discounted = false; + }); + + } } }); diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index 2010843cb..1915f96cf 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -37,9 +37,11 @@
    + @{{ errors.first('code') }} + @{{ message }} @{{ message }} @@ -49,31 +51,45 @@ @if(isset($rule)) -
    +
    {{ $rule['rule']->name }} {{ __('shop::app.checkout.onepage.applied') }}
    @if ($rule['impact']['amount_given']) - + - + @else - - + + + @endif
    @endif + +
    +
    + @{{ message }} +
    + + + + + + +
    @endif
    -
    -@push('scripts') - -@endpush \ No newline at end of file +
    \ No newline at end of file From 6705f07e274be7cb5b6d37338df00cc03b9716f8 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 31 May 2019 19:27:37 +0530 Subject: [PATCH 62/89] some bug fixes --- .../Shop/src/Http/Controllers/CartController.php | 1 - .../src/Resources/views/checkout/onepage.blade.php | 10 +++++++--- .../Resources/views/checkout/total/summary.blade.php | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 522daa806..95e9a2463 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -266,7 +266,6 @@ class CartController extends Controller */ public function removeCoupon() { - dd('removing coupon'); $result = Cart::removeCoupon(); if ($result) { diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index 2524de4b9..f46c443ec 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -547,12 +547,16 @@ axios.post('{{ route('shop.checkout.remove.coupon') }}', { code: this_this.code }).then(function(response) { - this.discounted = null; + if (response.data.message == true) { + this_this.discounted = null; + this_this.discount.amount = null; + this_this.discount.action = null; + this_this.discount.amount_given = null; + this_this.discount.message = null; + } }).catch(function(error) { this_this.discounted = false; }); - - } } }); diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index 1915f96cf..d7e664298 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -80,7 +80,7 @@
    - @{{ message }} + @{{ message }}
    From db3b35ff4cc2a93003199c2bd4b6751d4bc5a8a3 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 3 Jun 2019 17:52:52 +0530 Subject: [PATCH 63/89] cart rule labels refactoring in midway --- README.md | 5 +++ .../promotions/cart-rule/create.blade.php | 2 +- .../views/promotions/cart-rule/edit.blade.php | 38 +++---------------- .../Http/Controllers/CartRuleController.php | 4 ++ 4 files changed, 15 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 115fa6419..ef6504803 100755 --- a/README.md +++ b/README.md @@ -140,6 +140,11 @@ Although, mailer environment variables are also required to be set up as **Bagis ##### On server: +Warning: Before going full on production mode we recommend you to install developer dependencies. +In order to do that, run the command below: + +> composer install --no-dev + ~~~ Open the specified entry point in your hosts file in browser or make entry in hosts file if not done. ~~~ diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index d7eb89af1..dc2f58fa7 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -116,7 +116,7 @@ '']"> - diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php index 60b272517..c26ece9a1 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php @@ -232,6 +232,9 @@
    + + +
    @@ -348,27 +351,9 @@
    - -
    - - - - - @{{ errors.first('label') }} -
    - -
    @foreach($cart_rule[3]->labels as $label) - [{{ $label->channel->code }}] -
    - - - - @{{ errors.first('label') }} -
    @endforeach -
    @@ -421,11 +406,10 @@ global_label: null, label: { - global: null, @foreach(core()->getAllChannels() as $channel) @foreach($channel->locales as $locale) - '{{ trim($channel->code) }}' : { - '{{ trim($locale->code) }}': null + {{ trim($channel->code) }} : { + {{ trim($locale->code) }}: '' }, @endforeach @endforeach @@ -504,18 +488,6 @@ this.conditions_list = JSON.parse(JSON.parse(data.conditions)); } - this.dedicated_label = false; - global_label = null; - - this.label = { - @foreach($cart_rule[3]->labels as $label) - '{{ $label->channel->code }}': { - '{{ $label->locale->code }}': - '{{ $label->label }}' - }, - @endforeach - } - criteria = null; }, diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index 2e3d653bf..5fc1c3a79 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -209,12 +209,14 @@ class CartRuleController extends Controller foreach($channel->locales as $locale) { $label1['locale_id'] = $locale->id; $label1['label'] = $labels['global']; + $label1['cart_rule_id'] = $ruleCreated->id; $ruleLabelCreated = $this->cartRuleLabel->create($label1); } } } else { $label2['label'] = $labels['global']; + $label2['cart_rule_id'] = $ruleCreated->id; $ruleLabelCreated = $this->cartRuleLabel->create($label2); } @@ -280,6 +282,8 @@ class CartRuleController extends Controller $data = request()->all(); + dd($data); + if ($data['starts_from'] == "" || $data['ends_till'] == "") { $data['starts_from'] = null; $data['ends_till'] = null; From e0dd74c06c0a0c57d213bf42dea394bd1a1fcd55 Mon Sep 17 00:00:00 2001 From: imanghafoori Date: Tue, 4 Jun 2019 00:52:37 +0430 Subject: [PATCH 64/89] clean up --- .../Http/Controllers/DashboardController.php | 70 +++++++++---------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php index 37848b391..3be5ad0c8 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php @@ -131,47 +131,23 @@ class DashboardController extends Controller $statistics = [ 'total_customers' => [ - 'previous' => $previous = $this->customer->scopeQuery(function($query) { - return $query->where('customers.created_at', '>=', $this->lastStartDate) - ->where('customers.created_at', '<=', $this->lastEndDate); - })->count(), - 'current' => $current = $this->customer->scopeQuery(function($query) { - return $query->where('customers.created_at', '>=', $this->startDate) - ->where('customers.created_at', '<=', $this->endDate); - })->count(), + 'previous' => $previous = $this->getCustomersBetweenDates($this->lastStartDate, $this->lastEndDate)->count(), + 'current' => $current = $this->getCustomersBetweenDates($this->startDate, $this->endDate)->count(), 'progress' => $this->getPercentageChange($previous, $current) ], 'total_orders' => [ - 'previous' => $previous = $this->order->scopeQuery(function($query) { - return $query->where('orders.created_at', '>=', $this->lastStartDate) - ->where('orders.created_at', '<=', $this->lastEndDate); - })->count(), - 'current' => $current = $this->order->scopeQuery(function($query) { - return $query->where('orders.created_at', '>=', $this->startDate) - ->where('orders.created_at', '<=', $this->endDate); - })->count(), + 'previous' => $previous = $this->previousOrders()->count(), + 'current' => $current = $this->currentOrders()->count(), 'progress' => $this->getPercentageChange($previous, $current) ], 'total_sales' => [ - 'previous' => $previous = $this->order->scopeQuery(function($query) { - return $query->where('orders.created_at', '>=', $this->lastStartDate) - ->where('orders.created_at', '<=', $this->lastEndDate); - })->sum('base_grand_total'), - 'current' => $current = $this->order->scopeQuery(function($query) { - return $query->where('orders.created_at', '>=', $this->startDate) - ->where('orders.created_at', '<=', $this->endDate); - })->sum('base_grand_total'), + 'previous' => $previous = $this->previousOrders()->sum('base_grand_total'), + 'current' => $current = $this->currentOrders()->sum('base_grand_total'), 'progress' => $this->getPercentageChange($previous, $current) ], 'avg_sales' => [ - 'previous' => $previous = $this->order->scopeQuery(function($query) { - return $query->where('orders.created_at', '>=', $this->lastStartDate) - ->where('orders.created_at', '<=', $this->lastEndDate); - })->avg('base_grand_total'), - 'current' => $current = $this->order->scopeQuery(function($query) { - return $query->where('orders.created_at', '>=', $this->startDate) - ->where('orders.created_at', '<=', $this->endDate); - })->avg('base_grand_total'), + 'previous' => $previous = $this->previousOrders()->avg('base_grand_total'), + 'current' => $current = $this->currentOrders()->avg('base_grand_total'), 'progress' => $this->getPercentageChange($previous, $current) ], 'top_selling_categories' => $this->getTopSellingCategories(), @@ -180,14 +156,10 @@ class DashboardController extends Controller 'stock_threshold' => $this->getStockThreshold(), ]; - foreach (core()->getTimeInterval($this->startDate, $this->endDate) as $interval) { $statistics['sale_graph']['label'][] = $interval['start']->format('d M'); - $total = $this->order->scopeQuery(function($query) use($interval) { - return $query->where('orders.created_at', '>=', $interval['start']) - ->where('orders.created_at', '<=', $interval['end']); - })->sum('base_grand_total'); + $total = $this->getOrdersBetweenDate($interval['start'], $interval['end'])->sum('base_grand_total'); $statistics['sale_graph']['total'][] = $total; $statistics['sale_graph']['formated_total'][] = core()->formatBasePrice($total); @@ -300,4 +272,28 @@ class DashboardController extends Controller $this->lastStartDate->subDays($this->startDate->diffInDays($this->endDate)); // $this->lastEndDate->subDays($this->lastStartDate->diffInDays($this->lastEndDate)); } + + private function previousOrders() + { + return $this->getOrdersBetweenDate($this->lastStartDate, $this->lastEndDate); + } + + private function currentOrders() + { + return $this->getOrdersBetweenDate($this->startDate, $this->endDate); + } + + private function getOrdersBetweenDate($start, $end) + { + return $this->order->scopeQuery(function ($query) use ($start, $end) { + return $query->where('orders.created_at', '>=', $start)->where('orders.created_at', '<=', $end); + }); + } + + private function getCustomersBetweenDates($start, $end) + { + return $this->customer->scopeQuery(function ($query) use ($start, $end) { + return $query->where('customers.created_at', '>=', $start)->where('customers.created_at', '<=', $end); + }); + } } \ No newline at end of file From 3c95e11df7f2d78984bbc12fb7e156cfd049d805 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Tue, 4 Jun 2019 14:54:42 +0530 Subject: [PATCH 65/89] Cart rule labels bug fixed --- .../promotions/cart-rule/create.blade.php | 4 +- .../views/promotions/cart-rule/edit.blade.php | 29 +++++++------ .../Http/Controllers/CartRuleController.php | 18 +------- .../src/Repositories/CartRuleRepository.php | 42 +++++++++++++++++-- 4 files changed, 59 insertions(+), 34 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index dc2f58fa7..421db019d 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -316,7 +316,7 @@
    - +
    {{--
    @@ -366,7 +366,7 @@
    - + @{{ errors.first('label') }}
    diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php index c26ece9a1..051a47cdc 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php @@ -38,6 +38,8 @@
    + +
    @@ -232,9 +234,6 @@
    - - -
    @@ -352,7 +351,14 @@
    @foreach($cart_rule[3]->labels as $label) + [{{ $label->channel->code }}] +
    + + + + @{{ errors.first('label') }} +
    @endforeach
    @@ -405,15 +411,14 @@ dedicated_label: true, global_label: null, - label: { - @foreach(core()->getAllChannels() as $channel) - @foreach($channel->locales as $locale) - {{ trim($channel->code) }} : { - {{ trim($locale->code) }}: '' - }, - @endforeach - @endforeach - }, + labels: [], + // label: { + // @foreach(core()->getAllChannels() as $channel) + // @foreach($channel->locales as $locale) + // {{ trim($channel->code) }} : null, + // @endforeach + // @endforeach + // }, criteria: null, conditions: @json($cart_rule[0]).conditions, diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index 5fc1c3a79..aca8d490e 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -105,7 +105,6 @@ class CartRuleController extends Controller 'channels' => 'required|array', 'status' => 'required|boolean', 'use_coupon' => 'boolean|required', - // 'auto_generation' => 'boolean|sometimes', 'usage_limit' => 'numeric|min:0', 'per_customer' => 'numeric|min:0', 'action_type' => 'required|string', @@ -282,8 +281,6 @@ class CartRuleController extends Controller $data = request()->all(); - dd($data); - if ($data['starts_from'] == "" || $data['ends_till'] == "") { $data['starts_from'] = null; $data['ends_till'] = null; @@ -362,20 +359,7 @@ class CartRuleController extends Controller $ruleGroupUpdated = $this->cartRule->CustomerGroupSync($customer_groups, $ruleUpdated); $ruleChannelUpdated = $this->cartRule->ChannelSync($channels, $ruleUpdated); - // if (isset($labels['global'])) { - // foreach (core()->getAllChannels() as $channel) { - // $label1['channel_id'] = $channel->id; - // foreach ($channel->locales as $locale) { - // $label1['locale_id'] = $locale->id; - // $label1['label'] = $labels['global']; - - // $ruleLabelUpdated = $this->cartRuleLabel->create($label1); - // } - // } - // } else { - // $label2['label'] = $labels['global']; - // $ruleLabelUpdated = $this->cartRuleLabel->create($label2); - // } + $labelsUpdated = $this->cartRule->LabelSync($labels, $ruleUpdated); if (isset($coupons)) { $coupons['cart_rule_id'] = $ruleUpdated->id; diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleRepository.php index 79fdb6450..3eebebc06 100644 --- a/packages/Webkul/Discount/src/Repositories/CartRuleRepository.php +++ b/packages/Webkul/Discount/src/Repositories/CartRuleRepository.php @@ -33,7 +33,7 @@ class CartRuleRepository extends Repository $this->cartRuleChannels = $cartRuleChannels; $this->cartRuleCustomerGroups = $cartRuleCustomerGroups; $this->cartRuleCoupons = $cartRuleCoupons; - $this->cartRuleLabels = $cartRuleLabels; + $this->cartRuleLabel = $cartRuleLabels; parent::__construct($app); } @@ -146,15 +146,51 @@ class CartRuleRepository extends Repository /** * To sync the labels associated with the cart rule */ - public function LabelsSync($labels, $cartRule) + public function LabelSync($labels, $cartRule) { + foreach ($labels as $channelCode => $value) { + $localeCode = array_keys($value)[0]; + $localeValue = array_values($value)[0]; + $updated = 0; + foreach ($cartRule->labels as $label) { + if ($label->channel->code == $channelCode && $label->locale->code == $localeCode) { + $label->update([ + 'label' => $localeValue + ]); + + $updated = 1; + } + } + + if ($updated == 0) { + foreach (core()->getAllChannels() as $channel) { + if ($channel->code == $channelCode) { + $newLabel['channel_id'] = $channel->id; + } + + foreach($channel->locales as $locale) { + if ($localeCode == $locale->code) { + $newLabel['locale_id'] = $locale->id; + $newLabel['label'] = $localeValue; + $newLabel['cart_rule_id'] = $cartRule->id; + + $ruleLabelCreated = $this->CartRuleLabels->create($newLabel); + } + } + } + } + + $updated = 0; + } + + return true; } /** * To sync the coupons associated with the cart rule */ - public function CouponsSync($coupon, $cartRule) + public function CouponSync($coupon, $cartRule) { } From 9f039cb9a5389e61393c1be901a56bfb2d542e1e Mon Sep 17 00:00:00 2001 From: imanghafoori Date: Tue, 4 Jun 2019 14:45:16 +0430 Subject: [PATCH 66/89] clean up - optimized imports - remove unused variable - extract a method - flatten code --- .../Controllers/ConfigurationController.php | 41 ++++++++----------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php index 9e1ec21b8..f24446b7c 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php @@ -2,13 +2,10 @@ namespace Webkul\Admin\Http\Controllers; -use Illuminate\Http\Request; -use Illuminate\Http\Response; use Illuminate\Support\Facades\Event; use Webkul\Admin\Facades\Configuration; use Webkul\Core\Repositories\CoreConfigRepository as CoreConfig; use Webkul\Core\Tree; -use Webkul\Admin\Http\Requests\ConfigurationForm; use Illuminate\Support\Facades\Storage; /** @@ -98,32 +95,18 @@ class ConfigurationController extends Controller */ public function getDefaultConfigSlugs() { - $slugs = []; - if (! request()->route('slug')) { $firstItem = current($this->configTree->items); $secondItem = current($firstItem['children']); - $temp = explode('.', $secondItem['key']); - - $slugs = [ - 'slug' => current($temp), - 'slug2' => end($temp) - ]; - } else { - if (! request()->route('slug2')) { - $secondItem = current($this->configTree->items[request()->route('slug')]['children']); - - $temp = explode('.', $secondItem['key']); - - $slugs = [ - 'slug' => current($temp), - 'slug2' => end($temp) - ]; - } + return $this->getSlugs($secondItem); } - return $slugs; + if (! request()->route('slug2')) { + $secondItem = current($this->configTree->items[request()->route('slug')]['children']); + + return $this->getSlugs($secondItem); + } } /** @@ -160,4 +143,16 @@ class ConfigurationController extends Controller return Storage::download($config['value']); } + + /** + * @param $secondItem + * + * @return array + */ + private function getSlugs($secondItem): array + { + $temp = explode('.', $secondItem['key']); + + return ['slug' => current($temp), 'slug2' => end($temp)]; + } } \ No newline at end of file From a78cc0b3b76cfbe54fc2f064e3f29a6231783038 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Thu, 6 Jun 2019 11:14:54 +0530 Subject: [PATCH 67/89] removed margin classes from shop to UI --- .../Http/Controllers/CartRuleController.php | 2 - .../Shop/src/Resources/assets/sass/app.scss | 110 ------------------ .../Ui/src/Resources/assets/sass/app.scss | 4 - 3 files changed, 116 deletions(-) diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index aca8d490e..e6427031b 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -144,8 +144,6 @@ class CartRuleController extends Controller unset($data['cart_attributes']); unset($data['attributes']); - // unset($data['all_conditions']); - if (isset($data['disc_amount']) && $data['action_type'] == config('pricerules.cart.validations.2')) { $data['actions'] = [ 'action_type' => $data['action_type'], diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index db79dd970..f6e235150 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -38,116 +38,6 @@ input { border-radius: 0px !important; } -//margin bottom classes -.mb-10 { - margin-bottom: 10px; -} - -.mb-15 { - margin-bottom: 15px; -} - -.mb-20 { - margin-bottom: 20px; -} - -.mb-25 { - margin-bottom: 25px; -} - -.mb-30 { - margin-bottom: 30px; -} - -.mb-35 { - margin-bottom: 35px; -} - -.mb-40 { - margin-bottom: 40px; -} - -.mb-45 { - margin-bottom: 45px; -} - -.mb-50 { - margin-bottom: 50px; -} - -.mb-60 { - margin-bottom: 60px; -} - -.mb-70 { - margin-bottom: 70px; -} - -.mb-80 { - margin-bottom: 80px; -} - -.mb-90 { - margin-bottom: 90px; -} - -//margin-top -.mt-5 { - margin-top: 5px; -} - -.mt-10 { - margin-top: 10px; -} - -.mt-15 { - margin-top: 15px; -} - -.mt-20 { - margin-top: 20px; -} - -.mt-25 { - margin-top: 25px; -} - -.mt-30 { - margin-top: 30px; -} - -.mt-35 { - margin-top: 35px; -} - -.mt-40 { - margin-top: 40px; -} - -.mt-45 { - margin-top: 45px; -} - -.mt-50 { - margin-top: 50px; -} - -.mt-60 { - margin-top: 60px; -} - -.mt-70 { - margin-top: 70px; -} - -.mt-80 { - margin-top: 80px; -} - -.mt-90 { - margin-top: 90px; -} - //pagination .pagination.shop{ display: flex; diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index 8c83a391c..d4413f8bf 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -16,10 +16,6 @@ } //margin bottom classes -.mb-5 { - margin-bottom: 5px; -} - .mb-10 { margin-bottom: 10px; } From 2d00679901fd7d206a720b2e904e129889cd22c5 Mon Sep 17 00:00:00 2001 From: jitendra Date: Thu, 6 Jun 2019 16:43:36 +0530 Subject: [PATCH 68/89] totalQuantity function added to product and product flat model --- packages/Webkul/Product/src/Models/Product.php | 18 +++++++++++++----- .../Webkul/Product/src/Models/ProductFlat.php | 8 ++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php index 4205d25ff..8a5577e23 100755 --- a/packages/Webkul/Product/src/Models/Product.php +++ b/packages/Webkul/Product/src/Models/Product.php @@ -168,11 +168,9 @@ class Product extends Model implements ProductContract } /** - * @param integer $qty - * - * @return bool + * @return integer */ - public function haveSufficientQuantity($qty) + public function totalQuantity() { $total = 0; @@ -195,7 +193,17 @@ class Product extends Model implements ProductContract $total -= $orderedInventory->qty; } - return $qty <= $total ? true : (core()->getConfigData('catalog.inventory.stock_options.backorders') ? true : false); + return $total; + } + + /** + * @param integer $qty + * + * @return bool + */ + public function haveSufficientQuantity($qty) + { + return $qty <= $this->totalQuantity() ? true : (core()->getConfigData('catalog.inventory.stock_options.backorders') ? true : false); } /** diff --git a/packages/Webkul/Product/src/Models/ProductFlat.php b/packages/Webkul/Product/src/Models/ProductFlat.php index 26bdb5e6b..c23ecbefa 100644 --- a/packages/Webkul/Product/src/Models/ProductFlat.php +++ b/packages/Webkul/Product/src/Models/ProductFlat.php @@ -53,6 +53,14 @@ class ProductFlat extends Model implements ProductFlatContract return false; } + /** + * @return integer + */ + public function totalQuantity() + { + return $this->product->totalQuantity(); + } + /** * @param integer $qty * From 99ccac943dd4aa2cf919946fa89a1135686eb086 Mon Sep 17 00:00:00 2001 From: imanghafoori Date: Thu, 6 Jun 2019 16:25:06 +0430 Subject: [PATCH 69/89] fix bug --- .../Admin/src/Http/Controllers/ConfigurationController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php index f24446b7c..eefc14ad0 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php @@ -107,6 +107,8 @@ class ConfigurationController extends Controller return $this->getSlugs($secondItem); } + + return []; } /** From b6d64b251b6594beed5b3984dd67fc8926ac5320 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Thu, 6 Jun 2019 19:33:52 +0530 Subject: [PATCH 70/89] Refactoring cart rule on front end --- .../Admin/src/DataGrids/CartRuleDataGrid.php | 44 ++++--- .../Admin/src/Resources/lang/en/app.php | 3 +- .../Discount/src/Config/rule-conditions.php | 3 +- .../Webkul/Discount/src/Helpers/Discount.php | 118 +++++------------- .../Http/Controllers/CartRuleController.php | 6 +- .../Shop/publishable/assets/css/shop.css | 2 +- .../src/Http/Controllers/CartController.php | 2 +- .../Shop/src/Resources/assets/sass/app.scss | 4 +- .../views/checkout/onepage.blade.php | 97 +++++++------- .../views/checkout/total/summary.blade.php | 68 +--------- 10 files changed, 119 insertions(+), 228 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php index 24c94b830..ef51932bf 100644 --- a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php @@ -21,7 +21,7 @@ class CartRuleDataGrid extends DataGrid { $queryBuilder = DB::table('cart_rules') ->select('id') - ->addSelect('id', 'name', 'starts_from', 'ends_till', 'usage_limit', 'per_customer', 'status', 'end_other_rules', 'action_type'); + ->addSelect('id', 'name', 'starts_from', 'ends_till', 'priority', 'usage_limit', 'per_customer', 'status', 'end_other_rules', 'is_guest', 'action_type'); $this->setQueryBuilder($queryBuilder); } @@ -47,21 +47,12 @@ class CartRuleDataGrid extends DataGrid ]); $this->addColumn([ - 'index' => 'per_customer', - 'label' => trans('admin::app.datagrid.per-cust'), - 'type' => 'string', + 'index' => 'priority', + 'label' => trans('admin::app.datagrid.priority'), + 'type' => 'number', 'searchable' => false, 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'usage_limit', - 'label' => trans('admin::app.datagrid.usage-throttle'), - 'type' => 'string', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true + 'filterable' => true, ]); $this->addColumn([ @@ -72,10 +63,25 @@ class CartRuleDataGrid extends DataGrid 'sortable' => true, 'filterable' => true, 'wrapper' => function($value) { - if ($value->end_other_rules == 1) - return 'true'; + if ($value->status == 1) + return 'True'; else - return 'false'; + return 'False'; + } + ]); + + $this->addColumn([ + 'index' => 'is_guest', + 'label' => trans('admin::app.datagrid.for-guest'), + 'type' => 'boolean', + 'searchable' => false, + 'sortable' => true, + 'filterable' => true, + 'wrapper' => function($value) { + if ($value->is_guest == 1) + return 'True'; + else + return 'False'; } ]); @@ -88,9 +94,9 @@ class CartRuleDataGrid extends DataGrid 'filterable' => true, 'wrapper' => function($value) { if ($value->end_other_rules == 1) - return 'true'; + return 'True'; else - return 'false'; + return 'False'; } ]); diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 29fa8ef01..64f8dbb6f 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -157,7 +157,8 @@ return [ 'starts-from' => 'Starts From', 'ends-till' => 'Ends Till', 'per-cust' => 'Per Customer', - 'usage-throttle' => 'Usage Times' + 'usage-throttle' => 'Usage Times', + 'for-guest' => 'For Guest' ], 'account' => [ diff --git a/packages/Webkul/Discount/src/Config/rule-conditions.php b/packages/Webkul/Discount/src/Config/rule-conditions.php index 443699c5f..90ea67d0c 100644 --- a/packages/Webkul/Discount/src/Config/rule-conditions.php +++ b/packages/Webkul/Discount/src/Config/rule-conditions.php @@ -67,8 +67,7 @@ return [ 'actions' => [ 'percent_of_product' => 'Percentage of product', 'fixed_amount' => 'Apply as fixed amount', - 'buy_a_get_b' => 'Get B units free', - 'fixed_amount_cart' => 'Fixed amount for whole cart' + 'buy_a_get_b' => 'Get B amount back', ], 'validation' => [ diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index 2c12c8cd5..7e31cc6f0 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -516,7 +516,7 @@ class Discount $appliedRule = null; if (! isset($rules['id'])) { - return response()->json(['message' => trans('admin::app.promotion.status.no-coupon')], 200); + return ['message' => trans('admin::app.promotion.status.no-coupon'), 'success' => false]; } foreach($rules['id'] as $rule) { @@ -532,13 +532,13 @@ class Discount } if (! isset($appliedRule)) { - return response()->json(['message' => trans('admin::app.promotion.status.no-coupon')], 200); + return ['message' => trans('admin::app.promotion.status.no-coupon'), 'success' => false]; } $race = $this->endRace($appliedRule); if (! $race) { - return response()->json(['message' => trans('admin::app.promotion.status.no-coupon')], 200); + return ['message' => trans('admin::app.promotion.status.no-coupon'), 'success' => false]; } $cart = \Cart::getCart(); @@ -578,6 +578,7 @@ class Discount } else { if ($appliedRule->starts_from != null && $appliedRule->ends_till != null) { if (Carbon::parse($appliedRule->starts_from) < now() && now() < Carbon::parse($appliedRule->ends_till)) { + $result = 1; } else { $result = 0; } @@ -595,13 +596,14 @@ class Discount $newQuantity = 0; if ($cart->items_qty >= $disc_threshold && $disc_quantity > 0) { - if ($disc_quantity > 1) { - $disc_amount = $disc_amount * $disc_quantity; - } // add the time conditions if rule is expired and active then make it in active $leastWorthItem = \Cart::leastWorthItem(); $realQty = $leastWorthItem['quantity']; + if ($disc_quantity > 1) { + $disc_amount = $disc_amount * $disc_quantity; + } + if ($action_type == config('pricerules.cart.validation.0')) { if ($realQty <= $disc_quantity) { $amountDiscounted = (($leastWorthItem['total'] / $realQty) * ($disc_amount / 100)) * $disc_quantity; @@ -624,92 +626,36 @@ class Discount } } else if ($action_type == config('pricerules.cart.validation.2')) { if ($realQty <= $disc_quantity) { - $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; + $amountDiscounted = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; } else { - $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_quantity; + $amountDiscounted = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_quantity; } - } else if ($action_type == config('pricerules.cart.validation.3')) { - $amountDiscounted = $disc_amount; - } - - if ($action_type == config('pricerules.cart.validation.2')) { - $cartRuleCart = $this->cartRuleCart->findWhere([ - 'cart_id' => $cart->id, - ]); - - if (count($cartRuleCart)) { - $this->cartRuleCart->update([ - 'cart_id' => $cart->id, - 'cart_rule_id' => $appliedRule->id - ], $cartRuleCart->first()->id); - } else { - $this->cartRuleCart->create([ - 'cart_id' => $cart->id, - 'cart_rule_id' => $appliedRule->id - ]); - } - - return response()->json([ - 'message' => trans('admin::app.promotion.status.coupon-applied'), - 'action' => $action_type, - 'amount_given' => false, - 'amount_payable' => $newQuantity, - 'amount' => null, - 'success' => true - ]); } else { - $cartRuleCart = $this->cartRuleCart->findWhere([ + $amountDiscounted = 0; + } + + $cartRuleCart = $this->cartRuleCart->findWhere([ + 'cart_id' => $cart->id, + ]); + + if (count($cartRuleCart)) { + $this->cartRuleCart->update([ 'cart_id' => $cart->id, - ]); - - if (count($cartRuleCart)) { - $this->cartRuleCart->update([ - 'cart_id' => $cart->id, - 'cart_rule_id' => $appliedRule->id - ], $cartRuleCart->first()->id); - } else { - $this->cartRuleCart->create([ - 'cart_id' => $cart->id, - 'cart_rule_id' => $appliedRule->id - ]); - } - - return response()->json([ - 'id' => $appliedRule->id, - 'rule' => $appliedRule, - 'item_id' => $leastWorthItem['id'], - 'message' => trans('admin::app.promotion.status.coupon-applied'), - 'amount_given' => true, - 'amount' => core()->currency($amountDiscounted + $cart->tax_total), - 'action_type' => $action_type, - 'success' => true + 'cart_rule_id' => $appliedRule->id + ], $cartRuleCart->first()->id); + } else { + $this->cartRuleCart->create([ + 'cart_id' => $cart->id, + 'cart_rule_id' => $appliedRule->id ]); } + dd($amountDiscounted); + return ['message' => trans('admin::app.promotion.status.coupon-applied'), 'success' => true, 'amount' => $amountDiscounted]; } else { - return response()->json([ - 'id' => null, - 'rule' => null, - 'item_id' => null, - 'message' => trans('admin::app.promotion.status.coupon-failed'), - 'action' => $action_type, - 'amount_given' => null, - 'amount' => null, - 'least_value_item' => null, - 'success' => false - ]); + return ['message' => trans('admin::app.promotion.status.coupon-failed'), 'success' => false, 'amount' => $amountDiscounted]; } } else { - return response()->json([ - 'id' => null, - 'rule' => null, - 'item_id' => null, - 'message' => trans('admin::app.promotion.status.coupon-failed'), - 'action' => null, - 'amount_given' => null, - 'amount' => null, - 'least_value_item' => null, - 'success' => false - ]); + return ['message' => trans('admin::app.promotion.status.coupon-failed'), 'success' => false, 'amount' => $amountDiscounted]; } } @@ -769,6 +715,11 @@ class Discount } } + /** + * Used when race condition occurs between + * any two rules possibly a discounted and + * a non discounted rule + */ public function analyzeImpact($rule) { $cart = \Cart::getCart(); @@ -947,7 +898,6 @@ class Discount protected function testAllConditionAreFalse($conditions, $cart) { $shipping_address = $cart->getShippingAddressAttribute(); - $shipping_method = $cart->shipping_method; $shipping_country = $shipping_address->country; $shipping_state = $shipping_address->state; diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index e6427031b..e577304e5 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -162,12 +162,12 @@ class CartRuleController extends Controller $data['actions'] = json_encode($data['actions']); - if (! isset($data['all_conditions'])) { + if (! isset($data['all_conditions']) || $data['all_conditions'] == "[]") { $data['conditions'] = null; } else { $data['conditions'] = json_encode($data['all_conditions']); - unset($data['all_conditions']); } + unset($data['all_conditions']); if ($data['use_coupon']) { // if (isset($data['auto_generation']) && $data['auto_generation']) { @@ -318,7 +318,7 @@ class CartRuleController extends Controller } $data['actions'] = json_encode($data['actions']); - if (! isset($data['all_conditions'])) { + if (! isset($data['all_conditions']) || $data['all_conditions'] == "[]") { $data['conditions'] = null; } else { $data['conditions'] = json_encode($data['all_conditions']); diff --git a/packages/Webkul/Shop/publishable/assets/css/shop.css b/packages/Webkul/Shop/publishable/assets/css/shop.css index a74033e95..4f71e11da 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}.mb-10{margin-bottom:10px}.mb-15{margin-bottom:15px}.mb-20{margin-bottom:20px}.mb-25{margin-bottom:25px}.mb-30{margin-bottom:30px}.mb-35{margin-bottom:35px}.mb-40{margin-bottom:40px}.mb-45{margin-bottom:45px}.mb-50{margin-bottom:50px}.mb-60{margin-bottom:60px}.mb-70{margin-bottom:70px}.mb-80{margin-bottom:80px}.mb-90{margin-bottom:90px}.mt-5{margin-top:5px}.mt-10{margin-top:10px}.mt-15{margin-top:15px}.mt-20{margin-top:20px}.mt-25{margin-top:25px}.mt-30{margin-top:30px}.mt-35{margin-top:35px}.mt-40{margin-top:40px}.mt-45{margin-top:45px}.mt-50{margin-top:50px}.mt-60{margin-top:60px}.mt-70{margin-top:70px}.mt-80{margin-top:80px}.mt-90{margin-top:90px}.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}.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}.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:#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}@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 .payble-amount{margin-top:17px;border-top:1px solid #c7c7c7;padding-top:12px}.order-summary .payble-amount label{font-weight:700}.order-summary .payble-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}.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 .payble-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}.mb-10{margin-bottom:10px}.mb-15{margin-bottom:15px}.mb-20{margin-bottom:20px}.mb-25{margin-bottom:25px}.mb-30{margin-bottom:30px}.mb-35{margin-bottom:35px}.mb-40{margin-bottom:40px}.mb-45{margin-bottom:45px}.mb-50{margin-bottom:50px}.mb-60{margin-bottom:60px}.mb-70{margin-bottom:70px}.mb-80{margin-bottom:80px}.mb-90{margin-bottom:90px}.mt-5{margin-top:5px}.mt-10{margin-top:10px}.mt-15{margin-top:15px}.mt-20{margin-top:20px}.mt-25{margin-top:25px}.mt-30{margin-top:30px}.mt-35{margin-top:35px}.mt-40{margin-top:40px}.mt-45{margin-top:45px}.mt-50{margin-top:50px}.mt-60{margin-top:60px}.mt-70{margin-top:70px}.mt-80{margin-top:80px}.mt-90{margin-top:90px}.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}.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}.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:#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}@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}.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 diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 55bbbb482..3c967a865 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -256,7 +256,7 @@ class CartController extends Controller $code = request()->input('code'); $result = Cart::applyCoupon($code); - + dd($result); return $result; } diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index f6e235150..b509f28a5 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -2174,7 +2174,7 @@ section.cart { } } - .payble-amount { + .payable-amount { margin-top: 17px; border-top: 1px solid $border-color; padding-top: 12px; @@ -3710,7 +3710,7 @@ section.review { } } - .order-summary .item-detail, .payble-amount { + .order-summary .item-detail, .payable-amount { label.right { float: left; } diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index f46c443ec..33f9472d7 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -5,18 +5,35 @@ @stop @section('content-wrapper') - - @endsection @push('scripts') + @@ -135,9 +133,7 @@ data: function() { return { currentStep: 1, - completedStep: 0, - address: { billing: { address1: [''], @@ -149,23 +145,14 @@ address1: [''] }, }, - selected_shipping_method: '', - selected_payment_method: '', - disable_button: false, - new_shipping_address: false, - new_billing_address: false, - allAddress: {}, - countryStates: @json(core()->groupedStatesByCountries()), - country: @json(core()->countries()), - resetSummary: true } }, @@ -483,7 +470,31 @@ Vue.component('review-section', { data: function() { return { - templateRender: null, + templateRender: null + } + }, + staticRenderFns: reviewTemplateRenderFns, + mounted: function() { + this.templateRender = reviewHtml.render; + for (var i in reviewHtml.staticRenderFns) { + reviewTemplateRenderFns.push(reviewHtml.staticRenderFns[i]); + } + }, + render: function(h) { + return h('div', [ + (this.templateRender ? + this.templateRender() : + '') + ]); + } + }); + + Vue.component('discount', { + template: '#discount-template', + inject: ['$validator'], + + data: function() { + return { code: null, message: null, qtyRevealed: false, @@ -499,22 +510,7 @@ } }, - staticRenderFns: reviewTemplateRenderFns, - mounted: function() { - this.templateRender = reviewHtml.render; - - for (var i in reviewHtml.staticRenderFns) { - reviewTemplateRenderFns.push(reviewHtml.staticRenderFns[i]); - } - }, - - render: function(h) { - return h('div', [ - (this.templateRender ? - this.templateRender() : - '') - ]); }, methods: { @@ -560,6 +556,7 @@ } } }); + @endpush \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index d7e664298..2e3b9beef 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -3,7 +3,7 @@
    @@ -24,72 +24,10 @@
    @endif -
    +
    -
    -
    - @inject('cart_rule', 'Webkul\Discount\Helpers\Discount') - - @if (! request()->is('checkout/cart')) -
    -
    - - - - @{{ errors.first('code') }} - - - @{{ message }} - - @{{ message }} - - -
    -
    - - @if(isset($rule)) -
    -
    - {{ $rule['rule']->name }} {{ __('shop::app.checkout.onepage.applied') }} -
    - - - @if ($rule['impact']['amount_given']) - - - - @else - - - - @endif - -
    - @endif - -
    -
    - @{{ message }} -
    - - - - - - -
    - @endif -
    -
    +
    \ No newline at end of file From cd1ea82d12a582b8e194b4effa30e0f0a73b8f1c Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 7 Jun 2019 07:06:19 +0530 Subject: [PATCH 71/89] added checks --- packages/Webkul/Checkout/src/Cart.php | 4 +- .../Discount/src/Config/rule-conditions.php | 1 + .../Webkul/Discount/src/Helpers/Discount.php | 1110 ++--------------- .../src/Http/Controllers/CartController.php | 18 +- packages/Webkul/Shop/src/Http/routes.php | 2 + .../views/checkout/onepage.blade.php | 38 +- 6 files changed, 172 insertions(+), 1001 deletions(-) diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 60369775f..03a598ce0 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1288,14 +1288,14 @@ class Cart { public function applyCoupon($code) { - $result = $this->discount->ruleCheck($code); + $result = $this->discount->applyCouponAbleRule($code); return $result; } public function applyNonCoupon() { - $result = $this->discount->nonRuleCheck(); + $result = $this->discount->applyNonCouponAbleRule(); return $result; } diff --git a/packages/Webkul/Discount/src/Config/rule-conditions.php b/packages/Webkul/Discount/src/Config/rule-conditions.php index 90ea67d0c..b8e147a4f 100644 --- a/packages/Webkul/Discount/src/Config/rule-conditions.php +++ b/packages/Webkul/Discount/src/Config/rule-conditions.php @@ -68,6 +68,7 @@ return [ 'percent_of_product' => 'Percentage of product', 'fixed_amount' => 'Apply as fixed amount', 'buy_a_get_b' => 'Get B amount back', + // 'fixed_amount_cart' => 'Fixed amount for whole cart' ], 'validation' => [ diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index 7e31cc6f0..a70a4e5e9 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -36,781 +36,173 @@ class Discount $this->cartRuleCart = $cartRuleCart; } - /** - * Gets the end rules applicable for guests - * autocheck for customer group and channels - */ - public function getGuestEndRules() - { - $rules = $this->cartRule->findWhere(['status' => 1, 'end_other_rules' => 1, 'is_guest' => 1]); - $currentChannel = core()->getCurrentChannel(); - - $guestRules = array(); - foreach ($rules as $rule) { - foreach ($rule->channels as $channel) { - if ($channel->channel_id == $currentChannel->id) { - array_push($guestRules, $rule); - } - } - } - - if (count($guestRules) > 1) { - $leastPriority = 999999999999; - $leastId = 999999999999; - - foreach ($guestRules as $guestRule) { - if ($leastPriority >= $guestRule->priority) { - $leastPriority = $guestRule->priority; - - if ($leastId > $guestRule->id) { - $leastId = $guestRule->id; - } - } - } - - return [$this->cartRule->find($leastId)]; - } - - return $guestRules; - } - - /** - * Get the non ending rules for the guest - * and completed auto check for guests and - * channels - */ - public function getGuestBestRules() - { - $rules = $this->cartRule->findWhere(['status' => 1, 'end_other_rules' => 0, 'is_guest' => 1]); - $currentChannel = core()->getCurrentChannel(); - - $guestRules = array(); - foreach ($rules as $rule) { - foreach ($rule->channels as $channel) { - if ($channel->channel_id == $currentChannel->id) { - array_push($guestRules, $rule); - } - } - } - - return $guestRules; - } - - - /** - * Gets the best rules for auth customers - */ - public function getBestRules() - { - $rules = $this->cartRule->findWhere(['status' => 1, 'end_other_rules' => 0]); - $currentChannel = core()->getCurrentChannel(); - - $suitableRules = array(); - foreach ($rules as $rule) { - foreach ($rule->channels as $channel) { - if ($channel->channel_id == $currentChannel->id) { - if (auth()->guard('customer')->check()) { - foreach ($rule->customer_groups as $customerGroup) { - if (auth()->guard('customer')->user()->customer_group_id == $customerGroup->customer_group_id) { - array_push($suitableRules, $rule); - } - } - } - } - } - } - - return $suitableRules; - } - - /** - * Gets the end rules for the auth customers - */ - public function getEndRules() - { - $rules = $this->cartRule->findWhere(['status' => 1, 'end_other_rules' => 1]); - $currentChannel = core()->getCurrentChannel(); - - $suitableRules = array(); - foreach ($rules as $rule) { - foreach ($rule->channels as $channel) { - if ($channel->channel_id == $currentChannel->id) { - if (auth()->guard('customer')->check()) { - foreach ($rule->customer_groups as $customerGroup) { - if (auth()->guard('customer')->user()->customer_group_id == $customerGroup->customer_group_id) { - array_push($suitableRules, $rule); - } - } - } - } - } - } - - if (count($suitableRules) > 1) { - $leastPriority = 999999999999; - $leastId = 999999999999; - - foreach($suitableRules as $suitableRule) { - if ($leastPriority >= $suitableRule->priority) { - $leastPriority = $suitableRule->priority; - - if ($leastId > $suitableRule->id) { - $leastId = $suitableRule->id; - } - } - } - - return [$this->cartRule->find($leastId)]; - } - - return $suitableRules; - } - - /** - * Get the rules to applied automatically - * depending on user state - */ - public function toApply() + public function applyNonCouponAbleRule() { if (auth()->guard('customer')->check()) { - $endRules = $this->getEndRules(); - - if (isset($endRules) && count($endRules)) { - $this->endRuleActive = true; - - return [ - 'end_rule' => true, - 'rule' => $endRules, - 'count' => count($endRules) - ]; - } else { - $bestRules = $this->getBestRules(); - - return [ - 'end_rule' => false, - 'rule' => $bestRules, - 'count' => count($bestRules) - ]; - } - } else { - $endRules = $this->getGuestEndRules(); - - if (isset($endRules) && count($endRules)) { - $this->endRuleActive = true; - - return [ - 'end_rule' => true, - 'rule' => $endRules, - 'count' => count($endRules) - ]; - } else { - $bestRules = $this->getGuestBestRules(); - - return [ - 'end_rule' => false, - 'rule' => $bestRules, - 'count' => count( $bestRules) - ]; - } - } - } - - /** - * To apply the coupon code based rules - */ - public function applyCouponAble() - { - $rules = $this->toApply(); - - if ($rules['end_rule']) { - $rules = $rules['rule']; - $id = array(); - - foreach($rules as $rule) { - if ($rule->use_coupon) { - array_push($id, $rule); - } - } - - if (count($id)) { - return [ - 'couponable' => true, - 'id' => $id, - 'end_rule' => true - ]; - } else { - return [ - 'couponable' => false, - 'id' => null, - 'end_rule' => null - ]; - } - } else { - $rules = $rules['rule']; - $id = array(); - - foreach ($rules as $rule) { - if ($rule->use_coupon) { - array_push($id, $rule); - } - } - - if (count($id)) { - return [ - 'couponable' => true, - 'id' => $id, - 'end_rule' => false - ]; - } else { - return [ - 'couponable' => false, - 'id' => null, - 'end_rule' => false - ]; - } - } - } - - /** - * To apply the non coupon based rules - */ - public function applyNonCouponAble() - { - $rules = $this->toApply(); - - if (! $rules['end_rule']) { - $rules = $rules['rule']; - $id = array(); - - foreach ($rules as $rule) { - if (! $rule->use_coupon) { - array_push($id, $rule); - } - } - - if (count($id)) { - return [ - 'end_rule' => false, - 'noncouponable' => true, - 'id' => $id, - 'end_rule' => false - ]; - } else { - return [ - 'end_rule' => false, - 'noncouponable' => false, - 'id' => null, - 'end_rule' => false - ]; - } - } else { - $rules = $rules['rule']; - $id = array(); - - foreach ($rules as $rule) { - if (! $rule->use_coupon) { - array_push($id, $rule); - } - } - - if (count($id)) { - return [ - 'end_rule' => true, - 'noncouponable' => true, - 'id' => $id, - 'end_rule' => true - ]; - } else { - return [ - 'end_rule' => true, - 'noncouponable' => false, - 'id' => null, - 'end_rule' => null - ]; - } - } - } - - public function nonRuleCheck() - { - $result = $this->applyNonCouponAble(); - $cart = \Cart::getCart(); - $maxImpacts = array(); - - if (isset($result['id']) && count($result['id'])) { - $rules = array(); - - if (count($result['id']) > 1) { - $leastPriority = 999999999999; - - foreach($result['id'] as $rule) { - if ($rule->priority < $leastPriority) { - array_push($rules, $rule); - } - } - } else if (count($result['id'])) { - array_push($rules, $result['id'][0]); - } - - foreach ($rules as $rule) { - // All of conditions is/are true - $result = 1; - if ($rule->conditions && ($rule->conditions != "null" || $rule->conditions != "")) { - if ($rule->starts_from != null && $rule->ends_till != null) { - if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) { - $conditions = json_decode(json_decode($rule->conditions)); - $test_mode = config('pricerules.test_mode.0'); - - if ($test_mode == config('pricerules.test_mode.0')) { - $result = $this->testAllConditionAreTrue($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.1')) { - $result = $this->testAllConditionAreFalse($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.2')) { - $result = $this->testAnyConditionIsTrue($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.3')) { - $result = $this->testAbyConditionIsFalse($conditions, $cart); - } - } - } else { - $conditions = json_decode(json_decode($rule->conditions)); - $test_mode = config('pricerules.test_mode.0'); - - if ($test_mode == config('pricerules.test_mode.0')) { - $result = $this->testAllConditionAreTrue($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.1')) { - $result = $this->testAllConditionAreFalse($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.2')) { - $result = $this->testAnyConditionIsTrue($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.3')) { - $result = $this->testAbyConditionIsFalse($conditions, $cart); - } - } - } else { - if ($rule->starts_from != null && $rule->ends_till != null) { - if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) { - } else { - $result = 0; - } - } - } - - // check all the conditions associated with the rule - if ($result) { - $action_type = $rule->action_type; - $disc_threshold = $rule->disc_threshold; - $disc_amount = $rule->disc_amount; - $disc_quantity = $rule->disc_quantity; - - $amountDiscounted = 0; - $newQuantity = 0; - - if ($cart->items_qty >= $disc_threshold && $disc_quantity > 0) { - if ($disc_quantity > 1) { - $disc_amount = $disc_amount * $disc_quantity; - } - // add the time conditions if rule is expired and active then make it in active - $leastWorthItem = \Cart::leastWorthItem(); - $realQty = $leastWorthItem['quantity']; - - if ($action_type == config('pricerules.cart.validation.0')) { - if ($realQty <= $disc_quantity) { - $amountDiscounted = (($leastWorthItem['total'] / $realQty) * ($disc_amount / 100)) * $disc_quantity; - } else { - $amountDiscounted = ($leastWorthItem['total'] / $realQty) * ($disc_amount / 100); - } - } else if ($action_type == config('pricerules.cart.validation.1')) { - if ($realQty <= $disc_quantity) { - if ($disc_amount > ($disc_quantity * $leastWorthItem['total'])) { - $amountDiscounted = 0; - } else { - $amountDiscounted = $cart->sub_total - $disc_amount; - } - } else { - if ($disc_amount > $leastWorthItem['total']) { - $amountDiscounted = 0; - } else { - $amountDiscounted = $cart->sub_total - $disc_amount; - } - } - } else if ($action_type == config('pricerules.cart.validation.2')) { - if ($realQty <= $disc_quantity) { - $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; - } else { - $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_quantity; - } - } else if ($action_type == config('pricerules.cart.validation.3')) { - $amountDiscounted = $disc_amount; - } - - //standard returns - if ($action_type == config('pricerules.cart.validation.2')) { - array_push($maxImpacts, [ - 'id' => $rule->id, - 'rule' => $rule, - 'item_id' => $leastWorthItem['id'], - 'amount_given' => false, - 'amount' => $newQuantity, - 'action_type' => $action_type - ]); - } else { - array_push($maxImpacts, [ - 'id' => $rule->id, - 'rule' => $rule, - 'item_id' => $leastWorthItem['id'], - 'amount_given' => true, - 'amount' => $amountDiscounted, - 'action_type' => $action_type - ]); - } - } - } - } - } - - $leastItemAvg = 999999999999; - $leastId = -1; - foreach ($maxImpacts as $key => $maxImpact) { - $minItemPrice = array(); - - if ($maxImpact['action_type'] == config('pricerules.cart.validation.2')) { - $amount = $cart->base_grand_total / $maxImpact['amount']; - - if ($amount < $leastItemAvg) { - $leastItemAvg = $amount; - $leastId = $key; - } - } else { - $amount = $maxImpact['amount'] / $cart->items_qty; - - if ($amount < $leastItemAvg) { - $leastItemAvg = $amount; - $leastId = $key; - } - } - } - - if ($leastId != -1) { - $cartRuleCart = $this->cartRuleCart->findWhere([ - 'cart_id' => $cart->id, + $nonCouponAbleRules = $this->cartRule->findWhere([ + 'use_coupon' => 0, + 'status' => 1 + ]); + } else { + $nonCouponAbleRules = $this->cartRule->findWhere([ + 'use_coupon' => 0, + 'is_guest' => 1, + 'status' => 1 ]); - - if (count($cartRuleCart)) { - $this->cartRuleCart->update([ - 'cart_id' => $cart->id, - 'cart_rule_id' => $maxImpacts[$leastId]['rule']->id - ], $cartRuleCart->first()->id); - } else { - $this->cartRuleCart->create([ - 'cart_id' => $cart->id, - 'cart_rule_id' => $maxImpacts[$leastId]['rule']->id - ]); - } - - return ['rule' => $maxImpacts[$leastId]['rule'], 'impact' => $maxImpacts[$leastId], 'success' => true]; - } - } - - public function ruleCheck($code) - { - $rules = $this->applyCouponAble(); - $appliedRule = null; - - if (! isset($rules['id'])) { - return ['message' => trans('admin::app.promotion.status.no-coupon'), 'success' => false]; } - foreach($rules['id'] as $rule) { - if ($rule->auto_generation == 0) { - if ($rule->coupons->code == $code) { - $appliedRule = $rule; + $canBeApplied = array(); - break; - } else { - continue; + // time based filter + foreach($nonCouponAbleRules as $rule) { + $report = $this->checkApplicability($rule); + $report['rule'] = $rule; + + $passed = 0; + if ($rule->starts_from != null && $rule->ends_till == null) { + if (Carbon::parse($rule->starts_from) < now()) { + $passed = 1; } + } else if ($rule->starts_from == null && $rule->ends_till != null) { + if (Carbon::parse($rule->ends_till) > now()) { + $passed = 1; + } + } else if ($rule->starts_from != null && $rule->ends_till != null) { + if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) { + $passed = 1; + } + } else { + $passed = 1; + } + + if ($passed) { + array_push($canBeApplied, $report); } } - if (! isset($appliedRule)) { - return ['message' => trans('admin::app.promotion.status.no-coupon'), 'success' => false]; - } + //min priority + $minPriority = collect($canBeApplied)->min('priority'); - $race = $this->endRace($appliedRule); + $canBeApplied = collect($canBeApplied)->where('priority', $minPriority); - if (! $race) { - return ['message' => trans('admin::app.promotion.status.no-coupon'), 'success' => false]; - } + if (count($canBeApplied) > 1) { + $maxDiscount = collect($canBeApplied)->max('discount'); - $cart = \Cart::getCart(); + $canBeApplied = collect($canBeApplied)->where('discount', $maxDiscount); - // All of conditions is/are true - $result = 1; - if ($appliedRule->conditions && $appliedRule->conditions != "null") { - if ($appliedRule->starts_from != null && $appliedRule->ends_till != null) { - if (Carbon::parse($appliedRule->starts_from) < now() && now() < Carbon::parse($appliedRule->ends_till)) { - $conditions = json_decode(json_decode($appliedRule->conditions)); - $test_mode = config('pricerules.test_mode.0'); - - if ($test_mode == config('pricerules.test_mode.0')) { - $result = $this->testAllConditionAreTrue($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.1')) { - $result = $this->testAllConditionAreFalse($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.2')) { - $result = $this->testAnyConditionIsTrue($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.3')) { - $result = $this->testAbyConditionIsFalse($conditions, $cart); + $leastId = 999999999999; + if (count($canBeApplied) > 1) { + foreach($canBeApplied as $rule) { + if ($rule['rule'] < $leastId) { + $leastId = $rule['rule']->id; } } - } else { - $conditions = json_decode(json_decode($rule->conditions)); - $test_mode = config('pricerules.test_mode.0'); - - if ($test_mode == config('pricerules.test_mode.0')) { - $result = $this->testAllConditionAreTrue($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.1')) { - $result = $this->testAllConditionAreFalse($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.2')) { - $result = $this->testAnyConditionIsTrue($conditions, $cart); - } else if ($test_mode == config('pricerules.test_mode.3')) { - $result = $this->testAnyConditionIsFalse($conditions, $cart); - } } + } + //find end rule + return $canBeApplied; + } + + public function applyCouponAbleRule() + { + if (auth()->guard('customer')->check()) { + $couponAbleRules = $this->cartRule->findWhere([ + 'use_coupon' => 1 + ]); } else { - if ($appliedRule->starts_from != null && $appliedRule->ends_till != null) { - if (Carbon::parse($appliedRule->starts_from) < now() && now() < Carbon::parse($appliedRule->ends_till)) { - $result = 1; - } else { - $result = 0; + $couponAbleRules = $this->cartRule->findWhere([ + 'use_coupon' => 1, + 'is_guest' => 1 + ]); + } + + // time based filter + foreach($couponAbleRules as $rule) { + if ($rule->starts_from != null && $rule->ends_till == null) { + if (Carbon::parse($rule->starts_from) < now()) { + + } + } else if ($rule->starts_from == null && $rule->ends_till != null) { + if (Carbon::parse($rule->ends_till) < now()) { + + } + } else if ($rule->starts_from != null && $rule->ends_till != null) { + if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) { } } } - // check all the conditions associated with the rule + return $couponAbleRules; + } + + public function checkApplicability($rule) + { + $cart = \Cart::getCart(); + $report = array(); + $result = 0; + //check conditions + if ($rule->conditions != null) { + $conditions = json_decode(json_decode($rule->conditions)); + $test_mode = config('pricerules.test_mode.0'); + + if ($test_mode == config('pricerules.test_mode.0')) { + $result = $this->testIfAllConditionAreTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.1')) { + $result = $this->testIfAllConditionAreFalse($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.2')) { + $result = $this->testIfAnyConditionIsTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.3')) { + $result = $this->testIfAnyConditionIsFalse($conditions, $cart); + } + } + if ($result) { - $action_type = $rule->action_type; - $disc_threshold = $rule->disc_threshold; - $disc_amount = $rule->disc_amount; - $disc_quantity = $rule->disc_quantity; - - $amountDiscounted = 0; - $newQuantity = 0; - - if ($cart->items_qty >= $disc_threshold && $disc_quantity > 0) { - // add the time conditions if rule is expired and active then make it in active - $leastWorthItem = \Cart::leastWorthItem(); - $realQty = $leastWorthItem['quantity']; - - if ($disc_quantity > 1) { - $disc_amount = $disc_amount * $disc_quantity; - } - - if ($action_type == config('pricerules.cart.validation.0')) { - if ($realQty <= $disc_quantity) { - $amountDiscounted = (($leastWorthItem['total'] / $realQty) * ($disc_amount / 100)) * $disc_quantity; - } else { - $amountDiscounted = ($leastWorthItem['total'] / $realQty) * ($disc_amount / 100); - } - } else if ($action_type == config('pricerules.cart.validation.1')) { - if ($realQty <= $disc_quantity) { - if ($disc_amount > ($disc_quantity * $leastWorthItem['total'])) { - $amountDiscounted = 0; - } else { - $amountDiscounted = $cart->sub_total - $disc_amount; - } - } else { - if ($disc_amount > $leastWorthItem['total']) { - $amountDiscounted = 0; - } else { - $amountDiscounted = $cart->sub_total - $disc_amount; - } - } - } else if ($action_type == config('pricerules.cart.validation.2')) { - if ($realQty <= $disc_quantity) { - $amountDiscounted = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; - } else { - $amountDiscounted = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_quantity; - } - } else { - $amountDiscounted = 0; - } - - $cartRuleCart = $this->cartRuleCart->findWhere([ - 'cart_id' => $cart->id, - ]); - - if (count($cartRuleCart)) { - $this->cartRuleCart->update([ - 'cart_id' => $cart->id, - 'cart_rule_id' => $appliedRule->id - ], $cartRuleCart->first()->id); - } else { - $this->cartRuleCart->create([ - 'cart_id' => $cart->id, - 'cart_rule_id' => $appliedRule->id - ]); - } - dd($amountDiscounted); - return ['message' => trans('admin::app.promotion.status.coupon-applied'), 'success' => true, 'amount' => $amountDiscounted]; - } else { - return ['message' => trans('admin::app.promotion.status.coupon-failed'), 'success' => false, 'amount' => $amountDiscounted]; - } + $report['conditions'] = true; } else { - return ['message' => trans('admin::app.promotion.status.coupon-failed'), 'success' => false, 'amount' => $amountDiscounted]; + if ($rule->conditions == null) + $report['conditions'] = true; + else + $report['conditions'] = false; } - } - /** - * To remove the couponable rule - */ - public function removeCoupon() - { - $rule = $this->cartRuleCart->findWhere([ - 'cart_id' => \Cart::getCart()->id - ])->first(); - - if ($rule->cart_rule->use_coupon) { - if ($rule->delete()) { - return true; - } else { - return false; - } + //check endrule + if ($rule->end_other_rules) { + $report['end_other_rules'] = true; } else { - return false; - } - } - - /** - * End race between two rules i.e the one already - * applied and one trying to be used - */ - protected function endRace($newRule) - { - $appliedRule = $this->cartRuleCart->findWhere([ - 'cart_id' => \Cart::getCart()->id - ]); - - if (! count($appliedRule)) { - return true; + $report['end_other_rules'] = false; } - $appliedRule = $appliedRule->first()->cart_rule; - - if ($appliedRule->end_other_rules) { - return false; - } else { - if ($newRule->priority > $appliedRule->priority) { - return false; - } else if ($appliedRule->priority == $newRule->priority) { - $appliedRuleImpact = $this->analyzeImpact($appliedRule); - $newRuleImpact = $this->analyzeImpact($newRule); - - if ($newRuleImpact > $appliedRuleImpact) { - return true; - } else { - return false; - } - } else { - return true; - } - } - } - - /** - * Used when race condition occurs between - * any two rules possibly a discounted and - * a non discounted rule - */ - public function analyzeImpact($rule) - { - $cart = \Cart::getCart(); - - $action_type = $rule->action_type; - $disc_threshold = $rule->disc_threshold; - $disc_amount = $rule->disc_amount; - $disc_quantity = $rule->disc_quantity; - - $amountDiscounted = 0; - $newQuantity = 0; + //calculate discount amount + $action_type = $rule->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; $leastWorthItem = \Cart::leastWorthItem(); $realQty = $leastWorthItem['quantity']; - if ($cart->items_qty >= $disc_threshold && $disc_quantity > 0) { - if ($disc_quantity > 1) { - $disc_amount = $disc_amount * $disc_quantity; - } - + if ($cart->items_qty >= $disc_threshold && $realQty >= $disc_quantity) { if ($action_type == config('pricerules.cart.validation.0')) { - if ($realQty <= $disc_quantity) { - $amountDiscounted = (($leastWorthItem['total'] / $realQty) * ($disc_amount / 100)) * $disc_quantity; - } else { - $amountDiscounted = ($leastWorthItem['total'] / $realQty) * ($disc_amount / 100); - } + $amountDiscounted = $leastWorthItem['total'] * ($disc_amount / 100); } else if ($action_type == config('pricerules.cart.validation.1')) { - if ($realQty <= $disc_quantity) { - if ($disc_amount > ($disc_quantity * $leastWorthItem['total'])) { - $amountDiscounted = 0; - } else { - $amountDiscounted = $cart->sub_total - $disc_amount; - } - } else { - if ($disc_amount > $leastWorthItem['total']) { - $amountDiscounted = 0; - } else { - $amountDiscounted = $cart->sub_total - $disc_amount; - } + $amountDiscounted = $leastWorthItem['total'] - $disc_amount; + + if ($amountDiscounted < 0) { + $amountDiscounted = $leastWorthItem['total']; } } else if ($action_type == config('pricerules.cart.validation.2')) { - if ($realQty <= $disc_quantity) { - $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_amount; - } else { - $newQuantity = $this->cartItem->find($leastWorthItem['id'])->quantity + $disc_quantity; - } - } else if ($action_type == config('pricerules.cart.validation.3')) { $amountDiscounted = $disc_amount; } - - if ($action_type == config('pricerules.cart.validation.2')) { - // $cartRuleCart = $this->cartRuleCart->findWhere([ - // 'cart_id' => $cart->id, - // ]); - - // if (count($cartRuleCart)) { - // $this->cartRuleCart->update([ - // 'cart_id' => $cart->id, - // 'cart_rule_id' => $rule->id - // ], $cartRuleCart->first()->id); - // } else { - // $this->cartRuleCart->create([ - // 'cart_id' => $cart->id, - // 'cart_rule_id' => $rule->id - // ]); - // } - - return $newQuantity; - } else { - // $cartRuleCart = $this->cartRuleCart->findWhere([ - // 'cart_id' => $cart->id, - // ]); - - // if (count($cartRuleCart)) { - // $this->cartRuleCart->update([ - // 'cart_id' => $cart->id, - // 'cart_rule_id' => $rule->id - // ], $cartRuleCart->first()->id); - // } else { - // $this->cartRuleCart->create([ - // 'cart_id' => $cart->id, - // 'cart_rule_id' => $rule->id - // ]); - // } - - return $amountDiscounted; - } } + + $report['discount'] = $amountDiscounted; + $report['priority'] = $rule->priority; + + return $report; } - protected function testAllConditionAreTrue($conditions, $cart) { + protected function testIfAllConditionAreTrue($conditions, $cart) { $shipping_address = $cart->getShippingAddressAttribute(); $shipping_method = $cart->shipping_method; @@ -881,258 +273,6 @@ class Discount break; } - } else if ($test_condition == '()') { - } else if ($test_condition == '!()') { - } - } - // else if ($condition->type == 'boolean') { - // if ($test_conditions[$condition->type][$test_condition]) { - // if ($test_condition == 0) { - // } else if ($test_condition == 1) { - // } - // } - // } - } - return $result; - } - - protected function testAllConditionAreFalse($conditions, $cart) { - $shipping_address = $cart->getShippingAddressAttribute(); - $shipping_method = $cart->shipping_method; - $shipping_country = $shipping_address->country; - $shipping_state = $shipping_address->state; - $shipping_postcode = $shipping_address->postcode; - $shipping_city = $shipping_address->city; - - $payment_method = $cart->payment->method; - $sub_total = $cart->base_sub_total; - - $total_items = $cart->items_qty; - $total_weight = 0; - - foreach($cart->items as $item) { - $total_weight = $total_weight + $item->base_total_weight; - } - - $test_mode = config('pricerules.test_mode.0'); - $test_conditions = config('pricerules.cart.conditions'); - - $result = 1; - foreach ($conditions as $condition) { - $actual_value = ${$condition->attribute}; - $test_value = $condition->value; - $test_condition = $condition->condition; - - if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text') { - if ($test_condition == '=') { - if (! ($actual_value != $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '>=') { - if (($actual_value >= $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '<=') { - if (($actual_value <= $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '>') { - if (($actual_value > $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '<') { - if (($actual_value < $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '{}') { - if (str_contains($actual_value, $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '!{}') { - if (! str_contains($actual_value, $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '()') { - // dd($test_condition); - } else if ($test_condition == '!()') { - // dd($test_condition); - } - } - // else if ($condition->type == 'boolean') { - // if ($test_conditions[$condition->type][$test_condition]) { - // if ($test_condition == 0) { - // dd($test_condition); - // } else if ($test_condition == 1) { - // dd($test_condition); - // } - // } - // } - } - - return $result; - } - - protected function testAnyConditionIsTrue($conditions, $cart) { - $shipping_address = $cart->getShippingAddressAttribute(); - - $shipping_method = $cart->shipping_method; - $shipping_country = $shipping_address->country; - $shipping_state = $shipping_address->state; - $shipping_postcode = $shipping_address->postcode; - $shipping_city = $shipping_address->city; - - $payment_method = $cart->payment->method; - $sub_total = $cart->base_sub_total; - - $total_items = $cart->items_qty; - $total_weight = 0; - - foreach($cart->items as $item) { - $total_weight = $total_weight + $item->base_total_weight; - } - - $test_mode = config('pricerules.test_mode.0'); - $test_conditions = config('pricerules.cart.conditions'); - $result = 1; - - foreach ($conditions as $condition) { - $actual_value = ${$condition->attribute}; - $test_value = $condition->value; - $test_condition = $condition->condition; - - if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text'){ - if ($test_condition == '=') { - if ($actual_value == $test_value) { - break; - } - } else if ($test_condition == '>=') { - if ($actual_value >= $test_value) { - break; - } - } else if ($test_condition == '<=') { - if ($actual_value <= $test_value) { - break; - } - } else if ($test_condition == '>') { - if ($actual_value > $test_value) { - break; - } - } else if ($test_condition == '<') { - if ($actual_value < $test_value) { - break; - } - } else if ($test_condition == '{}') { - if (str_contains($actual_value, $test_value)) { - break; - } - } else if ($test_condition == '!{}') { - if (! (! str_contains($actual_value, $test_value))) { - break; - } - } else if ($test_condition == '()') { - // dd($test_condition); - } else if ($test_condition == '!()') { - // dd($test_condition); - } else { - $result = 0; - } - } - } - - return $result; - } - - protected function testAnyConditionIsFalse($conditions, $cart) { - $shipping_address = $cart->getShippingAddressAttribute(); - - $shipping_method = $cart->shipping_method; - $shipping_country = $shipping_address->country; - $shipping_state = $shipping_address->state; - $shipping_postcode = $shipping_address->postcode; - $shipping_city = $shipping_address->city; - - $payment_method = $cart->payment->method; - $sub_total = $cart->base_sub_total; - - $total_items = $cart->items_qty; - $total_weight = 0; - - foreach($cart->items as $item) { - $total_weight = $total_weight + $item->base_total_weight; - } - - $test_mode = config('pricerules.test_mode.0'); - $test_conditions = config('pricerules.cart.conditions'); - $result = 1; - - foreach ($conditions as $condition) { - $actual_value = ${$condition->attribute}; - $test_value = $condition->value; - $test_condition = $condition->condition; - - if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text'){ - if ($test_condition == '=') { - if ($actual_value != $test_value) { - $result = 0; - - break; - } - } else if ($test_condition == '>=') { - if (! ($actual_value >= $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '<=') { - if (! ($actual_value <= $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '>') { - if (! ($actual_value > $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '<') { - if ((! $actual_value < $test_value)) { - $result = 0; - - break; - } - } else if ($test_condition == '{}') { - if (! (str_contains($actual_value, $test_value))) { - $result = 0; - - break; - } - } else if ($test_condition == '!{}') { - if (! (! str_contains($actual_value, $test_value))) { - $result = 0; - - break; - } - } else if ($test_condition == '()') { - // dd($test_condition); - } else if ($test_condition == '!()') { - // dd($test_condition); - } else { - $result = 0; } } } diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 3c967a865..15088b420 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -9,6 +9,7 @@ use Webkul\Checkout\Repositories\CartItemRepository; use Webkul\Product\Repositories\ProductRepository; use Webkul\Customer\Repositories\CustomerRepository; use Webkul\Customer\Repositories\WishlistRepository; +use Webkul\Discount\Repositories\CartRuleCartRepository as CartRuleCart; use Illuminate\Support\Facades\Event; use Cart; @@ -37,6 +38,7 @@ class CartController extends Controller protected $cartItem; protected $customer; protected $product; + protected $cartRuleCart; protected $suppressFlash = false; /** @@ -51,7 +53,8 @@ class CartController extends Controller CartItemRepository $cartItem, CustomerRepository $customer, ProductRepository $product, - WishlistRepository $wishlist + WishlistRepository $wishlist, + CartRuleCart $cartRuleCart ) { @@ -67,6 +70,8 @@ class CartController extends Controller $this->wishlist = $wishlist; + $this->cartRuleCart = $cartRuleCart; + $this->_config = request('_config'); } @@ -260,6 +265,17 @@ class CartController extends Controller return $result; } + /** + * Fetch the non couponable rule + */ + public function getNonCouponAbleRule() + { + $cart = Cart::getCart(); + $nonCouponAbleRules = Cart::applyNonCoupon(); + + return $nonCouponAbleRules; + } + /** * To remove the currently active * couponable rule diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index 26ac06451..c97358e3a 100755 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -41,6 +41,8 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function Route::post('checkout/check/coupons', 'Webkul\Shop\Http\Controllers\CartController@applyCoupon')->name('shop.checkout.check.coupons'); + Route::post('checkout/fetch/noncoupon', 'Webkul\Shop\Http\Controllers\CartController@getNonCouponAbleRule')->name('shop.checkout.fetch.non-coupon'); + Route::post('checkout/remove/coupon', 'Webkul\Shop\Http\Controllers\CartController@removeCoupon')->name('shop.checkout.remove.coupon'); //Cart Items Add diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index 33f9472d7..7ab890a82 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -284,22 +284,22 @@ this.disable_button = true; this.$http.post("{{ route('shop.checkout.save-payment') }}", {'payment': this.selected_payment_method}) - .then(function(response) { - this_this.disable_button = false; + .then(function(response) { + this_this.disable_button = false; - if (response.data.jump_to_section == 'review') { - reviewHtml = Vue.compile(response.data.html) - this_this.completedStep = 3; - this_this.currentStep = 4; + if (response.data.jump_to_section == 'review') { + reviewHtml = Vue.compile(response.data.html) + this_this.completedStep = 3; + this_this.currentStep = 4; - this_this.getOrderSummary(); - } - }) - .catch(function (error) { - this_this.disable_button = false; + this_this.getOrderSummary(); + } + }) + .catch(function (error) { + this_this.disable_button = false; - this_this.handleErrorResponse(error.response, 'payment-form') - }) + this_this.handleErrorResponse(error.response, 'payment-form') + }); }, placeOrder: function() { @@ -511,6 +511,8 @@ }, mounted: function() { + // shop.checkout.fetch.non-coupon + this.checkNonCouponAble(); }, methods: { @@ -530,6 +532,16 @@ }); }, + checkNonCouponAble: function () { + var this_this = this; + + axios.post('{{ route('shop.checkout.fetch.non-coupon') }}').then(function(response) { + console.log(response.data); + }).catch(function (error) { + console.log(error); + }); + }, + codeChange: function() { if (this.code.length == 0 || this.code.length == 1) { From c6a44b54149696282b9d1d666f50126750545922 Mon Sep 17 00:00:00 2001 From: jitendra Date: Fri, 7 Jun 2019 11:18:46 +0530 Subject: [PATCH 72/89] Updated cart for custom_price --- packages/Webkul/Checkout/src/Cart.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 5850f8d52..a68aa485e 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -866,7 +866,7 @@ class Cart { } else if ($this->price->getMinimalPrice($item->child->product_flat) != $item->price) { // $price = (float) $item->custom_price ? $item->custom_price : $item->child->product->price; - if ((float)$item->custom_price) { + if (! is_null($item->custom_price)) { $price = $item->custom_price; } else { $price = $this->price->getMinimalPrice($item->child->product_flat); @@ -890,7 +890,7 @@ class Cart { } else if ($this->price->getMinimalPrice($productFlat) != $item->price) { // $price = (float) $item->custom_price ? $item->custom_price : $item->product->price; - if ((float)$item->custom_price) { + if (! is_null($item->custom_price)) { $price = $item->custom_price; } else { $price = $this->price->getMinimalPrice($productFlat); From ca4d9ef9ba54d28a8121f2243bb7799ed38d18c4 Mon Sep 17 00:00:00 2001 From: jitendra Date: Fri, 7 Jun 2019 15:42:58 +0530 Subject: [PATCH 73/89] Fixed js issue buy now button not exist --- .../views/products/view/configurable-options.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php index 1f8a305a4..536f6a006 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php @@ -145,7 +145,7 @@ var buyNowLink = $('.btn.buynow').attr('data-href'); var quantity = document.getElementById('quantity').value; - if (this.selectedProductId != '') { + if (this.selectedProductId != '' && buyNowLink) { var splitted = buyNowLink.split("/"); splitted.pop(); From 5585b503cff4ec376e9a73d88edc009437fb775d Mon Sep 17 00:00:00 2001 From: jitendra Date: Fri, 7 Jun 2019 16:36:50 +0530 Subject: [PATCH 74/89] Car controller updated --- .../src/Http/Controllers/CartController.php | 60 ++++++++++--------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index afbff7de4..8d46d9cd3 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -157,41 +157,45 @@ class CartController extends Controller */ public function updateBeforeCheckout() { - $request = request()->except('_token'); + try { + $request = request()->except('_token'); - foreach ($request['qty'] as $id => $quantity) { - if ($quantity <= 0) { - session()->flash('warning', trans('shop::app.checkout.cart.quantity.illegal')); + foreach ($request['qty'] as $id => $quantity) { + if ($quantity <= 0) { + session()->flash('warning', trans('shop::app.checkout.cart.quantity.illegal')); - return redirect()->back(); - } - } - - foreach ($request['qty'] as $key => $value) { - $item = $this->cartItem->findOneByField('id', $key); - - $data['quantity'] = $value; - - Event::fire('checkout.cart.update.before', $key); - - $result = Cart::updateItem($item->product_id, $data, $key); - - if ($result == false) { - $this->suppressFlash = true; + return redirect()->back(); + } } - Event::fire('checkout.cart.update.after', $item); + foreach ($request['qty'] as $key => $value) { + $item = $this->cartItem->findOneByField('id', $key); - unset($item); - unset($data); - } + $data['quantity'] = $value; - Cart::collectTotals(); + Event::fire('checkout.cart.update.before', $item); - if ($this->suppressFlash) { - session()->forget('success'); - session()->forget('warning'); - session()->flash('info', trans('shop::app.checkout.cart.partial-cart-update')); + $result = Cart::updateItem($item->product_id, $data, $key); + + if ($result == false) { + $this->suppressFlash = true; + } + + Event::fire('checkout.cart.update.after', $item); + + unset($item); + unset($data); + } + + Cart::collectTotals(); + + if ($this->suppressFlash) { + session()->forget('success'); + session()->forget('warning'); + session()->flash('info', trans('shop::app.checkout.cart.partial-cart-update')); + } + } catch(\Exception $e) { + session()->flash('error', trans($e->getMessage())); } return redirect()->back(); From 66bd3e7989a71600234fc3eab7a010d7174e813f Mon Sep 17 00:00:00 2001 From: jitendra Date: Fri, 7 Jun 2019 17:59:38 +0530 Subject: [PATCH 75/89] Optional index for datagrid action --- packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php index ba5d14a84..46f2ff647 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php @@ -44,7 +44,7 @@ @foreach ($actions as $action) Date: Fri, 7 Jun 2019 18:59:46 +0530 Subject: [PATCH 76/89] Discount rule implemented. --- .../Webkul/Discount/src/Helpers/Discount.php | 129 ++++++++++++++++-- .../src/Http/Controllers/CartController.php | 2 +- .../Shop/src/Resources/assets/sass/app.scss | 3 + .../Webkul/Shop/src/Resources/lang/en/app.php | 8 +- .../views/checkout/onepage.blade.php | 82 ++++++++--- 5 files changed, 189 insertions(+), 35 deletions(-) diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index a70a4e5e9..b14cb15a3 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -76,6 +76,7 @@ class Discount } if ($passed) { + $report['used_coupon'] = false; array_push($canBeApplied, $report); } } @@ -93,49 +94,148 @@ class Discount $leastId = 999999999999; if (count($canBeApplied) > 1) { foreach($canBeApplied as $rule) { - if ($rule['rule'] < $leastId) { + if ($rule['rule']->id < $leastId) { $leastId = $rule['rule']->id; } } + + // fighting the edge case for non couponable discount rule + foreach($canBeApplied as $rule) { + if ($rule['rule']->id == $leastId) { + $rule['used_coupon'] = false; + return $rule; + } + } } } + //find end rule - return $canBeApplied; + return $canBeApplied[0]; } - public function applyCouponAbleRule() + public function applyCouponAbleRule($code) { if (auth()->guard('customer')->check()) { $couponAbleRules = $this->cartRule->findWhere([ - 'use_coupon' => 1 + 'use_coupon' => 1, + 'status' => 1 ]); } else { $couponAbleRules = $this->cartRule->findWhere([ 'use_coupon' => 1, - 'is_guest' => 1 + 'is_guest' => 1, + 'status' => 1 ]); } - // time based filter - foreach($couponAbleRules as $rule) { + $rule; + foreach ($couponAbleRules as $couponAbleRule) { + if ($couponAbleRule->coupons->code == $code) { + $rule = $couponAbleRule; + } + } + + $useCouponable = false; + if (isset($rule)) { + $canBeApplied = array(); + + // time based filter + $report = $this->checkApplicability($rule); + $report['rule'] = $rule; + + $passed = 0; if ($rule->starts_from != null && $rule->ends_till == null) { if (Carbon::parse($rule->starts_from) < now()) { - + $passed = 1; } } else if ($rule->starts_from == null && $rule->ends_till != null) { - if (Carbon::parse($rule->ends_till) < now()) { - + if (Carbon::parse($rule->ends_till) > now()) { + $passed = 1; } } else if ($rule->starts_from != null && $rule->ends_till != null) { if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) { + $passed = 1; + } + } else { + $passed = 1; + } + + if ($passed) { + array_push($canBeApplied, $report); + + $useCouponable = true; + $alreadyAppliedRule = $this->cartRuleCart->findWhere([ + 'cart_id' => \Cart::getCart()->id + ]); + + if ($alreadyAppliedRule->count() && ! ($alreadyAppliedRule->first()->cart_rule->priority < $canBeApplied[0]['rule']->priority)) { + unset($report); + + $alreadyAppliedRule = $alreadyAppliedRule->first()->cart_rule; + + // analyze impact + $report = $this->checkApplicability($alreadyAppliedRule); + $report['rule'] = $alreadyAppliedRule; + + array_push($canBeApplied, $report); + + //min priority + $minPriority = collect($canBeApplied)->min('priority'); + //min priority rule + $canBeApplied = collect($canBeApplied)->where('priority', $minPriority); + + if (count($canBeApplied) > 1) { + $maxDiscount = collect($canBeApplied)->max('discount'); + + $canBeApplied = collect($canBeApplied)->where('discount', $maxDiscount); + + $leastId = 999999999999; + if (count($canBeApplied) > 1) { + foreach($canBeApplied as $rule) { + if ($rule['rule']->id < $leastId) { + $leastId = $rule['rule']->id; + } + } + + // fighting the edge case for couponable discount rule + foreach($canBeApplied as $rule) { + if ($rule['rule']->id == $leastId) { + if($rule->use_coupon) { + $useCouponable = true; + } + } + } + } else { + if ($canBeApplied[0]['rule']->use_coupon) { + $useCouponable = true; + } + } + } else if (count($canBeApplied)) { + if ($canBeApplied[0]['rule']->use_coupon) { + $useCouponable = true; + } + } + } + + if ($alreadyAppliedRule->end_other_rules) { + $useCouponable = false; } } } - return $couponAbleRules; + $canBeApplied = array(); + if ($useCouponable) { + $report = $this->checkApplicability($rule); + $report['rule'] = $rule; + $report['used_coupon'] = $useCouponable; + + return $report; + } else { + return false; + } } - public function checkApplicability($rule) + public function checkApplicability($rule = null) { $cart = \Cart::getCart(); $report = array(); @@ -178,7 +278,7 @@ class Discount $disc_amount = $rule->disc_amount; // value of discount $disc_quantity = $rule->disc_quantity; //max quantity allowed to be discounted - $amountDiscounted; + $amountDiscounted = 0; $leastWorthItem = \Cart::leastWorthItem(); $realQty = $leastWorthItem['quantity']; @@ -197,6 +297,9 @@ class Discount } $report['discount'] = $amountDiscounted; + $report['formatted_discount'] = core()->formatPrice($amountDiscounted, $cart->cart_currency_code); + $report['new_grand_total'] = $cart->grand_total - $amountDiscounted; + $report['formatted_new_grand_total'] = core()->formatPrice($cart->grand_total - $amountDiscounted, $cart->cart_currency_code); $report['priority'] = $rule->priority; return $report; diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 15088b420..c005a22ee 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -261,7 +261,7 @@ class CartController extends Controller $code = request()->input('code'); $result = Cart::applyCoupon($code); - dd($result); + return $result; } diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index b509f28a5..ac5f07841 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -2187,6 +2187,9 @@ section.cart { } } } + + .discount-details-group { + } } // cart pages responsive css start diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 6320aa674..30fe59da1 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -397,7 +397,7 @@ return [ 'quantity-error' => 'Requested Quantity Is Not Available', 'cart-subtotal' => 'Cart Subtotal', 'cart-remove-action' => 'Do you really want to do this ?', - 'partial-cart-update' => 'Only some of the product(s) were updated' + 'partial-cart-update' => 'Only some of the product(s) were updated', ], 'onepage' => [ @@ -449,7 +449,11 @@ return [ 'delivery-charges' => 'Delivery Charges', 'tax' => 'Tax', 'discount' => 'Discount', - 'price' => 'price' + 'price' => 'price', + 'disc-amount' => 'Amount discounted', + 'new-grand-total' => 'New Grand Total', + 'coupon' => 'Coupon', + 'coupon-applied' => 'Coupon Applied' ], 'success' => [ diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index 7ab890a82..8ff3ec2c6 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -11,8 +11,8 @@ @push('scripts') @@ -497,16 +535,14 @@ return { code: null, message: null, - qtyRevealed: false, - amount_given: null, - amount: null, - discounted: null, - discount: { - amount: null, - action: null, - amount_given: null, - message: null - } + end_rule_present: false, + discount_amount: 0, + rule_name: null, + free_shipping: null, + new_grand_total: null, + non_coupon_able: false, + coupon_able: false, + discount_code: null } }, @@ -522,13 +558,16 @@ axios.post('{{ route('shop.checkout.check.coupons') }}', { code: this_this.code }).then(function(response) { - this_this.message = response.data.message; - - this_this.discounted = response.data.success; - this_this.discount.amount = response.data.amount; - this_this.discount.amount_given = response.data.amount_given; + this_this.end_rule_present = response.data.end_other_rules; + this_this.discount_amount = response.data.formatted_discount; + this_this.rule_name = response.data.rule.name; + this_this.free_shipping = response.data.rule.free_shipping; + this_this.new_grand_total = response.data.formatted_new_grand_total; + this_this.non_coupon_able = false; + this_this.coupon_able = true; + this_this.discount_code = this_this.code; }).catch(function(error) { - this_this.discounted = false; + // this_this.discounted = false; }); }, @@ -536,7 +575,12 @@ var this_this = this; axios.post('{{ route('shop.checkout.fetch.non-coupon') }}').then(function(response) { - console.log(response.data); + this_this.end_rule_present = response.data.end_other_rules; + this_this.discount_amount = response.data.formatted_discount; + this_this.rule_name = response.data.rule.name; + this_this.free_shipping = response.data.rule.free_shipping; + this_this.new_grand_total = response.data.formatted_new_grand_total; + this_this.non_coupon_able = true; }).catch(function (error) { console.log(error); }); From c79183342521b371514ba226b4f76b232560a12b Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 7 Jun 2019 19:51:45 +0530 Subject: [PATCH 77/89] cart rule bug fixes --- .../Migrations/2019_05_13_024326_create_cart_rule_table.php | 6 ++++++ .../Shop/src/Resources/views/checkout/onepage.blade.php | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php index 151a76602..03f6273ec 100644 --- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php @@ -13,6 +13,12 @@ class CreateCartRuleTable extends Migration */ public function up() { + Schema::dropIfExists('discount_customer_group'); + Schema::dropIfExists('discount_channels'); + Schema::dropIfExists('discount_rules'); + Schema::dropIfExists('discounts'); + Schema::dropIfExists('products_grid'); + Schema::create('cart_rules', function (Blueprint $table) { $table->increments('id'); $table->string('name')->nullable(); diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index 8ff3ec2c6..ecb29a67a 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -567,7 +567,6 @@ this_this.coupon_able = true; this_this.discount_code = this_this.code; }).catch(function(error) { - // this_this.discounted = false; }); }, @@ -582,7 +581,6 @@ this_this.new_grand_total = response.data.formatted_new_grand_total; this_this.non_coupon_able = true; }).catch(function (error) { - console.log(error); }); }, From 3c16cbba737731f7a9a65896eb59b66563176e83 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Sat, 8 Jun 2019 16:13:17 +0530 Subject: [PATCH 78/89] provision to remove the couponable and non couponable rule had been added --- .../Webkul/Discount/src/Helpers/Discount.php | 43 +++++++++++++++++++ .../src/Http/Controllers/CartController.php | 8 ++++ packages/Webkul/Shop/src/Http/routes.php | 2 + .../views/checkout/onepage.blade.php | 18 ++++---- .../views/checkout/onepage/review.blade.php | 10 ----- .../views/checkout/success.blade.php | 3 -- 6 files changed, 62 insertions(+), 22 deletions(-) diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index b14cb15a3..e1e27ebf9 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -240,6 +240,7 @@ class Discount $cart = \Cart::getCart(); $report = array(); $result = 0; + //check conditions if ($rule->conditions != null) { $conditions = json_decode(json_decode($rule->conditions)); @@ -305,6 +306,48 @@ class Discount return $report; } + public function removeNonCoupon() + { + $cart = \Cart::getCart(); + + $nonCouponAbleRule = $this->cartRuleCart->findWhere([ + 'cart_id' => $cart->id + ]); + + if (count($couponAbleRule) && ! $couponAbleRule->first()->cart_rule->use_coupon) { + $result = $nonCouponAbleRule->delete(); + + if ($result) { + return true; + } else { + return false; + } + } else { + return false; + } + } + + public function removeCoupon() + { + $cart = \Cart::getCart(); + + $couponAbleRule = $this->cartRuleCart->findWhere([ + 'cart_id' => $cart->id + ]); + + if (count($couponAbleRule) && $couponAbleRule->first()->cart_rule->use_coupon) { + $result = $couponAbleRule->delete(); + + if ($result) { + return true; + } else { + return false; + } + } else { + return false; + } + } + protected function testIfAllConditionAreTrue($conditions, $cart) { $shipping_address = $cart->getShippingAddressAttribute(); diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index c005a22ee..a7a3fc6be 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -276,6 +276,14 @@ class CartController extends Controller return $nonCouponAbleRules; } + /** + * To save the discount values inside the tables of orders and cart + */ + public function saveDiscount() + { + return ['hellow']; + } + /** * To remove the currently active * couponable rule diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index c97358e3a..59f63da37 100755 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -41,6 +41,8 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function Route::post('checkout/check/coupons', 'Webkul\Shop\Http\Controllers\CartController@applyCoupon')->name('shop.checkout.check.coupons'); + Route::post('checkout/save/discounts', 'Webkul\Shop\Http\Controllers\CartController@saveDiscount')->name('shop.checkout.save.discount'); + Route::post('checkout/fetch/noncoupon', 'Webkul\Shop\Http\Controllers\CartController@getNonCouponAbleRule')->name('shop.checkout.fetch.non-coupon'); Route::post('checkout/remove/coupon', 'Webkul\Shop\Http\Controllers\CartController@removeCoupon')->name('shop.checkout.remove.coupon'); diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index ecb29a67a..26445833f 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -58,7 +58,7 @@
    - +
    @@ -343,6 +343,12 @@ placeOrder: function() { var this_this = this; + axios.post('{{ route('shop.checkout.save.discount') }}').then(function (response) { + console.log(response.data); + }).catch(function (error) { + console.log('error in saving discount'); + }); + this.disable_button = true; this.$http.post("{{ route('shop.checkout.save-order') }}", {'_token': "{{ csrf_token() }}"}) @@ -597,15 +603,9 @@ axios.post('{{ route('shop.checkout.remove.coupon') }}', { code: this_this.code }).then(function(response) { - if (response.data.message == true) { - this_this.discounted = null; - this_this.discount.amount = null; - this_this.discount.action = null; - this_this.discount.amount_given = null; - this_this.discount.message = null; - } + console.log(response.data); }).catch(function(error) { - this_this.discounted = false; + console.log(error.data); }); } } diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php index 09f4bcfa4..5341e42e4 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php @@ -87,8 +87,6 @@
    {!! view_render_event('bagisto.shop.checkout.name.after', ['item' => $item]) !!} - - {!! view_render_event('bagisto.shop.checkout.price.before', ['item' => $item]) !!}
    @@ -101,8 +99,6 @@
    {!! view_render_event('bagisto.shop.checkout.price.after', ['item' => $item]) !!} - - {!! view_render_event('bagisto.shop.checkout.quantity.before', ['item' => $item]) !!}
    @@ -116,27 +112,21 @@ {!! view_render_event('bagisto.shop.checkout.quantity.after', ['item' => $item]) !!} - @if ($product->type == 'configurable') {!! view_render_event('bagisto.shop.checkout.options.after', ['item' => $item]) !!}
    - {{ Cart::getProductAttributeOptionDetails($item->child->product)['html'] }} -
    {!! view_render_event('bagisto.shop.checkout.options.after', ['item' => $item]) !!} @endif
    -
    @endforeach -
    -
    diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php index e17fbaae3..0608ef3dc 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php @@ -7,7 +7,6 @@ @section('content-wrapper')
    -

    {{ __('shop::app.checkout.success.thanks') }}

    {{ __('shop::app.checkout.success.order-id-info', ['order_id' => $order->id]) }}

    @@ -19,7 +18,5 @@ {{ __('shop::app.checkout.cart.continue-shopping') }}
    -
    - @endsection \ No newline at end of file From 194fc512615db70d5a339f0271ff2b1dcf25be84 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Sat, 8 Jun 2019 20:34:41 +0530 Subject: [PATCH 79/89] Cart rule frontend work done --- .../Webkul/Discount/src/Helpers/Discount.php | 50 ++++++++++++------- .../Webkul/Shop/src/Resources/lang/en/app.php | 3 +- .../views/checkout/onepage.blade.php | 34 ++++++++----- 3 files changed, 55 insertions(+), 32 deletions(-) diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index e1e27ebf9..bdfd823f1 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -103,13 +103,17 @@ class Discount foreach($canBeApplied as $rule) { if ($rule['rule']->id == $leastId) { $rule['used_coupon'] = false; + + $this->save($rule['rule']); + return $rule; } } } } - //find end rule + $this->save($canBeApplied[0]['rule']); + return $canBeApplied[0]; } @@ -197,10 +201,10 @@ class Discount } } - // fighting the edge case for couponable discount rule + // fighting the edge case for couponable discount rule foreach($canBeApplied as $rule) { if ($rule['rule']->id == $leastId) { - if($rule->use_coupon) { + if($rule['rule']->use_coupon) { $useCouponable = true; } } @@ -215,10 +219,10 @@ class Discount $useCouponable = true; } } - } - if ($alreadyAppliedRule->end_other_rules) { - $useCouponable = false; + if ($alreadyAppliedRule->end_other_rules) { + $useCouponable = false; + } } } } @@ -229,6 +233,8 @@ class Discount $report['rule'] = $rule; $report['used_coupon'] = $useCouponable; + $this->save($rule); + return $report; } else { return false; @@ -306,39 +312,45 @@ class Discount return $report; } - public function removeNonCoupon() + public function save($rule) { $cart = \Cart::getCart(); - $nonCouponAbleRule = $this->cartRuleCart->findWhere([ + // create or update + $existingRule = $this->cartRuleCart->findWhere([ 'cart_id' => $cart->id ]); - if (count($couponAbleRule) && ! $couponAbleRule->first()->cart_rule->use_coupon) { - $result = $nonCouponAbleRule->delete(); + if (count($existingRule)) { + if ($existingRule->first()->cart_rule_id != $rule->id) { + $existingRule->first()->update([ + 'cart_rule_id' => $rule->id + ]); - if ($result) { return true; - } else { - return false; } } else { - return false; + $this->cartRuleCart->create([ + 'cart_id' => $cart->id, + 'cart_rule_id' => $rule->id + ]); + + return true; } + + return false; } public function removeCoupon() { $cart = \Cart::getCart(); - $couponAbleRule = $this->cartRuleCart->findWhere([ + $existingRule = $this->cartRuleCart->findWhere([ 'cart_id' => $cart->id ]); - if (count($couponAbleRule) && $couponAbleRule->first()->cart_rule->use_coupon) { - $result = $couponAbleRule->delete(); - - if ($result) { + if ($existingRule->count()) { + if ($existingRule->first()->delete()) { return true; } else { return false; diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 30fe59da1..29ff6503c 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -453,7 +453,8 @@ return [ 'disc-amount' => 'Amount discounted', 'new-grand-total' => 'New Grand Total', 'coupon' => 'Coupon', - 'coupon-applied' => 'Coupon Applied' + 'coupon-applied' => 'Coupon Applied', + 'remove-coupon' => 'Remove Coupon' ], 'success' => [ diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index 26445833f..0217057cb 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -10,7 +10,7 @@ @push('scripts') + + + @endpush +@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php new file mode 100644 index 000000000..d565e979f --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php @@ -0,0 +1,582 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.promotion.edit-cart-rule') }} +@stop + +@section('content') + +
    + +
    + + @push('scripts') + + + + @endpush +@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/index.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/index.blade.php new file mode 100644 index 000000000..cf172412a --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/index.blade.php @@ -0,0 +1,27 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.promotion.cart-rule') }} +@stop + +@section('content') + +
    +
    +
    +

    {{ __('admin::app.promotion.cart-rule') }}

    +
    + +
    + + {{ __('admin::app.promotion.add-cart-rule') }} + +
    +
    + +
    + @inject('cartRuleGrid','Webkul\Admin\DataGrids\CartRuleDataGrid') + {!! $cartRuleGrid->render() !!} +
    +
    +@endsection \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php new file mode 100644 index 000000000..2e9783c23 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php @@ -0,0 +1,539 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.promotion.add-catalog-rule') }} +@stop + +@section('content') +
    + +
    + + @push('scripts') + + + + @endpush +@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php new file mode 100644 index 000000000..000014dd1 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php @@ -0,0 +1,542 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.promotion.edit-catalog-rule') }} +@stop + +@section('content') +
    + +
    + + @push('scripts') + + + + @endpush +@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php new file mode 100644 index 000000000..f0bbfc8ca --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php @@ -0,0 +1,31 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.promotion.catalog-rule') }} +@stop + +@section('content') + +
    +
    +
    +

    {{ __('admin::app.promotion.catalog-rule') }}

    +
    + +
    + + {{ __('Apply Rules') }} + + + + {{ __('admin::app.promotion.add-catalog-rule') }} + +
    +
    + +
    + @inject('catalogRuleGrid','Webkul\Admin\DataGrids\CatalogRuleDataGrid') + {!! $catalogRuleGrid->render() !!} +
    +
    +@endsection \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeOptionTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeOptionTableSeeder.php index 0135f6e76..992c625c0 100755 --- a/packages/Webkul/Attribute/src/Database/Seeders/AttributeOptionTableSeeder.php +++ b/packages/Webkul/Attribute/src/Database/Seeders/AttributeOptionTableSeeder.php @@ -13,27 +13,27 @@ class AttributeOptionTableSeeder extends Seeder DB::table('attribute_options')->delete(); DB::table('attribute_options')->insert([ - ['id' => '1','admin_name' => 'Red','sort_order' => '1','attribute_id' => '23'], - ['id' => '2','admin_name' => 'Green','sort_order' => '2','attribute_id' => '23'], - ['id' => '3','admin_name' => 'Yellow','sort_order' => '3','attribute_id' => '23'], - ['id' => '4','admin_name' => 'Black','sort_order' => '4','attribute_id' => '23'], - ['id' => '5','admin_name' => 'White','sort_order' => '5','attribute_id' => '23'], - ['id' => '6','admin_name' => 'S','sort_order' => '1','attribute_id' => '24'], - ['id' => '7','admin_name' => 'M','sort_order' => '2','attribute_id' => '24'], - ['id' => '8','admin_name' => 'L','sort_order' => '3','attribute_id' => '24'], - ['id' => '9','admin_name' => 'XL','sort_order' => '4','attribute_id' => '24'] + ['id' => '1', 'admin_name' => 'Red', 'sort_order' => '1', 'attribute_id' => '23'], + ['id' => '2', 'admin_name' => 'Green', 'sort_order' => '2', 'attribute_id' => '23'], + ['id' => '3', 'admin_name' => 'Yellow', 'sort_order' => '3', 'attribute_id' => '23'], + ['id' => '4', 'admin_name' => 'Black', 'sort_order' => '4', 'attribute_id' => '23'], + ['id' => '5', 'admin_name' => 'White', 'sort_order' => '5', 'attribute_id' => '23'], + ['id' => '6', 'admin_name' => 'S', 'sort_order' => '1', 'attribute_id' => '24'], + ['id' => '7', 'admin_name' => 'M', 'sort_order' => '2', 'attribute_id' => '24'], + ['id' => '8', 'admin_name' => 'L', 'sort_order' => '3', 'attribute_id' => '24'], + ['id' => '9', 'admin_name' => 'XL', 'sort_order' => '4', 'attribute_id' => '24'] ]); DB::table('attribute_option_translations')->insert([ - ['id' => '1','locale' => 'en','label' => 'Red','attribute_option_id' => '1'], - ['id' => '2','locale' => 'en','label' => 'Green','attribute_option_id' => '2'], - ['id' => '3','locale' => 'en','label' => 'Yellow','attribute_option_id' => '3'], - ['id' => '4','locale' => 'en','label' => 'Black','attribute_option_id' => '4'], - ['id' => '5','locale' => 'en','label' => 'White','attribute_option_id' => '5'], - ['id' => '6','locale' => 'en','label' => 'S','attribute_option_id' => '6'], - ['id' => '7','locale' => 'en','label' => 'M','attribute_option_id' => '7'], - ['id' => '8','locale' => 'en','label' => 'L','attribute_option_id' => '8'], - ['id' => '9','locale' => 'en','label' => 'XL','attribute_option_id' => '9'] + ['id' => '1', 'locale' => 'en', 'label' => 'Red', 'attribute_option_id' => '1'], + ['id' => '2', 'locale' => 'en', 'label' => 'Green', 'attribute_option_id' => '2'], + ['id' => '3', 'locale' => 'en', 'label' => 'Yellow', 'attribute_option_id' => '3'], + ['id' => '4', 'locale' => 'en', 'label' => 'Black', 'attribute_option_id' => '4'], + ['id' => '5', 'locale' => 'en', 'label' => 'White', 'attribute_option_id' => '5'], + ['id' => '6', 'locale' => 'en', 'label' => 'S', 'attribute_option_id' => '6'], + ['id' => '7', 'locale' => 'en', 'label' => 'M', 'attribute_option_id' => '7'], + ['id' => '8', 'locale' => 'en', 'label' => 'L', 'attribute_option_id' => '8'], + ['id' => '9', 'locale' => 'en', 'label' => 'XL', 'attribute_option_id' => '9'] ]); } } \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php index 3deb198de..c66f99c13 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php @@ -153,6 +153,24 @@ class AttributeFamilyRepository extends Repository return $family; } + public function getPartial() + { + $attributeFamilies = $this->model->all(); + $trimmed = array(); + + foreach($attributeFamilies as $key => $attributeFamily) { + if ($attributeFamily->name != null || $attributeFamily->name != "") { + $trimmed[$key] = [ + 'id' => $attributeFamily->id, + 'code' => $attributeFamily->code, + 'name' => $attributeFamily->name + ]; + } + } + + return $trimmed; + } + /** * @param $id * @return void diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php index 1de148040..0c80612dc 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php @@ -210,4 +210,26 @@ class AttributeRepository extends Repository return $attributes[$attributeFamily->id] = $attributeFamily->custom_attributes; } + + /** + * @return Object + */ + public function getPartial() + { + $attributes = $this->model->all(); + $trimmed = array(); + + foreach($attributes as $key => $attribute) { + if ($attribute->code != 'tax_category_id' && ($attribute->type == 'select' || $attribute->type == 'multiselect' || $attribute->code == 'sku')) { + array_push($trimmed, [ + 'id' => $attribute->id, + 'name' => $attribute->name, + 'type' => $attribute->type, + 'code' => $attribute->code + ]); + } + } + + return $trimmed; + } } \ 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 7a2f43536..a5b3432d0 100755 --- a/packages/Webkul/Category/src/Repositories/CategoryRepository.php +++ b/packages/Webkul/Category/src/Repositories/CategoryRepository.php @@ -212,4 +212,21 @@ class CategoryRepository extends Repository $category->save(); } } + + public function getPartial() + { + $categories = $this->model->all(); + $trimmed = array(); + + foreach ($categories as $key => $category) { + if ($category->name != null || $category->name != "") { + $trimmed[$key] = [ + 'id' => $category->id, + 'name' => $category->name + ]; + } + } + + return $trimmed; + } } \ No newline at end of file diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index a68aa485e..694f3fc62 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -12,6 +12,8 @@ use Webkul\Tax\Repositories\TaxCategoryRepository; use Webkul\Checkout\Models\CartPayment; use Webkul\Customer\Repositories\WishlistRepository; use Webkul\Customer\Repositories\CustomerAddressRepository; +use Webkul\Discount\Repositories\CartRuleRepository as CartRule; +use Webkul\Discount\Helpers\Discount; use Webkul\Product\Helpers\Price; /** @@ -24,81 +26,94 @@ use Webkul\Product\Helpers\Price; class Cart { /** - * CartRepository model + * CartRepository instance * * @var mixed */ protected $cart; /** - * CartItemRepository model + * CartItemRepository instance * * @var mixed */ protected $cartItem; /** - * CustomerRepository model + * CustomerRepository instance * * @var mixed */ protected $customer; /** - * CartAddressRepository model + * CartAddressRepository instance * * @var mixed */ protected $cartAddress; /** - * ProductRepository model + * ProductRepository instance * * @var mixed */ protected $product; /** - * TaxCategoryRepository model + * TaxCategoryRepository instance * * @var mixed */ protected $taxCategory; /** - * WishlistRepository model + * WishlistRepository instance * * @var mixed */ protected $wishlist; /** - * CustomerAddressRepository model + * CustomerAddressRepository instance * * @var mixed */ - protected $customerAddress; + protected $customerAddress; + + /** + * CartRule Repository instance + */ + protected $cartRule; + + /** + * Discount helper instance + */ + protected $discount; /** * Suppress the session flash messages - */ + */ protected $suppressFlash; /** * Product price helper instance - */ + */ protected $price; /** * Create a new controller instance. * - * @param Webkul\Checkout\Repositories\CartRepository $cart - * @param Webkul\Checkout\Repositories\CartItemRepository $cartItem - * @param Webkul\Checkout\Repositories\CartAddressRepository $cartAddress - * @param Webkul\Customer\Repositories\CustomerRepository $customer - * @param Webkul\Product\Repositories\ProductRepository $product - * @param Webkul\Product\Repositories\TaxCategoryRepository $taxCategory + * @param Webkul\Checkout\Repositories\CartRepository $cart + * @param Webkul\Checkout\Repositories\CartItemRepository $cartItem + * @param Webkul\Checkout\Repositories\CartAddressRepository $cartAddress + * @param Webkul\Customer\Repositories\CustomerRepository $customer + * @param Webkul\Product\Repositories\ProductRepository $product + * @param Webkul\Product\Repositories\TaxCategoryRepository $taxCategory * @param Webkul\Product\Repositories\CustomerAddressRepository $customerAddress + * @param Webkul\Product\Repositories\CustomerAddressRepository $customerAddress + * @param Webkul\Discount\Repositories\CartRuleRepository $cartRule + * @param Webkul\Helpers\Discount $discount * @return void */ public function __construct( @@ -110,6 +125,8 @@ class Cart { TaxCategoryRepository $taxCategory, WishlistRepository $wishlist, CustomerAddressRepository $customerAddress, + CartRule $cartRule, + Discount $discount, Price $price ) { @@ -129,12 +146,15 @@ class Cart { $this->customerAddress = $customerAddress; + $this->cartRule = $cartRule; + + $this->discount = $discount; + $this->price = $price; $this->suppressFlash = false; } - /** * Return current logged in customer * @@ -1072,6 +1092,59 @@ class Cart { return $finalData; } + /** + * Save discount data for cart + */ + public function saveDiscount() + { + $rule = $impact['rule']; + + $cart = $this->getCart(); + + //update the cart items + foreach($cart->items as $item) { + if ($rule->use_coupon) { + if ($rule->action_type != config('pricerules.cart.validation.0')) { + $item->update([ + 'coupon_code' => $rule->coupon->code, + 'discount_amount' => core()->convertPrice($impact['amount'], $cart->channel_currency_code), + 'base_discount_amount' => $impact['amount'] + ]); + } else { + $item->update([ + 'coupon_code' => $rule->coupon->code, + 'discount_percent' => $rule->disc_amount + ]); + } + } else { + if ($rule->action_type != config('pricerules.cart.validation.0')) { + $item->update([ + 'discount_amount' => core()->convertPrice($impact['amount'], $cart->channel_currency_code), + 'base_discount_amount' => $impact['amount'] + ]); + } else { + $item->update([ + 'discount_percent' => $rule->disc_amount + ]); + } + } + } + + // update the cart + if ($rule->use_coupon) { + $cart->update([ + 'coupon_code' => $rule->coupons->code, + 'discount_amount' => core()->convertPrice($impact['amount'], $cart->channel_currency_code), + 'base_discount_amount' => $impact['amount'] + ]); + } else { + $cart->update([ + 'discount_amount' => core()->convertPrice($impact['amount'], $cart->channel_currency_code), + 'base_discount_amount' => $impact['amount'] + ]); + } + } + /** * Prepares data for order item * @@ -1212,4 +1285,67 @@ class Cart { } } } + + public function applyCoupon($code) + { + $result = $this->discount->applyCouponAbleRule($code); + + return $result; + } + + public function applyNonCoupon() + { + $result = $this->discount->applyNonCouponAbleRule(); + + return $result; + } + + public function removeCoupon() + { + $result = $this->discount->removeCoupon(); + + return $result; + } + + public function leastWorthItem() + { + $cart = $this->getCart(); + $leastValue = 999999999999; + $leastSubTotal = []; + + foreach ($cart->items as $item) { + if ($item->price < $leastValue) { + $leastValue = $item->price; + $leastSubTotal = [ + 'id' => $item->id, + 'total' => $item->total, + 'base_total' => $leastValue, + 'quantity' => $item->quantity + ]; + } + } + + return $leastSubTotal; + } + + public function maxWorthItem() + { + $cart = $this->getCart(); + $maxValue = 0; + $maxSubTotal = []; + + foreach ($cart->items as $item) { + if ($item->base_total > $maxValue) { + $maxValue = $item->total; + $maxSubTotal = [ + 'id' => $item->id, + 'total' => $item->total, + 'base_total' => $maxValue, + 'quantity' => $item->quantity + ]; + } + } + + return $maxSubTotal; + } } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Config/concord.php b/packages/Webkul/Core/src/Config/concord.php index 3585e74c6..b9e18a31e 100644 --- a/packages/Webkul/Core/src/Config/concord.php +++ b/packages/Webkul/Core/src/Config/concord.php @@ -17,6 +17,6 @@ return [ \Webkul\Inventory\Providers\ModuleServiceProvider::class, \Webkul\Product\Providers\ModuleServiceProvider::class,\Webkul\Sales\Providers\ModuleServiceProvider::class, \Webkul\Tax\Providers\ModuleServiceProvider::class, - \Webkul\User\Providers\ModuleServiceProvider::class + \Webkul\User\Providers\ModuleServiceProvider::class,\Webkul\Discount\Providers\ModuleServiceProvider::class, ] ]; \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Database/Seeders/CustomerGroupTableSeeder.php b/packages/Webkul/Customer/src/Database/Seeders/CustomerGroupTableSeeder.php index b4457f230..6a83e7b4d 100755 --- a/packages/Webkul/Customer/src/Database/Seeders/CustomerGroupTableSeeder.php +++ b/packages/Webkul/Customer/src/Database/Seeders/CustomerGroupTableSeeder.php @@ -19,6 +19,10 @@ class CustomerGroupTableSeeder extends Seeder 'id' => 2, 'name' => 'Wholesale', 'is_user_defined' => 0, + ], [ + 'id' => 3, + 'name' => 'Not Logged In', + 'is_user_defined' => 0, ]); } } \ No newline at end of file diff --git a/packages/Webkul/Discount/Untitled-1.txt b/packages/Webkul/Discount/Untitled-1.txt new file mode 100644 index 000000000..b2803cd5d --- /dev/null +++ b/packages/Webkul/Discount/Untitled-1.txt @@ -0,0 +1,8 @@ +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/composer.json b/packages/Webkul/Discount/composer.json new file mode 100644 index 000000000..78ac3d63e --- /dev/null +++ b/packages/Webkul/Discount/composer.json @@ -0,0 +1,27 @@ +{ + "name": "bagisto/laravel-discount", + "license": "MIT", + "authors": [ + { + "name": "Prashant Singh", + "email": "prashant.singh852@webkul.com" + } + ], + "require": { + "propaganistas/laravel-intl": "^2.0" + }, + "autoload": { + "psr-4": { + "Webkul\\Discount\\": "src/" + } + }, + "extra": { + "laravel": { + "providers": [ + "Webkul\\Discount\\DiscountServiceProvider" + ], + "aliases": {} + } + }, + "minimum-stability": "dev" +} \ 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 new file mode 100644 index 000000000..b8e147a4f --- /dev/null +++ b/packages/Webkul/Discount/src/Config/rule-conditions.php @@ -0,0 +1,179 @@ + [ + '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', + ] + ], + + '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' + ], + + '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' + ] + ] + ], + + 'cart' => [ + 'actions' => [ + 'percent_of_product' => 'Percentage of product', + 'fixed_amount' => 'Apply as fixed amount', + 'buy_a_get_b' => 'Get B amount back', + // 'fixed_amount_cart' => 'Fixed amount for whole cart' + ], + + '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', + '{}' => 'Contains' + // '!{}' => 'Does not contains', + // '()' => 'Is one of', + // '!()' => 'Not is one of' + ], + + 'text' => [ + '=' => 'Equals', + '>=' => 'Greater or equals', + '<=' => 'Lesser or equals', + '>' => 'Greater than', + '<' => 'Lesser than', + '{}' => 'Contains', + '!{}' => 'Does not contains' + // '()' => 'Is one of', + // '!()' => 'Not is one of' + ], + + 'string' => [ + '=' => 'Equals', + '>=' => 'Greater or equals', + '<=' => 'Lesser or equals', + '>' => 'Greater than', + '<' => 'Lesser than', + '{}' => 'Contains', + '!{}' => 'Does not contains' + // '()' => 'Is one of', + // '!()' => 'Not is one of' + ], + + 'boolean' => [ + 0 => 'True/Yes', + 1 => 'False/No' + ] + ], + + 'attributes' => [ + 0 => [ + 'code' => 'sub_total', + 'name' => 'Sub Total', + 'type' => 'numeric' + ], + 1 => [ + 'code' => 'total_items', + 'name' => 'Total Items', + 'type' => 'numeric' + ], + 2 => [ + 'code' => 'total_weight', + 'name' => 'Total Weight', + 'type' => 'numeric' + ], + 3 => [ + 'code' => 'shipping_method', + 'name' => 'Shipping Method', + 'type' => 'string' + ], + 4 => [ + 'code' => 'payment_method', + 'name' => 'Payment Method', + 'type' => 'string' + ], + 5 => [ + 'code' => 'shipping_postcode', + 'name' => 'Shipping Postcode', + 'type' => 'string' + ], + 6 => [ + 'code' => 'shipping_state', + 'name' => 'Shipping State', + 'type' => 'string' + ], + 7 => [ + 'code' => 'shipping_country', + 'name' => 'Shipping Country', + 'type' => 'string' + ], + 8 => [ + 'code' => 'shipping_city', + 'name' => 'Shipping City', + 'type' => 'string' + ] + ] + ], + + 'test_mode' => [ + 0 => 'all_are_true', + 1 => 'all_are_false', + 2 => 'any_of_true', + 3 => 'all_of_false' + ] +]; \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Contracts/CartRule.php b/packages/Webkul/Discount/src/Contracts/CartRule.php new file mode 100644 index 000000000..c6da453eb --- /dev/null +++ b/packages/Webkul/Discount/src/Contracts/CartRule.php @@ -0,0 +1,7 @@ +increments('id'); + $table->string('name')->nullable(); + $table->string('description')->nullable(); + $table->datetime('starts_from')->nullable(); + $table->datetime('ends_till')->nullable(); + $table->boolean('status')->default(0); + $table->integer('per_customer')->unsigned()->default(0); + $table->boolean('is_guest')->default(0); + $table->boolean('use_coupon')->default(0); + $table->integer('usage_limit')->unsigned()->default(0); + $table->json('conditions')->nullable(); + $table->json('actions')->nullable(); + $table->boolean('end_other_rules')->default(0); + $table->integer('priority')->unsigned()->default(0); + $table->boolean('uses_attribute_conditions')->default(0); + $table->longtext('product_ids')->nullable(); + $table->integer('sort_order')->unsigned()->default(0); + $table->string('action_type')->nullable(); + $table->decimal('disc_amount', 12, 4)->default(0); + $table->decimal('disc_quantity', 12, 4)->default(0); + $table->string('disc_threshold')->default(0); + $table->integer('coupon_type')->default(1); + $table->boolean('auto_generation')->default(0); + $table->boolean('apply_to_shipping')->default(0); + $table->boolean('free_shipping')->default(0); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cart_rule'); + } +} diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024340_create_cart_rule_channels_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024340_create_cart_rule_channels_table.php new file mode 100644 index 000000000..3808c6545 --- /dev/null +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024340_create_cart_rule_channels_table.php @@ -0,0 +1,35 @@ +increments('id'); + $table->integer('cart_rule_id')->unsigned(); + $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade'); + $table->integer('channel_id')->unsigned(); + $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cart_rule_channels'); + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024419_create_cart_rule_customer_groups_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024419_create_cart_rule_customer_groups_table.php new file mode 100644 index 000000000..4396b999a --- /dev/null +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024419_create_cart_rule_customer_groups_table.php @@ -0,0 +1,35 @@ +increments('id'); + $table->integer('cart_rule_id')->unsigned(); + $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade'); + $table->integer('customer_group_id')->unsigned(); + $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cart_rule_customer_groups'); + } +} diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_16_094238_create_cart_rule_labels_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_16_094238_create_cart_rule_labels_table.php new file mode 100644 index 000000000..de1b43599 --- /dev/null +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_16_094238_create_cart_rule_labels_table.php @@ -0,0 +1,38 @@ +increments('id'); + $table->integer('channel_id')->unsigned()->nullable(); + $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade'); + $table->integer('locale_id')->unsigned()->nullable(); + $table->foreign('locale_id')->references('id')->on('locales')->onDelete('cascade'); + $table->integer('cart_rule_id')->unsigned()->nullable(); + $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade'); + $table->text('label')->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cart_rule_labels'); + } +} diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_175727_create_cart_rule_customers_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_175727_create_cart_rule_customers_table.php new file mode 100644 index 000000000..a65435173 --- /dev/null +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_175727_create_cart_rule_customers_table.php @@ -0,0 +1,36 @@ +increments('id'); + $table->integer('cart_rule_id')->unsigned(); + $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade'); + $table->integer('customer_id')->unsigned(); + $table->foreign('customer_id')->references('id')->on('customers')->onDelete('cascade'); + $table->bigInteger('usage_throttle')->unsigned()->default(0); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cartrule_customers'); + } +} diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_180457_create_cart_rule_coupons_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_180457_create_cart_rule_coupons_table.php new file mode 100644 index 000000000..8c99d442c --- /dev/null +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_180457_create_cart_rule_coupons_table.php @@ -0,0 +1,40 @@ +increments('id'); + $table->integer('cart_rule_id')->unsigned(); + $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade'); + $table->string('prefix')->nullable(); + $table->string('suffix')->nullable(); + $table->string('code')->nullable(); + $table->integer('usage_limit')->unsigned()->default(0); + $table->integer('usage_per_customer')->unsigned()->default(0); + $table->integer('usage_throttle')->unsigned()->default(0); + $table->integer('type')->unsigned()->default(0); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cartrule_coupons'); + } +} diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_24_113949_create_cart_rule_coupons_usage_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_24_113949_create_cart_rule_coupons_usage_table.php new file mode 100644 index 000000000..60f23900e --- /dev/null +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_24_113949_create_cart_rule_coupons_usage_table.php @@ -0,0 +1,39 @@ +increments('id'); + $table->integer('coupon_id')->unsigned(); + $table->foreign('coupon_id')->references('id')->on('cart_rules')->onDelete('cascade'); + $table->integer('channel_id')->unsigned(); + $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade'); + $table->integer('customer_id')->unsigned(); + $table->foreign('customer_id')->references('id')->on('customers')->onDelete('cascade'); + $table->bigInteger('usage')->unsigned()->default(0); + $table->date('expired_on'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cart_rule_coupons_usage'); + } +} diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_30_141207_create_cart_rule_cart_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_30_141207_create_cart_rule_cart_table.php new file mode 100644 index 000000000..ec6fc70e8 --- /dev/null +++ b/packages/Webkul/Discount/src/Database/Migrations/2019_05_30_141207_create_cart_rule_cart_table.php @@ -0,0 +1,35 @@ +increments('id'); + $table->integer('cart_rule_id')->unsigned()->nullable(); + $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade'); + $table->integer('cart_id')->unsigned()->nullable(); + $table->foreign('cart_id')->references('id')->on('cart')->onDelete('cascade'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cart_rule_order'); + } +} diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php new file mode 100644 index 000000000..bdfd823f1 --- /dev/null +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -0,0 +1,440 @@ +cartRule = $cartRule; + $this->endRuleActive = false; + $this->cartRuleCart = $cartRuleCart; + } + + public function applyNonCouponAbleRule() + { + if (auth()->guard('customer')->check()) { + $nonCouponAbleRules = $this->cartRule->findWhere([ + 'use_coupon' => 0, + 'status' => 1 + ]); + } else { + $nonCouponAbleRules = $this->cartRule->findWhere([ + 'use_coupon' => 0, + 'is_guest' => 1, + 'status' => 1 + ]); + } + + $canBeApplied = array(); + + // time based filter + foreach($nonCouponAbleRules as $rule) { + $report = $this->checkApplicability($rule); + $report['rule'] = $rule; + + $passed = 0; + if ($rule->starts_from != null && $rule->ends_till == null) { + if (Carbon::parse($rule->starts_from) < now()) { + $passed = 1; + } + } else if ($rule->starts_from == null && $rule->ends_till != null) { + if (Carbon::parse($rule->ends_till) > now()) { + $passed = 1; + } + } else if ($rule->starts_from != null && $rule->ends_till != null) { + if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) { + $passed = 1; + } + } else { + $passed = 1; + } + + if ($passed) { + $report['used_coupon'] = false; + array_push($canBeApplied, $report); + } + } + + //min priority + $minPriority = collect($canBeApplied)->min('priority'); + + $canBeApplied = collect($canBeApplied)->where('priority', $minPriority); + + if (count($canBeApplied) > 1) { + $maxDiscount = collect($canBeApplied)->max('discount'); + + $canBeApplied = collect($canBeApplied)->where('discount', $maxDiscount); + + $leastId = 999999999999; + if (count($canBeApplied) > 1) { + foreach($canBeApplied as $rule) { + if ($rule['rule']->id < $leastId) { + $leastId = $rule['rule']->id; + } + } + + // fighting the edge case for non couponable discount rule + foreach($canBeApplied as $rule) { + if ($rule['rule']->id == $leastId) { + $rule['used_coupon'] = false; + + $this->save($rule['rule']); + + return $rule; + } + } + } + } + + $this->save($canBeApplied[0]['rule']); + + return $canBeApplied[0]; + } + + public function applyCouponAbleRule($code) + { + if (auth()->guard('customer')->check()) { + $couponAbleRules = $this->cartRule->findWhere([ + 'use_coupon' => 1, + 'status' => 1 + ]); + } else { + $couponAbleRules = $this->cartRule->findWhere([ + 'use_coupon' => 1, + 'is_guest' => 1, + 'status' => 1 + ]); + } + + $rule; + foreach ($couponAbleRules as $couponAbleRule) { + if ($couponAbleRule->coupons->code == $code) { + $rule = $couponAbleRule; + } + } + + $useCouponable = false; + if (isset($rule)) { + $canBeApplied = array(); + + // time based filter + $report = $this->checkApplicability($rule); + $report['rule'] = $rule; + + $passed = 0; + if ($rule->starts_from != null && $rule->ends_till == null) { + if (Carbon::parse($rule->starts_from) < now()) { + $passed = 1; + } + } else if ($rule->starts_from == null && $rule->ends_till != null) { + if (Carbon::parse($rule->ends_till) > now()) { + $passed = 1; + } + } else if ($rule->starts_from != null && $rule->ends_till != null) { + if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) { + $passed = 1; + } + } else { + $passed = 1; + } + + if ($passed) { + array_push($canBeApplied, $report); + + $useCouponable = true; + $alreadyAppliedRule = $this->cartRuleCart->findWhere([ + 'cart_id' => \Cart::getCart()->id + ]); + + if ($alreadyAppliedRule->count() && ! ($alreadyAppliedRule->first()->cart_rule->priority < $canBeApplied[0]['rule']->priority)) { + unset($report); + + $alreadyAppliedRule = $alreadyAppliedRule->first()->cart_rule; + + // analyze impact + $report = $this->checkApplicability($alreadyAppliedRule); + $report['rule'] = $alreadyAppliedRule; + + array_push($canBeApplied, $report); + + //min priority + $minPriority = collect($canBeApplied)->min('priority'); + //min priority rule + $canBeApplied = collect($canBeApplied)->where('priority', $minPriority); + + if (count($canBeApplied) > 1) { + $maxDiscount = collect($canBeApplied)->max('discount'); + + $canBeApplied = collect($canBeApplied)->where('discount', $maxDiscount); + + $leastId = 999999999999; + if (count($canBeApplied) > 1) { + foreach($canBeApplied as $rule) { + if ($rule['rule']->id < $leastId) { + $leastId = $rule['rule']->id; + } + } + + // fighting the edge case for couponable discount rule + foreach($canBeApplied as $rule) { + if ($rule['rule']->id == $leastId) { + if($rule['rule']->use_coupon) { + $useCouponable = true; + } + } + } + } else { + if ($canBeApplied[0]['rule']->use_coupon) { + $useCouponable = true; + } + } + } else if (count($canBeApplied)) { + if ($canBeApplied[0]['rule']->use_coupon) { + $useCouponable = true; + } + } + + if ($alreadyAppliedRule->end_other_rules) { + $useCouponable = false; + } + } + } + } + + $canBeApplied = array(); + if ($useCouponable) { + $report = $this->checkApplicability($rule); + $report['rule'] = $rule; + $report['used_coupon'] = $useCouponable; + + $this->save($rule); + + return $report; + } else { + return false; + } + } + + public function checkApplicability($rule = null) + { + $cart = \Cart::getCart(); + $report = array(); + $result = 0; + + //check conditions + if ($rule->conditions != null) { + $conditions = json_decode(json_decode($rule->conditions)); + $test_mode = config('pricerules.test_mode.0'); + + if ($test_mode == config('pricerules.test_mode.0')) { + $result = $this->testIfAllConditionAreTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.1')) { + $result = $this->testIfAllConditionAreFalse($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.2')) { + $result = $this->testIfAnyConditionIsTrue($conditions, $cart); + } else if ($test_mode == config('pricerules.test_mode.3')) { + $result = $this->testIfAnyConditionIsFalse($conditions, $cart); + } + } + + if ($result) { + $report['conditions'] = true; + } else { + if ($rule->conditions == null) + $report['conditions'] = true; + else + $report['conditions'] = false; + } + + //check endrule + if ($rule->end_other_rules) { + $report['end_other_rules'] = true; + } else { + $report['end_other_rules'] = false; + } + + //calculate discount amount + $action_type = $rule->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; + $leastWorthItem = \Cart::leastWorthItem(); + $realQty = $leastWorthItem['quantity']; + + if ($cart->items_qty >= $disc_threshold && $realQty >= $disc_quantity) { + if ($action_type == config('pricerules.cart.validation.0')) { + $amountDiscounted = $leastWorthItem['total'] * ($disc_amount / 100); + } else if ($action_type == config('pricerules.cart.validation.1')) { + $amountDiscounted = $leastWorthItem['total'] - $disc_amount; + + if ($amountDiscounted < 0) { + $amountDiscounted = $leastWorthItem['total']; + } + } else if ($action_type == config('pricerules.cart.validation.2')) { + $amountDiscounted = $disc_amount; + } + } + + $report['discount'] = $amountDiscounted; + $report['formatted_discount'] = core()->formatPrice($amountDiscounted, $cart->cart_currency_code); + $report['new_grand_total'] = $cart->grand_total - $amountDiscounted; + $report['formatted_new_grand_total'] = core()->formatPrice($cart->grand_total - $amountDiscounted, $cart->cart_currency_code); + $report['priority'] = $rule->priority; + + return $report; + } + + public function save($rule) + { + $cart = \Cart::getCart(); + + // create or update + $existingRule = $this->cartRuleCart->findWhere([ + 'cart_id' => $cart->id + ]); + + if (count($existingRule)) { + if ($existingRule->first()->cart_rule_id != $rule->id) { + $existingRule->first()->update([ + 'cart_rule_id' => $rule->id + ]); + + return true; + } + } else { + $this->cartRuleCart->create([ + 'cart_id' => $cart->id, + 'cart_rule_id' => $rule->id + ]); + + return true; + } + + return false; + } + + public function removeCoupon() + { + $cart = \Cart::getCart(); + + $existingRule = $this->cartRuleCart->findWhere([ + 'cart_id' => $cart->id + ]); + + if ($existingRule->count()) { + if ($existingRule->first()->delete()) { + return true; + } else { + return false; + } + } else { + return false; + } + } + + protected function testIfAllConditionAreTrue($conditions, $cart) { + $shipping_address = $cart->getShippingAddressAttribute(); + + $shipping_method = $cart->shipping_method; + $shipping_country = $shipping_address->country; + $shipping_state = $shipping_address->state; + $shipping_postcode = $shipping_address->postcode; + $shipping_city = $shipping_address->city; + + $payment_method = $cart->payment->method; + $sub_total = $cart->base_sub_total; + + $total_items = $cart->items_qty; + $total_weight = 0; + + foreach($cart->items as $item) { + $total_weight = $total_weight + $item->base_total_weight; + } + + $test_mode = config('pricerules.test_mode.0'); + $test_conditions = config('pricerules.cart.conditions'); + + $result = 1; + foreach ($conditions as $condition) { + $actual_value = ${$condition->attribute}; + $test_value = $condition->value; + $test_condition = $condition->condition; + + if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text') { + if ($test_condition == '=') { + if ($actual_value != $test_value) { + $result = 0; + + break; + } + } else if ($test_condition == '>=') { + if (! ($actual_value >= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<=') { + if (! ($actual_value <= $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '>') { + if (! ($actual_value > $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '<') { + if (! ($actual_value < $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '{}') { + if (! str_contains($actual_value, $test_value)) { + $result = 0; + + break; + } + } else if ($test_condition == '!{}') { + if (str_contains($actual_value, $test_value)) { + $result = 0; + + break; + } + } + } + } + + return $result; + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Helpers/FindProducts.php b/packages/Webkul/Discount/src/Helpers/FindProducts.php new file mode 100644 index 000000000..fffa421cd --- /dev/null +++ b/packages/Webkul/Discount/src/Helpers/FindProducts.php @@ -0,0 +1,72 @@ +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/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php new file mode 100644 index 000000000..914d6bf7a --- /dev/null +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -0,0 +1,426 @@ + @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CartRuleController extends Controller +{ + /** + * Initialize _config, a default request parameter with route + */ + protected $_config; + + /** + * Attribute $attribute + */ + protected $attribute; + + /** + * AttributeFamily $attributeFamily + */ + protected $attributeFamily; + + /** + * Category $category + */ + protected $category; + + /** + * Product $product + */ + protected $product; + + /** + * Property for Cart rule application + */ + protected $appliedConfig; + + /** + * To hold Cart repository instance + */ + protected $cartRule; + + /** + * To hold Rule Label repository instance + */ + protected $cartRuleLabel; + + /** + * To hold Coupons Repository instance + */ + protected $cartRuleCoupon; + + /** + * To hold the cart repository instance + */ + protected $cart; + + public function __construct(Attribute $attribute, AttributeFamily $attributeFamily, Category $category, Product $product, CatalogRule $catalogRule, CartRule $cartRule, CartRuleCoupons $cartRuleCoupon, CartRuleLabels $cartRuleLabel) + { + $this->_config = request('_config'); + $this->attribute = $attribute; + $this->attributeFamily = $attributeFamily; + $this->category = $category; + $this->product = $product; + $this->cartRule = $cartRule; + $this->cartRuleCoupon = $cartRuleCoupon; + $this->cartRuleLabel = $cartRuleLabel; + $this->appliedConfig = config('pricerules.cart'); + } + + public function index() + { + return view($this->_config['view']); + } + + public function create() + { + return view($this->_config['view'])->with('cart_rule', [$this->appliedConfig, $this->fetchOptionableAttributes(), $this->getStatesAndCountries()]); + } + + public function store() + { + $data = request()->all(); + + $validated = Validator::make($data, [ + 'name' => 'required|string', + 'description' => 'string', + // 'customer_groups' => 'required|array', + 'channels' => 'required|array', + 'status' => 'required|boolean', + 'use_coupon' => 'boolean|required', + // 'usage_limit' => 'numeric|min:0', + // 'per_customer' => 'numeric|min:0', + 'action_type' => 'required|string', + 'disc_amount' => 'required|numeric', + 'disc_quantity' => 'numeric', + 'disc_threshold' => 'numeric', + 'free_shipping' => 'required|boolean', + 'apply_to_shipping' => 'required|boolean', + 'code' => 'string|required_if:auto_generation,0', + 'all_conditions' => 'sometimes|nullable', + 'label' => 'array|nullable' + ]); + + $data['usage_limit'] = 0; + $data['per_customer'] = 0; + + if ($validated->fails()) { + session()->flash('error', 'Validation failed'); + return redirect()->route('admin.cart-rule.create') + ->withErrors($validated) + ->withInput(); + } + + if ($data['starts_from'] == "" || $data['ends_till'] == "") { + $data['starts_from'] = null; + $data['ends_till'] = null; + } + + unset($data['_token']); + + $channels = $data['channels']; + unset($data['channels']); + + $customer_groups = $data['customer_groups']; + unset($data['customer_groups']); + unset($data['criteria']); + + $labels = $data['label']; + unset($data['label']); + unset($data['cart_attributes']); + unset($data['attributes']); + + 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'] + ]; + } + + $data['actions'] = json_encode($data['actions']); + + if (! isset($data['all_conditions']) || $data['all_conditions'] == "[]") { + $data['conditions'] = null; + } else { + $data['conditions'] = json_encode($data['all_conditions']); + } + unset($data['all_conditions']); + + if ($data['use_coupon']) { + // if (isset($data['auto_generation']) && $data['auto_generation']) { + $data['auto_generation'] = 0; + + $coupons['code'] = $data['code']; + unset($data['code']); + // } else { + // $data['auto_generation'] = 1; + // } + + // if (isset($data['prefix'])) { + // $coupons['prefix'] = $data['prefix']; + // unset($data['prefix']); + // } + + // if (isset($data['suffix'])) { + // $coupons['suffix'] = $data['suffix']; + // unset($data['suffix']); + // } + } + + if(isset($data['usage_limit'])) { + $coupons['usage_limit'] = $data['usage_limit']; + } + + $ruleCreated = $this->cartRule->create($data); + + $ruleGroupCreated = $this->cartRule->CustomerGroupSync($customer_groups, $ruleCreated); + $ruleChannelCreated = $this->cartRule->ChannelSync($channels, $ruleCreated); + + if (isset($labels['global'])) { + foreach (core()->getAllChannels() as $channel) { + $label1['channel_id'] = $channel->id; + foreach($channel->locales as $locale) { + $label1['locale_id'] = $locale->id; + $label1['label'] = $labels['global']; + $label1['cart_rule_id'] = $ruleCreated->id; + + $ruleLabelCreated = $this->cartRuleLabel->create($label1); + } + } + } else { + $label2['label'] = $labels['global']; + $label2['cart_rule_id'] = $ruleCreated->id; + $ruleLabelCreated = $this->cartRuleLabel->create($label2); + } + + if(isset($coupons)) { + $coupons['cart_rule_id'] = $ruleCreated->id; + $coupons['usage_per_customer'] = $data['per_customer']; //0 is for unlimited usage + + $couponCreated = $this->cartRuleCoupon->create($coupons); + } + + if ($ruleCreated && $ruleGroupCreated && $ruleChannelCreated) { + if (isset($couponCreated) && $couponCreated) { + session()->flash('success', trans('admin::app.promotion.status.success-coupon')); + } + + session()->flash('success', trans('admin::app.promotion.status.success')); + } else { + session()->flash('success', trans('admin::app.promotion.status.success')); + + return redirect()->back(); + } + + return redirect()->route($this->_config['redirect']); + } + + public function edit($id) + { + $cart_rule = $this->cartRule->find($id); + + return view($this->_config['view'])->with('cart_rule', [$this->appliedConfig, $this->fetchOptionableAttributes(), $this->getStatesAndCountries(), $cart_rule]); + } + + public function update($id) + { + $types = config('price_rules.cart.validations'); + + $validated = Validator::make(request()->all(), [ + 'name' => 'required|string', + 'description' => 'string', + // 'customer_groups' => 'required|array', + 'channels' => 'required|array', + 'status' => 'required|boolean', + 'use_coupon' => 'boolean|required', + // 'usage_limit' => 'numeric|min:0', + // 'per_customer' => 'numeric|min:0', + 'action_type' => 'required|string', + 'disc_amount' => 'required|numeric', + 'disc_quantity' => 'required|numeric', + 'disc_threshold' => 'required|numeric', + 'free_shipping' => 'required|boolean', + 'apply_to_shipping' => 'required|boolean', + 'code' => 'string|required_if:user_coupon,1', + 'all_conditions' => 'present', + 'label' => 'array|nullable' + ]); + + $data['usage_limit'] = 0; + $data['per_customer'] = 0; + + if ($validated->fails()) { + session()->flash('error', 'Validation failed'); + return redirect()->route('admin.cart-rule.create') + ->withErrors($validated) + ->withInput(); + } + + $data = request()->all(); + + if ($data['starts_from'] == "" || $data['ends_till'] == "") { + $data['starts_from'] = null; + $data['ends_till'] = null; + } + + unset($data['_token']); + + $channels = $data['channels']; + unset($data['channels']); + + // $customer_groups = $data['customer_groups']; + // unset($data['customer_groups']); + // unset($data['criteria']); + + if (isset($data['label'])) { + $labels = $data['label']; + unset($data['label']); + } + + unset($data['cart_attributes']); + unset($data['attributes']); + + 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'] + ]; + } + + $data['actions'] = json_encode($data['actions']); + if (! isset($data['all_conditions']) || $data['all_conditions'] == "[]") { + $data['conditions'] = null; + } else { + $data['conditions'] = json_encode($data['all_conditions']); + } + + unset($data['all_conditions']); + + if ($data['use_coupon']) { + // if (isset($data['auto_generation']) && $data['auto_generation']) { + $data['auto_generation'] = 0; + + $coupons['code'] = $data['code']; + unset($data['code']); + // } else { + // $data['auto_generation'] = 1; + // } + + // if (isset($data['prefix'])) { + // $coupons['prefix'] = $data['prefix']; + // unset($data['prefix']); + // } + + // if (isset($data['suffix'])) { + // $coupons['suffix'] = $data['suffix']; + // unset($data['suffix']); + // } + } + + if (isset($data['usage_limit'])) { + $coupons['usage_limit'] = $data['usage_limit']; + } + + $ruleUpdated = $this->cartRule->update($data, $id); + + // $ruleGroupUpdated = $this->cartRule->CustomerGroupSync($customer_groups, $ruleUpdated); + $ruleChannelUpdated = $this->cartRule->ChannelSync($channels, $ruleUpdated); + + $labelsUpdated = $this->cartRule->LabelSync($labels, $ruleUpdated); + + if (isset($coupons)) { + $coupons['cart_rule_id'] = $ruleUpdated->id; + $coupons['usage_per_customer'] = $data['per_customer']; //0 is for unlimited usage + + $couponUpdated = $ruleUpdated->coupons->update($coupons); + } + + if ($ruleUpdated && $ruleChannelUpdated) { + if (isset($couponUpdated) && $couponUpdated) { + session()->flash('info', trans('admin::app.promotion.status.success-coupon')); + } + + session()->flash('info', trans('admin::app.promotion.status.update-success')); + } else { + session()->flash('info', trans('admin::app.promotion.status.update-success')); + + return redirect()->back(); + } + + return redirect()->route($this->_config['redirect']); + } + + public function destroy($id) + { + $cartRule = $this->cartRule->findOrFail($id); + + if ($cartRule->delete()) { + session()->flash('success', trans('admin::app.promotion.status.delete-success')); + + return response()->json(['message' => true], 200); + } else { + session()->flash('success', trans('admin::app.promotion.status.delete-failed')); + + return response()->json(['message' => false], 400); + } + } + + public function getStatesAndCountries() + { + $countries = core()->countries()->toArray(); + $states = core()->groupedStatesByCountries(); + + return [ + 'countries' => $countries, + 'states' => $states + ]; + } + + public function fetchOptionableAttributes() + { + $attributesWithOptions = array(); + + foreach($this->attribute->all() as $attribute) { + if (($attribute->type == 'select' || $attribute->type == 'multiselect') && $attribute->code != 'tax_category_id') { + $attributesWithOptions[$attribute->admin_name] = $attribute->options->toArray(); + } + } + + return $attributesWithOptions; + } +} diff --git a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php new file mode 100644 index 000000000..b218bfe19 --- /dev/null +++ b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php @@ -0,0 +1,307 @@ + @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CatalogRuleController extends Controller +{ + /** + * Initialize _config, a default request parameter with route + */ + protected $_config; + + /** + * Attribute $attribute + */ + protected $attribute; + + /** + * AttributeFamily $attributeFamily + */ + protected $attributeFamily; + + /** + * Category $category + */ + protected $category; + + /** + * Product $product + */ + protected $product; + + /** + * Property for catalog rule application + */ + protected $appliedConfig; + + /** + * Property for catalog rule application + */ + protected $appliedConditions; + + /** + * Property to hold Catalog Rule Channels Repository + */ + protected $catalogRuleChannels; + + /** + * Property to hold Catalog Rule Customer Groups Repository + */ + protected $catalogRuleCustomerGroups; + + /** + * To hold the catalog repository instance + */ + protected $catalogRule; + + /** + * Find products using conditions helper instance + */ + protected $findProducts; + + public function __construct(Attribute $attribute, AttributeFamily $attributeFamily, Category $category, Product $product, CatalogRule $catalogRule, CatalogRuleChannels $catalogRuleChannels, CatalogRuleCustomerGroups $catalogRuleCustomerGroups, FindProducts $findProducts) + { + $this->_config = request('_config'); + $this->attribute = $attribute; + $this->attributeFamily = $attributeFamily; + $this->category = $category; + $this->product = $product; + $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() + { + return view($this->_config['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()]); + } + + public function store() + { + $this->validate(request(), [ + 'name' => 'required|string', + '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', + 'disc_amount' => 'sometimes', + 'disc_percent' => 'sometimes', + ]); + + $catalog_rule = request()->all(); + + $catalog_rule_channels = array(); + $catalog_rule_customer_groups = array(); + + $catalog_rule_channels = $catalog_rule['channels']; + $catalog_rule_customer_groups = $catalog_rule['customer_groups']; + unset($catalog_rule['channels']); unset($catalog_rule['customer_groups']); + + unset($catalog_rule['criteria']); + + $catalog_rule['conditions'] = $catalog_rule['all_conditions']; + unset($catalog_rule['all_conditions']); + + if (isset($catalog_rule['disc_amount'])) { + $catalog_rule['action_type'] = $catalog_rule['apply']; + $catalog_rule['actions'] = [ + 'action_type' => $catalog_rule['apply'], + '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'], + 'disc_percent' => $catalog_rule['disc_percent'], + ]; + } + + 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); + + foreach($catalog_rule_channels as $catalog_rule_channel) { + $data['catalog_rule_id'] = $catalogRule->id; + $data['channel_id'] = $catalog_rule_channel; + + $catalogRuleChannels = $this->catalogRuleChannels->create($data); + } + + unset($data); + foreach ($catalog_rule_customer_groups as $catalog_rule_customer_group) { + $data['catalog_rule_id'] = $catalogRule->id; + $data['customer_group_id'] = $catalog_rule_customer_group; + + $catalogRuleCustomerGroups = $this->catalogRuleCustomerGroups->create($data); + } + + if($catalogRule && $catalogRuleChannels && $catalogRuleCustomerGroups) { + session()->flash('success', trans('admin::app.promotion.status.success')); + + return redirect()->route('admin.catalog-rule.index'); + } else { + session()->flash('error', trans('admin::app.promotion.status.failed')); + + return redirect()->back(); + } + } + + 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()]); + } + + public function update($id) + { + $this->validate(request(), [ + 'name' => 'required|string', + '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', + 'disc_amount' => 'sometimes', + 'disc_percent' => 'sometimes', + ]); + + $catalog_rule = request()->all(); + + $catalog_rule_channels = array(); + $catalog_rule_customer_groups = array(); + + $catalog_rule_channels = $catalog_rule['channels']; + $catalog_rule_customer_groups = $catalog_rule['customer_groups']; + unset($catalog_rule['channels']); unset($catalog_rule['customer_groups']); + + unset($catalog_rule['criteria']); + + $catalog_rule['conditions'] = $catalog_rule['all_conditions']; + unset($catalog_rule['all_conditions']); + + if (isset($catalog_rule['disc_amount'])) { + $catalog_rule['action_type'] = $catalog_rule['apply']; + $catalog_rule['actions'] = [ + 'action_type' => $catalog_rule['apply'], + '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'], + 'disc_percent' => $catalog_rule['disc_percent'], + ]; + } + + 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->update($catalog_rule, $id); + + $catalogRuleChannels = $this->catalogRule->ChannelSync($catalog_rule_channels, $catalogRule); + $catalogRuleCustomerGroups = $this->catalogRule->CustomerGroupSync($catalog_rule_customer_groups, $catalogRule); + + if($catalogRule && $catalogRuleChannels && $catalogRuleCustomerGroups) { + session()->flash('info', trans('admin::app.promotion.status.update-success')); + + return redirect()->route($this->_config['redirect']); + } else { + session()->flash('error', trans('admin::app.promotion.status.update-failed')); + + return redirect()->back(); + } + } + + public function applyRules() + { + $catalogRules = $this->catalogRule->all(); + $decoded = json_decode($catalogRules->first()->conditions); + $conditions = json_decode($decoded[0]); + $optionableAttributes = $this->fetchOptionableAttributes(); + + $results = $this->findProducts->findByConditions($conditions); + + dd($results); + } + + public function fetchOptionableAttributes() + { + $attributesWithOptions = array(); + + foreach($this->attribute->all() as $attribute) { + if (($attribute->type == 'select' || $attribute->type == 'multiselect') && $attribute->code != 'tax_category_id') { + $attributesWithOptions[$attribute->code] = $attribute->options->toArray(); + } + } + + return $attributesWithOptions; + } + + public function destroy($id) + { + $catalogRule = $this->catalogRule->findOrFail($id); + + if ($catalogRule->delete()) { + session()->flash('success', trans('admin::app.promotion.delete-success')); + + return response()->json(['message' => true], 200); + } else { + session()->flash('success', trans('admin::app.promotion.delete-failed')); + + return response()->json(['message' => false], 400); + } + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Http/Controllers/Controller.php b/packages/Webkul/Discount/src/Http/Controllers/Controller.php new file mode 100644 index 000000000..dc4b61e7c --- /dev/null +++ b/packages/Webkul/Discount/src/Http/Controllers/Controller.php @@ -0,0 +1,13 @@ +hasMany(CartRuleChannels::modelClass()); + } + + public function customer_groups() + { + return $this->hasMany(CartRuleCustomerGroups::modelClass()); + } + + public function coupons() + { + return $this->hasOne(CartRuleCoupons::modelClass()); + } + + public function labels() + { + return $this->hasMany(CartRuleLabels::modelClass()); + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Models/CartRuleCart.php b/packages/Webkul/Discount/src/Models/CartRuleCart.php new file mode 100644 index 000000000..66d2b503c --- /dev/null +++ b/packages/Webkul/Discount/src/Models/CartRuleCart.php @@ -0,0 +1,22 @@ +hasOne(CartRule::modelClass(), 'id', 'cart_rule_id'); + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Models/CartRuleCartProxy.php b/packages/Webkul/Discount/src/Models/CartRuleCartProxy.php new file mode 100644 index 000000000..98245e4d8 --- /dev/null +++ b/packages/Webkul/Discount/src/Models/CartRuleCartProxy.php @@ -0,0 +1,10 @@ +belongsTo(CartRule::modelClass(), 'cart_rule_id'); + } + + public function coupons_usage() + { + return $this->hasOne(CartRuleCouponsUsage::modelClass()); + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Models/CartRuleCouponsProxy.php b/packages/Webkul/Discount/src/Models/CartRuleCouponsProxy.php new file mode 100644 index 000000000..8f2fb7f23 --- /dev/null +++ b/packages/Webkul/Discount/src/Models/CartRuleCouponsProxy.php @@ -0,0 +1,10 @@ +belongsTo(CartRule::modelClass(), 'cart_rule_id'); + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Models/CartRuleCustomersProxy.php b/packages/Webkul/Discount/src/Models/CartRuleCustomersProxy.php new file mode 100644 index 000000000..fed8df2c8 --- /dev/null +++ b/packages/Webkul/Discount/src/Models/CartRuleCustomersProxy.php @@ -0,0 +1,10 @@ +belongsTo(CartRule::modelClass(), 'cart_rule_id'); + } + + public function locale() + { + return $this->hasOne(Locale::modelClass(), 'id', 'locale_id'); + } + + public function channel() + { + return $this->hasOne(Channel::modelClass(), 'id', 'channel_id'); + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Models/CartRuleProxy.php b/packages/Webkul/Discount/src/Models/CartRuleProxy.php new file mode 100644 index 000000000..4f66578b3 --- /dev/null +++ b/packages/Webkul/Discount/src/Models/CartRuleProxy.php @@ -0,0 +1,10 @@ +hasMany(CatalogRuleChannels::modelClass()); + } + + public function customer_groups() + { + return $this->hasMany(CatalogRuleCustomerGroups::modelClass()); + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleChannels.php b/packages/Webkul/Discount/src/Models/CatalogRuleChannels.php new file mode 100644 index 000000000..d31ebf9de --- /dev/null +++ b/packages/Webkul/Discount/src/Models/CatalogRuleChannels.php @@ -0,0 +1,19 @@ +belongsTo(CatalogRule::modelClass(), 'catalog_rule_id'); + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleChannelsProxy.php b/packages/Webkul/Discount/src/Models/CatalogRuleChannelsProxy.php new file mode 100644 index 000000000..c723f5482 --- /dev/null +++ b/packages/Webkul/Discount/src/Models/CatalogRuleChannelsProxy.php @@ -0,0 +1,10 @@ +belongsTo(CatalogRule::modelClass(), 'catalog_rule_id'); + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroupsProxy.php b/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroupsProxy.php new file mode 100644 index 000000000..12de4951a --- /dev/null +++ b/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroupsProxy.php @@ -0,0 +1,10 @@ +loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); + } + + /** + * Register services. + * + * @return void + */ + public function register() + { + $this->registerConfig(); + } + + /** + * To merge the price rule configuration in price rule configuration + */ + protected function registerConfig() + { + $this->mergeConfigFrom( + dirname(__DIR__) . '/Config/rule-conditions.php', 'pricerules' + ); + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Discount/src/Providers/ModuleServiceProvider.php new file mode 100644 index 000000000..f654e68fa --- /dev/null +++ b/packages/Webkul/Discount/src/Providers/ModuleServiceProvider.php @@ -0,0 +1,23 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CartRuleCartRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Discount\Contracts\CartRuleCart'; + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php new file mode 100644 index 000000000..fe8680e40 --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php @@ -0,0 +1,24 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CartRuleChannelsRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Discount\Contracts\CartRuleChannels'; + } +} diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleCouponsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleCouponsRepository.php new file mode 100644 index 000000000..6db964d5b --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CartRuleCouponsRepository.php @@ -0,0 +1,18 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CartRuleCustomerGroupsRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Discount\Contracts\CartRuleCustomerGroups'; + } +} diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleLabelsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleLabelsRepository.php new file mode 100644 index 000000000..ba5ba2aaa --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CartRuleLabelsRepository.php @@ -0,0 +1,18 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CartRuleRepository extends Repository +{ + protected $cartRuleChannels; + + protected $cartRuleCustomerGroups; + + protected $cartRuleCoupons; + + protected $cartRuleLabels; + + /** + * + */ + public function __construct(CartRuleChannels $cartRuleChannels, CartRuleCustomerGroups $cartRuleCustomerGroups, CartRuleCoupons $cartRuleCoupons, CartRuleLabels $cartRuleLabels, App $app) + { + $this->cartRuleChannels = $cartRuleChannels; + $this->cartRuleCustomerGroups = $cartRuleCustomerGroups; + $this->cartRuleCoupons = $cartRuleCoupons; + $this->cartRuleLabel = $cartRuleLabels; + + parent::__construct($app); + } + + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Discount\Contracts\CartRule'; + } + + /** + * To sync the customer groups related records + */ + public function CustomerGroupSync($newCustomerGroups, $cartRule) + { + $oldCustomerGroups = array(); + foreach ($cartRule->customer_groups as $oldCustomerGroup) { + array_push($oldCustomerGroups, ['id' => $oldCustomerGroup->id, 'customer_group_id' => $oldCustomerGroup->customer_group_id]); + } + + foreach ($oldCustomerGroups as $key => $oldCustomerGroup) { + $found = 0; + foreach ($newCustomerGroups as $newCustomerGroup) { + if ($oldCustomerGroup['customer_group_id'] == $newCustomerGroup) { + $found = 1; + } + } + + if ($found == 0) { + $this->cartRuleCustomerGroups->find($oldCustomerGroup['id'])->delete(); + } else { + $found = 0; + } + } + + //unset the commons + if (count($newCustomerGroups) && count($oldCustomerGroups)) { + foreach ($oldCustomerGroups as $oldCustomerGroup) { + $found = 0; + foreach ($newCustomerGroups as $key => $newCustomerGroup) { + if ($oldCustomerGroup['customer_group_id'] == $newCustomerGroup) { + unset($newCustomerGroups[$key]); + } + } + } + } + + //create the left ones + foreach ($newCustomerGroups as $newCustomerGroup) { + $data['customer_group_id'] = $newCustomerGroup; + $data['cart_rule_id'] = $cartRule->id; + + $this->cartRuleCustomerGroups->create($data); + } + + return true; + } + + /** + * To sync the channels related records + */ + public function ChannelSync($newChannels, $cartRule) + { + $oldChannels = array(); + foreach ($cartRule->channels as $oldChannel) { + array_push($oldChannels, ['id' => $oldChannel->id, 'channel_id' => $oldChannel->channel_id]); + } + + foreach ($oldChannels as $key => $oldChannel) { + $found = 0; + foreach ($newChannels as $newChannel) { + if ($oldChannel['channel_id'] == $newChannel) { + $found = 1; + } + } + + if ($found == 0) { + $this->cartRuleChannels->find($oldChannel['id'])->delete(); + } else { + $found = 0; + } + } + + //unset the commons + if (count($newChannels) && count($oldChannels)) { + foreach ($oldChannels as $oldChannel) { + $found = 0; + foreach ($newChannels as $key => $newChannel) { + if ($oldChannel['channel_id'] == $newChannel) { + unset($newChannels[$key]); + } + } + } + } + + //create the left ones + foreach ($newChannels as $newChannel) { + $data['channel_id'] = $newChannel; + $data['cart_rule_id'] = $cartRule->id; + $this->cartRuleChannels->create($data); + } + + return true; + } + + /** + * To sync the labels associated with the cart rule + */ + public function LabelSync($labels, $cartRule) + { + foreach ($labels as $channelCode => $value) { + $localeCode = array_keys($value)[0]; + $localeValue = array_values($value)[0]; + + $updated = 0; + foreach ($cartRule->labels as $label) { + if ($label->channel->code == $channelCode && $label->locale->code == $localeCode) { + $label->update([ + 'label' => $localeValue + ]); + + $updated = 1; + } + } + + if ($updated == 0) { + foreach (core()->getAllChannels() as $channel) { + if ($channel->code == $channelCode) { + $newLabel['channel_id'] = $channel->id; + } + + foreach($channel->locales as $locale) { + if ($localeCode == $locale->code) { + $newLabel['locale_id'] = $locale->id; + $newLabel['label'] = $localeValue; + $newLabel['cart_rule_id'] = $cartRule->id; + + $ruleLabelCreated = $this->CartRuleLabels->create($newLabel); + } + } + } + } + + $updated = 0; + } + + return true; + } + + /** + * To sync the coupons associated with the cart rule + */ + public function CouponSync($coupon, $cartRule) + { + + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php new file mode 100644 index 000000000..dbdf996ec --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php @@ -0,0 +1,24 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CatalogRuleChannelsRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Discount\Contracts\CatalogRuleChannels'; + } +} diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php new file mode 100644 index 000000000..76323d394 --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php @@ -0,0 +1,24 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CatalogRuleCustomerGroupsRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Discount\Contracts\CatalogRuleCustomerGroups'; + } +} \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleProducts.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleProducts.php new file mode 100644 index 000000000..142179ddc --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleProducts.php @@ -0,0 +1,24 @@ + + * @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 new file mode 100644 index 000000000..f330516dc --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsPrice.php @@ -0,0 +1,24 @@ + + * @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/CatalogRuleRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleRepository.php new file mode 100644 index 000000000..d70f9ff75 --- /dev/null +++ b/packages/Webkul/Discount/src/Repositories/CatalogRuleRepository.php @@ -0,0 +1,137 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CatalogRuleRepository extends Repository +{ + protected $catalogRuleChannels; + + protected $catalogRuleCustomerGroups; + + /** + * + */ + public function __construct(CatalogRuleChannels $catalogRuleChannels, CatalogRuleCustomerGroups $catalogRuleCustomerGroups, App $app) + { + $this->catalogRuleChannels = $catalogRuleChannels; + $this->catalogRuleCustomerGroups = $catalogRuleCustomerGroups; + + parent::__construct($app); + } + + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Discount\Contracts\CatalogRule'; + } + + /** + * To sync the customer groups related records + */ + public function CustomerGroupSync($newCustomerGroups, $catalogRule) + { + $oldCustomerGroups = array(); + foreach ($catalogRule->customer_groups as $oldCustomerGroup) { + array_push($oldCustomerGroups, ['id' => $oldCustomerGroup->id, 'customer_group_id' => $oldCustomerGroup->customer_group_id]); + } + + foreach ($oldCustomerGroups as $key => $oldCustomerGroup) { + $found = 0; + foreach($newCustomerGroups as $newCustomerGroup) { + if ($oldCustomerGroup['customer_group_id'] == $newCustomerGroup) { + $found = 1; + } + } + + if ($found == 0) { + $this->catalogRuleCustomerGroups->find($oldCustomerGroup['id'])->delete(); + } else { + $found = 0; + } + } + + //unset the commons + if (count($newCustomerGroups) && count($oldCustomerGroups)) { + foreach ($oldCustomerGroups as $oldCustomerGroup) { + $found = 0; + foreach ($newCustomerGroups as $key => $newCustomerGroup) { + if ($oldCustomerGroup['customer_group_id'] == $newCustomerGroup) { + unset($newCustomerGroups[$key]); + } + } + } + } + + //create the left ones + foreach ($newCustomerGroups as $newCustomerGroup) { + $data['customer_group_id'] = $newCustomerGroup; + $data['catalog_rule_id'] = $catalogRule->id; + + $this->catalogRuleCustomerGroups->create($data); + } + + return true; + } + + /** + * To sync the channels related records + */ + public function ChannelSync($newChannels, $catalogRule) + { + $oldChannels = array(); + foreach ($catalogRule->channels as $oldChannel) { + array_push($oldChannels, ['id' => $oldChannel->id, 'channel_id' => $oldChannel->channel_id]); + } + + foreach ($oldChannels as $key => $oldChannel) { + $found = 0; + foreach($newChannels as $newChannel) { + if ($oldChannel['channel_id'] == $newChannel) { + $found = 1; + } + } + + if ($found == 0) { + $this->catalogRuleChannels->find($oldChannel['id'])->delete(); + } else { + $found = 0; + } + } + + //unset the commons + if (count($newChannels) && count($oldChannels)) { + foreach ($oldChannels as $oldChannel) { + $found = 0; + foreach ($newChannels as $key => $newChannel) { + if ($oldChannel['channel_id'] == $newChannel) { + unset($newChannels[$key]); + } + } + } + } + + //create the left ones + foreach ($newChannels as $newChannel) { + $data['channel_id'] = $newChannel; + $data['catalog_rule_id'] = $catalogRule->id; + $this->catalogRuleChannels->create($data); + } + + return true; + } +} \ No newline at end of file diff --git a/packages/Webkul/Product/src/Contracts/ProductGrid.php b/packages/Webkul/Product/src/Contracts/ProductGrid.php deleted file mode 100644 index 7d4848d6c..000000000 --- a/packages/Webkul/Product/src/Contracts/ProductGrid.php +++ /dev/null @@ -1,7 +0,0 @@ -increments('id'); - $table->integer('product_id')->unsigned(); - $table->foreign('product_id')->references('id')->on('products')->onDelete('cascade'); - $table->string('attribute_family_name')->nullable(); - $table->string('sku')->nullable(); - $table->string('type')->nullable(); - $table->string('name')->nullable(); - $table->string('quantity')->default(0); - $table->string('cost')->default(0); - $table->string('price')->nullable(); - $table->string('status')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('products_grid'); - } -} diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_11_27_113535_remove_cost_column_from_datagrid.php b/packages/Webkul/Product/src/Database/Migrations/2018_11_27_113535_remove_cost_column_from_datagrid.php deleted file mode 100755 index 7bc776467..000000000 --- a/packages/Webkul/Product/src/Database/Migrations/2018_11_27_113535_remove_cost_column_from_datagrid.php +++ /dev/null @@ -1,32 +0,0 @@ -dropColumn('cost'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('products_grid', function (Blueprint $table) { - $table->string('cost')->nullable(); - }); - } -} diff --git a/packages/Webkul/Product/src/Http/Requests/ProductForm.php b/packages/Webkul/Product/src/Http/Requests/ProductForm.php index 06fcb610b..be0ba0d4d 100755 --- a/packages/Webkul/Product/src/Http/Requests/ProductForm.php +++ b/packages/Webkul/Product/src/Http/Requests/ProductForm.php @@ -104,11 +104,15 @@ class ProductForm extends FormRequest } if ($attribute->type == 'text' && $attribute->validation) { - array_push($validations, $attribute->validation); + if ($attribute->validation == 'decimal') { + array_push($validations, new \Webkul\Core\Contracts\Validations\Decimal); + } else { + array_push($validations, $attribute->validation); + } } if ($attribute->type == 'price') { - array_push($validations, 'decimal'); + array_push($validations, new \Webkul\Core\Contracts\Validations\Decimal); } if ($attribute->is_unique) { diff --git a/packages/Webkul/Product/src/Models/ProductGrid.php b/packages/Webkul/Product/src/Models/ProductGrid.php deleted file mode 100755 index a2e015d7a..000000000 --- a/packages/Webkul/Product/src/Models/ProductGrid.php +++ /dev/null @@ -1,20 +0,0 @@ -belongsTo(ProductProxy::modelClass(), 'product_id'); - } -} \ No newline at end of file diff --git a/packages/Webkul/Product/src/Models/ProductGridProxy.php b/packages/Webkul/Product/src/Models/ProductGridProxy.php deleted file mode 100644 index e80da1675..000000000 --- a/packages/Webkul/Product/src/Models/ProductGridProxy.php +++ /dev/null @@ -1,10 +0,0 @@ - 'Free Shipping', 'description' => 'This is a free shipping', 'active' => true, + 'default_rate' => '0', 'class' => 'Webkul\Shipping\Carriers\Free', ] ]; \ No newline at end of file diff --git a/packages/Webkul/Shop/publishable/assets/css/shop.css b/packages/Webkul/Shop/publishable/assets/css/shop.css index a74033e95..4f71e11da 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}.mb-10{margin-bottom:10px}.mb-15{margin-bottom:15px}.mb-20{margin-bottom:20px}.mb-25{margin-bottom:25px}.mb-30{margin-bottom:30px}.mb-35{margin-bottom:35px}.mb-40{margin-bottom:40px}.mb-45{margin-bottom:45px}.mb-50{margin-bottom:50px}.mb-60{margin-bottom:60px}.mb-70{margin-bottom:70px}.mb-80{margin-bottom:80px}.mb-90{margin-bottom:90px}.mt-5{margin-top:5px}.mt-10{margin-top:10px}.mt-15{margin-top:15px}.mt-20{margin-top:20px}.mt-25{margin-top:25px}.mt-30{margin-top:30px}.mt-35{margin-top:35px}.mt-40{margin-top:40px}.mt-45{margin-top:45px}.mt-50{margin-top:50px}.mt-60{margin-top:60px}.mt-70{margin-top:70px}.mt-80{margin-top:80px}.mt-90{margin-top:90px}.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}.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}.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:#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}@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 .payble-amount{margin-top:17px;border-top:1px solid #c7c7c7;padding-top:12px}.order-summary .payble-amount label{font-weight:700}.order-summary .payble-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}.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 .payble-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}.mb-10{margin-bottom:10px}.mb-15{margin-bottom:15px}.mb-20{margin-bottom:20px}.mb-25{margin-bottom:25px}.mb-30{margin-bottom:30px}.mb-35{margin-bottom:35px}.mb-40{margin-bottom:40px}.mb-45{margin-bottom:45px}.mb-50{margin-bottom:50px}.mb-60{margin-bottom:60px}.mb-70{margin-bottom:70px}.mb-80{margin-bottom:80px}.mb-90{margin-bottom:90px}.mt-5{margin-top:5px}.mt-10{margin-top:10px}.mt-15{margin-top:15px}.mt-20{margin-top:20px}.mt-25{margin-top:25px}.mt-30{margin-top:30px}.mt-35{margin-top:35px}.mt-40{margin-top:40px}.mt-45{margin-top:45px}.mt-50{margin-top:50px}.mt-60{margin-top:60px}.mt-70{margin-top:70px}.mt-80{margin-top:80px}.mt-90{margin-top:90px}.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}.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}.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:#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}@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}.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 diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 8d46d9cd3..82a00be47 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -9,6 +9,7 @@ use Webkul\Checkout\Repositories\CartItemRepository; use Webkul\Product\Repositories\ProductRepository; use Webkul\Customer\Repositories\CustomerRepository; use Webkul\Customer\Repositories\WishlistRepository; +use Webkul\Discount\Repositories\CartRuleCartRepository as CartRuleCart; use Illuminate\Support\Facades\Event; use Cart; @@ -33,15 +34,11 @@ class CartController extends Controller * @param $productView */ protected $_config; - protected $cart; - protected $cartItem; - protected $customer; - protected $product; - + protected $cartRuleCart; protected $suppressFlash = false; /** @@ -56,7 +53,8 @@ class CartController extends Controller CartItemRepository $cartItem, CustomerRepository $customer, ProductRepository $product, - WishlistRepository $wishlist + WishlistRepository $wishlist, + CartRuleCart $cartRuleCart ) { @@ -72,6 +70,8 @@ class CartController extends Controller $this->wishlist = $wishlist; + $this->cartRuleCart = $cartRuleCart; + $this->_config = request('_config'); } @@ -252,4 +252,60 @@ class CartController extends Controller return redirect()->back(); } } + + /** + * To apply coupon rules + */ + public function applyCoupon() + { + $this->validate(request(), [ + 'code' => 'string|required' + ]); + + $code = request()->input('code'); + + $result = Cart::applyCoupon($code); + + return $result; + } + + /** + * Fetch the non couponable rule + */ + public function getNonCouponAbleRule() + { + $cart = Cart::getCart(); + $nonCouponAbleRules = Cart::applyNonCoupon(); + + return $nonCouponAbleRules; + } + + /** + * To save the discount values inside the tables of orders and cart + */ + public function saveDiscount() + { + return ['hellow']; + } + + /** + * To remove the currently active + * couponable rule + */ + public function removeCoupon() + { + $result = Cart::removeCoupon(); + + if ($result) { + return response()->json([ + 'success' => true, + 'message' => trans('admin::app.promotion.status.coupon-removed') + ]); + } else { + return response()->json([ + 'success' => false, + 'message' => trans('admin::app.promotion.status.coupon-remove-failed') + ]); + } + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php index dc4f55dac..4f8e149a1 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php @@ -3,8 +3,6 @@ namespace Webkul\Shop\Http\Controllers; use Webkul\Shop\Http\Controllers\Controller; -use Illuminate\Http\Request; -use Illuminate\Http\Response; use Webkul\Core\Repositories\SliderRepository; /** @@ -16,9 +14,7 @@ use Webkul\Core\Repositories\SliderRepository; class HomeController extends Controller { protected $_config; - protected $sliderRepository; - protected $current_channel; public function __construct(SliderRepository $sliderRepository) @@ -34,7 +30,6 @@ use Webkul\Core\Repositories\SliderRepository; public function index() { $currentChannel = core()->getCurrentChannel(); - $sliderData = $this->sliderRepository->findByField('channel_id', $currentChannel->id)->toArray(); return view($this->_config['view'], compact('sliderData')); diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index 4ce942230..f1a0662b5 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -15,7 +15,7 @@ use Webkul\Sales\Repositories\OrderRepository; /** * Chekout controller for the customer and guest for placing order * - * @author Jitendra Singh + * @author Jitendra Singh * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) */ class OnepageController extends Controller @@ -126,10 +126,12 @@ class OnepageController extends Controller $cart = Cart::getCart(); + $rule = Cart::applyNonCoupon(); + return response()->json([ - 'jump_to_section' => 'review', - 'html' => view('shop::checkout.onepage.review', compact('cart'))->render() - ]); + 'jump_to_section' => 'review', + 'html' => view('shop::checkout.onepage.review', compact('cart', 'rule'))->render() + ]); } /** @@ -150,9 +152,9 @@ class OnepageController extends Controller if ($redirectUrl = Payment::getRedirectUrl($cart)) { return response()->json([ - 'success' => true, - 'redirect_url' => $redirectUrl - ]); + 'success' => true, + 'redirect_url' => $redirectUrl + ]); } $order = $this->orderRepository->create(Cart::prepareDataForOrder()); @@ -162,8 +164,8 @@ class OnepageController extends Controller session()->flash('order', $order); return response()->json([ - 'success' => true, - ]); + 'success' => true, + ]); } /** diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index 79e570ca3..59f63da37 100755 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -39,6 +39,14 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function 'view' => 'shop::checkout.cart.index' ])->name('shop.checkout.cart.index'); + Route::post('checkout/check/coupons', 'Webkul\Shop\Http\Controllers\CartController@applyCoupon')->name('shop.checkout.check.coupons'); + + Route::post('checkout/save/discounts', 'Webkul\Shop\Http\Controllers\CartController@saveDiscount')->name('shop.checkout.save.discount'); + + Route::post('checkout/fetch/noncoupon', 'Webkul\Shop\Http\Controllers\CartController@getNonCouponAbleRule')->name('shop.checkout.fetch.non-coupon'); + + Route::post('checkout/remove/coupon', 'Webkul\Shop\Http\Controllers\CartController@removeCoupon')->name('shop.checkout.remove.coupon'); + //Cart Items Add Route::post('checkout/cart/add/{id}', 'Webkul\Shop\Http\Controllers\CartController@add')->defaults('_config', [ 'redirect' => 'shop.checkout.cart.index' diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index db79dd970..ac5f07841 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -38,116 +38,6 @@ input { border-radius: 0px !important; } -//margin bottom classes -.mb-10 { - margin-bottom: 10px; -} - -.mb-15 { - margin-bottom: 15px; -} - -.mb-20 { - margin-bottom: 20px; -} - -.mb-25 { - margin-bottom: 25px; -} - -.mb-30 { - margin-bottom: 30px; -} - -.mb-35 { - margin-bottom: 35px; -} - -.mb-40 { - margin-bottom: 40px; -} - -.mb-45 { - margin-bottom: 45px; -} - -.mb-50 { - margin-bottom: 50px; -} - -.mb-60 { - margin-bottom: 60px; -} - -.mb-70 { - margin-bottom: 70px; -} - -.mb-80 { - margin-bottom: 80px; -} - -.mb-90 { - margin-bottom: 90px; -} - -//margin-top -.mt-5 { - margin-top: 5px; -} - -.mt-10 { - margin-top: 10px; -} - -.mt-15 { - margin-top: 15px; -} - -.mt-20 { - margin-top: 20px; -} - -.mt-25 { - margin-top: 25px; -} - -.mt-30 { - margin-top: 30px; -} - -.mt-35 { - margin-top: 35px; -} - -.mt-40 { - margin-top: 40px; -} - -.mt-45 { - margin-top: 45px; -} - -.mt-50 { - margin-top: 50px; -} - -.mt-60 { - margin-top: 60px; -} - -.mt-70 { - margin-top: 70px; -} - -.mt-80 { - margin-top: 80px; -} - -.mt-90 { - margin-top: 90px; -} - //pagination .pagination.shop{ display: flex; @@ -2284,7 +2174,7 @@ section.cart { } } - .payble-amount { + .payable-amount { margin-top: 17px; border-top: 1px solid $border-color; padding-top: 12px; @@ -2297,6 +2187,9 @@ section.cart { } } } + + .discount-details-group { + } } // cart pages responsive css start @@ -3820,7 +3713,7 @@ section.review { } } - .order-summary .item-detail, .payble-amount { + .order-summary .item-detail, .payable-amount { label.right { float: left; } diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 9365c1adf..06e4ae39b 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -397,7 +397,7 @@ return [ 'quantity-error' => 'Requested Quantity Is Not Available', 'cart-subtotal' => 'Cart Subtotal', 'cart-remove-action' => 'Do you really want to do this ?', - 'partial-cart-update' => 'Only some of the product(s) were updated' + 'partial-cart-update' => 'Only some of the product(s) were updated', ], 'onepage' => [ @@ -434,6 +434,12 @@ return [ 'place-order' => 'Place Order', 'new-address' => 'Add New Address', 'save_as_address' => 'Save as Address', + 'apply-coupon' => 'Apply Coupon', + 'amt-payable' => 'Amount Payable', + 'got' => 'Got', + 'free' => 'Free', + 'coupon-used' => 'Coupon Used', + 'applied' => 'Applied', 'back' => 'Back' ], @@ -444,7 +450,12 @@ return [ 'delivery-charges' => 'Delivery Charges', 'tax' => 'Tax', 'discount' => 'Discount', - 'price' => 'price' + 'price' => 'price', + 'disc-amount' => 'Amount discounted', + 'new-grand-total' => 'New Grand Total', + 'coupon' => 'Coupon', + 'coupon-applied' => 'Coupon Applied', + 'remove-coupon' => 'Remove Coupon' ], 'success' => [ diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index 59d2c7f65..435920b9a 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -5,18 +5,73 @@ @stop @section('content-wrapper') - - @endsection @push('scripts') + @endpush \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php index 8ef912c1c..5341e42e4 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php @@ -87,8 +87,6 @@
    {!! view_render_event('bagisto.shop.checkout.name.after', ['item' => $item]) !!} - - {!! view_render_event('bagisto.shop.checkout.price.before', ['item' => $item]) !!}
    @@ -101,8 +99,6 @@
    {!! view_render_event('bagisto.shop.checkout.price.after', ['item' => $item]) !!} - - {!! view_render_event('bagisto.shop.checkout.quantity.before', ['item' => $item]) !!}
    @@ -116,27 +112,21 @@ {!! view_render_event('bagisto.shop.checkout.quantity.after', ['item' => $item]) !!} - @if ($product->type == 'configurable') {!! view_render_event('bagisto.shop.checkout.options.after', ['item' => $item]) !!}
    - {{ Cart::getProductAttributeOptionDetails($item->child->product)['html'] }} -
    {!! view_render_event('bagisto.shop.checkout.options.after', ['item' => $item]) !!} @endif
    -
    @endforeach -
    -
    @@ -165,11 +155,7 @@
    - @include('shop::checkout.total.summary', ['cart' => $cart]) -
    -
    -
    \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php index e17fbaae3..0608ef3dc 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php @@ -7,7 +7,6 @@ @section('content-wrapper')
    -

    {{ __('shop::app.checkout.success.thanks') }}

    {{ __('shop::app.checkout.success.order-id-info', ['order_id' => $order->id]) }}

    @@ -19,7 +18,5 @@ {{ __('shop::app.checkout.cart.continue-shopping') }}
    -
    - @endsection \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index 941772b4c..2e3b9beef 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -24,8 +24,10 @@
    @endif -
    +
    + +
    \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php index d36d0c443..c0d9f588c 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php @@ -14,7 +14,7 @@
    - +
    diff --git a/packages/Webkul/Shop/src/Resources/views/products/price.blade.php b/packages/Webkul/Shop/src/Resources/views/products/price.blade.php index 09abe08f2..a6d740bc4 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/price.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/price.blade.php @@ -7,7 +7,6 @@ {{ __('shop::app.products.price-label') }} {{ core()->currency($priceHelper->getMinimalPrice($product)) }} - @else @if ($priceHelper->haveSpecialPrice($product))
    @@ -17,13 +16,10 @@ {{ core()->currency($product->price) }} {{ core()->currency($priceHelper->getSpecialPrice($product)) }} - @else {{ core()->currency($product->price) }} @endif - @endif -
    {!! view_render_event('bagisto.shop.products.price.after', ['product' => $product]) !!} \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/images/icon-note.svg b/packages/Webkul/Ui/src/Resources/assets/images/icon-note.svg new file mode 100644 index 000000000..fb6fbbfef --- /dev/null +++ b/packages/Webkul/Ui/src/Resources/assets/images/icon-note.svg @@ -0,0 +1,13 @@ + + + + Icon-Note-Large + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/images/icon-promotion-active.svg b/packages/Webkul/Ui/src/Resources/assets/images/icon-promotion-active.svg new file mode 100644 index 000000000..f3543efd0 --- /dev/null +++ b/packages/Webkul/Ui/src/Resources/assets/images/icon-promotion-active.svg @@ -0,0 +1,18 @@ + + + + Icon-Promition-Active + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/images/icon-promotion.svg b/packages/Webkul/Ui/src/Resources/assets/images/icon-promotion.svg new file mode 100644 index 000000000..f3329e941 --- /dev/null +++ b/packages/Webkul/Ui/src/Resources/assets/images/icon-promotion.svg @@ -0,0 +1,18 @@ + + + + Icon-Promition + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index 1d8ca2938..d4413f8bf 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -15,6 +15,116 @@ outline: none; } +//margin bottom classes +.mb-10 { + margin-bottom: 10px; +} + +.mb-15 { + margin-bottom: 15px; +} + +.mb-20 { + margin-bottom: 20px; +} + +.mb-25 { + margin-bottom: 25px; +} + +.mb-30 { + margin-bottom: 30px; +} + +.mb-35 { + margin-bottom: 35px; +} + +.mb-40 { + margin-bottom: 40px; +} + +.mb-45 { + margin-bottom: 45px; +} + +.mb-50 { + margin-bottom: 50px; +} + +.mb-60 { + margin-bottom: 60px; +} + +.mb-70 { + margin-bottom: 70px; +} + +.mb-80 { + margin-bottom: 80px; +} + +.mb-90 { + margin-bottom: 90px; +} + +//margin-top +.mt-5 { + margin-top: 5px; +} + +.mt-10 { + margin-top: 10px; +} + +.mt-15 { + margin-top: 15px; +} + +.mt-20 { + margin-top: 20px; +} + +.mt-25 { + margin-top: 25px; +} + +.mt-30 { + margin-top: 30px; +} + +.mt-35 { + margin-top: 35px; +} + +.mt-40 { + margin-top: 40px; +} + +.mt-45 { + margin-top: 45px; +} + +.mt-50 { + margin-top: 50px; +} + +.mt-60 { + margin-top: 60px; +} + +.mt-70 { + margin-top: 70px; +} + +.mt-80 { + margin-top: 80px; +} + +.mt-90 { + margin-top: 90px; +} + body { letter-spacing: -0.26px; line-height: 19px; @@ -74,6 +184,13 @@ h5 { display: none !important; } +.row { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} + .btn { @include box-shadow( 0 1px 4px 0 rgba(0, 0, 0, 0.2), @@ -118,6 +235,11 @@ h5 { color: #ffffff; } + &.btn-white { + background: #ffffff; + color: #000; + } + &:disabled, &[disabled="disabled"], &[disabled="disabled"]:hover, diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss index 9a506cd4c..b4cd4286b 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss @@ -34,6 +34,11 @@ background-image: url("../images/Icon-Settings.svg"); } +.promotion-icon { + @extend %menu-properties; + background-image: url("../images/icon-promotion.svg"); +} + .angle-right-icon { background-image: url("../images/Angle-Right.svg"); width: 17px; @@ -220,6 +225,12 @@ height: 47px; } +.note-icon { + background-image: url("../images/icon-note.svg"); + width: 24px; + height: 24px; +} + .active { .dashboard-icon { background-image: url("../images/Icon-Dashboard-Active.svg"); @@ -245,6 +256,10 @@ background-image: url("../images/Icon-Configure-Active.svg"); } + .promotion-icon { + background-image: url("../images/icon-promotion-active.svg"); + } + > .arrow-down-icon { background-image: url("../images/Arrow-Down.svg"); width: 14px; diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php index 46f2ff647..4a782f3b3 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php @@ -53,7 +53,11 @@ data-method="{{ $action['method'] }}" data-action="{{ route($action['route'], $record->{$index}) }}" - data-token="{{ csrf_token() }}"> + data-token="{{ csrf_token() }}" + + @if (isset($action['title'])) + title="{{ $action['title'] }}" + @endif> @endforeach diff --git a/tests/Browser/ProductCategoryTest.php b/tests/Browser/ProductCategoryTest.php new file mode 100644 index 000000000..4c8b2658b --- /dev/null +++ b/tests/Browser/ProductCategoryTest.php @@ -0,0 +1,49 @@ +all(); + $products = app('Webkul\Product\Repositories\ProductRepository')->all(); + + $slugs = array(); + + foreach ($categories as $category) { + if ($category->slug != 'root') { + array_push($slugs, $category->slug); + } + } + + $slugIndex = array_rand($slugs); + $testSlug = $slugs[$slugIndex]; + $testProduct = array(); + + foreach ($products as $product) { + $categories = $product->categories; + + if ($categories->last()->slug == $testSlug) { + array_push($testProduct, ['name' => $product->name, 'url_key' => $product->url_key]); + + break; + } + } + + $this->browse(function (Browser $browser) use($testSlug, $testProduct) { + $browser->visit(route('shop.categories.index', $testSlug)); + $browser->assertSeeLink($testProduct[0]['name']); + $browser->pause(5000); + }); + } +} \ No newline at end of file From e495232c53eb2012b6856f2bba976521bc4bf956 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 10 Jun 2019 13:34:24 +0530 Subject: [PATCH 83/89] removed an extra dependency from composer.json --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 0e268403b..e4e0e4b2f 100755 --- a/composer.json +++ b/composer.json @@ -39,7 +39,6 @@ "laravel/dusk": "^4.0", "mockery/mockery": "^1.0", "nunomaduro/collision": "^2.0", - "phploc/phploc": "^5.0@dev", "phpunit/phpunit": "^7.0" }, "replace": { From c8f7608c46b9d60c44be163cc8d59e2f2930d075 Mon Sep 17 00:00:00 2001 From: Prashant Singh <41140572+prashant-webkul@users.noreply.github.com> Date: Mon, 10 Jun 2019 13:35:48 +0530 Subject: [PATCH 84/89] Development (#990) * Some syntax issue fixes * Adding discount things inside promotions in admin * routes updated for creating discount rules * fixed customer profile redirect parameter issue * added cart and catalog rule routes to admin section * migrations for discount almost to be finished, final revision left * migrations for discounts complete * catalog rule form underway * catalog rule * Made some dynamic form fields in catalog rule create form * made some changes for custom validations used in ProductForm request class * working on prepopulating the values fields in conditions * need another revisit on discount rules tables and then prepare for actions * removed discounts table * catalog rule form changed to muliti attribute set for single condition * new icons added for promotion and customer note. new action for customer added to take notes on the customers * catalog and cart rule designs stable, now moving towards validations on client side and backend * catalog rules migrations added * catalog rule models added with contracts and proxies * fixed customer group bug in customer registration controller * fixed customer registration bug due to last fix * fixed product card image not found issue * catalog rule translations added * Added migrations for cart rules and catalog rule products their contracts and remaining necessary files related to them. * making cart attributes for cart rules * Added more fields for cart rules * working on conditions for cart rule form * minor changes in migrations related to price rules * currency and locale switcher now only available for a channel on storefront when more than on locale and currency are assigned to that channel * part of conditions on the cart rule form added * daily sync * cart rate migrations updated * Added select and multi select attributes options fetching with ajax on catalog rule form * changed some migrations and data being populated at runtime inside catalog rule form * catalog rule create complete, migrations changes, translations added * catalog rule edit form complete * catalog rule form complete, now moving towards catalog rule products * added delete functionality for catalog rules * added cart rule preferences for coupon codes * cart rule submission problem due to repository issue * Cart rule form and migrations complete * Models and Repositories updated for cart rule usage * base sync with master * designing process to get suitable discount rules * cart rule form completed * added helpers in cart and discount to apply rules on cart at checkout or not * cart rule coupon implementation in progress for discount coupon in shop checkout pages * cart rules working * added coupon box on checkout screen * removed the conditions empty bug * Nearing to completion of coupon based rules * made some changes in cart rule coupon application on checkout related to new designs * some bug fixes * calculation for automatic cart rules complete * non couponable cart rules implemented, now moving on to binding them on frontend * some conditions improvements in couponable cart rules * some bug fixes * removed some bugs from summary blade for cart rule * added the table for cart rule cart for managing rules with cart and removed various bug fixes * some bug fixes * Removed bugs and added coupon based cart rule removal functionality * some bug fixes * cart rule labels refactoring in midway * Cart rule labels bug fixed * removed margin classes from shop to UI * Refactoring cart rule on front end * added checks * Discount rule implemented. * cart rule bug fixes * provision to remove the couponable and non couponable rule had been added * Cart rule frontend work done * altered some frontend variables on onepage checkout * Altered cart rules to some extent * removed an extra dependency from composer.json From 3b0ef1badedba4f22f867bb8975fb003ce2bc3ac Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 10 Jun 2019 13:57:09 +0530 Subject: [PATCH 85/89] Removed php loc from require dev of composer.json --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 0e268403b..e4e0e4b2f 100755 --- a/composer.json +++ b/composer.json @@ -39,7 +39,6 @@ "laravel/dusk": "^4.0", "mockery/mockery": "^1.0", "nunomaduro/collision": "^2.0", - "phploc/phploc": "^5.0@dev", "phpunit/phpunit": "^7.0" }, "replace": { From cfb16da64a8eb67b8fecd0e3942ce057571df55d Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 10 Jun 2019 15:21:45 +0530 Subject: [PATCH 86/89] fixed issue #994 --- .../Discount/src/Http/Controllers/CartRuleController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index 914d6bf7a..5e4998f54 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -138,8 +138,8 @@ class CartRuleController extends Controller $channels = $data['channels']; unset($data['channels']); - $customer_groups = $data['customer_groups']; - unset($data['customer_groups']); + // $customer_groups = $data['customer_groups']; + // unset($data['customer_groups']); unset($data['criteria']); $labels = $data['label']; From 0d3539f3c9a670e1998cf7f654d057b221cb1cbf Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 10 Jun 2019 15:29:19 +0530 Subject: [PATCH 87/89] fixed validation issues in cart rule #993 & #997 --- .../src/Resources/views/promotions/cart-rule/create.blade.php | 4 ++-- .../src/Resources/views/promotions/cart-rule/edit.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index 3dfed56a9..8270f4aca 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -41,7 +41,7 @@
    - + @{{ errors.first('name') }}
    @@ -49,7 +49,7 @@
    - + @{{ errors.first('description') }}
    diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php index d565e979f..65f3f7292 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php @@ -43,7 +43,7 @@
    - + @{{ errors.first('name') }}
    @@ -51,7 +51,7 @@
    - + @{{ errors.first('description') }}
    From 451000c0d5e208ac646a37ef577f9208d519c7d9 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 10 Jun 2019 16:41:31 +0530 Subject: [PATCH 88/89] disabled customer groups from cart rules --- .../Webkul/Discount/src/Http/Controllers/CartRuleController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index 5e4998f54..f39223ac9 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -199,7 +199,7 @@ class CartRuleController extends Controller $ruleCreated = $this->cartRule->create($data); - $ruleGroupCreated = $this->cartRule->CustomerGroupSync($customer_groups, $ruleCreated); + // $ruleGroupCreated = $this->cartRule->CustomerGroupSync($customer_groups, $ruleCreated); $ruleChannelCreated = $this->cartRule->ChannelSync($channels, $ruleCreated); if (isset($labels['global'])) { From e20e29b0bd6625b96bf290179e3ba2f19a012ef7 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Mon, 10 Jun 2019 16:44:39 +0530 Subject: [PATCH 89/89] Fixed bug in cart rule form --- .../Discount/src/Http/Controllers/CartRuleController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index f39223ac9..7157a2a03 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -194,7 +194,7 @@ class CartRuleController extends Controller } if(isset($data['usage_limit'])) { - $coupons['usage_limit'] = $data['usage_limit']; + $coupons['limit'] = $data['usage_limit']; } $ruleCreated = $this->cartRule->create($data); @@ -226,7 +226,7 @@ class CartRuleController extends Controller $couponCreated = $this->cartRuleCoupon->create($coupons); } - if ($ruleCreated && $ruleGroupCreated && $ruleChannelCreated) { + if ($ruleCreated && $ruleChannelCreated) { if (isset($couponCreated) && $couponCreated) { session()->flash('success', trans('admin::app.promotion.status.success-coupon')); } @@ -353,7 +353,7 @@ class CartRuleController extends Controller } if (isset($data['usage_limit'])) { - $coupons['usage_limit'] = $data['usage_limit']; + $coupons['limit'] = $data['usage_limit']; } $ruleUpdated = $this->cartRule->update($data, $id);