igiqr/flutter-woocommerce-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v5.0.2 - updates

Browse Source
This commit is contained in:
Anthony Gordon 2021-04-17 18:53:07 +01:00
parent 40f3ebb6ac
commit d08d1b0fe3
19 changed files with 75 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LabelStoreMax/.env
View File

@ -34,6 +34,8 @@ PAYPAL_ACCOUNT_EMAIL="mystore@business.com"
# Your PayPal account email e.g. mystore@business.com
PAYPAL_LIVE_MODE="false"
# Change to 'true' for live payments
PAYPAL_LOCALE="en-GB"
# Use BCP-47 code from this link https://developer.paypal.com/docs/api/reference/locale-codes/
# *<! ------ EXTRAS ------!>*

6
LabelStoreMax/CHANGELOG.md
View File

@ -1,3 +1,9 @@
## [5.0.2] - 2020-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
* Update to app_payment_gateways

2
LabelStoreMax/README.md
View File

@ -4,7 +4,7 @@
# WooCommerce App: Label StoreMax
### Label StoreMax - v5.0.1
### Label StoreMax - v5.0.2
[Official WooSignal WooCommerce App](https://woosignal.com)

4
LabelStoreMax/lang/es.json
View File

@ -179,8 +179,8 @@
"Dark Mode": "Modo oscuro",
"PayPal Checkout": "Pago con PayPal",
"Processing Payment": "Procesando el pago",
"Please wait, your order is being processed and you will be redirected to the PayPal website.": "Espere, su pedido se está procesando y será redirigido al sitio web de PayPal.",
"If you are not automatically redirected to PayPal within 5 seconds": "Si no se le redirige automáticamente a PayPal en 5 segundos",
"Please wait, your order is being processed and you will be redirected to the PayPal website.": "Espere, su pedido se esta procesando y sera redirigido al sitio web de PayPal.",
"If you are not automatically redirected to PayPal within 5 seconds": "Si no se le redirige automaticamente a PayPal en 5 segundos",
"Payment Cancelled": "Pago cancelado",
"The payment has been cancelled": "El pago ha sido cancelado",
"Must have": "Debe tener",

4
LabelStoreMax/lang/fr.json
View File

@ -179,8 +179,8 @@
"Dark Mode": "Mode sombre",
"PayPal Checkout": "Paiement PayPal",
"Processing Payment": "Traitement du paiement",
"Please wait, your order is being processed and you will be redirected to the PayPal website.": "Veuillez patienter, votre commande est en cours de traitement et vous serez redirigé vers le site PayPal.",
"If you are not automatically redirected to PayPal within 5 seconds": "Si vous n'êtes pas automatiquement redirigé vers PayPal dans les 5 secondes",
"Please wait, your order is being processed and you will be redirected to the PayPal website.": "Veuillez patienter, votre commande est en cours de traitement et vous serez redirige vers le site PayPal.",
"If you are not automatically redirected to PayPal within 5 seconds": "Si vous n'etes pas automatiquement redirige vers PayPal dans les 5 secondes",
"Payment Cancelled": "Paiement annulé",
"The payment has been cancelled": "Le paiement a été annulé",
"Must have": "Doit avoir",

2
LabelStoreMax/lang/it.json
View File

@ -179,7 +179,7 @@
"Dark Mode": "Modalità scura",
"PayPal Checkout": "Pagamento PayPal",
"Processing Payment": "Pagamento in elaborazione",
"Please wait, your order is being processed and you will be redirected to the PayPal website.": "Attendi, il tuo ordine è in fase di elaborazione e verrai reindirizzato al sito web di PayPal.",
"Please wait, your order is being processed and you will be redirected to the PayPal website.": "Attendi, verrai reindirizzato al sito web di PayPal.",
"If you are not automatically redirected to PayPal within 5 seconds": "Se non vieni reindirizzato automaticamente a PayPal entro 5 secondi",
"Payment Cancelled": "Pagamento annullato",
"The payment has been cancelled": "Il pagamento è stato annullato",

4
LabelStoreMax/lang/pt.json
View File

@ -179,8 +179,8 @@
"Dark Mode": "Modo escuro",
"PayPal Checkout": "PayPal Checkout",
"Processing Payment": "Processando o pagamento",
"Please wait, your order is being processed and you will be redirected to the PayPal website.": "Aguarde, seu pedido está sendo processado e você será redirecionado para o site do PayPal.",
"If you are not automatically redirected to PayPal within 5 seconds": "Se você não for redirecionado automaticamente para o PayPal em 5 segundos",
"Please wait, your order is being processed and you will be redirected to the PayPal website.": "Aguarde, seu pedido esta sendo processado e voce sera redirecionado para o site do PayPal.",
"If you are not automatically redirected to PayPal within 5 seconds": "Se voce nao for redirecionado automaticamente para o PayPal em 5 segundos",
"Payment Cancelled": "Pagamento Cancelado",
"The payment has been cancelled": "O pagamento foi cancelado",
"Must have": "Deve ter",

6
LabelStoreMax/lib/app/providers/cash_on_delivery.dart
View File

@ -33,8 +33,7 @@ cashOnDeliveryPay(context,
showToastNotification(
context,
title: trans(context, "Error"),
description: trans(context,
trans(context, "Something went wrong, please contact our store")),
description: trans(context, "Something went wrong, please contact our store"),
);
state.reloadState(showLoader: false);
}
@ -42,8 +41,7 @@ cashOnDeliveryPay(context,
showToastNotification(
context,
title: trans(context, "Error"),
description: trans(context,
trans(context, "Something went wrong, please contact our store")),
description: trans(context, "Something went wrong, please contact our store"),
);
state.reloadState(showLoader: false);
}

3
LabelStoreMax/lib/app/providers/example_pay.dart
View File

@ -53,8 +53,7 @@ examplePay(context,
showToastNotification(
context,
title: trans(context, "Error"),
description: trans(context,
trans(context, "Something went wrong, please contact our store")),
description: trans(context, "Something went wrong, please contact our store"),
);
state.reloadState(showLoader: false);
}

46
LabelStoreMax/lib/app/providers/paypal_pay.dart
View File

@ -28,7 +28,7 @@ payPalPay(context,
await checkout(taxRate, (total, billingDetails, cart) async {
List<CartLineItem> cartLineItems = await cart.getCart();
String description = await cart.cartShortDesc();
state.reloadState(showLoader: true);
await Navigator.push(
context,
MaterialPageRoute(
@ -36,43 +36,43 @@ payPalPay(context,
description: description,
amount: total,
cartLineItems: cartLineItems))).then((value) async {
if (value is Map<String, dynamic>) {
if (!(value is Map<String, dynamic>)) {
showToastNotification(
context,
title: trans(context, "Payment Cancelled"),
description:
trans(context, "The payment has been cancelled"),
);
state.reloadState(showLoader: false);
return;
}
state.reloadState(showLoader: true);
if (value.containsKey("status") && value["status"] == "success") {
OrderWC orderWC =
await buildOrderWC(taxRate: taxRate, markPaid: true);
Order order = await appWooSignal((api) => api.createOrder(orderWC));
if (order != null) {
Navigator.pushNamed(context, "/checkout-status", arguments: order);
} else {
if (order == null) {
showToastNotification(
context,
title: trans(context, "Error"),
description: trans(
context,
trans(context,
"Something went wrong, please contact our store")),
description: trans(context,
"Something went wrong, please contact our store"),
);
state.reloadState(showLoader: false);
return;
}
Navigator.pushNamed(context, "/checkout-status", arguments: order);
return;
} else {
showToastNotification(
context,
title: trans(context, "Payment Cancelled"),
description: trans(
context, trans(context, "The payment has been cancelled")),
description: trans(context, "The payment has been cancelled"),
);
}
}
);
state.reloadState(showLoader: false);
}
} else {
showToastNotification(
context,
title: trans(context, "Payment Cancelled"),
description:
trans(context, trans(context, "The payment has been cancelled")),
);
state.reloadState(showLoader: false);
}
});
});
}

