merge changes

PrestaShopCorp · Nov 29, 2024 · e0c6b14 · e0c6b14
1 parent 7cd7d0a
commit e0c6b14
Show file tree

Hide file tree

Showing 11 changed files with 951 additions and 934 deletions.
diff --git a/.github/mktp-metadata.json b/.github/mktp-metadata.json
@@ -8,4 +8,3 @@
   "compatible_from" : "1.7.4.0",
   "compatible_to" : "1.7.8.11"
 }
-
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ There 3 main branches on the repository:
 
 Contributors **must** follow the following rules:
 
-* Use the main branch `prestashop/8.x`
+* Use the main branch `prestashop/1.7.x`
 * Do not update the module's version number.
 * Follow [the coding standards][1].
 

diff --git a/_dev/js/front/src/service/paypal.service.js b/_dev/js/front/src/service/paypal.service.js
diff --git a/config.xml b/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>ps_checkout</name>
     <displayName><![CDATA[PrestaShop Checkout]]></displayName>
-    <version><![CDATA[7.3.6.3]]></version>
+    <version><![CDATA[7.4.2.1]]></version>
     <description><![CDATA[Provide the most commonly used payment methods to your customers in this all-in-one module, and manage all your sales in a centralized interface.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[payments_gateways]]></tab>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,3 @@
		"compatible_from" : "1.7.4.0",
		"compatible_to" : "1.7.8.11"
		}