@lancom/shared 0.0.355 → 0.0.357

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

@@ -13,7 +13,8 @@
         Order {{ orderData.code }}
       </div>
       <div class="OrderSuccess__card-info">
-        Thanks for your order! You will receive an order confirmation email shortly. 
+        Thanks for your order! Your order has been successfully processed using <b>{{ orderData.googleCharge ? 'Google Pay' : orderData.paymentMethod }} {{ cardInfo ? `(${cardInfo})` : '' }}</b>. You will receive an order confirmation email shortly.
+        <b></b>
       </div>
       <div>
         <btn
@@ -31,7 +32,11 @@ import { mapGetters } from 'vuex';
 export default {
   name: 'OrderSuccess',
   computed: {
-    ...mapGetters('order', ['orderData'])
+    ...mapGetters('order', ['orderData']),
+    cardInfo() {
+      const { card } = this.orderData.charge?.payment_method_details || this.orderData.charge || {};
+      return card ? `${card.brand || card.scheme} ${card.display_number || `XXXX-XXXX-XXXX-${card.last4 || 'XXXX'}`}` : null;
+    }
   }
 };
 </script>

package/components/common/payment/payment_card/googlepay/googlepay.vue

@@ -41,7 +41,7 @@
                       type: 'CARD',
                       parameters: {
                         allowedAuthMethods: ['PAN_ONLY', 'CRYPTOGRAM_3DS'],
-                        allowedCardNetworks: ['MASTERCARD', 'VISA'],
+                        allowedCardNetworks: ['MASTERCARD', 'VISA', 'AMEX'],
                       },
                       tokenizationSpecification: {
                         type: 'PAYMENT_GATEWAY',

package/components/common/spinner.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="Spinner">
+  <div class="Spinner" :class="{ small }">
     <div class="Spinner__container">
       <div
         v-for="petal in 12"
@@ -17,16 +17,23 @@ export default {
   props: {
     background: {
       type: String
+    },
+    small: {
+      type: Boolean,
+      default: false
     }
   }
 };
 </script>
 
 <style lang="scss">
-$size: 26px;
+$spinnerSize: 26px;
 $delay_step: 1/12;
 
 .Spinner {
+  &.small {
+    $spinnerSize: 14px !global;  
+  }
   @keyframes lds-spinner {
     0% {
       opacity: 1;
@@ -45,22 +52,22 @@ $delay_step: 1/12;
   }
 
   &__container {
-    width: $size;
-    height: $size;
+    width: $spinnerSize;
+    height: $spinnerSize;
     margin: 0 auto;
     position: relative;
-    transform: translate(-$size, -$size) scale(1) translate($size, $size);
+    transform: translate(-$spinnerSize, -$spinnerSize) scale(1) translate($spinnerSize, $spinnerSize);
   }
 
   &__petal{
-    left: calc(#{($size / 16) * 7});
+    left: calc(#{($spinnerSize / 16) * 7});
     position: absolute;
     animation: lds-spinner linear 1s infinite;
     background: #55A8FF;
-    width: calc(#{$size} / 8);
-    height: calc(#{$size} / 4);
+    width: calc(#{$spinnerSize} / 8);
+    height: calc(#{$spinnerSize} / 4);
     border-radius: 40%;
-    transform-origin: calc(#{$size} / 16) calc(#{$size} / 2);
+    transform-origin: calc(#{$spinnerSize} / 16) calc(#{$spinnerSize} / 2);
 
     @for $i from 1 through 12 {
       &:nth-child(#{$i}) {

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

@@ -1,7 +1,7 @@
 <template>
   <div class="EditorProductDetails__wrapper">
     <h3 class="lc_h3 lc_black EditorProductDetails__name">
-      {{ product.name }}
+      {{ fullProductName }}
     </h3>
     <div class="EditorProductDetails__header">
       <div
@@ -208,7 +208,9 @@ export default {
       'defaultSimpleProduct',
       'selectedPrintType',
       'isPrintPricing',
-      'printsPrice'
+      'printsPrice',
+      'availableSizes',
+      'availableColors'
     ]),
     ...mapGetters('layers', [
       'layerThumbnails'
@@ -218,6 +220,12 @@ export default {
       'pricingSettings',
       'country'
     ]),
+    fullProductName() {
+      const name = this.product.name;
+      const color = this.availableColors?.find(c => c.alias === this.$route.query?.color);
+      const size = this.availableSizes?.find(c => c.shortName === this.$route.query?.size);
+      return `${name}${(color || size) ? ` | ${[color?.name, size?.shortName].filter(i => !!i).join(', ') || ''}` : ''}`;
+    },
     hasImages() {
       return this.modelImages.length > 0;
     },

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

@@ -20,6 +20,8 @@
     font-size: 14px;
     cursor: pointer;
     margin-right: 5px;
+    display: flex;
+    align-items: center;
     &--active {
       background: rgb(196, 226, 236);
     }

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

@@ -28,7 +28,11 @@
           'EditorWorkspaceSide__toggle-wireframe--active': visibleOnpress
         }"
         @mousedown.stop.prevent="toggleOnpressImage(true)">
-        {{ visibleOnpress ? 'Hide On Press' : 'Show On Press' }}
+        <spinner
+          v-if="visibleOnpress && !backgroundImageLoaded"
+          :small="true"
+          style="margin-right: 10px;" />
+        {{ visibleOnpress ? 'Real product photo' : 'Press for real product photo' }}
       </div>
     </div>
     <div

package/feeds/google-shopping.js

@@ -59,6 +59,7 @@ async function googleShoppingFeed(axios, config, availableStores, country, isEdi
                 .replace(/·/, '·');
                 
               let link = `https://${config.HOST_NAME}${generateProductLink(product, sp.color, isEditor)}`;
+              link = link.includes('?') ? `${link}&size=${sp.size?.shortName}` : `${link}?size=${sp.size?.shortName}`
               link = link.includes('?') ? `${link}&price=IT` : `${link}?price=IT`
               if (sp.multipackQty) {
                 link = link.includes('?') ? `${link}&multipack=${sp.SKU}` : `${link}?multipack=${sp.SKU}`;

package/layouts/products.vue

@@ -285,7 +285,7 @@
         ]
       };
   
-      return [productsSchema, breadcrumbSchema];
+      return [productsSchema, breadcrumbSchema, this.$store.state.shop?.schema].filter(s => !!s);
     },
     methods: {
       ...mapActions([

package/mixins/product-view.js

@@ -4,7 +4,7 @@ import { fitLayerToEditorSize } from '@lancom/shared/assets/js/utils/layers';
 import { getPrintAreaByName } from '@lancom/shared/assets/js/models/print-area';
 import { getLayerModel } from '@lancom/shared/assets/js/models/product-layers';
 import { tax, staticLink, inRange } from '@lancom/shared/assets/js/utils/filters';
-import { getProductLargeCover } from '@lancom/shared/assets/js/utils/colors';
+import { getProductLargeCover, isValidImageTypes } from '@lancom/shared/assets/js/utils/colors';
 import metaInfo from '@lancom/shared/mixins/meta-info';
 import { STORE_CODES } from '@/constants/store';
 import { generateProductLink, generateProductsLink } from '@lancom/shared/assets/js/utils/product';
@@ -255,19 +255,20 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
       brandAdditionalProductsRichSnippet = JSON.parse(this.product.brand.additionalProductsRichSnippet);
     } catch (e) {}
 
+    const description = (this.product.gsFeedDescription || this.product.description || '').replace(/<[^>]*>/g, '');
     const productSchema = {
       '@context': 'https://schema.org',
-      '@type': 'Product',
-      description: (this.product.gsFeedDescription || this.product.description || '').replace(/<[^>]*>/g, ''),
+      '@type': 'ProductGroup',
+      description: description,
       name,
-      offers: this.productDetails?.simpleProducts.map(sp => {
+      hasVariant: this.productDetails?.simpleProducts.map(sp => {
         const spMaxPrice = (sp.pricing || []).reduce((price, pricing) => Math.max(price, pricing.price), 0);
         const maxPrice = this.printsPrice ? spMaxPrice + this.printsPrice : spMaxPrice;
         const availability = sp.quantityStock > 0 ? 'InStock' : 'OutOfStock';
     
         const offer = {
           '@type': 'Offer',
-          name: `${sp.size?.name || ''} / ${sp.color?.name || ''}`,
+          name: `${sp.size?.shortName || ''} / ${sp.color?.name || ''}`,
           url,
           availability: `https://schema.org/${availability}`,
           price: +tax(maxPrice, this.gstTax).toFixed(2),
@@ -295,7 +296,24 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
           };
         }
 
-        return offer;
+        const galleryImages = this.product.images?.filter(i => !(i.types || []).includes('designer') && i.color === sp.color?._id) || [];
+        const image = getProductLargeCover(this.product, 'front', sp.color);
+        return {
+          "@type": "Product",
+          "sku": sp.SKU,
+          "gtin13": sp.gtin,
+          "image": [
+            image,
+            ...galleryImages.map(i => i.large).filter(i => !!i && i !== image)
+          ],
+          "name": `${this.product.name} | ${sp.size?.shortName || ''} ${sp.color?.name || ''}`,
+          "description": description,
+          "color": sp.color?.name,
+          "size": sp.size?.shortName,
+          "offers": offer,
+          "shippingDetails": { "@id": "#shipping_policy" },
+          "hasMerchantReturnPolicy": { "@id": "#return_policy" }
+        };
       })
     };
 
@@ -308,7 +326,7 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
     }
 
     if (SKU) {
-      productSchema.sku = SKU;
+      productSchema.productGroupID = SKU;
       // schema.gtin = SKU;
     }
 
@@ -384,7 +402,9 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
     return [
       productSchema,
       breadcrumbSchema,
-      mainEntity.length > 0 ? faqSchema : null
+      mainEntity.length > 0 ? faqSchema : null,
+      this.$store.state.shop?.shippingPolicySchema,
+      this.$store.state.shop?.returnPolicySchema
     ].filter(s => !!s);
   }
 });

package/package.json

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