v1.1.6

agordn52 · agordn52 · commit ce46c6d63fa5 · 2024-03-04T14:26:53.000+07:00
diff --git a/ShopMax/CHANGELOG.md b/ShopMax/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [1.1.6] - 2024-03-04
+
+* Add missing translations
+* Refactor pages
+* pubspec.yaml updates
+
 ## [1.1.5] - 2024-02-26
 
 * Fix the Controller on the `CheckoutStatus` page
diff --git a/ShopMax/lang/de.json b/ShopMax/lang/de.json
@@ -234,5 +234,11 @@
   "Send Reset Email": "Senden Sie eine E-Mail zum Zurücksetzen",
   "Password reset email sent": "E-Mail zum Zurücksetzen des Passworts gesendet",
   "Failed to send reset email": "E-Mail zum Zurücksetzen konnte nicht gesendet werden",
+  "Checkout as guest": "Als Gast auschecken",
+  "Logout?": "Ausloggen?",
+  "Checkout as guest or login to continue": "Bezahlen Sie als Gast oder melden Sie sich an, um fortzufahren",
+  "Login / Create an account": "Anmelden / Konto erstellen",
+  "Contact us for any questions on your order.": "Kontaktieren Sie uns bei Fragen zu Ihrer Bestellung.",
+  "Delete my account": "Mein Konto löschen",
   "By completing this order, I agree to all": "Mit Abschluss dieser Bestellung stimme ich allem zu"
 }
diff --git a/ShopMax/lang/es.json b/ShopMax/lang/es.json
@@ -234,5 +234,11 @@
   "Send Reset Email": "Enviar correo electrónico de reinicio",
   "Password reset email sent": "Correo electrónico de restablecimiento de contraseña enviado",
   "Failed to send reset email": "No se pudo enviar el correo electrónico de reinicio",
+  "Checkout as guest": "Pagar como invitado",
+  "Logout?": "¿Cerrar sesión?",
+  "Checkout as guest or login to continue": "Pagar como invitado o iniciar sesión para continuar",
+  "Login / Create an account": "Iniciar sesión / Crear una cuenta",
+  "Contact us for any questions on your order.": "Contáctenos para cualquier pregunta sobre su pedido.",
+  "Delete my account": "Borrar mi cuenta",
   "By completing this order, I agree to all": "Al completar este pedido, acepto todos"
 }
diff --git a/ShopMax/lang/fr.json b/ShopMax/lang/fr.json
@@ -234,5 +234,11 @@
   "Send Reset Email": "Envoyer un e-mail de réinitialisation",
   "Password reset email sent": "E-mail de réinitialisation du mot de passe envoyé",
   "Failed to send reset email": "Échec de l'envoi de l'e-mail de réinitialisation",
+  "Checkout as guest": "Commander en tant qu'invité",
+  "Logout?": "Se déconnecter?",
+  "Checkout as guest or login to continue": "Payez en tant qu'invité ou connectez-vous pour continuer",
+  "Login / Create an account": "Connexion / Créer un compte",
+  "Contact us for any questions on your order.": "Contactez-nous pour toute question sur votre commande.",
+  "Delete my account": "Supprimer mon compte",
   "By completing this order, I agree to all": "En remplissant cette commande, j'accepte toutes"
 }
diff --git a/ShopMax/lang/hi.json b/ShopMax/lang/hi.json
@@ -234,5 +234,11 @@
   "Send Reset Email": "reeset eemel bhejen",
   "Password reset email sent": "paasavard reeset eemel bheja gaya",
   "Failed to send reset email": "reeset eemel bhejane mein viphal",
+  "Checkout as guest": "atithi ke roop mein chekaut karen",
+  "Logout?": "log aaut?",
+  "Checkout as guest or login to continue": "atithi ke roop mein chekaut karen ya jaaree rakhane ke lie login karen",
+  "Login / Create an account": "log in karen / ek khaata banaen",
+  "Contact us for any questions on your order.": "apane ordar par kisee bhee prashn ke lie hamase sampark karen.",
+  "Delete my account": "mera ekaunt hata do",
   "By completing this order, I agree to all": "is aadesh ko poora karake, main sabhee ke lie sahamat hoon"
 }
