Skip to content

Commit

Permalink
FIx for #2894
Browse files Browse the repository at this point in the history
  • Loading branch information
pkarw committed May 17, 2019
1 parent 8e85faa commit 106de8e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion core/modules/checkout/store/checkout/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const actions: ActionTree<CheckoutState, RootState> = {
const result = await dispatch('order/placeOrder', order, {root: true})
if (!result.resultCode || result.resultCode === 200) {
Vue.prototype.$db.usersCollection.setItem('last-cart-bypass-ts', new Date().getTime())
await dispatch('cart/clear', {}, {root: true})
await dispatch('cart/clear', { recreateAndSyncCart: true }, {root: true})
if (state.personalDetails.createAccount) {
commit(types.CHECKOUT_DROP_PASSWORD)
}
Expand Down
2 changes: 1 addition & 1 deletion core/modules/user/store/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ const actions: ActionTree<UserState, RootState> = {
context.dispatch('cart/serverTokenClear', {}, { root: true })
.then(() => {context.dispatch('clearCurrentUser')})
.then(() => {Vue.prototype.$bus.$emit('user-after-logout')})
.then(() => {context.dispatch('cart/clear', {}, { root: true })})
.then(() => {context.dispatch('cart/clear', { recreateAndSyncCart: true }, { root: true })})
if (!silent) {
rootStore.dispatch('notification/spawnNotification', {
type: 'success',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export default {
this.$store.dispatch('checkout/setThankYouPage', true)
this.$store.commit('ui/setMicrocart', false)
this.$router.push(this.localizedRoute('/checkout'))
this.$store.dispatch('cart/clear', {}, {root: true})
this.$store.dispatch('cart/clear', { recreateAndSyncCart: true }, {root: true})
}
})
})
Expand Down
3 changes: 2 additions & 1 deletion src/themes/default/resource/i18n/en-US.csv
Original file line number Diff line number Diff line change
Expand Up @@ -273,4 +273,5 @@
"My Recently viewed products","My Recently viewed products"
"No products yet","No products yet"
"The server order id has been set to ","The server order id has been set to "
"Customer service (Magento CMS)","Customer service (Magento CMS)",""Customer service (Magento CMS)","Customer service (Magento CMS)"
"Customer service (Magento CMS)","Customer service (Magento CMS)",""Customer service (Magento CMS)","Customer service (Magento CMS)"
"Instant Checkout","Instant Checkout"

0 comments on commit 106de8e

Please sign in to comment.