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

issue #824

This commit is contained in:
rahul shukla 2019-04-16 20:15:28 +05:30
parent ae6d498f4c
commit ad6acfa7e0
18 changed files with 189 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/js/admin.js 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=4432c46ebc2216884b7a",
"/js/admin.js": "/js/admin.js?id=c0d374be105e7359054c",
"/css/admin.css": "/css/admin.css?id=a71a72c31d6ac0fe375f"
}

14
packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
View File

@ -326,12 +326,14 @@
inject: ['$validator'],
data: () => ({
optionRowCount: 0,
optionRows: [],
show_swatch: false,
swatch_type: ''
}),
data() {
return {
optionRowCount: 0,
optionRows: [],
show_swatch: false,
swatch_type: ''
}
},
created () {
var this_this = this;

14
packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
View File

@ -370,12 +370,14 @@
inject: ['$validator'],
data: () => ({
optionRowCount: 0,
optionRows: [],
show_swatch: "{{ $attribute->type == 'select' ? true : false }}",
swatch_type: "{{ $attribute->swatch_type }}"
}),
data() {
return {
optionRowCount: 0,
optionRows: [],
show_swatch: "{{ $attribute->type == 'select' ? true : false }}",
swatch_type: "{{ $attribute->swatch_type }}"
}
},
created () {
@foreach ($attribute->options as $option)

26
packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php
View File

@ -203,14 +203,16 @@
Vue.component('group-form', {
data: () => ({
group: {
'groupName': '',
'position': '',
'is_user_defined': 1,
'custom_attributes': []
data() {
return {
group: {
'groupName': '',
'position': '',
'is_user_defined': 1,
'custom_attributes': []
}
}
}),
},
template: '#group-form-template',
@ -260,10 +262,12 @@
template: '#group-list-template',
data: () => ({
groups: groups,
custom_attributes: custom_attributes
}),
data() {
return {
groups: groups,
custom_attributes: custom_attributes
}
},
created () {
this.groups.forEach(function(group) {

24
packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
View File

@ -202,13 +202,15 @@
Vue.component('group-form', {
data: () => ({
group: {
'groupName': '',
'position': '',
'custom_attributes': []
data() {
return {
group: {
'groupName': '',
'position': '',
'custom_attributes': []
}
}
}),
},
template: '#group-form-template',
@ -258,10 +260,12 @@
template: '#group-list-template',
data: () => ({
groups: groups,
custom_attributes: custom_attributes
}),
data() {
return {
groups: groups,
custom_attributes: custom_attributes
}
},
created () {
this.groups.forEach(function(group) {

21
packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
View File

@ -248,9 +248,11 @@
props: ['code'],
data: () => ({
country: "",
}),
data() {
return {
country: "",
}
},
mounted() {
this.country = this.code;
@ -293,14 +295,15 @@
props: ['code'],
data: () => ({
data() {
return {
state: "",
state: "",
country: "",
country: "",
countryStates: @json(core()->groupedStatesByCountries())
}),
countryStates: @json(core()->groupedStatesByCountries())
}
},
mounted() {
this.state = this.code

12
packages/Webkul/Admin/src/Resources/views/customers/country-state.blade.php
View File

@ -55,13 +55,15 @@
inject: ['$validator'],
data: () => ({
country: "{{ $countryCode }}",
data() {
return {
country: "{{ $countryCode }}",
state: "{{ $stateCode }}",
state: "{{ $stateCode }}",
countryStates: @json(core()->groupedStatesByCountries())
}),
countryStates: @json(core()->groupedStatesByCountries())
}
},
methods: {
haveStates() {

68
packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
View File

@ -8,7 +8,7 @@
<div class="content full-page">
<form method="POST" action="{{ route('admin.sales.shipments.store', $order->id) }}" @submit.prevent="onSubmit">
@csrf()
<div class="page-header">
<div class="page-title">
<h1>
@ -38,7 +38,7 @@
<div class="section-content">
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.shipments.order-id') }}
</span>
@ -48,11 +48,11 @@
</div>
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.order-date') }}
</span>
<span class="value">
<span class="value">
{{ $order->created_at }}
</span>
</div>
@ -61,7 +61,7 @@
<span class="title">
{{ __('admin::app.sales.orders.order-status') }}
</span>
<span class="value">
{{ $order->status_label }}
</span>
@ -71,7 +71,7 @@
<span class="title">
{{ __('admin::app.sales.orders.channel') }}
</span>
<span class="value">
{{ $order->channel_name }}
</span>
@ -86,21 +86,21 @@
<div class="section-content">
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.customer-name') }}
</span>
<span class="value">
<span class="value">
{{ $order->customer_full_name }}
</span>
</div>
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.email') }}
</span>
<span class="value">
<span class="value">
{{ $order->customer_email }}
</span>
</div>
@ -119,9 +119,9 @@
</div>
<div class="section-content">
@include ('admin::sales.address', ['address' => $order->billing_address])
</div>
</div>
@ -132,13 +132,13 @@
</div>
<div class="section-content">
@include ('admin::sales.address', ['address' => $order->shipping_address])
</div>
</div>
@endif
</div>
</accordian>
@ -152,21 +152,21 @@
<div class="section-content">
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.payment-method') }}
</span>
<span class="value">
<span class="value">
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</span>
</div>
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.currency') }}
</span>
<span class="value">
<span class="value">
{{ $order->order_currency_code }}
</span>
</div>
@ -180,21 +180,21 @@
<div class="section-content">
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.shipping-method') }}
</span>
<span class="value">
<span class="value">
{{ $order->shipping_title }}
</span>
</div>
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.shipping-price') }}
</span>
<span class="value">
<span class="value">
{{ core()->formatBasePrice($order->base_shipping_amount) }}
</span>
</div>
@ -237,10 +237,10 @@
<script type="text/x-template" id="order-item-list-template">
<div>
<div>
<div class="control-group" :class="[errors.has('shipment[source]') ? 'has-error' : '']">
<label for="shipment[source]" class="required">{{ __('admin::app.sales.shipments.source') }}</label>
<select v-validate="'required'" class="control" name="shipment[source]" id="shipment[source]" data-vv-as="&quot;{{ __('admin::app.sales.shipments.source') }}&quot;" v-model="source">
<option value="">{{ __('admin::app.sales.shipments.select-source') }}</option>
@ -284,7 +284,7 @@
<td>{{ $item->qty_ordered }}</td>
<td>{{ $item->qty_to_ship }}</td>
<td>
<table>
<thead>
<tr>
@ -302,15 +302,15 @@
</td>
<td>
<?php
<?php
if ($item->type == 'configurable') {
$sourceQty = $item->child->product->inventory_source_qty($inventorySource);
} else {
$sourceQty = $item->product->inventory_source_qty($inventorySource);
$sourceQty = $item->product->inventory_source_qty($inventorySource);
}
?>
<?php
<?php
$sourceQty = 0;
$product = $item->type == 'configurable' ? $item->child->product : $item->product;
@ -327,7 +327,7 @@
<td>
<?php $inputName = "shipment[items][$item->id][$inventorySource->id]"; ?>
<div class="control-group" :class="[errors.has('{{ $inputName }}') ? 'has-error' : '']">
<input type="text" v-validate="'required|numeric|min_value:0|max_value:{{$sourceQty}}'" class="control" id="{{ $inputName }}" name="{{ $inputName }}" value="0" data-vv-as="&quot;{{ __('admin::app.sales.shipments.qty-to-ship') }}&quot;" :disabled="source != '{{ $inventorySource->id }}'"/>
@ -362,9 +362,11 @@
inject: ['$validator'],
data: () => ({
source: ""
})
data() {
return {
source: ""
}
}
});
</script>

8
packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
View File

@ -90,9 +90,11 @@
inject: ['$validator'],
data: () => ({
is_zip: false
}),
data() {
return {
is_zip: false
}
},
});
</script>
@endpush

2
packages/Webkul/Shop/publishable/assets/js/shop.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=412d129ed770afb5dee3",
"/js/shop.js": "/js/shop.js?id=a13f5cfbeef666d71b37",
"/css/shop.css": "/css/shop.css?id=8991884e53441d770cee"
}

2
packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue
View File

@ -33,7 +33,7 @@ export default {
}
},
data: function() {
data() {
return {
images: [],

82
packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
View File

@ -132,30 +132,32 @@
template: '#checkout-template',
inject: ['$validator'],
data: () => ({
currentStep: 1,
completedStep: 0,
address: {
billing: {
address1: [''],
use_for_shipping: true,
data() {
return {
currentStep: 1,
completedStep: 0,
address: {
billing: {
address1: [''],
use_for_shipping: true,
},
shipping: {
address1: ['']
},
},
shipping: {
address1: ['']
},
},
selected_shipping_method: '',
selected_payment_method: '',
disable_button: false,
new_shipping_address: false,
new_billing_address: false,
selected_shipping_method: '',
selected_payment_method: '',
disable_button: false,
new_shipping_address: false,
new_billing_address: false,
allAddress: {},
allAddress: {},
countryStates: @json(core()->groupedStatesByCountries()),
countryStates: @json(core()->groupedStatesByCountries()),
country: @json(core()->countries())
}),
country: @json(core()->countries())
}
},
created() {
if(! customerAddress) {
@ -333,9 +335,11 @@
Vue.component('summary-section', {
inject: ['$validator'],
data: () => ({
templateRender: null
}),
data() {
return {
templateRender: null
}
},
staticRenderFns: summaryTemplateRenderFns,
@ -360,10 +364,12 @@
Vue.component('shipping-section', {
inject: ['$validator'],
data: () => ({
templateRender: null,
selected_shipping_method: '',
}),
data() {
return {
templateRender: null,
selected_shipping_method: '',
}
},
staticRenderFns: shippingTemplateRenderFns,
@ -397,13 +403,15 @@
Vue.component('payment-section', {
inject: ['$validator'],
data: () => ({
templateRender: null,
data() {
return {
templateRender: null,
payment: {
method: ""
},
}),
payment: {
method: ""
},
}
},
staticRenderFns: paymentTemplateRenderFns,
@ -436,9 +444,11 @@
var reviewTemplateRenderFns = [];
Vue.component('review-section', {
data: () => ({
templateRender: null
}),
data() {
return {
templateRender: null
}
},
staticRenderFns: reviewTemplateRenderFns,

12
packages/Webkul/Shop/src/Resources/views/customers/account/address/country-state.blade.php
View File

@ -51,13 +51,15 @@
inject: ['$validator'],
data: () => ({
country: "{{ $countryCode }}",
data() {
return {
country: "{{ $countryCode }}",
state: "{{ $stateCode }}",
state: "{{ $stateCode }}",
countryStates: @json(core()->groupedStatesByCountries())
}),
countryStates: @json(core()->groupedStatesByCountries())
}
},
methods: {
haveStates() {

10
packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php
View File

@ -81,10 +81,12 @@
template: '#layered-navigation-template',
data: () => ({
attributes: @json($attributeRepository->getFilterAttributes()),
appliedFilters: {}
}),
data() {
return {
attributes: @json($attributeRepository->getFilterAttributes()),
appliedFilters: {}
}
},
created () {
var urlParams = new URLSearchParams(window.location.search);

24
packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php
View File

@ -19,7 +19,7 @@
<label class="required">@{{ attribute.label }}</label>
<span v-if="! attribute.swatch_type || attribute.swatch_type == '' || attribute.swatch_type == 'dropdown'">
<select
<select
class="control"
v-validate="'required'"
:name="['super_attribute[' + attribute.id + ']']"
@ -34,13 +34,13 @@
</span>
<span class="swatch-container" v-else>
<label class="swatch"
<label class="swatch"
v-for='(option, index) in attribute.options'
v-if="option.id"
:data-id="option.id"
:for="['attribute_' + attribute.id + '_option_' + option.id]">
<input type="radio"
<input type="radio"
v-validate="'required'"
:name="['super_attribute[' + attribute.id + ']']"
:id="['attribute_' + attribute.id + '_option_' + option.id]"
@ -79,17 +79,19 @@
inject: ['$validator'],
data: () => ({
config: @json($config),
data() {
return {
config: @json($config),
childAttributes: [],
childAttributes: [],
selectedProductId: '',
selectedProductId: '',
simpleProduct: null,
simpleProduct: null,
galleryImages: []
}),
galleryImages: []
}
}
created () {
this.galleryImages = galleryImages.slice(0)
@ -133,7 +135,7 @@
attribute.nextAttribute.disabled = false;
this.fillSelect(attribute.nextAttribute);
this.resetChildren(attribute.nextAttribute);
} else {
this.selectedProductId = attribute.options[attribute.selectedIndex].allowedProducts[0];

14
packages/Webkul/Ui/src/Resources/assets/js/components/tree-view/tree-view.vue
View File

@ -61,15 +61,17 @@
}
},
data: () => ({
finalValues: []
}),
data() {
return {
finalValues: []
}
},
computed: {
savedValues () {
if(!this.value)
return [];
if(this.inputType == 'radio')
return [this.value];
@ -90,7 +92,7 @@
return childElements;
},
generateTreeItem(item) {
return this.$createElement('tree-item', {
props: {