@lancom/shared 0.0.304 → 0.0.306

package/assets/js/api/index.js

@@ -95,9 +95,9 @@ const api = {
   fetchOrderByToken(token, params) {
     return _get(`order/token/${token}`, params);
   },
-  getPaymentIntent(shop, { amount, currency, payment }) {
+  getPaymentIntent(shop, { amount, currency, payment, description }) {
     const url = `shop/${shop}/payment-intent`;
-    return _post(url, { amount, currency, payment });
+    return _post(url, { amount, currency, payment, description });
   },
   createOrderPayment(id, { card, shop, country, currency, invoice, payment, recaptchaToken }) {
     const url = invoice ? `shop/${shop}/order/${id}/invoice/${invoice}/payment` : `shop/${shop}/order/${id}/payment`;

package/assets/js/utils/layers.js

@@ -0,0 +1,21 @@
+export function generateLayersTemplate(template, printArea) {
+  return template.layers.map(layer => ({
+    type: layer.type,
+    properties: fitLayerToEditorSize(layer, template, printArea),
+    isEditMode: false,
+    preselect: false
+  }));
+}
+
+function fitLayerToEditorSize(layer, { size }, { width, height, top, left }) {
+  const scaleKoef = Math.min(width, height) / size.width;
+  layer.top = top + layer.top * scaleKoef;
+  layer.left = left + layer.left * scaleKoef;
+  ['fontSize', 'scaleX', 'scaleY'].forEach(property => {
+    if (property in layer) {
+      layer[property] = layer[property] * scaleKoef;
+    }
+  });
+  delete layer.sideId;
+  return layer;
+}

package/assets/js/utils/prints.js

@@ -26,10 +26,10 @@ export const generatePrintLayer = layer => {
     text: layer.copy,
     params: layer
   };
-  if (layer.url) {
+  if (layer.url || layer.file?.origin) {
     model.file = {
-      fileName: layer.fileName,
-      origin: layer.url
+      fileName: layer.fileName || layer.file?.fileName,
+      origin: layer.url || layer.file?.origin
     }
   }
   return model

package/components/checkout/cart/cart_entity/cart-entity.mixin.js

@@ -10,6 +10,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['SETTINGS']),
     ...mapGetters('cart', [
       'cartPricing',
       'cartProductsPricing'
@@ -18,7 +19,7 @@ export default {
       return this.entity.product;
     },
     productLink() {
-      return generateProductLink(this.product);
+      return generateProductLink(this.product, null, !!this.SETTINGS.CART_PRODUCT_LINK_TO_EDITOR);
     },
     sumPrints() {
       return (this.entity.prints || []).length;

package/components/common/postcode_select/postcode-select.vue

@@ -157,7 +157,7 @@ export default {
       if (query.trim().length > 1) {
         this.isLoading = true;
         const country = this.codeCountry || this.country;
-        const countryName = country ? (country.isoCode === 'GB' ? 'England' : (country.name || country)) : 'Australia';
+        const countryName = country ? (['GB','UK'].includes(country.isoCode) ? 'England' : (country.name || country)) : 'Australia';
         const params = {
           query: query.trim(),
           country: countryName

package/components/editor/editor_product_details/editor-product-details.vue

@@ -81,11 +81,11 @@
         </div>
       </div>
     </div>
-    <div
+    <!-- <div
       v-if="!productAvailableInCurrentCountry"
       class="EditorProductDetails__available-warning">
       Product Not Available in {{ country.name }}
-    </div>
+    </div> -->
     <div
       v-if="product.description"
       class="EditorProductDetails__description">
@@ -107,7 +107,7 @@
       </div>
     </div>
     <div
-      v-if="productDetailsLoaded && productAvailableInCurrentCountry">
+      v-if="productDetailsLoaded">
       <div class="EditorProductDetails__section">
         <product-colors-selector
           :has-another-print-btn="false"

package/components/product/wizard/wizard_print_layers/wizard_print_layer/wizard-print-layer.vue

@@ -76,10 +76,10 @@
                   <a
                     :href="layer.file.origin"
                     target="_blank">
-                    <img
+                    <!-- <img
                       v-if="layer.url"
-                      :src="layer.url" />
-                    <span v-else>
+                      :src="layer.url" /> -->
+                    <span>
                       <i class="icon-blank"></i> Download logo
                     </span>
                   </a>

package/components/quotes/quote_request/quote-request.scss

@@ -2,9 +2,9 @@
 
 .QuoteRequest {
   &__wrapper {
-    margin: -20px 40px 0 40px;
+    margin: -30px 20px 0 20px;
     @media (max-width: $bp-extra-small-max) { 
-      margin: -20px 0px 0 0px;
+      margin: -30px 0px 0 0px;
     }
   }
   &__title {

package/components/quotes/quote_request/quote-request.vue

@@ -277,20 +277,37 @@
                 </div>
               </div>
             </div>
+            <div v-else>
+              <div v-if="submittedErrors.length > 0">
+                Please fill in all required fields
+              </div>
+              <div class="QuoteRequest__btn form-actions full">
+                <btn
+                  btn-class="green"
+                  :btn-disabled="processing"
+                  :btn-processing="processing"
+                  :btn-block="true"
+                  btn-label="GET A QUOTE NOW"
+                  @onclick="handleSubmit(submit)">
+                </btn>
+              </div>
+            </div>
           </div>
         </div>
-        <div v-if="submittedErrors.length > 0">
-          Please fill in all required fields
-        </div>
-        <div class="QuoteRequest__btn form-actions full">
-          <btn
-            btn-class="green"
-            :btn-disabled="processing"
-            :btn-processing="processing"
-            :btn-block="true"
-            btn-label="GET A QUOTE NOW"
-            @onclick="handleSubmit(submit)">
-          </btn>
+        <div v-if="visibleProductTypes">
+          <div v-if="submittedErrors.length > 0">
+            Please fill in all required fields
+          </div>
+          <div class="QuoteRequest__btn form-actions full">
+            <btn
+              btn-class="green"
+              :btn-disabled="processing"
+              :btn-processing="processing"
+              :btn-block="true"
+              btn-label="GET A QUOTE NOW"
+              @onclick="handleSubmit(submit)">
+            </btn>
+          </div>
         </div>
       </validation-observer>
     </div>

package/components/quotes/quote_request_modal/quote-request-modal.scss

@@ -1,6 +1,16 @@
+@import "@/assets/scss/variables";
+
 .QuoteRequestModal {
   &__wrapper  {
     border-radius: 0px;
-    margin-bottom: 100px;
+    margin-bottom: 50px;
+    .lc_modal__content {
+      @media (min-width: $bp-extra-small-max) {
+        padding: 0 0 20px 0 !important;
+      }
+    }
+    .icon-cancel {
+      z-index: 2;
+    }
   }
 }

package/package.json

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