@lancom/shared 0.0.227 → 0.0.228

package/assets/js/api/admin.js

@@ -480,6 +480,9 @@ export default {
   removeWarehouseAllocation(allocation) {
     return _delete(`admin/allocations/${allocation._id}`, allocation);
   },
+  removeWarehouseAllocations(allocations) {
+    return _delete(`admin/allocations`, { allocations });
+  },
   fetchWarehouseLocationById(id) {
     return _get(`admin/warehouse-locations/${id}`);
   },

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

@@ -24,14 +24,18 @@ export default {
       'suburb',
       'quantities',
       'notValidProductsQuantities',
+      'notValidStockQuantities',
       'notValidPrintsQuantities'
     ]),
     isNotValidQuantity() {
-      return this.isNotValidProductsQuantity || this.isNotValidPrintsQuantity || this.isNotValidPrintsBigSizeQuantity;
+      return this.isNotValidProductsQuantity || this.isNotValidStockQuantity || this.isNotValidPrintsQuantity || this.isNotValidPrintsBigSizeQuantity;
     },
     isNotValidProductsQuantity() {
       return this.notValidProductsQuantities.length > 0;
     },
+    isNotValidStockQuantity() {
+      return this.notValidStockQuantities.length > 0;
+    },
     isNotValidPrintsQuantity() {
       return this.notValidPrintsQuantities.length > 0;
     },

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart-entity-color-simple-products.mixin.js

@@ -55,6 +55,9 @@ export default {
       return this.simpleProductsWithAmount.reduce((amount, entity) => {
         return amount + entity.amount;
       }, 0);
+    },
+    simpleProductWithInvalidStock() {
+      return this.simpleProductsWithAmount.filter(({ amount, quantityStock }) => amount > quantityStock)
     }
   },
   methods: {

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart-entity-color-simple-products.scss

@@ -71,6 +71,11 @@
       margin-right: 26px;
     }
   }
+  &__error {
+    margin-bottom: 5px;
+    color: $error;
+    font-size: 12px;
+  }
   &__totals {
     width: 200px;
     display: flex;

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart-entity-color-simple-products.vue

@@ -49,6 +49,14 @@
             :display-unit-price="displayUnitPrice"
             @change="onChangeQty" />
         </div>
+        <div v-if="simpleProductWithInvalidStock.length > 0">
+          <div
+            v-for="simpleProduct in simpleProductWithInvalidStock"
+            :key="simpleProduct._id"
+            class="CartEntityColorSimpleProducts__error">
+            Error size {{ simpleProduct.size.shortName }}, qty available: {{ simpleProduct.quantityStock }}
+          </div>
+        </div>
         <div class="CartEntityColorSimpleProducts__totals">
           <div class="CartEntityColorSimpleProducts__total">
             <div class="lc_title-small">

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart_entity_color_simple_product/cart-entity-color-simple-product.scss

@@ -47,6 +47,9 @@
     &.empty {
       color: #272727;
     }
+    &.error {
+      color: #ff5a5a;
+    }
   }
   &__price {
     width: 32px;

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart_entity_color_simple_product/cart-entity-color-simple-product.vue

@@ -16,7 +16,10 @@
         type="number"
         min="0"
         class="form-field centered CartColorSimpleProduct__field"
-        :class="{ empty: !model }"
+        :class="{
+          empty: !model,
+          error: model > simpleProduct.quantityStock
+        }"
         @change="onChange()"
         @focus="onFocus()"
         @blur="onBlur()" />

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

@@ -5,6 +5,11 @@
       :key="product._id">
       Minimum <b>{{ product.name }}</b> order quantity: {{ product.minimumOrderQuantity }}
     </li>
+    <li
+      v-for="product in notValidStockQuantities"
+      :key="product._id">
+      Available <b>{{ product.name }}</b> quantity: {{ product.maxQuantity }}
+    </li>
     <li
       v-for="print in notValidPrintsQuantities"
       :key="print._id">
