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

Merge pull request #5612 from deepaksinghgusain227/catalog-rule-cart-rule-ui 

fixed cart-rule catalog-rule condition ui
This commit is contained in:
Glenn Hermans 2022-01-18 10:20:59 +01:00 committed by GitHub
parent 9fc3aedcee 253c759669
commit 87b0cf41d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 135 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=16e7709105034d93361f",
"/css/admin.css": "/css/admin.css?id=8cdddf33a52d656a0b93"
"/css/admin.css": "/css/admin.css?id=cc2c43f23ee0703db2d4"
}

80
packages/Webkul/Admin/src/Resources/assets/sass/partials/_configuration.scss vendored
View File

@ -52,25 +52,71 @@
.cart-rule-conditions,
.catalog-rule-conditions {
table {
td {
&.attribute {
width: 250px;
padding-left: 0;
}
&.operator,
&.value {
width: 260px;
}
display: flex;
column-gap: 10px;
.attribute ,.operator,.value {
width: 25%;
padding-left: 0;
&.actions {
width: 44px;
.icon {
margin-top: 6px;
}
.control-group{
.control {
width: 100% !important;
}
}
.date:after{
top:30% !important;
}
.cross-icon{
top:35% !important;
}
}
.actions {
width: 44px;
.icon {
margin-top: 15px;
}
}
}
@media only screen and (max-width: 770px) {
.cart-rule-conditions,
.catalog-rule-conditions {
display: block;
border: 1px solid #e8e8e8;
padding: 10px;
.attribute ,.operator,.value {
width: 100%;
padding-left: 0;
.control-group{
.control {
width: 100% !important;
margin-top: 0px !important;
margin-bottom: 0px !important;
}
}
.date:after{
top:18% !important;
}
.cross-icon{
top:20% !important;
}
}
.actions {
width: 44px;
.icon {
margin: 0px;
}
}
}
}

42
packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php
View File

@ -169,20 +169,14 @@
</select>
</div>
<div class="table cart-rule-conditions" style="margin-top: 20px; overflow-x: unset;">
<table>
<tbody>
<cart-rule-condition-item
v-for='(condition, index) in conditions'
:condition="condition"
:key="index"
:index="index"
@onRemoveCondition="removeCondition($event)">
</cart-rule-condition-item>
</tbody>
</table>
</div>
<cart-rule-condition-item
v-for='(condition, index) in conditions'
:condition="condition"
:key="index"
:index="index"
@onRemoveCondition="removeCondition($event)">
</cart-rule-condition-item>
<button type="button" class="btn btn-lg btn-primary" style="margin-top: 20px;" @click="addCondition">
{{ __('admin::app.promotions.cart-rules.add-condition') }}
</button>
@ -273,8 +267,8 @@
</script>
<script type="text/x-template" id="cart-rule-condition-item-template">
<tr>
<td class="attribute">
<div class="cart-rule-conditions">
<div class="attribute">
<div class="control-group">
<select :name="['conditions[' + index + '][attribute]']" class="control" v-model="condition.attribute">
<option value="">{{ __('admin::app.promotions.cart-rules.choose-condition-to-add') }}</option>
@ -285,9 +279,9 @@
</optgroup>
</select>
</div>
</td>
</div>
<td class="operator">
<div class="operator">
<div class="control-group" v-if="matchedAttribute">
<select :name="['conditions[' + index + '][operator]']" class="control" v-model="condition.operator">
<option v-for='operator in condition_operators[matchedAttribute.type]' :value="operator.operator">
@ -295,9 +289,9 @@
</option>
</select>
</div>
</td>
</div>
<td class="value">
<div class="value">
<div v-if="matchedAttribute">
<input type="hidden" :name="['conditions[' + index + '][attribute_type]']" v-model="matchedAttribute.type">
@ -354,12 +348,12 @@
</div>
</div>
</div>
</td>
</div>
<td class="actions">
<div class="actions">
<i class="icon trash-icon" @click="removeCondition"></i>
</td>
</tr>
</div>
</div>
</script>
<script>

40
packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php
View File

@ -188,19 +188,13 @@
</select>
</div>
<div class="table cart-rule-conditions" style="margin-top: 20px; overflow-x: unset;">
<table>
<tbody>
<cart-rule-condition-item
v-for='(condition, index) in conditions'
:condition="condition"
:key="index"
:index="index"
@onRemoveCondition="removeCondition($event)">
</cart-rule-condition-item>
</tbody>
</table>
</div>
<cart-rule-condition-item
v-for='(condition, index) in conditions'
:condition="condition"
:key="index"
:index="index"
@onRemoveCondition="removeCondition($event)">
</cart-rule-condition-item>
<button type="button" class="btn btn-lg btn-primary" style="margin-top: 20px;" @click="addCondition">
{{ __('admin::app.promotions.cart-rules.add-condition') }}
@ -331,8 +325,8 @@
</script>
<script type="text/x-template" id="cart-rule-condition-item-template">
<tr>
<td class="attribute">
<div class="cart-rule-conditions">
<div class="attribute">
<div class="control-group">
<select :name="['conditions[' + index + '][attribute]']" class="control" v-model="condition.attribute">
<option value="">{{ __('admin::app.promotions.cart-rules.choose-condition-to-add') }}</option>
@ -343,9 +337,9 @@
</optgroup>
</select>
</div>
</td>
</div>
<td class="operator">
<div class="operator">
<div class="control-group" v-if="matchedAttribute">
<select :name="['conditions[' + index + '][operator]']" class="control" v-model="condition.operator">
<option v-for='operator in condition_operators[matchedAttribute.type]' :value="operator.operator">
@ -353,9 +347,9 @@
</option>
</select>
</div>
</td>
</div>
<td class="value">
<div class="value">
<div v-if="matchedAttribute">
<input type="hidden" :name="['conditions[' + index + '][attribute_type]']" v-model="matchedAttribute.type">
@ -412,12 +406,12 @@
</div>
</div>
</div>
</td>
</div>
<td class="actions">
<div class="actions">
<i class="icon trash-icon" @click="removeCondition"></i>
</td>
</tr>
</div>
</div>
</script>
<script type="text/x-template" id="create-coupon-form-template">

40
packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php
View File

@ -124,19 +124,13 @@
</select>
</div>
<div class="table catalog-rule-conditions" style="margin-top: 20px; overflow-x: unset;">
<table>
<tbody>
<catalog-rule-condition-item
v-for='(condition, index) in conditions'
:condition="condition"
:key="index"
:index="index"
@onRemoveCondition="removeCondition($event)">
</catalog-rule-condition-item>
</tbody>
</table>
</div>
<catalog-rule-condition-item
v-for='(condition, index) in conditions'
:condition="condition"
:key="index"
:index="index"
@onRemoveCondition="removeCondition($event)">
</catalog-rule-condition-item>
<button type="button" class="btn btn-lg btn-primary" style="margin-top: 20px;" @click="addCondition">
{{ __('admin::app.promotions.catalog-rules.add-condition') }}
@ -191,8 +185,8 @@
</script>
<script type="text/x-template" id="catalog-rule-condition-item-template">
<tr>
<td class="attribute">
<div class="catalog-rule-conditions">
<div class="attribute">
<div class="control-group">
<select :name="['conditions[' + index + '][attribute]']" class="control" v-model="condition.attribute">
<option value="">{{ __('admin::app.promotions.catalog-rules.choose-condition-to-add') }}</option>
@ -203,9 +197,9 @@
</optgroup>
</select>
</div>
</td>
</div>
<td class="operator">
<div class="operator">
<div class="control-group" v-if="matchedAttribute">
<select :name="['conditions[' + index + '][operator]']" class="control" v-model="condition.operator">
<option v-for='operator in condition_operators[matchedAttribute.type]' :value="operator.operator">
@ -213,9 +207,9 @@
</option>
</select>
</div>
</td>
</div>
<td class="value">
<div class="value">
<div v-if="matchedAttribute">
<input type="hidden" :name="['conditions[' + index + '][attribute_type]']" v-model="matchedAttribute.type">
@ -272,12 +266,12 @@
</div>
</div>
</div>
</td>
</div>
<td class="actions">
<div class="actions">
<i class="icon trash-icon" @click="removeCondition"></i>
</td>
</tr>
</div>
</div>
</script>
<script>

42
packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php
View File

@ -130,20 +130,14 @@
<option value="2">{{ __('admin::app.promotions.catalog-rules.any-condition-true') }}</option>
</select>
</div>
<div class="table catalog-rule-conditions" style="margin-top: 20px; overflow-x: unset;">
<table>
<tbody>
<catalog-rule-condition-item
v-for='(condition, index) in conditions'
:condition="condition"
:key="index"
:index="index"
@onRemoveCondition="removeCondition($event)">
</catalog-rule-condition-item>
</tbody>
</table>
</div>
<catalog-rule-condition-item
v-for='(condition, index) in conditions'
:condition="condition"
:key="index"
:index="index"
@onRemoveCondition="removeCondition($event)">
</catalog-rule-condition-item>
<button type="button" class="btn btn-lg btn-primary" style="margin-top: 20px;" @click="addCondition">
{{ __('admin::app.promotions.catalog-rules.add-condition') }}
@ -208,8 +202,8 @@
</script>
<script type="text/x-template" id="catalog-rule-condition-item-template">
<tr>
<td class="attribute">
<div class="catalog-rule-conditions">
<div class="attribute">
<div class="control-group">
<select :name="['conditions[' + index + '][attribute]']" class="control" v-model="condition.attribute">
<option value="">{{ __('admin::app.promotions.catalog-rules.choose-condition-to-add') }}</option>
@ -220,9 +214,9 @@
</optgroup>
</select>
</div>
</td>
</div>
<td class="operator">
<div class="operator">
<div class="control-group" v-if="matchedAttribute">
<select :name="['conditions[' + index + '][operator]']" class="control" v-model="condition.operator">
<option v-for='operator in condition_operators[matchedAttribute.type]' :value="operator.operator">
@ -230,9 +224,9 @@
</option>
</select>
</div>
</td>
</div>
<td class="value">
<div class="value">
<div v-if="matchedAttribute">
<input type="hidden" :name="['conditions[' + index + '][attribute_type]']" v-model="matchedAttribute.type">
@ -289,12 +283,12 @@
</div>
</div>
</div>
</td>
</div>
<td class="actions">
<div class="actions">
<i class="icon trash-icon" @click="removeCondition"></i>
</td>
</tr>
</div>
</div>
</script>
<script>