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

more normalization of cart rule form variables

This commit is contained in:
Prashant Singh 2019-09-07 04:48:27 +05:30
parent c190f6f230
commit 1aab4ccfe3
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,7 +481,6 @@
conditions: @json($cart_rule[0]).conditions,
cart_input: @json($cart_rule[0]).attributes,
actions: @json($cart_rule[0]).actions,
conditions_list:[],
cart_object: {
attribute: [],
condition: [],
@ -604,7 +603,7 @@
this.all_attributes = JSON.stringify(this.all_attributes);
if (this.conditions_list.length != 0) {
if (this.conditions_list != null && this.conditions_list.length != 0) {
this.conditions_list.push({'criteria': this.match_criteria});
this.all_conditions = JSON.stringify(this.conditions_list);

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

@ -228,7 +228,7 @@
<option v-for="(condition, index) in conditions.numeric" :value="index" :key="index">@{{ condition }}</option>
</select>
<input class="control" type="number" step="0.1000" name="cart_attributes[]" v-model="conditions_list[index].value" placeholder="{{ __('admin::app.promotion.enter-attribtue', ['attrbibute' => 'Value']) }}">
<input class="control" type="number" step="0.1000" name="cart_attributes[]" v-model="conditions_list[index].value">
</div>
<span class="icon trash-icon" v-on:click="removeCartAttr(index)"></span>
@ -663,13 +663,7 @@
},
detectApply() {
if (this.apply == 'percent_of_product' || this.apply == 'buy_a_get_b') {
this.apply_prct = true;
this.apply_amt = false;
} else if (this.apply == 'fixed_amount' || this.apply == 'fixed_amount_cart') {
this.apply_prct = false;
this.apply_amt = true;
}
return;
},
enableCondition(event, index) {