@@ -26,6 +31,7 @@ export default {
   computed: {
     ...mapGetters('cart', [
       'notValidProductsQuantities',
+      'notValidStockQuantities',
       'notValidPrintsQuantities'
     ])
   }

package/components/checkout/order/address-form/address-form.vue

@@ -282,7 +282,7 @@ export default {
   },
   methods: {
     validateAddress() {
-      this.$refs.addressProvider.validate();
+      // this.$refs.addressProvider.validate();
     },
     ...mapMutations('cart', [
       'setSuburb'

package/components/common/payment/payment_card/payment-card.vue

@@ -28,8 +28,7 @@ export default {
   computed: {
     ...mapGetters(['payment']),
     cardComponent() {
-      console.log('payment: ', this.payment);
-      return 'stripe';
+      return this.payment?.type || 'stripe';
     }
   },
   methods: {

package/components/product/gallery/gallery.scss

@@ -74,6 +74,7 @@
   }
   &__big-image,
   &__small-image {
+    text-align: center;
     width: 100%;
     position: relative;
     background-repeat: no-repeat;
@@ -89,6 +90,7 @@
   }
   &__small-image {
     height: 75px;
+    max-width: 140px;
     padding: 5px 0;
     text-align: center;
     &-src {

package/components/product/gallery/gallery.vue

@@ -5,6 +5,8 @@
         <img
           :src="staticLink(currentImage.large)"
           :alt="product.name"
+          width="400"
+          height="400"
           class="Gallery__big-image-src" />
         <div
           v-if="currentImage.print"
@@ -47,18 +49,22 @@
         <img
           :src="staticLink(image.small)"
           :alt="product.name"
+          width="65"
+          height="65"
           class="Gallery__small-image-src" />
         <div class="Gallery__small-printed">
           {{ image.printType ? 'Printed' : (product.prePrint ? product.prePrintText : image.colorName || 'Blank') }}
         </div>
       </div>
       <button
+        v-if="hasThumbsArrows"
         type="button"
         class="slick-arrow slick-prev slick-disabled"
         @click="goToPrevPage()">
         Previous
       </button>
       <button
+        v-if="hasThumbsArrows"
         type="button"
         class="slick-arrow slick-next"
         @click="goToNextPage()">
@@ -141,6 +147,9 @@ export default {
     visibleImages() {
       return this.filteredImages.slice(this.visibleImagesFrom, this.visibleImagesFrom + this.slidesPerRow);
     },
+    hasThumbsArrows() {
+      return this.filteredImages.length > this.slidesPerRow;
+    },
     filteredImages() {
       const images = this.filterType ? this.images.filter(i => this.isValidImageByFilter(this.filterType, i)) : this.images;
       return images.map(image => {

package/package.json

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

package/store/cart.js

@@ -31,6 +31,19 @@ const getProductsQuantities = entities => {
   return quantities;
 };
 
+const getInvalidStockQuantities = entities => {
+  const quantities = entities.reduce((items, entity) => {
+    const { product: { name }, simpleProducts } = entity;
+    return [
+      ...items,
+      ...simpleProducts
+        .filter(({ amount }) => amount > 0)
+        .map(({ _id, amount, quantityStock, size }) => ({ _id, name: `${name}, ${size.shortName}`, quantity: amount, maxQuantity: quantityStock }))
+    ];
+  }, []);
+  return quantities;
+};
+
 const getPrintsQuantities = entities => {
   const printTypes = entities.reduce((types, e) => [...types, ...e.prints.map(({ printType }) => ({ ...printType, guid: `${e.guid}-${printType._id}` }))], []);
   const grouped = groupBy(printTypes, 'guid');
@@ -56,11 +69,15 @@ export const getters = {
   isEmpty: (state, { entities }) => (entities || []).length === 0,
   quantities: ({ entities }) => ({
     products: getProductsQuantities(entities),
-    prints: getPrintsQuantities(entities)
+    prints: getPrintsQuantities(entities),
+    stock: getInvalidStockQuantities(entities)
   }),
   notValidProductsQuantities(state, { quantities }) {
     return (quantities?.products || []).filter(({ minimumOrderQuantity, quantity }) => quantity < minimumOrderQuantity);
   },
+  notValidStockQuantities(state, { quantities }) {
+    return (quantities?.stock || []).filter(({ maxQuantity, quantity }) => quantity > maxQuantity);
+  },
   notValidPrintsQuantities(state, { quantities }) {
     return (quantities?.prints || []).filter(({ minQuantity, quantity }) => quantity < minQuantity);
   },

package/store/product.js

@@ -324,6 +324,9 @@ export const mutations = {
   clearTemplateLayers(state) {
     state.template.layers = [];
   },
+  setTemplateLayers(layers) {
+    state.template.layers = layers;
+  },
   /*
   ** MANAGE LAYERS
   */

package/store/quote.js

@@ -16,6 +16,18 @@ export const getters = {
   selectedOption: ({ selectedOption }) => selectedOption,
   proceedOption: ({ option, selectedOption }) => option || selectedOption,
   hasProceedOption: (state, { proceedOption }) => !!proceedOption,
+  proceedOptionNotValidStock: (state, { proceedOption }) => {
+    if (!proceedOption) {
+      return false;
+    }
+    const simpleProducts = proceedOption.products.reduce((simpleProducts, product) => {
+      return [
+        ...simpleProducts,
+        ...(product.isCustom ? [] : product.simpleProducts.filter(({ amount }) => amount > 0))
+      ];
+    }, []);
+    return simpleProducts.some(sp => sp.amount > sp.quantityStock);
+  },
   options: ({ option, quote }) => (option ? quote.options.filter(o => o._id === option) : quote.options) || [],
   quoteId: ({ quote }) => `${quote.code}`.replace('QUOTE', ''),
   shopContacts: ({ quote }) => quote.shop.settings?.contacts || {},