merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

This commit is contained in:
Prashant Singh 2019-07-22 12:50:06 +05:30
parent 38e029463e
commit 27ca4cb622
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php
View File

@ -134,7 +134,7 @@
{{-- <input type="hidden" name="auto_generation" v-model="auto_generation"> --}}
<div class="control-group" :class="[errors.has('per_customer') ? 'has-error' : '']">
{{-- <div class="control-group" :class="[errors.has('per_customer') ? 'has-error' : '']">
<label for="per_customer" class="required">{{ __('admin::app.promotion.general-info.uses-per-cust') }}</label>
<input type="number" step="1" class="control" name="per_customer" v-model="per_customer" v-validate="'required|numeric|min_value:0'" value="{{ old('per_customer') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.uses-per-cust') }}&quot;">
@ -148,7 +148,7 @@
<input type="number" step="1" class="control" name="usage_limit" v-model="usage_limit" v-validate="'required|numeric|min_value:0'" value="{{ old('usage_limit') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.uses-per-cust') }}&quot;">
<span class="control-error" v-if="errors.has('usage_limit')">@{{ errors.first('usage_limit') }}</span>
</div>
</div> --}}
<div class="control-group" :class="[errors.has('priority') ? 'has-error' : '']">
<label for="priority" class="required">{{ __('admin::app.promotion.general-info.priority') }}</label>

4
packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php
View File

@ -136,7 +136,7 @@
{{-- <input type="hidden" name="auto_generation" v-model="auto_generation"> --}}
<div class="control-group" :class="[errors.has('per_customer') ? 'has-error' : '']">
{{-- <div class="control-group" :class="[errors.has('per_customer') ? 'has-error' : '']">
<label for="per_customer" class="required">{{ __('admin::app.promotion.general-info.uses-per-cust') }}</label>
<input type="number" step="1" class="control" name="per_customer" v-model="per_customer" v-validate="'required|numeric|min_value:0'" value="{{ old('per_customer') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.uses-per-cust') }}&quot;">
@ -154,7 +154,7 @@
<figcaption class="required">* {{ __('admin::app.promotion.zero-unlimited') }}</figcaption>
<span class="control-error" v-if="errors.has('usage_limit')">@{{ errors.first('usage_limit') }}</span>
</div>
</div> --}}
<div class="control-group" :class="[errors.has('priority') ? 'has-error' : '']">
<label for="priority" class="required">{{ __('admin::app.promotion.general-info.priority') }}</label>

10
packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
View File

@ -123,8 +123,8 @@ class CartRuleController extends Controller
'channels' => 'required|array',
'status' => 'required|boolean',
'use_coupon' => 'boolean|required',
'usage_limit' => 'numeric|min:0',
'per_customer' => 'numeric|min:0',
// 'usage_limit' => 'numeric|min:0',
// 'per_customer' => 'numeric|min:0',
'action_type' => 'required|string',
'disc_amount' => 'required|numeric',
'disc_quantity' => 'numeric',
@ -244,7 +244,7 @@ class CartRuleController extends Controller
}
// set coupon usage per customer same as per_customer limit which is disabled for now
$coupons['usage_per_customer'] = $data['per_customer']; //0 is for unlimited usage
// $coupons['usage_per_customer'] = $data['per_customer']; //0 is for unlimited usage
// unset coupon code from coupon section
unset($data['code']);
// } else {
@ -356,8 +356,8 @@ class CartRuleController extends Controller
'channels' => 'required|array',
'status' => 'required|boolean',
'use_coupon' => 'boolean|required',
'usage_limit' => 'numeric|min:0',
'per_customer' => 'numeric|min:0',
// 'usage_limit' => 'numeric|min:0',
// 'per_customer' => 'numeric|min:0',
'action_type' => 'required|string',
'disc_amount' => 'required|numeric',
'disc_quantity' => 'required|numeric',