@lancom/shared 0.0.382 → 0.0.384

package/pages/customer/orders.vue

@@ -0,0 +1,39 @@
+<template>
+  <div
+    :data-aos="aosFadeRight"
+    class="CustomerOrdersPage__wrapper">
+    <customer-navigation-menu active-menu-item="orders" />
+    <customer-orders :customer="user" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import metaInfo from '@lancom/shared/mixins/meta-info';
+
+export default {
+  name: 'CustomerOrdersPage',
+  components: {
+    CustomerOrders: () => import('@lancom/shared/components/customer/customer_orders/customer-orders'),
+    CustomerNavigationMenu: () => import('@lancom/shared/components/customer/customer_navigation_menu/customer-navigation-menu')
+  },
+  mixins: [metaInfo],
+  computed: {
+    ...mapGetters('auth', ['user'])
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+  @import "@/assets/scss/variables";
+
+  .CustomerOrdersPage {
+    &__wrapper {
+      margin: 50px auto;
+      width: 1100px;
+      @media (max-width: $bp-extra-small-max) {
+        width: auto;
+      }
+    }
+  }
+</style>

package/pages/customer/settings.vue

@@ -2,6 +2,7 @@
   <div
     :data-aos="aosFadeRight"
     class="CustomerSettingsPage__wrapper">
+    <customer-navigation-menu active-menu-item="settings" />
     <customer-settings />
   </div>
 </template>
@@ -12,6 +13,7 @@ import metaInfo from '@lancom/shared/mixins/meta-info';
 export default {
   name: 'CustomerCreatePage',
   components: {
+    CustomerNavigationMenu: () => import('@lancom/shared/components/customer/customer_navigation_menu/customer-navigation-menu'),
     CustomerSettings: () => import('@lancom/shared/components/pages/customer/settings/settings')
   },
   mixins: [metaInfo]
@@ -23,8 +25,8 @@ export default {
 
   .CustomerSettingsPage {
     &__wrapper {
-      margin: 100px auto;
-      width: 500px;
+      margin: 50px auto;
+      width: 1100px;
       @media (max-width: $bp-extra-small-max) {
         width: auto;
       }

package/routes/index.js

@@ -112,8 +112,13 @@ module.exports = function(routes, resolve) {
   }, {
     name: 'customer-orders',
     path: '/customer/orders',
-    component: resolve('@lancom/shared/pages/customer/orders/index.vue'),
+    component: resolve('@lancom/shared/pages/customer/orders.vue'),
     chunkName: 'pages/customer/orders'
+  }, {
+    name: 'customer-coupons',
+    path: '/customer/coupons',
+    component: resolve('@lancom/shared/pages/customer/coupons.vue'),
+    chunkName: 'pages/customer/coupons'
   }, {
     name: 'customer-recovery',
     path: '/customer/recovery',

package/store/cart.js

@@ -4,7 +4,7 @@ import gtm from '@lancom/shared/assets/js/utils/gtm';
 import { getPrintTypeSizePricing } from '@lancom/shared/assets/js/utils/prints';
 import { filterBigSize } from '@lancom/shared/assets/js/utils/product';
 
-const SUPPLIERS_WITH_RATES_KEY = 'suppliers-with-wates';
+const SUPPLIERS_WITH_RATES_KEY = 'suppliers-with-rates';
 
 export const state = () => ({
   id: null,
@@ -76,6 +76,7 @@ export const getters = {
   entities: ({ entities }) => entities,
   coupon: ({ coupon }) => coupon,
   needToPickup: ({ needToPickup }) => needToPickup,
+  needToPickupWithoutErrors: (state, { notValidProductsPickup }) => state.needToPickup && notValidProductsPickup?.length === 0,
   cartPricingCalculating: ({ cartPricingCalculating }) => cartPricingCalculating,
   simpleProducts: ({ entities }) => entities.reduce((simpleProducts, entity) => [...simpleProducts, ...(entity.simpleProducts || [])], []),
   notEmptySimpleProducts: (state, { simpleProducts }) => simpleProducts.filter(e => e.amount > 0),
@@ -189,7 +190,7 @@ export const actions = {
     await api.saveCart(payload, shop._id);
     commit('setEntities', entities);
   },
-  async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing, needToPickup }, commit }, { shop, country, currency }) {
+  async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing }, getters: { needToPickupWithoutErrors }, commit }, { shop, country, currency }) {
     let savedSuppliersWithRates = null;
     try {
       savedSuppliersWithRates = JSON.parse(localStorage.getItem(SUPPLIERS_WITH_RATES_KEY));
@@ -199,7 +200,7 @@ export const actions = {
     console.log('calculateCartPrice:payload: ', payload)
     try {
       commit('setCartPricingCalculating', true);
-      const response = await api.calculateProductPrice({ ...payload, needToPickup }, shop._id);
+      const response = await api.calculateProductPrice({ ...payload, needToPickup: needToPickupWithoutErrors }, shop._id);
       commit('setCartPricing', response);
       commit('setCartPricingError', null);
     } catch (e) {

package/pages/customer/orders/index.vue

@@ -1,29 +0,0 @@
-<template>
-  <div class="CustomerCreate__wrapper">
-    <div class="lc_h2">Customer Orders</div>
-    <customer-orders class="mt-10" :customer="user" />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import CustomerOrders from '@lancom/shared/components/customer/customer_orders/customer-orders';
-
-export default {
-  name: 'CustomerOrdersPage',
-  components: {
-    CustomerOrders
-  },
-  computed: {
-    ...mapGetters('auth', ['user'])
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.CustomerCreate {
-  &__wrapper {
-    padding-top: 30px;
-  }
-}
-</style>