@lancom/shared 0.0.432 → 0.0.434

package/store/cart.js

@@ -14,6 +14,7 @@ export const state = () => ({
   suburb: null,
   coupon: null,
   cartPricingCalculating: false,
+  cartSaving: false,
   cartPricing: null,
   cartPricingError: null
 });
@@ -106,6 +107,7 @@ export const getters = {
   needToPickup: ({ needToPickup }) => needToPickup,
   needToPickupWithoutErrors: (state, { notValidProductsPickup }) => state.needToPickup && notValidProductsPickup?.length === 0,
   cartPricingCalculating: ({ cartPricingCalculating }) => cartPricingCalculating,
+  cartSaving: ({ cartSaving }) => cartSaving,
   simpleProducts: ({ entities }) => entities.reduce((simpleProducts, entity) => [...simpleProducts, ...(entity.simpleProducts || [])], []),
   notEmptySimpleProducts: (state, { simpleProducts }) => simpleProducts.filter(e => e.amount > 0),
   simpleProductsQuantity: (state, { notEmptySimpleProducts }) => notEmptySimpleProducts.reduce((quantity, sp) => quantity + sp.amount, 0),
@@ -175,6 +177,7 @@ export const actions = {
       }
       return e;
     }).filter(e => !!e);
+    commit('setCartSaving', true);
     const payload = {
       _id: state.id || undefined,
       currency: currency?._id,
@@ -182,6 +185,7 @@ export const actions = {
       entities: [...cartEntities, ...entities]
     };
     const cart = await api.saveCart(payload, shop._id);
+    commit('setCartSaving', false);
     if (cart) {
       commit('setId', cart._id);
       commit('setEntities', cart.entities);
@@ -196,13 +200,17 @@ export const actions = {
       ...entity,
       simpleProducts: entity.simpleProducts.filter(sp => !removeGuids.includes(sp.guid))
     })).filter(({ simpleProducts }) => simpleProducts.length > 0);
+    commit('setEntities', entities);
+
+    commit('setCartSaving', true);
     const payload = {
       _id: state.id,
       entities,
       currency: currency?._id
     };
     await api.saveCart(payload, shop._id);
-    commit('setEntities', entities);
+    commit('setCartSaving', false);
+
     if (state.cartPricing) {
       gtm.removeFromCart(simpleProducts, state.cartPricing, currency);
     }
@@ -214,9 +222,12 @@ export const actions = {
       const simpleProducts = entities.reduce((items, entity) => [...items, ...entity.simpleProducts], []);
       gtm.removeFromCart(simpleProducts, state.cartPricing, currency);
     }
+    commit('setEntities', entities);
+
+    commit('setCartSaving', true);
     const payload = { _id: state.id, entities, currency: currency?._id};
     await api.saveCart(payload, shop._id);
-    commit('setEntities', entities);
+    commit('setCartSaving', false);
   },
   async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing }, getters: { needToPickup }, commit }, { shop, country, currency }) {
     let savedSuppliersWithRates = null;
@@ -247,9 +258,12 @@ export const actions = {
         amount: sp.guid === guid ? +amount : sp.amount
       }))
     }));
+    commit('setEntities', entities);
+
+    commit('setCartSaving', true);
     const payload = { _id: state.id, entities, currency: currency?._id };
     await api.saveCart(payload, shop._id);
-    commit('setEntities', entities);
+    commit('setCartSaving', false);
   },
   clearCart({ commit }) {
     commit('clearCart');
@@ -303,6 +317,9 @@ export const mutations = {
   setId(state, id) {
     state.id = id;
   },
+  setCartSaving(state, cartSaving) {
+    state.cartSaving = cartSaving;
+  },
   setNeedToPickup(state, needToPickup) {
     state.needToPickup = needToPickup;
   },

package/store/index.js

@@ -108,7 +108,7 @@ export const actions = {
     }
   },
   async loadState({ dispatch, commit, state: { shop, currency, country, notificationBar } }, query) {
-    const state = await loadState();
+    const state = await loadState(query);
     if (state) {
       commit('setState', state);
       if (state.cart?.id) {

package/store/product.js

@@ -170,8 +170,8 @@ export const getters = {
   printsPrice: ({ productPricing, product }) => {
     const maxPrintsPrice = +product.maxPrintsPrice || 0;
     const pricing = (productPricing?.products || {})[product._id];
-    const price = pricing?.prints?.prints?.reduce((sum, print) => sum + (+print.priceWithoutTax || 0), 0) || maxPrintsPrice;
-    return price;
+    const pricePrintsPrice = pricing?.prints?.prints?.reduce((sum, print) => sum + (+print.priceWithoutTax || 0), 0);
+    return pricePrintsPrice >= 0 ? pricePrintsPrice : maxPrintsPrice;
   },
   offsetWarningVisible: ({ offsetWarningVisible }) => offsetWarningVisible,
   showRecommendationToUseLargerImage: ({ selectedLayer }) => {