diff --git a/ShopMax/lang/it.json b/ShopMax/lang/it.json
@@ -234,5 +234,11 @@
   "Send Reset Email": "Invia e-mail di reimpostazione",
   "Password reset email sent": "E-mail di reimpostazione della password inviata",
   "Failed to send reset email": "Impossibile inviare l'e-mail di reimpostazione",
+  "Checkout as guest": "Checkout come ospite",
+  "Logout?": "Disconnettersi?",
+  "Checkout as guest or login to continue": "Acquista come ospite o accedi per continuare",
+  "Login / Create an account": "Accedi / Crea un account",
+  "Contact us for any questions on your order.": "Contattaci per qualsiasi domanda sul tuo ordine.",
+  "Delete my account": "Cancella il mio account",
   "By completing this order, I agree to all": "Completando questo ordine, accetto tutto"
 }
diff --git a/ShopMax/lang/nl.json b/ShopMax/lang/nl.json
@@ -234,5 +234,11 @@
   "Send Reset Email": "Reset-e-mail verzenden",
   "Password reset email sent": "E-mail voor wachtwoordherstel verzonden",
   "Failed to send reset email": "Kan geen reset-e-mail verzenden",
+  "Checkout as guest": "Check uit als gast",
+  "Logout?": "Uitloggen?",
+  "Checkout as guest or login to continue": "Afrekenen als gast of inloggen om verder te gaan",
+  "Login / Create an account": "Inloggen / Maak een account aan",
+  "Contact us for any questions on your order.": "Neem contact met ons op voor eventuele vragen over uw bestelling.",
+  "Delete my account": "Verwijder mijn account",
   "By completing this order, I agree to all": "Door deze bestelling te voltooien, ga ik akkoord met alles"
 }
diff --git a/ShopMax/lang/pt.json b/ShopMax/lang/pt.json
@@ -234,5 +234,11 @@
   "Password reset email sent": "E-mail de redefinição de senha enviado",
   "Failed to send reset email": "Falha ao enviar e-mail de redefinição",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) itens de {{appName}}",
+  "Checkout as guest": "Finalizar compra como convidado",
+  "Logout?": "Sair?",
+  "Checkout as guest or login to continue": "Finalize a compra como convidado ou faça login para continuar",
+  "Login / Create an account": "Entrar / Criar uma conta",
+  "Contact us for any questions on your order.": "Entre em contato conosco para qualquer dúvida sobre seu pedido.",
+  "Delete my account": "Deletar minha conta",
   "By completing this order, I agree to all": "Ao concluir este pedido, concordo com todos"
 }
diff --git a/ShopMax/lang/tr.json b/ShopMax/lang/tr.json
@@ -234,5 +234,11 @@
   "Send Reset Email": "Sıfırlama E-postasını Gönder",
   "Password reset email sent": "Şifre sıfırlama e-postası gönderildi",
   "Failed to send reset email": "Sıfırlama e-postası gönderilemedi",
+  "Checkout as guest": "Misafir olarak ödeme yap",
+  "Logout?": "Çıkış Yap?",
+  "Checkout as guest or login to continue": "Devam etmek için misafir olarak ödeme yapın veya giriş yapın",
+  "Login / Create an account": "Giriş yap / Hesap oluştur",
+  "Contact us for any questions on your order.": "Siparişinizle ilgili sorularınız için bizimle iletişime geçin.",
+  "Delete my account": "Hesabımı sil",
   "By completing this order, I agree to all": "Bu siparişi tamamlayarak, tümünü kabul ediyorum"
 }
diff --git a/ShopMax/lang/zh.json b/ShopMax/lang/zh.json
@@ -234,5 +234,11 @@
   "Send Reset Email": "发送重置电子邮件",
   "Password reset email sent": "密码重置电子邮件已发送",
   "Failed to send reset email": "发送重置邮件失败",
+  "Checkout as guest": "以访客身份结账",
+  "Logout?": "登出？",
+  "Checkout as guest or login to continue": "以访客身份结帐或登录以继续",
+  "Login / Create an account": "登录/创建帐户",
+  "Contact us for any questions on your order.": "如果您对订单有任何疑问，请联系我们。",
+  "Delete my account": "删除我的账户",
   "By completing this order, I agree to all": "通过完成此订单，我同意所有"
 }
