Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Sorting fixed on category page - @AdKamil (#3785)
- Mount app in 'beforeResolve' if it's not dispatched in 'onReady' - @gibkigonzo (#3669)
- change translation from jp-JP to ja-JP - @gibkigonzo (#3824)
- Fix product images, my account link, warnings in console - @andrzejewsky (#3850)

## [1.10.4] - 18.10.2019

Expand Down
1 change: 0 additions & 1 deletion src/themes/default/components/core/ProductImage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ export default {
top: 50%;
left: 50%;
width: auto;
height: 100%;
transform: translate3d(-50%, -50%, 0);
&--placeholder{
width: auto;
Expand Down
14 changes: 13 additions & 1 deletion src/themes/default/components/core/blocks/Footer/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
{{ $t('Orders') }}
</h3>
<div class="mt15">
<router-link class="cl-secondary" :to="localizedRoute('/my-account')" exact>
<router-link v-show="isLogged" class="cl-secondary" :to="localizedRoute('/my-account')" exact>
{{ $t('My account') }}
</router-link>
<a v-show="!isLogged" class="cl-secondary" href="#" @click.prevent="goToAccount">
{{ $t('My account') }}
</a>
</div>
<div class="mt15">
<router-link class="cl-secondary" :to="localizedRoute('/delivery')" exact>
Expand Down Expand Up @@ -158,6 +161,7 @@
</template>

<script>
import { mapGetters } from 'vuex'
import CurrentPage from 'theme/mixins/currentPage'
import LanguageSwitcher from '../../LanguageSwitcher.vue'
import Newsletter from 'theme/components/core/blocks/Footer/Newsletter'
Expand All @@ -167,7 +171,15 @@ import config from 'config'
export default {
mixins: [CurrentPage],
name: 'MainFooter',
methods: {
goToAccount () {
this.$bus.$emit('modal-toggle', 'modal-signup')
}
},
computed: {
...mapGetters({
isLogged: 'user/isLoggedIn'
}),
multistoreEnabled () {
return config.storeViews.multistore
},
Expand Down
1 change: 0 additions & 1 deletion src/themes/default/pages/MyAccount.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<div class="container">
<breadcrumbs
:with-homepage="true"
:routes="[{name: 'Homepage', route_link: '/'}]"
active-route="My Account"
/>
<h1>
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/pages/Static.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div>
<div class="bg-cl-secondary py35 pl20">
<div class="container">
<breadcrumbs :with-homepage="true" :routes="[{name: 'Homepage', route_link: '/'}]" :active-route="$props.title" />
<breadcrumbs :with-homepage="true" :active-route="$props.title" />
<h2 class="fs-big">
{{ $props.title }}
</h2>
Expand Down