Merge pull request #18 from woosignal/master

agordn52 · web-flow · commit 97c1f68c599d · 2021-11-02T21:29:59.000Z
v5.3.0 - Ability to update payment providers via WooSignal Dashboard,…
diff --git a/LabelStoreMax/.env b/LabelStoreMax/.env
@@ -10,7 +10,7 @@ ASSET_PATH_IMAGES="public/assets/images"
 TIMEZONE="UTC"
 # *<! ------ Language  ------!>*
 
-DEFAULT_LOCALE="en"
+DEFAULT_LOCALE=null
 # supports: "en" (English), "es" (Spanish), "fr" (French), "hi" (Hindi), "it" (Italian), "pt" (Portuguese) or "zh" (Simplified Chinese)
 
 # *<! ------ WooSignal Config ------!>*
@@ -23,19 +23,19 @@ APP_KEY="your app key"
 STRIPE_ACCOUNT=null
 # Stripe account key from WooSignal https://woosignal.com/dashboard
 
-STRIPE_COUNTRY_CODE="GB"
+STRIPE_COUNTRY_CODE=null
 # Alpha-2 country code list: https://www.iban.com/country-codes
 
 STRIPE_LIVE_MODE=null
 # Change to 'true' for live payments and update the "Environment for Stripe" here https://woosignal.com/dashboard
 
 # *<! ------ PAYPAL (OPTIONAL) ------!>*
 
-PAYPAL_ACCOUNT_EMAIL="mystore@business.com"
+PAYPAL_ACCOUNT_EMAIL=null
 # Your PayPal account email e.g. mystore@business.com
-PAYPAL_LIVE_MODE="false"
+PAYPAL_LIVE_MODE=null
 # Change to 'true' for live payments
-PAYPAL_LOCALE="en-GB"
+PAYPAL_LOCALE=null
 # Use BCP-47 code from this link https://developer.paypal.com/docs/api/reference/locale-codes/
 
 # *<! ------ EXTRAS ------!>*
diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md
@@ -1,8 +1,13 @@
-## [5.2.1] - 2020-10-13
+## [5.3.0] - 2021-11-02
+
+* Ability to update payment providers via WooSignal Dashboard
+* Pubspec.yaml dependency updates
+
+## [5.2.1] - 2021-10-13
 
 * Bug fixes
 
-## [5.2.0] - 2020-10-12
+## [5.2.0] - 2021-10-12
 
 * Migrate to Nylo 2.1.0
 * Use flutter_stripe library for payments
@@ -11,47 +16,47 @@
 * Android compileSdkVersion 30
 * Bug fixes
 
-## [5.1.0] - 2020-07-19
+## [5.1.0] - 2021-07-19
 
 * Add support for simplified Chinese locale (zh)
 * Add ability to change language from WooSignal dashboard
 
-## [5.0.7] - 2020-07-08
+## [5.0.7] - 2021-07-08
 
 * Pubspec.yaml dependency updates
 
-## [5.0.6] - 2020-07-08
+## [5.0.6] - 2021-07-08
 
 * Refactor project to use Nylo v1.0.0
 * Pubspec.yaml dependency updates
 
-## [5.0.5] - 2020-05-03
+## [5.0.5] - 2021-05-03
 
 * Add NSCameraUsageDescription meta to plist for IOS
 
-## [5.0.4] - 2020-04-30
+## [5.0.4] - 2021-04-30
 
 * Fix IOS build failing with Stripe
 * Pubspec.yaml dependency updates
 
-## [5.0.3] - 2020-04-27
+## [5.0.3] - 2021-04-27
 
 * Fix issue account page when logged in for Notic theme
 * Small tweak to helpers.dart
 * Pubspec.yaml dependency updates
 
-## [5.0.2] - 2020-04-17
+## [5.0.2] - 2021-04-17
 
 * Fix issue with PayPal checkout when using different locales
 * Fix nested `trans` methods
 * PAYPAL_LOCALE added to .env file
 
-## [5.0.1] - 2020-04-13
+## [5.0.1] - 2021-04-13
 
 * Update to app_payment_gateways
 * Pubspec.yaml dependency updates
 
-## [5.0.0] - 2020-04-11
+## [5.0.0] - 2021-04-11
 
 * Major release
 * Null safety libraries added
@@ -62,7 +67,7 @@
 * Pubspec.yaml dependency updates
 * Bug fixes
 
-## [4.0.0] - 2020-03-28
+## [4.0.0] - 2021-03-28
 
 * Major release
 * New config structure
@@ -74,22 +79,22 @@
 * Dart code formatted
 * Pubspec.yaml dependency updates
 
