@lancom/shared 0.0.202 → 0.0.204

package/assets/js/api/admin.js

@@ -58,8 +58,8 @@ export default {
   getCanonicalProductProducts(id) {
     return _get(`admin/canonical-product/${id}/products`);
   },
-  fetchShops() {
-    return _get('admin/shops');
+  fetchShops(params) {
+    return _get('admin/shops', params);
   },
   fetchShopById(id) {
     return _get(`admin/shops/${id}`);
@@ -389,9 +389,6 @@ export default {
   async fetchCurrencies(params) {
     return sortByName(await _get('admin/currencies', params));
   },
-  async fetchCountries(params) {
-    return sortByName(await _get('admin/countries', params));
-  },
   fetchCountryById(id) {
     return _get(`admin/countries/${id}`);
   },

package/assets/js/utils/filters.js

@@ -98,7 +98,7 @@ export const staticLink = link => {
     }
     return link;
   } else {
-    return `${STATIC_URL}${link}`;
+    return `${STATIC_URL || ''}${link}`;
   };
 }
 

package/components/checkout/order/order-payment-information/order-payment-information.vue

@@ -103,6 +103,7 @@ export default {
     };
   },
   computed: {
+    ...mapGetters(['country', 'currency']),
     ...mapGetters(['orderSettings']),
     ...mapGetters('order', ['card']),
     ...mapGetters('cart', ['entities', 'notEmptySimpleProducts', 'cartPricing'])
@@ -158,7 +159,9 @@ export default {
             ...this.order,
             products: this.entities,
             pricing: this.cartPricing,
-            shop: this.shop._id
+            shop: this.shop._id,
+            currency: this.currency?._id,
+            country: this.country?._id
           });
         } else {
           const data = {

package/components/checkout/order/order-review/order-review.vue

@@ -74,6 +74,7 @@ export default {
     };
   },
   computed: {
+    ...mapGetters(['country','currency']),
     ...mapGetters('cart', ['entities', 'notEmptySimpleProducts', 'cartPricing']),
     isPaymentOrder() {
       return this.order.paymentMethod === ORDER_PAYMENT_METHOD.CARD;
@@ -95,7 +96,9 @@ export default {
             ...this.order,
             products: this.entities,
             pricing: this.cartPricing,
-            shop: this.shop._id
+            shop: this.shop._id,
+            currency: this.currency?._id,
+            country: this.country?._id
           });
         } else {
           const data = {

package/components/editor/editor_print_area_options/editor_print_area_option/editor-print-area-option.vue

@@ -4,8 +4,8 @@
       class="EditorPrintAreaOption__content"
       :class="{ selected }"
       @click="handleClick"
-      @mouseover="!(option.suboptions && option.suboptions.length) && $emit('option-mouseover', option)"
-      @mouseleave="!(option.suboptions && option.suboptions.length) && $emit('option-mouseleave', option)">
+      @mouseover="$emit('option-mouseover', option)"
+      @mouseleave="$emit('option-mouseleave', option)">
       <div class="lc_caption">
         {{ option.label }}
       </div>

package/components/editor/editor_workspace/editor-workspace.vue

@@ -91,7 +91,7 @@
       <editor-print-area-options
         v-if="productDetailsLoaded"
         :product="product"
-        :selected="selectedPrintArea"
+        :selected="selectedPrintArea._id"
         :side="editableSide.id"
         @select="selectPrintArea"
         @option-mouseover="toogleBoundBox(true, $event)"

package/components/editor/editor_workspace/editor_workspace_side/editor-workspace-side.vue

@@ -89,7 +89,7 @@ export default {
       type: Object
     },
     printAreaSize: {
-      type: String,
+      type: Object,
       required: true
     },
     zoomSize: {
@@ -150,7 +150,7 @@ export default {
       );
     },
     printAreaIsSmall() {
-      return this.printAreaSize === 'rect10';
+      return this.printAreaSize.alias === 'rect10';
     },
     backgroundColor() {
       return this.backgroundImageLoaded && this.editableColor?.rgb;

package/components/quotes/quote_view/quote-view.mixin.js

@@ -23,7 +23,7 @@ export default {
   },
   computed: {
     ...mapGetters('quote', ['quote', 'option', 'proceedOption', 'selectedOption', 'depositInfo', 'shopContacts', 'quoteAddress', 'quoteId', 'options', 'gstTax']),
-    ...mapGetters(['shop'])
+    ...mapGetters(['shop', 'country', 'currency'])
   },
   methods: {
     ...mapActions('quote', ['selectOption', 'clear']),
@@ -48,6 +48,8 @@ export default {
     createOrder(option) {
       const orderData = {
         shop: this.shop._id,
+        country: this.country?._id,
+        currency: this.currency?._id,
         ...convertQuoteToOrder(this.quote, option)
       };
       return api.createOrder(orderData, this.shop._id);

package/nuxt.config.js

@@ -81,7 +81,8 @@ module.exports = (config, axios, { raygunClient } = {}) => ({
     PROD_CDN_URL: process.env.PROD_CDN_URL,
     DEV_CDN_URL: process.env.DEV_CDN_URL,
     PROD_S3_BUCKET: process.env.PROD_S3_BUCKET,
-    DEV_S3_BUCKET: process.env.DEV_S3_BUCKET
+    DEV_S3_BUCKET: process.env.DEV_S3_BUCKET,
+    STATIC_URL: process.env.STATIC_URL
   },
   build: {
     publicPath: '/client/',

package/package.json

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

package/store/index.js

@@ -45,14 +45,14 @@ export const actions = {
     commit('setMenus', menus);
     commit('setShop', shop);
     commit('setSettings', shop.settings);
-    if (req.headers.cookie) {
-      const { country, currency } = cookieparser.parse(req.headers.cookie);
-      const headers = (req && req.headers) ? Object.assign({}, req.headers) : {};
-      const params = { country, currency, ip: headers['x-real-ip'] || req.ip };
-      const settings = await api.fetchClientSettings(shop._id, params);
-      commit('setCountry', settings.country);
-      commit('setCurrency', settings.currency);
-    }
+    // if (req.headers.cookie) {
+    const { country, currency } = (req.headers.cookie && cookieparser.parse(req.headers.cookie)) || {};
+    const headers = (req && req.headers) ? Object.assign({}, req.headers) : {};
+    const params = { country, currency, ip: headers['x-real-ip'] || req.ip };
+    const settings = await api.fetchClientSettings(shop._id, params);
+    commit('setCountry', settings.country);
+    commit('setCurrency', settings.currency);
+    // }
     try {
       if (req.headers.cookie) {
         const { auth } = cookieparser.parse(req.headers.cookie);