diff --git a/ShopMax/lib/resources/pages/account_order_detail_page.dart b/ShopMax/lib/resources/pages/account_order_detail_page.dart
@@ -9,15 +9,14 @@
 //  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 import 'package:flutter/material.dart';
-import 'package:flutter_app/app/controllers/controller.dart';
 import '/bootstrap/extensions.dart';
 import '/bootstrap/helpers.dart';
 import '/resources/widgets/safearea_widget.dart';
 import '/resources/widgets/woosignal_ui.dart';
 import 'package:nylo_framework/nylo_framework.dart';
 import 'package:woosignal_shopify_api/models/response/order_response.dart';
 
-class AccountOrderDetailPage extends NyStatefulWidget<Controller> {
+class AccountOrderDetailPage extends NyStatefulWidget {
   static String path = "/account-order-detail";
 
   AccountOrderDetailPage({Key? key})
diff --git a/ShopMax/lib/resources/pages/home_search_page.dart b/ShopMax/lib/resources/pages/home_search_page.dart
@@ -9,6 +9,7 @@
 //  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 import 'package:flutter/material.dart';
+import 'package:flutter_app/resources/pages/product_search_page.dart';
 import '/bootstrap/app_helper.dart';
 import '/resources/widgets/buttons.dart';
 import '/resources/widgets/safearea_widget.dart';
@@ -21,25 +22,23 @@ class HomeSearchPage extends NyStatefulWidget {
   HomeSearchPage() : super(path, child: _HomeSearchPageState());
 }
 
-class _HomeSearchPageState extends State<HomeSearchPage> {
+class _HomeSearchPageState extends NyState<HomeSearchPage> {
   _HomeSearchPageState();
 
   final TextEditingController _txtSearchController = TextEditingController();
 
-  @override
-  void initState() {
-    super.initState();
-  }
-
   _actionSearch() {
-    Navigator.pushNamed(context, "/product-search",
-            arguments: _txtSearchController.text)
-        .then((search) {
-      if (["notic", "compo"]
-              .contains(AppHelper.instance.shopifyAppConfig?.theme) ==
-          false) {
-        Navigator.pop(context);
-      }
+    String search = _txtSearchController.text;
+    validate(rules: {
+      "search": [search, "not_empty"]
+    }, onSuccess: () {
+      routeTo(ProductSearchPage.path, data: search, onPop: (value) {
+        if (["notic", "compo"]
+            .contains(AppHelper.instance.shopifyAppConfig?.theme) ==
+            false) {
+          Navigator.pop(context);
+        }
+      });
     });
   }
 
@@ -55,13 +54,14 @@ class _HomeSearchPageState extends State<HomeSearchPage> {
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
-            TextField(
+            NyTextField.compact(
               decoration: InputDecoration(prefixIcon: Icon(Icons.search)),
               controller: _txtSearchController,
               style: Theme.of(context).textTheme.displaySmall,
               keyboardType: TextInputType.text,
               autocorrect: false,
-              autofocus: true,
+              autoFocus: true,
+              backgroundColor: Colors.grey.shade100,
               textCapitalization: TextCapitalization.sentences,
             ),
             Container(
diff --git a/ShopMax/lib/resources/pages/product_search_page.dart b/ShopMax/lib/resources/pages/product_search_page.dart
@@ -9,15 +9,14 @@
 //  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 import 'package:flutter/material.dart';
-import 'package:flutter_app/app/controllers/controller.dart';
 import 'package:woosignal_shopify_api/models/response/product_search.dart';
 import '/bootstrap/helpers.dart';
 import '/resources/widgets/safearea_widget.dart';
 import '/resources/widgets/woosignal_ui.dart';
 import 'package:nylo_framework/nylo_framework.dart';
 import 'package:woosignal_shopify_api/models/response/shopify_product_search_response.dart';
 
-class ProductSearchPage extends NyStatefulWidget<Controller> {
+class ProductSearchPage extends NyStatefulWidget {
   static String path = "/product-search";
 
   ProductSearchPage({Key? key})
diff --git a/ShopMax/pubspec.lock b/ShopMax/pubspec.lock
diff --git a/ShopMax/pubspec.yaml b/ShopMax/pubspec.yaml
