Skip to content

Commit 3713b07

Browse files
mperngithub-actions[bot]RadhepS
authored
Bump/2211.33 (#122)
* Updated content of js-storefront/spartacusstore * Updated content of js-storefront/b2bspastore * Update manifest.json * Update manifest.json * Update manifest.json * bump to commerce 2211.33 * update spartacussampledata --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Radhep Sabapathipillai <[email protected]>
1 parent faec53d commit 3713b07

File tree

126 files changed

+23279
-17437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+23279
-17437
lines changed

‎core-customize/hybris/bin/custom/spartacussampledata/resources-lang/spartacussampledata/import/contentCatalogs/apparel-ukContentCatalog/email-content.vt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -----------------------------------------------------------------------
2-
# Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved.
2+
# Copyright (c) 2024 SAP SE or an SAP affiliate company. All rights reserved.
33
# -----------------------------------------------------------------------
44
#
55
# ImpEx for Consents for Apparel UK Store
@@ -23,3 +23,5 @@ UPDATE RendererTemplate;code[unique=true];templateScript[lang=\$lang,translator=
2323
;apparel-uk_Email_Customer_Customer_Coupon_Subject;\$emailResource/email-customerCouponSubject.vm
2424
;apparel-uk_Email_Customer_Customer_Coupon_Body;\$emailResource/email-customerCouponBody.vm
2525

26+
;apparel-uk_Spa_Email_Verification_Token_Body;\$emailResource/email-verificationTokenBody.vm
27+
;apparel-uk_Spa_Email_Verification_Token_Subject;\$emailResource/email-verificationTokenSubject.vm

‎core-customize/hybris/bin/custom/spartacussampledata/resources-lang/spartacussampledata/import/contentCatalogs/electronicsContentCatalog/email-content.vt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -----------------------------------------------------------------------
2-
# Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved.
2+
# Copyright (c) 2024 SAP SE or an SAP affiliate company. All rights reserved.
33
# -----------------------------------------------------------------------
44
#
55
# ImpEx for Consents for Electronics Store
@@ -23,3 +23,5 @@ UPDATE RendererTemplate;code[unique=true];templateScript[lang=\$lang,translator=
2323
;electronics_Email_Customer_Customer_Coupon_Subject;\$emailResource/email-customerCouponSubject.vm
2424
;electronics_Email_Customer_Customer_Coupon_Body;\$emailResource/email-customerCouponBody.vm
2525

26+
;electronics_Spa_Email_Verification_Token_Body;\$emailResource/email-verificationTokenBody.vm
27+
;electronics_Spa_Email_Verification_Token_Subject;\$emailResource/email-verificationTokenSubject.vm

‎core-customize/hybris/bin/custom/spartacussampledata/resources-lang/spartacussampledata/import/contentCatalogs/electronicsContentCatalog/email-content_en.properties‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -----------------------------------------------------------------------
22
# [y] hybris Platform
33
#
4-
# Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved.
4+
# Copyright (c) 2024 SAP SE or an SAP affiliate company. All rights reserved.
55
# The files in this addon are licensed under the Apache Software License, v. 2
66
# except as noted otherwise in the LICENSE file.
77
# -----------------------------------------------------------------------
@@ -10,4 +10,7 @@
1010
EmailPage.ProductBackInStockNotificationEmail.fromEmail=[email protected]
1111
EmailPage.ProductBackInStockNotificationEmail.fromName=Customer Services Team
1212
EmailPage.CustomerCouponEmail.fromEmail=[email protected]
13-
EmailPage.CustomerCouponEmail.fromName=Customer Services Team
13+
EmailPage.CustomerCouponEmail.fromName=Customer Services Team
14+
15+
EmailPage.VerificationTokenEmail.fromEmail=[email protected]
16+
EmailPage.VerificationTokenEmail.fromName=Customer Services Team

‎core-customize/hybris/bin/custom/spartacussampledata/resources-lang/spartacussampledata/import/contentCatalogs/powertoolsContentCatalog/cms-responsive-content_de.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ ContentPage.CheckoutPaymentType.title=Checkout Payment Type
4949
ContentPage.CheckoutDeliveryAddress.title=Checkout Delivery Address
5050
ContentPage.CheckoutDeliveryMode.title=Checkout Delivery Mode
5151
ContentPage.CheckoutPaymentDetails.title=Checkout Payment Details
52+
ContentPage.CheckoutServiceDetails.title=Checkout Service Details
5253
ContentPage.CheckoutReviewOrder.title=Checkout Review Order
5354
ContentPage.storefinderPage.title=Find a Store
5455
ContentPage.CancelOrderPage.title=Cancel Order

‎core-customize/hybris/bin/custom/spartacussampledata/resources-lang/spartacussampledata/import/contentCatalogs/powertoolsContentCatalog/cms-responsive-content_en.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ CMSLinkComponent.OrdersLink.linkName=Orders
1414
CMSLinkComponent.UnitLevelOrderLink.linkName=Unit-Level Orders
1515
CMSLinkComponent.MyCompanyLink.linkName=My Company
1616
CMSLinkComponent.SupportTicketHistoryLink.linkName=Customer Service
17+
CMSLinkComponent.QuotesLink.linkName=Quotes
1718

1819
LogoSimpleBannerComponent.SiteLogoComponent.picture=/images/theme/SAP_scrn_R.png
1920

@@ -49,6 +50,7 @@ ContentPage.CheckoutPaymentType.title=Checkout Payment Type
4950
ContentPage.CheckoutDeliveryAddress.title=Checkout Delivery Address
5051
ContentPage.CheckoutDeliveryMode.title=Checkout Delivery Mode
5152
ContentPage.CheckoutPaymentDetails.title=Checkout Payment Details
53+
ContentPage.CheckoutServiceDetails.title=Checkout Service Details
5254
ContentPage.CheckoutReviewOrder.title=Checkout Review Order
5355
ContentPage.storefinderPage.title=Find a Store
5456
ContentPage.CancelOrderPage.title=Cancel Order

‎core-customize/hybris/bin/custom/spartacussampledata/resources-lang/spartacussampledata/import/contentCatalogs/powertoolsContentCatalog/cms-responsive-content_ja.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ ContentPage.CheckoutPaymentType.title=Checkout Payment Type
4949
ContentPage.CheckoutDeliveryAddress.title=Checkout Delivery Address
5050
ContentPage.CheckoutDeliveryMode.title=Checkout Delivery Mode
5151
ContentPage.CheckoutPaymentDetails.title=Checkout Payment Details
52+
ContentPage.CheckoutServiceDetails.title=Checkout Service Details
5253
ContentPage.CheckoutReviewOrder.title=Checkout Review Order
5354
ContentPage.storefinderPage.title=Find a Store
5455
ContentPage.CancelOrderPage.title=Cancel Order

‎core-customize/hybris/bin/custom/spartacussampledata/resources-lang/spartacussampledata/import/contentCatalogs/powertoolsContentCatalog/cms-responsive-content_zh.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ ContentPage.CheckoutPaymentType.title=Checkout Payment Type
4949
ContentPage.CheckoutDeliveryAddress.title=Checkout Delivery Address
5050
ContentPage.CheckoutDeliveryMode.title=Checkout Delivery Mode
5151
ContentPage.CheckoutPaymentDetails.title=Checkout Payment Details
52+
ContentPage.CheckoutServiceDetails.title=Checkout Service Details
5253
ContentPage.CheckoutReviewOrder.title=Checkout Review Order
5354
ContentPage.storefinderPage.title=Find a Store
5455
ContentPage.CancelOrderPage.title=Cancel Order

‎core-customize/hybris/bin/custom/spartacussampledata/resources-lang/spartacussampledata/import/contentCatalogs/powertoolsContentCatalog/email-content.vt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# -----------------------------------------------------------------------
2+
# Copyright (c) 2024 SAP SE or an SAP affiliate company. All rights reserved.
3+
# -----------------------------------------------------------------------
4+
#
5+
# Import the CMS content for the Powertools site emails
6+
#
7+
#set($escContentCV=$esc.java('$contentCV[unique=true]'))
8+
# Email CMS data for stock notification
9+
\$contentCatalog=powertools-spaContentCatalog
10+
\$contentCV=catalogVersion(CatalogVersion.catalog(Catalog.id[default=\$contentCatalog]),CatalogVersion.version[default=Staged])[default=\$contentCatalog:Staged]
11+
\$emailResource=jar:de.hybris.platform.spartacussampledata.constants.SpartacussampledataConstants&/spartacussampledata/import/emails
12+
\$lang=$lang.toLowerCase()
13+
14+
#set( $rows = $query.load('email-content', 'EmailPage') )
15+
UPDATE EmailPage;$escContentCV;uid[unique=true];fromEmail[lang=\$lang];fromName[lang=\$lang]
16+
#foreach( $row in $rows )
17+
;;$row.key;"$row.values.fromEmail";"$row.values.fromName"
18+
#end
19+
20+
UPDATE RendererTemplate;code[unique=true];templateScript[lang=\$lang,translator=de.hybris.platform.commerceservices.impex.impl.FileLoaderValueTranslator]
21+
;powertools_Spa_Email_Verification_Token_Body;\$emailResource/email-verificationTokenBody.vm
22+
;powertools_Spa_Email_Verification_Token_Subject;\$emailResource/email-verificationTokenSubject.vm

‎core-customize/hybris/bin/custom/spartacussampledata/resources/spartacussampledata/import/contentCatalogs/apparel-ukContentCatalog/cms-responsive-content.impex‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -----------------------------------------------------------------------
22
# [y] hybris Platform
33
#
4-
# Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved.
4+
# Copyright (c) 2024 SAP SE or an SAP affiliate company. All rights reserved.
55
# The files in this addon are licensed under the Apache Software License, v. 2
66
# except as noted otherwise in the LICENSE file.
77
# -----------------------------------------------------------------------
@@ -496,9 +496,9 @@ INSERT_UPDATE CMSFlexComponent;$contentCV[unique=true];uid[unique=true];name;fle
496496

497497
## Amend Order Content ##
498498
INSERT_UPDATE CMSParagraphComponent;$contentCV[unique=true];uid[unique=true];name;content
499-
;;CancelOrderConfirmationIntro;CancelOrderConfirmationIntro;"<h4>The following items will be included in the cancellation request.</h4>"
500-
;;ReturnOrderConfirmationIntro;ReturnOrderConfirmationIntro;"<h4>The following items will be included in the return request.</h4>"
501-
;;AmendOrderConfirmationOutro;AmendOrderConfirmationOutro;"<h4>Please note that it may take a few moments for your order to reflect the request.</h4>";
499+
;;CancelOrderConfirmationIntro;CancelOrderConfirmationIntro;"<p style=""text-align: center; font-size: 1.125rem;"">The following items will be included in the cancellation request.</p>"
500+
;;ReturnOrderConfirmationIntro;ReturnOrderConfirmationIntro;"<p style=""text-align: center; font-size: 1.125rem;"">The following items will be included in the return request.</p>"
501+
;;AmendOrderConfirmationOutro;AmendOrderConfirmationOutro;"<p style=""text-align: center; font-size: 1.125rem;"">Please note that it may take a few moments for your order to reflect the request.</p>";
502502

503503
## Cancel Order Confirmation Page ##
504504
INSERT_UPDATE ContentPage;$contentCV[unique=true];uid[unique=true];name;masterTemplate(uid,$contentCV);label;defaultPage[default='true'];approvalStatus(code)[default='approved'];homepage[default='false']
@@ -684,3 +684,10 @@ INSERT_UPDATE ContentSlot;$contentCV[unique=true];uid[unique=true];name;cmsCompo
684684
;;BodyContentSlot-address-book;Body Content Slot for Address Book;AccountAddressBookComponent,MyPreferredStoreComponent;
685685
;;MiddleContentSlot-StoreFinder;Middle Content Slot for Store Finder;MyPreferredStoreComponent,StoreFinderComponent;
686686

687+
###### High Contrast Themes ######
688+
# theme switcher component
689+
INSERT_UPDATE CMSFlexComponent;$contentCV[unique=true];uid[unique=true];name;flexType;&componentRef
690+
;;SiteThemeSwitcherComponent;Site Theme Switcher Component;SiteThemeSwitcherComponent;SiteThemeSwitcherComponent
691+
692+
UPDATE ContentSlot;$contentCV[unique=true];uid[unique=true];name;active;cmsComponents(uid,$contentCV)
693+
;;SiteContextSlot;Site Context Slot;true;LanguageComponent,CurrencyComponent,SiteThemeSwitcherComponent

‎core-customize/hybris/bin/custom/spartacussampledata/resources/spartacussampledata/import/contentCatalogs/apparel-ukContentCatalog/email-content.impex‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,20 @@ INSERT_UPDATE EmailPage;$contentCV[unique=true];uid[unique=true];name;masterTemp
8888
# Email velocity templates
8989
INSERT_UPDATE RendererTemplate;code[unique=true];contextClass;rendererType(code)[default='velocity']
9090
;apparel-uk_Email_Customer_Customer_Coupon_Subject;$emailPackageName-mycoupons.CouponNotificationEmailContext
91-
;apparel-uk_Email_Customer_Customer_Coupon_Body;$emailPackageName-mycoupons.CouponNotificationEmailContext
91+
;apparel-uk_Email_Customer_Customer_Coupon_Body;$emailPackageName-mycoupons.CouponNotificationEmailContext
92+
93+
###### Email CMS data for verification token ######
94+
$emailVerificationTokenPackageName=de.hybris.platform.acceleratorservices.process.email.context.impl
95+
96+
# Email page Template
97+
INSERT_UPDATE EmailPageTemplate;$contentCV[unique=true];uid[unique=true];name;active;frontendTemplateName;subject(code);htmlTemplate(code);restrictedPageTypes(code)
98+
;;VerificationTokenEmailTemplate;Verification Token Email Template;true;verificationTokenEmail;apparel-uk_Spa_Email_Verification_Token_Subject;apparel-uk_Spa_Email_Verification_Token_Body;EmailPage
99+
100+
# Email Pages
101+
INSERT_UPDATE EmailPage;$contentCV[unique=true];uid[unique=true];name;masterTemplate(uid,$contentCV);defaultPage;approvalStatus(code)[default='approved'];previewImage(code, $contentCV)[default='EmailPageModel_preview']
102+
;;VerificationTokenEmail;Verification Token Email;VerificationTokenEmailTemplate;true
103+
104+
# Email velocity templates
105+
INSERT_UPDATE RendererTemplate;code[unique=true];contextClass;rendererType(code)[default='velocity']
106+
;apparel-uk_Spa_Email_Verification_Token_Subject;$emailVerificationTokenPackageName.VerificationTokenEmailContext
107+
;apparel-uk_Spa_Email_Verification_Token_Body;$emailVerificationTokenPackageName.VerificationTokenEmailContext

0 commit comments

Comments
 (0)