diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/text.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/text.blade.php index 5b9b01c70..a766ecd37 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/text.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/text.blade.php @@ -5,13 +5,14 @@ class="control" id="{{ $attribute->code }}" - {{-- To Do (@devansh-webkul): Need to handle from the backend. --}} @if ($attribute->code === 'sku') v-validate="{ required: true, regex: /^[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*$/ }" @else v-validate="'{{ $validations }}'" @endif - + data-vv-as=""{{ $attribute->admin_name }}"" + {{ in_array($attribute->code, ['url_key']) ? 'v-slugify' : '' }} - {{ $attribute->code == 'name' && ! $product[$attribute->code] ? 'v-slugify-target=\'url_key\'' : '' }}> \ No newline at end of file + {{ $attribute->code == 'name' && ! $product->url_key ? 'v-slugify-target=\'url_key\'' : '' }} +> diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php index e91ee6d1e..fa0b1a6bb 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php @@ -123,16 +123,18 @@ -
+
- + + @{{ errors.first('uses_per_coupon') }}
-
+
- + {{ __('admin::app.promotions.cart-rules.uses-per-customer-control-info') }} + @{{ errors.first('usage_per_customer') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php index 0a55f0883..654c472aa 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php @@ -135,19 +135,22 @@
-
+
- + + + @{{ errors.first('uses_per_coupon') }}
-
+
- + {{ __('admin::app.promotions.cart-rules.uses-per-customer-control-info') }} + @{{ errors.first('usage_per_customer') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php index 725797447..30d3f5bc9 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php @@ -218,8 +218,9 @@
-
- +
+ +
diff --git a/packages/Webkul/CartRule/src/Helpers/CartRule.php b/packages/Webkul/CartRule/src/Helpers/CartRule.php index f8c074c82..f8ee9ae47 100644 --- a/packages/Webkul/CartRule/src/Helpers/CartRule.php +++ b/packages/Webkul/CartRule/src/Helpers/CartRule.php @@ -46,7 +46,7 @@ class CartRule /** * Collect discount on cart * - * @param \Webkul\Cart\Contracts\Cart $cart + * @param \Webkul\Checkout\Contracts\Cart $cart * @return void */ public function collect($cart) @@ -84,7 +84,7 @@ class CartRule /** * Returns cart rules * - * @param \Webkul\Cart\Contracts\Cart $cart + * @param \Webkul\Checkout\Contracts\Cart $cart * @return \Illuminate\Support\Collection */ public function getCartRules($cart) @@ -125,7 +125,7 @@ class CartRule /** * Check if cart rule can be applied * - * @param \Webkul\Cart\Contracts\Cart $cart + * @param \Webkul\Checkout\Contracts\Cart $cart * @param \Webkul\CartRule\Contracts\CartRule $rule * @return bool */ @@ -193,7 +193,7 @@ class CartRule /** * Cart item discount calculation process * - * @param \Webkul\Cart\Contracts\Cart $cart + * @param \Webkul\Checkout\Contracts\Cart $cart * @param \Webkul\Checkout\Models\CartItem $item * @return array */ @@ -465,7 +465,7 @@ class CartRule /** * Calculate cart item totals for each rule * - * @param \Webkul\Cart\Contracts\Cart $cart + * @param \Webkul\Checkout\Contracts\Cart $cart * @param \Illuminate\Support\Collecton $items * @return \Webkul\Rule\Helpers\Validator */ @@ -502,7 +502,7 @@ class CartRule /** * Check if coupon code is applied or not * - * @param \Webkul\Cart\Contracts\Cart $cart + * @param \Webkul\Checkout\Contracts\Cart $cart * @return bool */ public function checkCouponCode($cart): bool diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php index 55cd11207..b3236c157 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php @@ -121,8 +121,8 @@
@else -