5
LabelStoreMax/lib/app/providers/razor_pay.dart
View File

@ -38,10 +38,7 @@ razorPay(context,
} else {
showToastNotification(context,
title: trans(context, "Error"),
description: trans(
context,
trans(context, "Something went wrong, please contact our store"),
),
description: trans(context, "Something went wrong, please contact our store"),
style: ToastNotificationStyleType.WARNING);
razorPay.clear();
state.reloadState(showLoader: false);

6
LabelStoreMax/lib/app/providers/stripe_pay.dart
View File

@ -91,10 +91,8 @@ stripePay(context,
showToastNotification(
context,
title: trans(context, "Error"),
description: trans(
context,
trans(context,
"Something went wrong, please contact our store")),
description: trans(context,
"Something went wrong, please contact our store"),
);
state.reloadState(showLoader: false);
}

2
LabelStoreMax/lib/resources/pages/checkout_confirmation.dart
View File

@ -51,7 +51,7 @@ class CheckoutConfirmationPageState extends State<CheckoutConfirmationPage> {
_getTaxes();
}
reloadState({bool showLoader}) {
reloadState({@required bool showLoader}) {
setState(() {
_showFullLoader = showLoader ?? false;
});

5
LabelStoreMax/lib/resources/pages/checkout_details.dart
View File

@ -323,11 +323,8 @@ class _CheckoutDetailsPageState extends State<CheckoutDetailsPage> {
showToastNotification(
context,
title: trans(context, "Oops"),
description: trans(
context,
trans(context,
description: trans(context,
"Invalid shipping address, please check your shipping details"),
),
style: ToastNotificationStyleType.WARNING,
);
return;

14
LabelStoreMax/lib/resources/pages/no_connection_page.dart
View File

@ -13,6 +13,7 @@ import 'package:flutter_app/bootstrap/app_helper.dart';
import 'package:flutter_app/bootstrap/helpers.dart';
import 'package:flutter_app/resources/widgets/buttons.dart';
import 'package:nylo_framework/helpers/helper.dart';
import 'package:woosignal/models/response/woosignal_app.dart';
class NoConnectionPage extends StatefulWidget {
NoConnectionPage();
@ -62,14 +63,17 @@ class _NoConnectionPageState extends State<NoConnectionPage> {
}
_retry() async {
AppHelper.instance.appConfig = await appWooSignal((api) => api.getApp());
WooSignalApp wooSignalApp = await appWooSignal((api) => api.getApp());
if (AppHelper.instance.appConfig != null) {
Navigator.pushNamed(context, "/home");
return;
}
if (wooSignalApp == null) {
showToastNotification(context,
title: trans(context, "Oops"),
description: trans(context, "Retry later"));
return;
}
AppHelper.instance.appConfig = wooSignalApp;
AppHelper.instance.themeType = wooSignalApp.theme;
Navigator.pushNamed(context, "/home");
}
}

13
LabelStoreMax/lib/resources/widgets/checkout_paypal.dart
View File

@ -115,16 +115,21 @@ class WebViewState extends NyState<PayPalCheckout> {
}
String _loadHTML() {
final String strProcessingPayment = trans(context, "Processing Payment");
final String strPleaseWait = trans(context, "Please wait, your order is being processed and you will be redirected to the PayPal website.");
final String strRedirectMessage = trans(context, "If you are not automatically redirected to PayPal within 5 seconds");
return '''
<html><head><title>${trans(context, "Processing Payment")}...</title></head>
<html><head><title>$strProcessingPayment...</title></head>
<body onload="document.forms['paypal_form'].submit();">
<div style="text-align:center;">
<img src="https://woosignal.com/images/paypal_logo.png" height="50" />
</div>
<center><h4>${trans(context, "Please wait, your order is being processed and you will be redirected to the PayPal website.")}</h4></center>
<center><h4>$strPleaseWait</h4></center>
<form method="post" name="paypal_form" action="${getPayPalUrl()}">
<input type="hidden" name="cmd" value="_xclick">
<input type="hidden" name="amount" value="${widget.amount}">
<input type="hidden" name="lc" value="${getEnv('PAYPAL_LOCALE', defaultValue: 'en-GB')}">
<input type="hidden" name="currency_code" value="${_wooSignalApp.currencyMeta.code}">
<input type="hidden" name="business" value="${getEnv('PAYPAL_ACCOUNT_EMAIL')}">
<input type="hidden" name="return" value="https://woosignal.com/paypal/payment~success">
@ -133,10 +138,10 @@ class WebViewState extends NyState<PayPalCheckout> {
<input type="hidden" name="custom" value="${getPayPalPaymentType()}">
<input type="hidden" name="address_override" value="1">
$formCheckoutShippingAddress
<center><br><br>${trans(context, "If you are not automatically redirected to PayPal within 5 seconds")}...<br><br>
<center><br><br>$strRedirectMessage...<br><br>
<input type="submit" value="Click Here"></center>
</form></body></html>
''';
'''.toString();
}
@override

7
LabelStoreMax/lib/resources/widgets/notic_home_widget.dart
View File

@ -151,14 +151,17 @@ class _NoticHomeWidgetState extends State<NoticHomeWidget> {
height: MediaQuery.of(context).size.height / 2.5,
),
Container(
height: 80,
height: 100,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(trans(context, "Must have")),
Text(
Flexible(
child: Text(
trans(context, "Our selection of new items"),
style: Theme.of(context).textTheme.headline4,
maxLines: 2, overflow: TextOverflow.ellipsis,
),
)
],
),

2
LabelStoreMax/pubspec.yaml
View File

@ -1,7 +1,7 @@
# Official WooSignal App Template for WooCommerce
# Label StoreMax
# Version: 5.0.1
# Version: 5.0.2
# Author: Anthony Gordon
# Homepage: https://woosignal.com
# Documentation: https://woosignal.com/docs/app/ios/label-storemax

2
README.md
View File

@ -4,7 +4,7 @@
# WooCommerce App: Label StoreMax
### Label StoreMax - v5.0.1
### Label StoreMax - v5.0.2
[Official WooSignal WooCommerce App](https://woosignal.com)