@lancom/shared 0.0.161 → 0.0.163

package/assets/js/api/admin.js

@@ -106,6 +106,9 @@ export default {
   markSubOrderAsDispatched(order, subOrder) {
     return _post(`admin/shop/${order.shop}/order/${order._id}/sub-order/${subOrder._id}/dispatched`, subOrder);
   },
+  sendShipmentTracking(order, shipment, tracking) {
+    return _post(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/tracking/${tracking._id}/send`, tracking);
+  },
   removeShipmentFromStarshipit(order, shipment) {
     return _delete(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}`);
   },

package/assets/js/utils/product.js

@@ -67,6 +67,10 @@ export function getProductSides({ layers = [] }) {
   return [...sidesSet];
 }
 
+export function filterBigSize(simpleProducts) {
+  return (simpleProducts || []).filter(sp => ['5XL', '6XL', '7XL'].includes(sp.size?.shortName));
+}
+
 // function getPrintZoneLayer(layer, { width: editorWidth, height: editorHeight }, product) {
 //   const printAreaRect = getPrintAreaByName({ printArea: layer.printArea, editorWidth, editorHeight }, product);
 //   return {

package/components/checkout/cart/cart.mixin.js

@@ -17,6 +17,8 @@ export default {
     ...mapGetters('cart', [
       'entities',
       'simpleProducts',
+      'simpleProductsQuantity',
+      'bigSizeSimpleProductsQuantity',
       'coupon',
       'suburb',
       'quantities',
@@ -24,13 +26,16 @@ export default {
       'notValidPrintsQuantities'
     ]),
     isNotValidQuantity() {
-      return this.isNotValidProductsQuantity || this.isNotValidPrintsQuantity;
+      return this.isNotValidProductsQuantity || this.isNotValidPrintsQuantity || this.isNotValidPrintsBigSizeQuantity;
     },
     isNotValidProductsQuantity() {
       return this.notValidProductsQuantities.length > 0;
     },
     isNotValidPrintsQuantity() {
       return this.notValidPrintsQuantities.length > 0;
+    },
+    isNotValidPrintsBigSizeQuantity() {
+      return this.simpleProductsQuantity ? ((this.bigSizeSimpleProductsQuantity / this.simpleProductsQuantity * 100) > 50) : false;
     }
   },
   watch: {

package/components/checkout/cart/cart_quantity_errors/cart-quantity-errors.vue

@@ -10,14 +10,19 @@
       :key="print._id">
       Minimum products quantity with <b>{{ print.name }}</b> print type: {{ print.minQuantity }}
     </li>
+    <li v-if="isNotValidPrintsBigSizeQuantity">
+      Minimum order of 5XL-7XL should be 50%
+    </li>
   </ul>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
+import CartMixin from '@lancom/shared/components/checkout/cart/cart.mixin';
 
 export default {
   name: 'CartQuantityErrors',
+  mixins: [CartMixin],
   computed: {
     ...mapGetters('cart', [
       'notValidProductsQuantities',

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

@@ -1,4 +1,4 @@
-import { mapGetters, mapActions } from 'vuex';
+import { mapGetters, mapActions, mapMutations } from 'vuex';
 import api from '@lancom/shared/assets/js/api';
 import { price, shortDate, tax } from '@lancom/shared/assets/js/utils/filters';
 import { convertQuoteToOrder } from '@lancom/shared/assets/js/utils/quote';
@@ -26,6 +26,7 @@ export default {
   },
   methods: {
     ...mapActions('quote', ['selectOption', 'clear']),
+    ...mapMutations('quote', ['setOrder']),
     optionGst(option) {
       return tax(option.total, this.gstTax) - option.total;
     },
@@ -33,6 +34,7 @@ export default {
       try {
         this.processing = true;
         this.order = await this.createOrder(option);
+        this.setOrder(this.order);
         this.clear();
       } catch (e) {
         const { message } = (e.response && e.response.data) || e;

package/mixins/payment.js

@@ -63,7 +63,7 @@ export default {
       }
     },
     sendConversionData() {
-      gtm.push({
+      const event = {
         event: 'purchase',
         transaction_id: this.orderData.code,
         value: this.orderData.total,
@@ -86,7 +86,8 @@ export default {
               }))
           ];
         }, [])
-      });
+      };
+      gtm.push(event);
     },
     clearFailedCharge() {
       this.errorMessage = null;

package/nuxt.config.js

@@ -77,6 +77,7 @@ module.exports = (config, axios, { raygunClient } = {}) => ({
   },
   build: {
     publicPath: '/client/',
+    postcss: null,
     transpile: [
       'vee-validate/dist/rules',
       'vue-json-editor',

package/package.json

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

package/store/cart.js

@@ -2,6 +2,7 @@ import groupBy from 'lodash/groupBy';
 import api from '@lancom/shared/assets/js/api';
 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';
 
 export const state = () => ({
   id: null,
@@ -46,6 +47,7 @@ export const getters = {
   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),
+  bigSizeSimpleProductsQuantity: (state, { notEmptySimpleProducts }) => filterBigSize(notEmptySimpleProducts).reduce((quantity, sp) => quantity + sp.amount, 0),
   suburb: ({ suburb }) => suburb,
   cartPricing: ({ cartPricing }) => cartPricing,
   cartProductsPricing: ({ cartPricing }) => (cartPricing && cartPricing.products) || {},

package/store/product.js

@@ -6,6 +6,7 @@ import { getPrintAreaByName, getProductPrintsAreasPrices } from '@lancom/shared/
 import { sortSizes } from '@lancom/shared/assets/js/utils/sizes';
 import { isValidImageTypes, getColorOfDefaultCatalogFrontImage } from '@lancom/shared/assets/js/utils/colors';
 import { getProductsForCalculatePricing } from '@lancom/shared/assets/js/utils/product';
+import { filterBigSize } from '@lancom/shared/assets/js/utils/product';
 import { sortByName } from '../assets/js/utils/filters';
 
 export const state = () => ({
@@ -65,6 +66,7 @@ export const getters = {
   simpleProducts: ({ template }) => template.simpleProducts || [],
   usedSimpleProducts: ({ template }) => (template.simpleProducts || []).filter(p => p.amount > 0),
   usedSimpleProductsQuantity: ({ template }) => (template.simpleProducts || []).filter(p => p.amount > 0).reduce((sum, { amount }) => sum + amount, 0),
+  usedBigSizeSimpleProductsQuantity: (state, { usedSimpleProducts }) => filterBigSize(usedSimpleProducts).reduce((sum, { amount }) => sum + amount, 0),
   defaultSimpleProduct: ({ productDetails, editableColor }) => {
     return editableColor && productDetails.simpleProducts.find(({ color, size }) => color._id === editableColor._id && size.alias === 'small');
   },

package/store/quote.js

@@ -65,6 +65,9 @@ export const mutations = {
   setQuote(state, quote) {
     state.quote = quote;
   },
+  setOrder(state, order) {
+    state.quote.order = order;
+  },
   setOption(state, option) {
     state.option = option;
   },