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

fixed conflicts

This commit is contained in:
Deepak Singh Gusain 2022-01-18 15:01:56 +05:30
parent 0f316e78fe 95d5d826ab
commit 999026d538
9 changed files with 147 additions and 119 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=d29d52303cb52a8a55da"
"/css/admin.css": "/css/admin.css?id=7a4562b605f6b0e50953"
}

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>

2
packages/Webkul/Velocity/src/Resources/views/shop/cms/page.blade.php
View File

@ -19,7 +19,7 @@
@endsection
@section('content-wrapper')
<div class="cms-page-container cart-details row">
<div class="cms-page-container p-2">
{!! DbView::make($page)->field('html_content')->render() !!}
</div>
@endsection

16
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php
View File

@ -7,6 +7,7 @@
@section('page-detail-wrapper')
<div class="account-head mb-15">
<span class="account-heading">{{ __('shop::app.customer.account.profile.index.title') }}</span>
<span></span>
</div>
@ -61,9 +62,14 @@
class="control styled-select"
data-vv-as="&quot;{{ __('shop::app.customer.account.profile.gender') }}&quot;">
<option value="" @if ($customer->gender == "") selected @endif></option>
<option
value="Other"
<option value=""
@if ($customer->gender == "")
selected="selected"
@endif>
{{ __('admin::app.customers.customers.select-gender') }}
</option>
<option value="Other"
@if ($customer->gender == "Other")
selected="selected"
@endif>
@ -148,7 +154,7 @@
<label class="col-12">
{{ __('admin::app.catalog.categories.image') }}
</label>
<div class="col-12">
<image-wrapper :button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'" input-name="image" :multiple="false" :images='"{{ $customer->image_url }}"'></image-wrapper>
@ -224,4 +230,4 @@
</form>
{!! view_render_event('bagisto.shop.customers.account.profile.edit.after', ['customer' => $customer]) !!}
@endsection
@endsection