diff --git a/examples/amp-story/amp-story-shopping.html b/examples/amp-story/amp-story-shopping.html index fd4f1cc70782..9d06a0ed57a1 100644 --- a/examples/amp-story/amp-story-shopping.html +++ b/examples/amp-story/amp-story-shopping.html @@ -55,7 +55,7 @@ "productUrl": "https://www.google.com", "productId": "lamp", "productTitle": "Brass Lamp", - "productVendor": "Lamp Co", + "productBrand": "Lamp Co", "productPrice": 799.00, "productPriceCurrency": "USD", "productImages": [ @@ -77,7 +77,7 @@ "productUrl": "https://www.google.com", "productId": "art", "productTitle": "Abstract Art", - "productVendor": "V. Artsy", + "productBrand": "V. Artsy", "productPrice": 1200.00, "productPriceCurrency": "INR", "productImages": [{"url": "https://source.unsplash.com/BdVQU-NDtA8/500x500", "alt": "art"}], @@ -102,7 +102,7 @@ "productUrl": "https://www.google.com", "productId": "flowers", "productTitle": "Flowers", - "productVendor": "Very Long Flower Company Name", + "productBrand": "Very Long Flower Company Name", "productPrice": 10.00, "productPriceCurrency": "USD", "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png", @@ -139,7 +139,7 @@ "productUrl": "https://www.google.com", "productId": "lamp", "productTitle": "Brass Lamp", - "productVendor": "Lamp Co", + "productBrand": "Lamp Co", "productPrice": 799.00, "productPriceCurrency": "USD", "productImages": [ @@ -160,7 +160,7 @@ "productUrl": "https://www.google.com", "productId": "art", "productTitle": "Abstract Art", - "productVendor": "V. Artsy", + "productBrand": "V. Artsy", "productPrice": 1200.00, "productPriceCurrency": "INR", "productImages": [{"url": "https://source.unsplash.com/BdVQU-NDtA8/500x500", "alt": "art"}], @@ -188,7 +188,7 @@ "productUrl": "https://www.google.com", "productId": "flowers", "productTitle": "Flowers", - "productVendor": "Very Long Flower Company Name", + "productBrand": "Very Long Flower Company Name", "productPrice": 10.00, "productPriceCurrency": "USD", "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png", diff --git a/examples/amp-story/shopping/remote.json b/examples/amp-story/shopping/remote.json index b38e90f1099b..c8b0e977ce4c 100644 --- a/examples/amp-story/shopping/remote.json +++ b/examples/amp-story/shopping/remote.json @@ -4,7 +4,7 @@ "productUrl": "https://www.google.com", "productId": "art", "productTitle": "Abstract Art", - "productVendor": "V. Artsy", + "productBrand": "V. Artsy", "productPrice": 1200.0, "productPriceCurrency": "JPY", "productImages": [ diff --git a/examples/visual-tests/amp-story/amp-story-shopping-landscape.html b/examples/visual-tests/amp-story/amp-story-shopping-landscape.html index efe1f8be50fa..1947456ed2de 100644 --- a/examples/visual-tests/amp-story/amp-story-shopping-landscape.html +++ b/examples/visual-tests/amp-story/amp-story-shopping-landscape.html @@ -56,7 +56,7 @@ "productUrl": "https://www.google.com", "productId": "lamp", "productTitle": "Brass Lamp", - "productVendor": "Lamp Co", + "productBrand": "Lamp Co", "productPrice": 799.00, "productPriceCurrency": "USD", "productImages": [ @@ -78,7 +78,7 @@ "productUrl": "https://www.google.com", "productId": "art", "productTitle": "Abstract Art", - "productVendor": "V. Artsy", + "productBrand": "V. Artsy", "productPrice": 1200.00, "productPriceCurrency": "INR", "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}], @@ -107,7 +107,7 @@ "productUrl": "https://www.google.com", "productId": "flowers", "productTitle": "Flowers", - "productVendor": "Very Long Flower Company Name", + "productBrand": "Very Long Flower Company Name", "productPrice": 10.00, "productPriceCurrency": "USD", "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png", @@ -145,7 +145,7 @@ "productUrl": "https://www.google.com", "productId": "lamp", "productTitle": "Brass Lamp", - "productVendor": "Lamp Co", + "productBrand": "Lamp Co", "productPrice": 799.00, "productPriceCurrency": "USD", "productImages": [ @@ -166,7 +166,7 @@ "productUrl": "https://www.google.com", "productId": "art", "productTitle": "Abstract Art", - "productVendor": "V. Artsy", + "productBrand": "V. Artsy", "productPrice": 1200.00, "productPriceCurrency": "INR", "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}], @@ -194,7 +194,7 @@ "productUrl": "https://www.google.com", "productId": "flowers", "productTitle": "Flowers", - "productVendor": "Very Long Flower Company Name", + "productBrand": "Very Long Flower Company Name", "productPrice": 10.00, "productPriceCurrency": "USD", "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png", diff --git a/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html b/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html index a8da763062ee..de23c151e3ef 100644 --- a/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html +++ b/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html @@ -55,7 +55,7 @@ "productUrl": "https://www.google.com", "productId": "lamp", "productTitle": "Brass Lamp", - "productVendor": "Lamp Co", + "productBrand": "Lamp Co", "productPrice": 799.00, "productPriceCurrency": "USD", "productImages": [ @@ -77,7 +77,7 @@ "productUrl": "https://www.google.com", "productId": "art", "productTitle": "Abstract Art", - "productVendor": "V. Artsy", + "productBrand": "V. Artsy", "productPrice": 1200.00, "productPriceCurrency": "INR", "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}], @@ -107,7 +107,7 @@ "productUrl": "https://www.google.com", "productId": "flowers", "productTitle": "Flowers", - "productVendor": "Very Long Flower Company Name", + "productBrand": "Very Long Flower Company Name", "productPrice": 10.00, "productPriceCurrency": "USD", "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png", @@ -144,7 +144,7 @@ "productUrl": "https://www.google.com", "productId": "lamp", "productTitle": "Brass Lamp", - "productVendor": "Lamp Co", + "productBrand": "Lamp Co", "productPrice": 799.00, "productPriceCurrency": "USD", "productImages": [ @@ -165,7 +165,7 @@ "productUrl": "https://www.google.com", "productId": "art", "productTitle": "Abstract Art", - "productVendor": "V. Artsy", + "productBrand": "V. Artsy", "productPrice": 1200.00, "productPriceCurrency": "INR", "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}], @@ -193,7 +193,7 @@ "productUrl": "https://www.google.com", "productId": "flowers", "productTitle": "Flowers", - "productVendor": "Very Long Flower Company Name", + "productBrand": "Very Long Flower Company Name", "productPrice": 10.00, "productPriceCurrency": "USD", "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png", diff --git a/examples/visual-tests/amp-story/amp-story-shopping-rtl.html b/examples/visual-tests/amp-story/amp-story-shopping-rtl.html index 070b28c1b53d..2819237d2fee 100644 --- a/examples/visual-tests/amp-story/amp-story-shopping-rtl.html +++ b/examples/visual-tests/amp-story/amp-story-shopping-rtl.html @@ -55,7 +55,7 @@ "productUrl": "https://www.google.com", "productId": "lamp", "productTitle": "Brass Lamp", - "productVendor": "Lamp Co", + "productBrand": "Lamp Co", "productPrice": 799.00, "productPriceCurrency": "USD", "productImages": [ @@ -77,7 +77,7 @@ "productUrl": "https://www.google.com", "productId": "art", "productTitle": "Abstract Art", - "productVendor": "V. Artsy", + "productBrand": "V. Artsy", "productPrice": 1200.00, "productPriceCurrency": "INR", "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}], @@ -107,7 +107,7 @@ "productUrl": "https://www.google.com", "productId": "flowers", "productTitle": "Flowers", - "productVendor": "Very Long Flower Company Name", + "productBrand": "Very Long Flower Company Name", "productPrice": 10.00, "productPriceCurrency": "USD", "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png", @@ -144,7 +144,7 @@ "productUrl": "https://www.google.com", "productId": "lamp", "productTitle": "Brass Lamp", - "productVendor": "Lamp Co", + "productBrand": "Lamp Co", "productPrice": 799.00, "productPriceCurrency": "USD", "productImages": [ @@ -165,7 +165,7 @@ "productUrl": "https://www.google.com", "productId": "art", "productTitle": "Abstract Art", - "productVendor": "V. Artsy", + "productBrand": "V. Artsy", "productPrice": 1200.00, "productPriceCurrency": "INR", "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}], @@ -193,7 +193,7 @@ "productUrl": "https://www.google.com", "productId": "flowers", "productTitle": "Flowers", - "productVendor": "Very Long Flower Company Name", + "productBrand": "Very Long Flower Company Name", "productPrice": 10.00, "productPriceCurrency": "USD", "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png", diff --git a/examples/visual-tests/amp-story/amp-story-shopping.html b/examples/visual-tests/amp-story/amp-story-shopping.html index f2091af339c2..75efb6da851a 100644 --- a/examples/visual-tests/amp-story/amp-story-shopping.html +++ b/examples/visual-tests/amp-story/amp-story-shopping.html @@ -55,7 +55,7 @@ "productUrl": "https://www.google.com", "productId": "lamp", "productTitle": "Brass Lamp", - "productVendor": "Lamp Co", + "productBrand": "Lamp Co", "productPrice": 799.00, "productPriceCurrency": "USD", "productImages": [ @@ -77,7 +77,7 @@ "productUrl": "https://www.google.com", "productId": "art", "productTitle": "Abstract Art", - "productVendor": "V. Artsy", + "productBrand": "V. Artsy", "productPrice": 1200.00, "productPriceCurrency": "INR", "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}], @@ -106,7 +106,7 @@ "productUrl": "https://www.google.com", "productId": "flowers", "productTitle": "Flowers", - "productVendor": "Very Long Flower Company Name", + "productBrand": "Very Long Flower Company Name", "productPrice": 10.00, "productPriceCurrency": "USD", "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png", @@ -144,7 +144,7 @@ "productUrl": "https://www.google.com", "productId": "lamp", "productTitle": "Brass Lamp", - "productVendor": "Lamp Co", + "productBrand": "Lamp Co", "productPrice": 799.00, "productPriceCurrency": "USD", "productImages": [ @@ -165,7 +165,7 @@ "productUrl": "https://www.google.com", "productId": "art", "productTitle": "Abstract Art", - "productVendor": "V. Artsy", + "productBrand": "V. Artsy", "productPrice": 1200.00, "productPriceCurrency": "INR", "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}], @@ -193,7 +193,7 @@ "productUrl": "https://www.google.com", "productId": "flowers", "productTitle": "Flowers", - "productVendor": "Very Long Flower Company Name", + "productBrand": "Very Long Flower Company Name", "productPrice": 10.00, "productPriceCurrency": "USD", "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png", diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.css b/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.css index 76423f218503..6eed889df54a 100644 --- a/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.css +++ b/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.css @@ -106,7 +106,7 @@ amp-story-shopping-attachment a { margin: 1.5em var(--i-amphtml-shopping-attachment-horizontal-spacing) 2em !important; } -.i-amphtml-amp-story-shopping-pdp-header-vendor { +.i-amphtml-amp-story-shopping-pdp-header-brand { font-weight: 500 !important; font-size: 1.1em !important; line-height: 0.9em !important; diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js b/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js index f6d698572aef..f8bc0b0c51b2 100644 --- a/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js +++ b/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js @@ -320,9 +320,9 @@ export class AmpStoryShoppingAttachment extends AMP.BaseElement { return (
- {activeProductData.productVendor && ( - - {activeProductData.productVendor} + {activeProductData.productBrand && ( + + {activeProductData.productBrand} )}
@@ -436,9 +436,9 @@ export class AmpStoryShoppingAttachment extends AMP.BaseElement { backgroundImage: `url("${data['productImages'][0].url}")`, }} >
- {data['productVendor'] && ( + {data['productBrand'] && (
- {data['productVendor']} + {data['productBrand']}
)}
diff --git a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js index 8c96c716d860..4df7f0756385 100644 --- a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js +++ b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js @@ -40,7 +40,7 @@ describes.realWin( productUrl: 'https://www.google.com', productId: 'lamp', productTitle: 'Brass Lamp', - productVendor: 'Lamp Co', + productBrand: 'Lamp Co', productPrice: 799.0, productPriceCurrency: 'USD', productImages: [ @@ -63,7 +63,7 @@ describes.realWin( productUrl: 'https://www.google.com', productId: 'art', productTitle: 'Abstract Art', - productVendor: 'V. Artsy', + productBrand: 'V. Artsy', productPrice: 1200.0, productPriceCurrency: 'INR', productImages: [ diff --git a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js index 3960d0b2121f..1cc8885f7d58 100644 --- a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js +++ b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js @@ -26,7 +26,7 @@ describes.realWin( 'productUrl': 'https://www.google.com', 'productId': 'lamp', 'productTitle': 'Brass Lamp', - 'productVendor': 'Lamp Co', + 'productBrand': 'Lamp Co', 'productPrice': 799.0, 'productPriceCurrency': 'USD', 'productImages': [ @@ -50,7 +50,7 @@ describes.realWin( 'productUrl': 'https://www.google.com', 'productId': 'art', 'productTitle': 'Abstract Art', - 'productVendor': 'V. Artsy', + 'productBrand': 'V. Artsy', 'productPrice': 1200.0, 'productPriceCurrency': 'JPY', 'productImages': [ @@ -71,7 +71,7 @@ describes.realWin( 'productUrl': 'https://www.google.com', 'productId': 'chair', 'productTitle': 'Yellow chair', - 'productVendor': 'Chair Co.', + 'productBrand': 'Chair Co.', 'productPrice': 1000.0, 'productPriceCurrency': 'BRL', 'productTagText': 'The perfectly imperfect yellow chair', @@ -91,7 +91,7 @@ describes.realWin( 'productUrl': 'https://www.google.com', 'productId': 'flowers', 'productTitle': 'Flowers', - 'productVendor': 'Very Long Flower Company Name', + 'productBrand': 'Very Long Flower Company Name', 'productPrice': 10.0, 'productPriceCurrency': 'USD', 'productIcon': @@ -167,7 +167,7 @@ describes.realWin( 'productUrl': 'https://www.google.com', 'productId': 'art', 'productTitle': 'Abstract Art', - 'productVendor': 'V. Artsy', + 'productBrand': 'V. Artsy', 'productPrice': 1200.0, 'productPriceCurrency': 'JPY', 'productImages': [ diff --git a/extensions/amp-story/1.0/amp-story-store-service.js b/extensions/amp-story/1.0/amp-story-store-service.js index 032f4f3dde20..ed38bab99ac6 100644 --- a/extensions/amp-story/1.0/amp-story-store-service.js +++ b/extensions/amp-story/1.0/amp-story-store-service.js @@ -88,7 +88,7 @@ export let InteractiveReactData; * @typedef {{ * productId: string, * productTitle: string, - * productVendor: string, + * productBrand: string, * productPrice: number, * productPriceCurrency: string, * productIcon: string,