@snabcentr/client-core 3.21.0 → 3.21.1

package/fesm2022/snabcentr-client-core.mjs

@@ -1748,6 +1748,7 @@ class ScProduct extends ScCatalogItem {
         else {
             this.image = data.images?.find((img) => img.isDefault)?.image ?? data.properties?.image;
             this.supplierSku = data.supplierSku;
+            this.brand = data.brand;
             this.cost = data.cost;
             this.costRub = data.costRub;
             this.costDate = data.costDate;
@@ -7991,7 +7992,6 @@ class SchemaOrgFactory {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         const image = this.mediaImageTransformerPipe.transform(product?.getImagePreview?.() ?? product.image, true);
         const description = product.properties?.description;
-        const priceValidUntil = this.normalizePriceValidUntil(product.discount?.expiredAt);
         return {
             '@context': 'https://schema.org',
             '@type': 'Product',
@@ -7999,21 +7999,16 @@ class SchemaOrgFactory {
             name: product.name,
             ...(image && { image }),
             ...(description && { description: this.stripHtml(description) }),
-            mpn: product.code,
-            url: productUrl,
-            offers: {
-                '@type': 'Offer',
-                priceCurrency: 'RUB',
-                ...(priceValidUntil && { priceValidUntil }),
-                price: product.costRub,
-                availability: this.getAvailability(product),
-                itemCondition: 'https://schema.org/NewCondition',
-                seller: {
-                    '@type': 'Organization',
-                    name: this.companyInfo.name,
+            sku: product.code,
+            ...(product.supplierSku && { mpn: product.supplierSku }),
+            ...(product.brand && {
+                brand: {
+                    '@type': 'Brand',
+                    name: product.brand,
                 },
-                url: productUrl,
-            },
+            }),
+            url: productUrl,
+            offers: this.createOffer(product, productUrl),
         };
     }
     /**
@@ -8097,6 +8092,7 @@ class SchemaOrgFactory {
     // eslint-disable-next-line sonarjs/function-return-type
     generateForOrganization() {
         const postalAddress = this.createPostalAddress(this.companyInfo.address);
+        const merchantReturnPolicy = this.createMerchantReturnPolicy();
         return {
             '@context': 'https://schema.org',
             '@type': 'OnlineStore',
@@ -8126,6 +8122,13 @@ class SchemaOrgFactory {
                     address: warehouseAddress,
                 })),
             }),
+            ...(merchantReturnPolicy && {
+                // Тип возмещения Google принимает только в политике организации, в предложениях его нет.
+                hasMerchantReturnPolicy: {
+                    ...merchantReturnPolicy,
+                    refundType: 'https://schema.org/FullRefund',
+                },
+            }),
         };
     }
     /**
@@ -8261,6 +8264,22 @@ class SchemaOrgFactory {
         }
         return contactPoints;
     }
+    /**
+     * Формирует MerchantReturnPolicy по условиям возврата из данных о компании.
+     */
+    createMerchantReturnPolicy() {
+        if (!this.companyInfo.returnPolicy) {
+            return undefined;
+        }
+        return {
+            '@type': 'MerchantReturnPolicy',
+            applicableCountry: 'RU',
+            returnPolicyCategory: 'https://schema.org/MerchantReturnFiniteReturnWindow',
+            merchantReturnDays: this.companyInfo.returnPolicy.returnDays,
+            returnMethod: 'https://schema.org/ReturnInStore',
+            returnFees: 'https://schema.org/FreeReturn',
+        };
+    }
     /**
      * Удаляет HTML-разметку из текста.
      *
@@ -8354,6 +8373,30 @@ class SchemaOrgFactory {
         const path = categoryPath.replace(':id', id);
         return `${this.urls.siteUrl}${path}`;
     }
+    /**
+     * Создаёт Offer о продаже товара.
+     *
+     * @param product Данные о продукте.
+     * @param productUrl Полный URL страницы товара.
+     */
+    createOffer(product, productUrl) {
+        const priceValidUntil = this.normalizePriceValidUntil(product.discount?.expiredAt);
+        const merchantReturnPolicy = this.createMerchantReturnPolicy();
+        return {
+            '@type': 'Offer',
+            priceCurrency: 'RUB',
+            ...(priceValidUntil && { priceValidUntil }),
+            price: product.costRub,
+            availability: this.getAvailability(product),
+            itemCondition: 'https://schema.org/NewCondition',
+            seller: {
+                '@type': 'Organization',
+                name: this.companyInfo.name,
+            },
+            url: productUrl,
+            ...(merchantReturnPolicy && { hasMerchantReturnPolicy: merchantReturnPolicy }),
+        };
+    }
     /**
      * Создаёт элемент списка ItemList с кратким Product для страницы категории.
      *
@@ -8366,7 +8409,6 @@ class SchemaOrgFactory {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         const image = this.mediaImageTransformerPipe.transform(product?.getImagePreview?.() ?? product.image, true);
         const description = product.seo?.description ?? product.properties?.description;
-        const priceValidUntil = this.normalizePriceValidUntil(product.discount?.expiredAt);
         return {
             '@type': 'ListItem',
             position,
@@ -8376,19 +8418,7 @@ class SchemaOrgFactory {
                 url: productUrl,
                 ...(image && { image }),
                 ...(description && { description: this.stripHtml(description) }),
-                offers: {
-                    '@type': 'Offer',
-                    priceCurrency: 'RUB',
-                    ...(priceValidUntil && { priceValidUntil }),
-                    price: product.costRub,
-                    availability: this.getAvailability(product),
-                    itemCondition: 'https://schema.org/NewCondition',
-                    seller: {
-                        '@type': 'Organization',
-                        name: this.companyInfo.name,
-                    },
-                    url: productUrl,
-                },
+                offers: this.createOffer(product, productUrl),
             },
         };
     }