-## [3.0.0] - 2020-03-08
+## [3.0.0] - 2021-03-08
 
 * Major release
 * Flutter 2.0.0+ support
 * Manage app from WooSignal
 * Code tidy up
 * Bug fixes
 
-## [2.6.0] - 2020-02-24
+## [2.6.0] - 2021-02-24
 
 * Ability to manage affiliate products
 * Refreshed design for checkout details screen
 * New logic to manage shipping better
 * Bug fixes
 
-## [2.5.1] - 2020-02-21
+## [2.5.1] - 2021-02-21
 
 * Pubspec.yaml dependency updates
 * Bug fixes
diff --git a/LabelStoreMax/README.md b/LabelStoreMax/README.md
@@ -4,7 +4,7 @@
 
 # WooCommerce App: Label StoreMax
 
-### Label StoreMax - v5.2.1
+### Label StoreMax - v5.3.0
 
 
 [Official WooSignal WooCommerce App](https://woosignal.com)
@@ -35,7 +35,7 @@ You can also upload the app to the IOS app store and Google play store using Flu
 2. Sign up for free on [WooSignal](https://woosignal.com) and link your WooCommerce store
 3. Add your app key into the **.env** file and hit play (with Android Studio) to build the app 🥳
 
-Full documentation this available [here](https://woosignal.com/docs/app/ios/label-storemax)
+Full documentation this available [here](https://woosignal.com/docs/app/label-storemax)
 
 ## Some features integrated
 
diff --git a/LabelStoreMax/lang/de.json b/LabelStoreMax/lang/de.json
@@ -185,5 +185,6 @@
   "The payment has been cancelled": "Die Zahlung wurde storniert",
   "Must have": "Haben müssen",
   "Our selection of new items": "Unsere Auswahl an Neuheiten",
-  "Register": "Registrieren"
+  "Register": "Registrieren",
+  "No payment methods are available": "Es sind keine Zahlungsmethoden verfügbar"
 }
diff --git a/LabelStoreMax/lang/en.json b/LabelStoreMax/lang/en.json
@@ -185,5 +185,6 @@
   "The payment has been cancelled": "The payment has been cancelled",
   "Must have": "Must have",
   "Our selection of new items": "Our selection of new items",
-  "Register": "Register"
+  "Register": "Register",
+  "No payment methods are available": "No payment methods are available"
 }
diff --git a/LabelStoreMax/lang/es.json b/LabelStoreMax/lang/es.json
@@ -185,5 +185,6 @@
   "The payment has been cancelled": "El pago ha sido cancelado",
   "Must have": "Debe tener",
   "Our selection of new items": "Nuestra selección de novedades",
-  "Register": "Registrarse"
+  "Register": "Registrarse",
+  "No payment methods are available": "No hay métodos de pago disponibles."
 }
diff --git a/LabelStoreMax/lang/fr.json b/LabelStoreMax/lang/fr.json
@@ -185,5 +185,6 @@
   "The payment has been cancelled": "Le paiement a été annulé",
   "Must have": "Doit avoir",
   "Our selection of new items": "Notre sélection de nouveautés",
-  "Register": "S'inscrire"
+  "Register": "S'inscrire",
+  "No payment methods are available": "Aucun mode de paiement n'est disponible"
 }
diff --git a/LabelStoreMax/lang/hi.json b/LabelStoreMax/lang/hi.json
@@ -185,5 +185,6 @@
   "The payment has been cancelled": "bhugataan radd kar diya gaya hai",
   "Must have": "hona aavashyak hai",
   "Our selection of new items": "naee vastuon ka hamaara chayan",
-  "Register": "rajistar karen"
+  "Register": "rajistar karen",
+  "No payment methods are available": "koee bhugataan vidhiyaan upalabdh nahin hain"
 }
diff --git a/LabelStoreMax/lang/it.json b/LabelStoreMax/lang/it.json
@@ -185,5 +185,6 @@
   "The payment has been cancelled": "Il pagamento è stato annullato",
   "Must have": "Deve avere",
   "Our selection of new items": "La nostra selezione di nuovi articoli",
-  "Register": "Registrati"
+  "Register": "Registrati",
+  "No payment methods are available": "Non sono disponibili metodi di pagamento"
 }
diff --git a/LabelStoreMax/lang/pt.json b/LabelStoreMax/lang/pt.json
@@ -185,5 +185,6 @@
   "The payment has been cancelled": "O pagamento foi cancelado",
   "Must have": "Deve ter",
   "Our selection of new items": "Nossa seleção de novos itens",
-  "Register": "Registro"
+  "Register": "Registro",
+  "No payment methods are available": "Nenhum método de pagamento disponível"
 }
diff --git a/LabelStoreMax/lang/zh.json b/LabelStoreMax/lang/zh.json
@@ -185,5 +185,6 @@
   "The payment has been cancelled": "付款已取消",
   "Must have": "一定有",
   "Our selection of new items": "我们精选的新品",
