@lancom/shared 0.0.120 → 0.0.123

package/assets/js/api/admin.js

@@ -28,6 +28,9 @@ export default {
   removeShop(id) {
     return _delete(`admin/shops/${id}`);
   },
+  fetchOrders(params) {
+    return _get(`admin/orders`, params);
+  },
   fetchOrderById(id, params) {
     return _get(`admin/order/${id}`, params);
   },
@@ -73,8 +76,8 @@ export default {
   createOrderWoTask(orderId, task) {
     return _post(`admin/order/${orderId}/wo-tasks`, task);
   },
-  fetchPages() {
-    return _get('admin/pages');
+  fetchPages(params) {
+    return _get('admin/pages', params);
   },
   fetchPageById(id) {
     return _get(`admin/pages/${id}`);
@@ -181,6 +184,18 @@ export default {
   removeProductType(id) {
     return _delete(`admin/product-types/${id}`);
   },
+  fetchSubscribes() {
+    return _get('admin/subscribe');
+  },
+  fetchSubscribeById(id) {
+    return _get(`admin/subscribe/${id}`);
+  },
+  saveSubscribe(subscribe) {
+    return subscribe._id ? _put(`admin/subscribe/${subscribe._id}`, subscribe) : _post('admin/subscribe', subscribe);
+  },
+  removeSubscribe(id) {
+    return _delete(`admin/subscribe/${id}`);
+  },
   fetchCoupons() {
     return _get('admin/coupons');
   },
@@ -205,8 +220,8 @@ export default {
   removeReview(id) {
     return _delete(`admin/reviews/${id}`);
   },
-  fetchQuotes() {
-    return _get('admin/quotes');
+  fetchQuotes(params) {
+    return _get('admin/quotes', params);
   },
   generateQuotePDF(id, option) {
     return _get(`admin/quotes/${id}/option/${option}/pdf`);

package/assets/js/api/index.js

@@ -57,8 +57,8 @@ const api = {
   fetchBanners(shop, params) {
     return _get(`shop/${shop}/banners`, params);
   },
-  fetchNews(shop) {
-    return _get(`shop/${shop}/news`);
+  fetchNews(shop, params) {
+    return _get(`shop/${shop}/news`, params);
   },
   fetchSingleNews(shop, alias, preview = false) {
     return _get(`shop/${shop}/news/${alias}?preview=${preview}`);

package/assets/js/utils/quote.js

@@ -3,7 +3,11 @@ export function convertQuoteToOrder(quote, option) {
     paymentMethod: option.paymentMethod || 'deposit',
     billingAddress: quote.address,
     shippingAddress: quote.address,
-    products: option.products,
+    products: option.products.map(p => ({
+      ...p,
+      prints: p.prints.filter(print => !(option.prints || []).some(({ _id }) => print._id === _id))
+    })),
+    prints: option.prints,
     total: option.total,
     totalGST: option.totalGST,
     productsTotal: option.productsTotal,

package/nuxt.config.js

@@ -102,9 +102,12 @@ module.exports = (config, axios) => ({
               const title = product.feedTitle 
                 ? product.feedTitle.replace('{colour}', sp.color.name).replace('{size}', sp.size.name).replace('{brand}', product.brand.name)
                 : `${product.name} ${sp.color.name}`;
+              const description = `${product.description || product.fabricInfoShort || product.name || ''}`
+                .replace(/ /g, ' ')
+                .replace(/·/, '·');
               const info = {
                 title: { _text: title },
-                description: { _text: product.description || product.fabricInfoShort || product.name },
+                description: { _text: description },
                 link: { _text: `https://${config.HOST_NAME}/${product.brand.alias}/${product.productType.alias}/${product.alias}?color=${sp.color.alias}` },
                 'g:id': { _text: sp.SKU },
                 'g:item_group_id': { _text: product.SKU },

package/package.json

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

package/store/order.js

@@ -20,7 +20,7 @@ export const actions = {
       order.totalGST = pricing.totalPrice;
       order.total = pricing.totalPriceWithoutTax;
       order.couponTotal = pricing.coupon?.totalPrice || 0;
-      order.couponCode = pricing.coupon?.code || 0;
+      order.couponCode = pricing.coupon?.code || null;
       order.productsTotal = pricing.products?.products?.totalPriceWithoutTax || 0;
       order.printsTotal = pricing.products?.prints?.totalPriceWithoutTax || 0;
       order.shippingTotal = pricing.shipping?.totalPriceWithoutTax || 0;

package/store/product.js

@@ -231,8 +231,12 @@ export const mutations = {
   },
   setProductDetails(state, simpleProducts) {
     const { preSetPrint } = state;
+    console.log('');
+    console.log('setProductDetails: ');
+    console.log('simpleProducts1: ', simpleProducts);
     simpleProducts = simpleProducts.filter(sp => !preSetPrint || (preSetPrint.colors || []).includes(sp.color._id) )
     state.productDetails = { simpleProducts };
+    console.log('simpleProducts2: ', simpleProducts);
     const availableSizes = [];
     const sizesPerColor = simpleProducts.reduce((map, { color, size }) => {
       if (!map[color.alias]) {
@@ -278,7 +282,7 @@ export const mutations = {
     const colorId = whiteColorId || state.template.colors[0];
     state.template = {
       layers: keepLayers ? state.template.layers : [],
-      colors: [colorId],
+      colors: colorId ? [colorId] : [],
       simpleProducts: getSimpleProductsByColor(state, colorId)
     };
     state.editableColor = state.availableColors.find(color => color._id === colorId);

package/store/quote.js

@@ -38,7 +38,8 @@ export const actions = {
     const playload = {
       populatePrints: true,
       populateShop: true,
-      populateColors: true
+      populateColors: true,
+      mergePrints: true
     };
     const quote = await api.fetchQuoteById(id, playload);
     commit('setQuote', quote);