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

Enabled usage parameters of cart rule in create and edit form

This commit is contained in:
Prashant Singh 2019-07-03 11:37:09 +05:30
parent 12c321e80e
commit f8d38e9bbd
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,21 +134,21 @@
{{-- <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;">
<span class="control-error" v-if="errors.has('per_customer')">@{{ errors.first('per_customer') }}</span>
</div> --}}
</div>
{{-- <div class="control-group" :class="[errors.has('usage_limit') ? 'has-error' : '']">
<div class="control-group" :class="[errors.has('usage_limit') ? 'has-error' : '']">
<label for="usage_limit" class="required">{{ __('admin::app.promotion.general-info.limit') }}</label>
<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>

18
packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php
View File

@ -9,5 +9,23 @@ use Cart;
class ConvertXToProductId
{
public function __construct()
{
}
public function convertFromCategory()
{
}
public function convertFromAttributeOptions()
{
}
public function convertFromAttributes()
{
}
}

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

@ -90,8 +90,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',
@ -108,12 +108,6 @@ class CartRuleController extends Controller
// unset token
unset($data['_token']);
// set usage limit
$data['usage_limit'] = 0;
// set per customer usage limit
$data['per_customer'] = 0;
// check if starts_from is null
if ($data['starts_from'] == "") {
$data['starts_from'] = null;