@lancom/shared 0.0.223 → 0.0.225

package/assets/js/api/admin.js

@@ -4,8 +4,9 @@ import { sortSizes } from './../utils/sizes';
 import { sortByName } from './../utils/filters';
 
 export default {
-  updateInventoryFromLink(link) {
-    return _post('admin/products/inventory/link', { link });
+  updateInventoryFromLink(link, warehouse) {
+    const url = `admin/products/inventory/link${warehouse ? `?warehouse=${warehouse}` : ''}`;
+    return _post(url, { link });
   },
   fetchPostcodes() {
     return _get('admin/postcodes');
@@ -58,6 +59,12 @@ export default {
   getCanonicalProductProducts(id) {
     return _get(`admin/canonical-product/${id}/products`);
   },
+  getCanonicalProductLocations(id) {
+    return _get(`admin/canonical-product/${id}/locations`);
+  },
+  saveWarehouseCanonicalProduct(warehouseCanonicalProduct) {
+    return warehouseCanonicalProduct._id ? _put(`admin/warehouse-canonical-product/${warehouseCanonicalProduct._id}`, warehouseCanonicalProduct) : _post('admin/warehouse-canonical-product', warehouseCanonicalProduct);
+  },
   fetchShops(params) {
     return _get('admin/shops', params);
   },

package/assets/js/api/utils/product.js

@@ -58,8 +58,5 @@ export function unminifyProduct(product) {
     });
   }
 
-
-  
-
   return product;
 }

package/components/editor/editor.vue

@@ -115,7 +115,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop']),
+    ...mapGetters(['shop', 'country', 'currency']),
     ...mapGetters('product', [
       'layers',
       'product',
@@ -177,7 +177,7 @@ export default {
     },
     proceedToCard() {
       const entities = generateCartProducts(this.product, this.template.simpleProducts, this.template.layers, this.isPrintPricing, this.layerThumbnails);
-      this.addToCart({ entities, shop: this.shop, pricing: this.productPricing });
+      this.addToCart({ entities, shop: this.shop, pricing: this.productPricing, country: this.country, currency: this.currency });
       this.showCartModal(async () => {
         const message = 'Do you wish to continue with editing the current design or reset the editor?';
         const reset = await this.showConfirmationModal(message, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.223",
+  "version": "0.0.225",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {

package/store/cart.js

@@ -68,14 +68,19 @@ export const getters = {
 };
 
 export const actions = {
-  async addToCart({ state, commit }, { entities, shop, pricing }) {
+  async addToCart({ state, commit }, { entities, shop, pricing, country, currency }) {
     const addingEntities = [...entities];
     const isSamePrints = (e, e2) => {
       const samePrints = (e.prints || []).filter(p => (e2.prints || []).some(p2 => p2.guid === p.guid));
       return (e.prints || []).length === samePrints.length;
     };
+    const params = {
+      currency: currency?._id,
+      country: country?._id
+    };
+    const cartEntities = state.id ? (await api.fetchCartById(shop._id, state.id, params)).entities : state.entities;
     entities = entities.map(e => {
-      const entitiy = state.entities.find(e2 => isSamePrints(e, e2) && e2?.product?._id === e?.product?._id);
+      const entitiy = cartEntities.find(e2 => isSamePrints(e, e2) && e2?.product?._id === e?.product?._id);
       if (entitiy) {
         e.simpleProducts.forEach(sp => {
           const simpleProduct = entitiy.simpleProducts.find(sp2 => sp2.SKU === sp.SKU);
@@ -91,7 +96,7 @@ export const actions = {
     }).filter(e => !!e);
     const payload = {
       _id: state.id || undefined,
-      entities: [...state.entities, ...entities]
+      entities: [...cartEntities, ...entities]
     };
     const cart = await api.saveCart(payload, shop._id);
     if (cart) {
@@ -224,7 +229,6 @@ export const mutations = {
 };
 
 function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, selectedSuppliersWithRates) {
-  console.log('entities: ', entities);
   const getSimpleObj = i => i && ({ _id: i._id, name: i.name });
   return {
     entities: entities.map(({ _id, guid, prints, simpleProducts, product }) => ({
@@ -247,6 +251,8 @@ function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon
       prints: (prints || []).map(print => {
         const { setupCost, freeSetupOver, printCost } = getPrintTypeSizePricing(print.printType, print.printSize?._id, coupon) || {};
         return {
+          _id: print._id,
+          guid: print.guid,
           costType: print.printType.costType,
           setupCost,
           printCost,