Merged PR 12736: #18889 - version bump

#18889 - version bump Related work items: #18889
dynamicweb · Apr 9, 2024 · acb7ee6 · acb7ee6
2 parents da8ac7f + 02b81fb
commit acb7ee6
Show file tree

Hide file tree

Showing 5 changed files with 121 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,63 @@
 # Changelog
 
+## [v1.26.1] - 09-04-2024
+
+> [!NOTE]  
+> **Requirements**
+> * **Swift v1.26.1 requires DynamicWeb v9.17.1 or newer, requires the newest Shipmondo.dll version 2.0.0**
+> * **Swift v1.26.1 can also run on DynamicWeb v10.1.0 or newer, requires the newest Shipmondo.dll v10.0.5 (which needs to be installed)**
+
+## Bugfixes
+
+* Checkout: Invalid voucher code message doesn't disappear in summary
+* General: Using Custom (not Google) Font result Swift template error on DW10, fix null checks
+* General: Searchfield change of what happens on Enter. Use Friendly standard url, for better url handeling
+* Itemtypes: Poster with two Product link buttons does not appear
+* Itemtypes: Video poster - Video is not rendered in DW10 - Use EscapeUriString instead of EscapeDataString
+* Itemtypes: Product group grid is not available. Extend ParentItemTypeRestrictionRule to ProductDetails
+* Itemtypes: ProductAddToCart, Never out of stock is false by default for non-stock type products
+* Itemtypes: ExpressBuySearchResponse, Add to cart disabled state fix
+* Itemtypes: ProductListCompactView, Add to cart disabled state fix
+* Itemtypes: ProductListListView, Add to cart disable state fix
+* Itemtypes: ProductAddToQuoteCart, add to cart disabled state fix
+* Itemtypes: RelatedProductsList, Add to cart disabled state fix
+* Itemtypes: ProductReplacement, Add to cart disabled state fix
+* Product group grid: W3C - Trailing slash on void elements. Group grid, remove trailing slash
+* Product group grid: Extra border between image and button area, fix grouptheme location
+* System Email: Order Email - Improve EmailOrderlines null checks
+
+> [!TIP]
+> ### System email - order receipt
+> **Set up order receipt**
+>
+> 1. In Content / System Emails / Checkout Email / **Order Confirmation Email** . Publish Order Confirmation Email
+> 2. On edit paragraph Swift_EmailOrderlines go to App, select template from **eCom / Order / Orderlines.cshtml** (IMG 1 & IMG 2))
+> 3. On the order number section, remove the styling bold from {{Ecom:Order.ID}} (Since order number info disappear on mail) (IMG 3)
+>
+> **Select order receipt in checkout for Checkout user & Anonymous checkout**
+>
+> 4. In Content / Navigation / Utilities / Cart / **Checkout user** 
+> 5. Edit checkout paragraph, go to App
+> 6. In section Notification e-mails, select Mail Content for Page (IMG 4)
+> 7. Select system Email / Checkout email / Order Confirmation Email page (IMG 4)
+> 8. Do the same steps for **Anonymous checkout** 
+
+**Set up order receipt**
+
+(IMG 1)
+![alt text](https://doc.dynamicweb.com/Files/Images/Swift/System-email-order-receipt.png)
+
+(IMG 2)
+![alt text](https://doc.dynamicweb.com/Files/Images/Swift/System-email-order-receipt2.png)
+
+(IMG 3)
+![alt text](https://doc.dynamicweb.com/Files/Images/Swift/remove-bold-orderid.png)
+
+**Select order receipt in checkout for Checkout user & Anonymous checkout**
+
+(IMG 4)
+![alt text](https://doc.dynamicweb.com/Files/Images/Swift/System-Email-Checkout.png)
+
 ## [v1.26.0] - 05-03-2024
 
 > [!NOTE]  

diff --git a/README.md b/README.md
@@ -38,7 +38,8 @@ This repository contains a `./Files` with design files, images, and other static
 
 ## Requirements
 
-* **Swift 1.26.0** requires **DynamicWeb version 9.17.1** and **Shipmondo dll v2.0.0** or newer, it can also run on DynamicWeb version 10.1.0 or newer
+* **Swift 1.26.1** requires **DynamicWeb version 9.17.1** and **Shipmondo dll v2.0.0** or newer, it can also run on DynamicWeb version 10.1.0 or newer and **Shipmondo dll v10.0.5 (Needs to be installed)**
+* **Swift 1.26.0** requires **DynamicWeb version 9.17.1** and **Shipmondo dll v2.0.0** or newer, it can also run on DynamicWeb version 10.1.0 or newer  and **Shipmondo dll v10.0.5 (Needs to be installed)**
 * **Swift 1.25.1** requires **DynamicWeb version 9.16.6** or newer, it can also run on DynamicWeb version 10.0.27
 * **Swift 1.25.0** requires **DynamicWeb version 9.16.5** or newer, it can also run on DynamicWeb version 10.0.25
 * **Swift 1.24.0** requires **DynamicWeb version 9.16.2** or newer, it can also run on DynamicWeb version 10.0.21

diff --git a/Releaselog/v1.26.1.md b/Releaselog/v1.26.1.md
@@ -0,0 +1,59 @@
+# v1.26.1
+
+## [v1.26.1] - 09-04-2024
+
+> [!NOTE]  
+> **Requirements**
+> * **Swift v1.26.1 requires DynamicWeb v9.17.1 or newer, requires the newest Shipmondo.dll version 2.0.0**
+> * **Swift v1.26.1 can also run on DynamicWeb v10.1.0 or newer, requires the newest Shipmondo.dll v10.0.5 (which needs to be installed)**
+
+## Bugfixes
+
+* Checkout: Invalid voucher code message doesn't disappear in summary
+* General: Using Custom (not Google) Font result Swift template error on DW10, fix null checks
+* General: Searchfield change of what happens on Enter. Use Friendly standard url, for better url handeling
+* Itemtypes: Poster with two Product link buttons does not appear
+* Itemtypes: Video poster - Video is not rendered in DW10 - Use EscapeUriString instead of EscapeDataString
+* Itemtypes: Product group grid is not available. Extend ParentItemTypeRestrictionRule to ProductDetails
+* Itemtypes: ProductAddToCart, Never out of stock is false by default for non-stock type products
+* Itemtypes: ExpressBuySearchResponse, Add to cart disabled state fix
+* Itemtypes: ProductListCompactView, Add to cart disabled state fix
+* Itemtypes: ProductListListView, Add to cart disable state fix
+* Itemtypes: ProductAddToQuoteCart, add to cart disabled state fix
+* Itemtypes: RelatedProductsList, Add to cart disabled state fix
+* Itemtypes: ProductReplacement, Add to cart disabled state fix
+* Product group grid: W3C - Trailing slash on void elements. Group grid, remove trailing slash
+* Product group grid: Extra border between image and button area, fix grouptheme location
+* System Email: Order Email - Improve EmailOrderlines null checks
+
+> [!TIP]
+> ### System email - order receipt
+> **Set up order receipt**
+>
+> 1. In Content / System Emails / Checkout Email / **Order Confirmation Email** . Publish Order Confirmation Email
+> 2. On edit paragraph Swift_EmailOrderlines go to App, select template from **eCom / Order / Orderlines.cshtml** (IMG 1 & IMG 2))
+> 3. On the order number section, remove the styling bold from {{Ecom:Order.ID}} (Since order number info disappear on mail) (IMG 3)
+>
+> **Select order receipt in checkout for Checkout user & Anonymous checkout**
+>
+> 4. In Content / Navigation / Utilities / Cart / **Checkout user** 
+> 5. Edit checkout paragraph, go to App
+> 6. In section Notification e-mails, select Mail Content for Page (IMG 4)
+> 7. Select system Email / Checkout email / Order Confirmation Email page (IMG 4)
+> 8. Do the same steps for **Anonymous checkout** 
+
+**Set up order receipt**
+
+(IMG 1)
+![alt text](https://doc.dynamicweb.com/Files/Images/Swift/System-email-order-receipt.png)
+
+(IMG 2)
+![alt text](https://doc.dynamicweb.com/Files/Images/Swift/System-email-order-receipt2.png)
+
+(IMG 3)
+![alt text](https://doc.dynamicweb.com/Files/Images/Swift/remove-bold-orderid.png)
+
+**Select order receipt in checkout for Checkout user & Anonymous checkout**
+
+(IMG 4)
+![alt text](https://doc.dynamicweb.com/Files/Images/Swift/System-Email-Checkout.png)
diff --git a/Swift/Files/Templates/Designs/Swift/swift_version.txt b/Swift/Files/Templates/Designs/Swift/swift_version.txt
@@ -1 +1 @@
-v1.26.0
+v1.26.1
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dynamicweb-swift",
-    "version": "1.26.0",
+    "version": "1.26.1",
     "description": "Dynamicweb Swift is a plug-and-play standard solution which allows you to create beautiful mobile-friendly websites",
     "private": true,
     "scripts": {