Merge pull request #17 from woosignal/master

agordn52 · web-flow · commit 7661597d7b56 · 2021-10-13T19:42:53.000+01:00
5.2.1
diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [5.2.1] - 2020-10-13
+
+* Bug fixes
+
 ## [5.2.0] - 2020-10-12
 
 * Migrate to Nylo 2.1.0
diff --git a/LabelStoreMax/README.md b/LabelStoreMax/README.md
@@ -4,7 +4,7 @@
 
 # WooCommerce App: Label StoreMax
 
-### Label StoreMax - v5.2.0
+### Label StoreMax - v5.2.1
 
 
 [Official WooSignal WooCommerce App](https://woosignal.com)
diff --git a/LabelStoreMax/lib/resources/widgets/checkout_paypal.dart b/LabelStoreMax/lib/resources/widgets/checkout_paypal.dart
@@ -38,32 +38,32 @@ class WebViewState extends NyState<PayPalCheckout> {
     String tmp = "";
     if (customerAddress.firstName != null) {
       tmp +=
-          '<input type="hidden" name="first_name" value="${customerAddress.firstName}">\n';
+          '<input type="hidden" name="first_name" value="${customerAddress.firstName.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';
     }
     if (customerAddress.lastName != null) {
       tmp +=
-          '<input type="hidden" name="last_name" value="${customerAddress.lastName}">\n';
+          '<input type="hidden" name="last_name" value="${customerAddress.lastName.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';
     }
     if (customerAddress.addressLine != null) {
       tmp +=
-          '<input type="hidden" name="address1" value="${customerAddress.addressLine}">\n';
+          '<input type="hidden" name="address1" value="${customerAddress.addressLine.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';
     }
     if (customerAddress.city != null) {
       tmp +=
-          '<input type="hidden" name="city" value="${customerAddress.city}">\n';
+          '<input type="hidden" name="city" value="${customerAddress.city.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';
     }
     if (customerAddress.customerCountry.hasState() &&
         customerAddress.customerCountry.state.name != null) {
       tmp +=
-          '<input type="hidden" name="state" value="${customerAddress.customerCountry.state.name}">\n';
+          '<input type="hidden" name="state" value="${customerAddress.customerCountry.state.name.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';
     }
     if (customerAddress.postalCode != null) {
       tmp +=
-          '<input type="hidden" name="zip" value="${customerAddress.postalCode}">\n';
+          '<input type="hidden" name="zip" value="${customerAddress.postalCode.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';
     }
     if (customerAddress.customerCountry.countryCode != null) {
       tmp +=
-          '<input type="hidden" name="country" value="${customerAddress.customerCountry.countryCode}">\n';
+          '<input type="hidden" name="country" value="${customerAddress.customerCountry.countryCode.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';
     }
     formCheckoutShippingAddress = tmp;
   }
diff --git a/LabelStoreMax/pubspec.yaml b/LabelStoreMax/pubspec.yaml
@@ -1,7 +1,7 @@
 # Official WooSignal App Template for WooCommerce
 
 # Label StoreMax
-# Version: 5.2.0
+# Version: 5.2.1
 # Author: Anthony Gordon
 # Homepage: https://woosignal.com
 # Documentation: https://woosignal.com/docs/app/ios/label-storemax
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 # WooCommerce App: Label StoreMax
 
-### Label StoreMax - v5.2.0
+### Label StoreMax - v5.2.1
 
 
 [Official WooSignal WooCommerce App](https://woosignal.com)

Original file line number	Diff line number	Diff line change
`@@ -38,32 +38,32 @@ class WebViewState extends NyState<PayPalCheckout> {`
`38`	`38`	`String tmp = "";`
`39`	`39`	`if (customerAddress.firstName != null) {`
`40`	`40`	`tmp +=`
`41`		`- '<input type="hidden" name="first_name" value="${customerAddress.firstName}">\n';`
	`41`	`+ '<input type="hidden" name="first_name" value="${customerAddress.firstName.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';`
`42`	`42`	`}`
`43`	`43`	`if (customerAddress.lastName != null) {`
`44`	`44`	`tmp +=`
`45`		`- '<input type="hidden" name="last_name" value="${customerAddress.lastName}">\n';`
	`45`	`+ '<input type="hidden" name="last_name" value="${customerAddress.lastName.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';`
`46`	`46`	`}`
`47`	`47`	`if (customerAddress.addressLine != null) {`
`48`	`48`	`tmp +=`
`49`		`- '<input type="hidden" name="address1" value="${customerAddress.addressLine}">\n';`
	`49`	`+ '<input type="hidden" name="address1" value="${customerAddress.addressLine.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';`
`50`	`50`	`}`
`51`	`51`	`if (customerAddress.city != null) {`
`52`	`52`	`tmp +=`
`53`		`- '<input type="hidden" name="city" value="${customerAddress.city}">\n';`
	`53`	`+ '<input type="hidden" name="city" value="${customerAddress.city.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';`
`54`	`54`	`}`
`55`	`55`	`if (customerAddress.customerCountry.hasState() &&`
`56`	`56`	`customerAddress.customerCountry.state.name != null) {`
`57`	`57`	`tmp +=`
`58`		`- '<input type="hidden" name="state" value="${customerAddress.customerCountry.state.name}">\n';`
	`58`	`+ '<input type="hidden" name="state" value="${customerAddress.customerCountry.state.name.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';`
`59`	`59`	`}`
`60`	`60`	`if (customerAddress.postalCode != null) {`
`61`	`61`	`tmp +=`
`62`		`- '<input type="hidden" name="zip" value="${customerAddress.postalCode}">\n';`
	`62`	`+ '<input type="hidden" name="zip" value="${customerAddress.postalCode.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';`
`63`	`63`	`}`
`64`	`64`	`if (customerAddress.customerCountry.countryCode != null) {`
`65`	`65`	`tmp +=`
`66`		`- '<input type="hidden" name="country" value="${customerAddress.customerCountry.countryCode}">\n';`
	`66`	`+ '<input type="hidden" name="country" value="${customerAddress.customerCountry.countryCode.replaceAll(new RegExp(r'[^\d\w\s,\-+]+'),'')}">\n';`
`67`	`67`	`}`
`68`	`68`	`formCheckoutShippingAddress = tmp;`
`69`	`69`	`}`