Skip to content

Develop #1641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 28, 2018
Merged

Develop #1641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22e3c15
Fix for status and visibility in product blocks on Home page
pkarw Aug 28, 2018
d2dae43
Fix for shipping methods change (org. PR: #1523)
pkarw Aug 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/components/blocks/Checkout/Shipping.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export default {
}
this.shipping.shippingMethod = shipping.method_code
}
this.changeShippingMethod()
},
methods: {
sendDataToCheckout () {
Expand Down
4 changes: 2 additions & 2 deletions core/pages/Checkout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,8 @@ export default {
region_code: this.payment.region_code ? this.payment.region_code : '',
vat_id: this.payment.taxId
},
shipping_method_code: this.shippingMethod.method_code ? this.shippingMethod.method_code : this.shipping.method_code,
shipping_carrier_code: this.shippingMethod.carrier_code ? this.shippingMethod.carrier_code : this.shipping.method_code,
shipping_method_code: this.shippingMethod.method_code ? this.shippingMethod.method_code : this.shipping.shippingMethod,
shipping_carrier_code: this.shippingMethod.carrier_code ? this.shippingMethod.carrier_code : this.shipping.shippingMethod,
payment_method_code: this.getPaymentMethod(),
payment_method_additional: this.payment.paymentMethodAdditional,
shippingExtraFields: this.shipping.extraFields
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/components/theme/blocks/Collection/Collection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default {
}
},
beforeMount () {
let inspirationsQuery = builder().query('match', 'category.name', this.category).build()
let inspirationsQuery = builder().query('match', 'category.name', this.category).andQuery('range', 'status', { 'gte': 0, 'lt': 2 }).andQuery('range', 'visibility', { 'gte': 2, 'lte': 4 }/** Magento visibility in search & categories */).build()

this.$store.dispatch('product/list', {
query: inspirationsQuery,
Expand Down
4 changes: 2 additions & 2 deletions src/themes/default/pages/Home.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ export default {
asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
return new Promise((resolve, reject) => {
console.log('Entering asyncData for Home ' + new Date())
let newProductsQuery = builder().query('match', 'category.name', 'Tees').andFilter('range', 'visibility', { 'gte': 2, 'lte': 4 }/** Magento visibility in search & categories */).build()
let coolBagsQuery = builder().query('match', 'category.name', 'Women').andFilter('range', 'visibility', { 'gte': 2, 'lte': 4 }/** Magento visibility in search & categories */).build()
let newProductsQuery = builder().query('match', 'category.name', 'Tees').andQuery('range', 'status', { 'gte': 0, 'lt': 2 }).andQuery('range', 'visibility', { 'gte': 2, 'lte': 4 }/** Magento visibility in search & categories */).build()
let coolBagsQuery = builder().query('match', 'category.name', 'Women').andQuery('range', 'status', { 'gte': 0, 'lt': 2 }).andQuery('range', 'visibility', { 'gte': 2, 'lte': 4 }/** Magento visibility in search & categories */).build()
store.dispatch('category/list', { includeFields: config.entities.optimize ? config.entities.category.includeFields : null }).then((categories) => {
store.dispatch('product/list', {
query: newProductsQuery,
Expand Down