Skip to content
This repository was archived by the owner on Jan 26, 2024. It is now read-only.

Commit f879eba

Browse files
authored
Merge pull request #1891 from DivanteLtd/develop
New Logo + Order Push fix
2 parents cdaf536 + 2adfffa commit f879eba

File tree

7 files changed

+42
-7
lines changed

7 files changed

+42
-7
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Added
1010
- Contact form mailer - #1875 - Akbar Abdrakhmanov @akbarik
1111
- oauth2 configuration in setup - #1865 - Krister Andersson @Cyclonecode
12+
- GraphQL schema extendibility in the API - Yoann Vié
13+
- A lot of new docs - Natalia Tepluhina @NataliTepluhina
14+
- Magento2 integrated importer
1215

1316
### Changed
1417
- New Modules API, and base modules (cart, wishlist, newsletter ...) refactored [read more...](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/api-modules/about-modules.md) - Filip Rakowski @filrak

core/scripts/installer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ let questions = [
744744
type: 'input',
745745
name: 'm2_url',
746746
message: 'Please provide your magento url',
747-
default: 'http://magento2.demo-1.xyz.com',
747+
default: 'http://demo-magento2.vuestorefront.io',
748748
when: function (answers) {
749749
return answers.m2_api_oauth2 === true
750750
}

core/store/modules/order/mutations.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ const mutations: MutationTree<OrderState> = {
1818
order.created_at = new Date()
1919
order.updated_at = new Date()
2020

21-
ordersCollection.setItem(orderId.toString(), order).catch((reason) => {
22-
console.error(reason) // it doesn't work on SSR
23-
}, (err, resp) => {
21+
ordersCollection.setItem(orderId.toString(), order, (err, resp) => {
2422
if (err) console.error(err)
2523
Vue.prototype.$bus.$emit('order/PROCESS_QUEUE', { config: rootStore.state.config }) // process checkout queue
2624
console.info('Order placed, orderId = ' + orderId)
25+
}).catch((reason) => {
26+
console.error(reason) // it doesn't work on SSR
2727
}) // populate cache
2828
}
2929
}
12.8 KB
Loading
2.6 KB
Loading

src/themes/default/assets/logo.svg

Lines changed: 33 additions & 1 deletion
Loading

src/themes/default/components/core/blocks/Header/Header.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<div class="col-xs-2 visible-xs">
2020
<search-icon class="p15 icon pointer" />
2121
</div>
22-
<div class="col-sm-4 col-xs-4 center-xs">
22+
<div class="col-sm-4 col-xs-4 center-xs pt5">
2323
<div>
24-
<logo width="36px" height="41px"/>
24+
<logo width="auto" height="41px"/>
2525
</div>
2626
</div>
2727
<div class="col-xs-2 visible-xs">

0 commit comments

Comments
 (0)