-  "Register": "登记"
+  "Register": "登记",
+  "No payment methods are available": "没有可用的付款方式"
 }
diff --git a/LabelStoreMax/lib/app/providers/stripe_pay.dart b/LabelStoreMax/lib/app/providers/stripe_pay.dart
@@ -34,8 +34,15 @@ stripePay(context,
       : getEnv('STRIPE_LIVE_MODE', defaultValue: false);
 
   // CONFIGURE STRIPE
-  Stripe.stripeAccountId = getEnv('STRIPE_ACCOUNT') == null ? wooSignalApp.stripeAccount : '';
+  Stripe.stripeAccountId = getEnv('STRIPE_ACCOUNT') == null ? wooSignalApp.stripeAccount : getEnv('STRIPE_ACCOUNT');
+
   Stripe.publishableKey = liveMode ? "pk_live_IyS4Vt86L49jITSfaUShumzi" : "pk_test_0jMmpBntJ6UkizPkfiB8ZJxH"; // Don't change this value
+  await Stripe.instance.applySettings();
+
+  if (Stripe.stripeAccountId == '') {
+    NyLogger.error('You need to connect your Stripe account to WooSignal via the dashboard https://woosignal.com/dashboard');
+    return;
+  }
 
   try {
     dynamic rsp = {};
@@ -77,8 +84,8 @@ stripePay(context,
       googlePay: false,
       style: Theme.of(state.context).brightness == Brightness.light ? ThemeMode.light : ThemeMode.dark,
       testEnv: liveMode,
-      merchantCountryCode: getEnv('STRIPE_COUNTRY_CODE', defaultValue: 'GB'),
-      merchantDisplayName: getEnv('APP_NAME'),
+      merchantCountryCode: envVal('STRIPE_COUNTRY_CODE', defaultValue: wooSignalApp.stripeCountryCode),
+      merchantDisplayName: envVal('APP_NAME', defaultValue: wooSignalApp.appName),
       paymentIntentClientSecret: rsp['client_secret'],
     ));
 
@@ -103,6 +110,9 @@ stripePay(context,
     Navigator.pushNamed(context, "/checkout-status", arguments: order);
 
   } on StripeException catch(e) {
+    if (getEnv('APP_DEBUG', defaultValue: true)) {
+      NyLogger.error(e.error.message);
+    }
     showToastNotification(
       context,
       title: trans(context, "Oops!"),
diff --git a/LabelStoreMax/lib/bootstrap/helpers.dart b/LabelStoreMax/lib/bootstrap/helpers.dart
@@ -52,24 +52,41 @@ appWooSignal(Function(WooSignal) api) async {
   return await api(wooSignal);
 }
 
-List<PaymentType> getPaymentTypes() =>
-    paymentTypeList.where((v) => v != null).toList();
+List<PaymentType> getPaymentTypes() {
+  List<PaymentType> paymentTypes = [];
+  app_payment_gateways.forEach((element) {
+    if (paymentTypes.firstWhere((paymentType) => paymentType.name != element, orElse: () => null) == null) {
+      paymentTypes.add(paymentTypeList.firstWhere((paymentTypeList) => paymentTypeList.name == element, orElse: () => null));
+    }
+  });
+
+  if (!app_payment_gateways.contains('Stripe') && AppHelper.instance.appConfig.stripeEnabled == true) {
+    paymentTypes.add(paymentTypeList.firstWhere((element) => element.name == "Stripe", orElse: () => null));
+  }
+  if (!app_payment_gateways.contains('PayPal') && AppHelper.instance.appConfig.paypalEnabled == true) {
+    paymentTypes.add(paymentTypeList.firstWhere((element) => element.name == "PayPal", orElse: () => null));
+  }
+  if (!app_payment_gateways.contains('CashOnDelivery') && AppHelper.instance.appConfig.codEnabled == true) {
+    paymentTypes.add(paymentTypeList.firstWhere((element) => element.name == "CashOnDelivery", orElse: () => null));
+  }
+
+  return paymentTypes.where((v) => v != null).toList();
+}
+
+dynamic envVal(String envVal, {dynamic defaultValue}) => (getEnv(envVal) == null ? defaultValue : getEnv(envVal));
 
 PaymentType addPayment(
         {@required int id,
         @required String name,
         @required String desc,
         @required String assetImage,
-        @required Function pay}) =>
-    app_payment_gateways.contains(name)
-        ? PaymentType(
-            id: id,
-            name: name,
-            desc: desc,
-            assetImage: assetImage,
-            pay: pay,
-          )
-        : null;
+        @required Function pay}) => PaymentType(
+      id: id,
+      name: name,
+      desc: desc,
+      assetImage: assetImage,
+      pay: pay,
+    );
 
 showStatusAlert(context,
     {@required String title, String subtitle, IconData icon, int duration}) {
diff --git a/LabelStoreMax/lib/config/app_locale.dart b/LabelStoreMax/lib/config/app_locale.dart
@@ -5,15 +5,10 @@ import 'package:flutter/cupertino.dart';
 | APP LOCALE
 |
 | Configure the language by setting the locale.
-|
-| e.g. Change app_locale = Locale('es'); for Spanish.
 | You can only use one of the supported locales below in app_locales_supported.
 |--------------------------------------------------------------------------
 */
 
-const Locale app_locale = null; // by default it will use the "DEFAULT_LOCALE" value from the /.env
-// const Locale app_locale = Locale('en'); // uncomment to change the locale here too.
-
 const List<Locale> app_locales_supported = [
   Locale('en'),
   Locale('es'),
diff --git a/LabelStoreMax/lib/config/app_payment_gateways.dart b/LabelStoreMax/lib/config/app_payment_gateways.dart
@@ -13,7 +13,7 @@ import 'package:flutter_app/bootstrap/helpers.dart';
 |--------------------------------------------------------------------------
 */
 
-const app_payment_gateways = ["Stripe", "CashOnDelivery", "PayPal"];
+const app_payment_gateways = [];
 // Available: "Stripe", "CashOnDelivery", "PayPal"
 // e.g. app_payment_gateways = ["Stripe", "CashOnDelivery"]; will only use Stripe and Cash on Delivery.
 
diff --git a/LabelStoreMax/lib/config/app_theme.dart b/LabelStoreMax/lib/config/app_theme.dart
@@ -16,7 +16,7 @@ import 'package:google_fonts/google_fonts.dart';
 |--------------------------------------------------------------------------
 */
 
-final TextStyle appThemeFont = GoogleFonts.overpass();
+final TextStyle appThemeFont = GoogleFonts.poppins();
 
 // e.g. custom font in pubspec.yaml - https://flutter.dev/docs/cookbook/design/fonts
 // final TextStyle appThemeFont = TextStyle(fontFamily: "ZenTokyoZoo");
diff --git a/LabelStoreMax/lib/main.dart b/LabelStoreMax/lib/main.dart
@@ -23,7 +23,7 @@ void main() async {
 
   String initialRoute = '/no-connection';
   WooSignalApp wooSignalApp = await appWooSignal((api) => api.getApp());
-  Locale locale = app_locale;
+  Locale locale;
 
   if (wooSignalApp != null) {
     initialRoute = "/home";
@@ -38,11 +38,7 @@ void main() async {
       );
     }
 
-    if (locale == null && wooSignalApp.locale != null) {
-      locale = Locale(wooSignalApp.locale);
-    } else {
-      locale = Locale(getEnv('DEFAULT_LOCALE', defaultValue: 'en'));
-    }
+    locale = Locale((getEnv('DEFAULT_LOCALE', defaultValue: null) == null && wooSignalApp.locale != null) ? wooSignalApp.locale : envVal('DEFAULT_LOCALE', defaultValue: 'en'));
   }
 
   runApp(
diff --git a/LabelStoreMax/lib/resources/pages/cart.dart b/LabelStoreMax/lib/resources/pages/cart.dart
diff --git a/LabelStoreMax/lib/resources/pages/checkout_confirmation.dart b/LabelStoreMax/lib/resources/pages/checkout_confirmation.dart
diff --git a/LabelStoreMax/lib/resources/pages/checkout_payment_type.dart b/LabelStoreMax/lib/resources/pages/checkout_payment_type.dart
diff --git a/LabelStoreMax/lib/resources/pages/product_detail.dart b/LabelStoreMax/lib/resources/pages/product_detail.dart
diff --git a/LabelStoreMax/lib/resources/widgets/checkout_paypal.dart b/LabelStoreMax/lib/resources/widgets/checkout_paypal.dart
diff --git a/LabelStoreMax/pubspec.lock b/LabelStoreMax/pubspec.lock
diff --git a/LabelStoreMax/pubspec.yaml b/LabelStoreMax/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -185,5 +185,6 @@`
`185`	`185`	`"The payment has been cancelled": "Die Zahlung wurde storniert",`
`186`	`186`	`"Must have": "Haben müssen",`
`187`	`187`	`"Our selection of new items": "Unsere Auswahl an Neuheiten",`
`188`		`- "Register": "Registrieren"`
	`188`	`+ "Register": "Registrieren",`
	`189`	`+ "No payment methods are available": "Es sind keine Zahlungsmethoden verfügbar"`
`189`	`190`	`}`