v1.1.0

agordn52 · agordn52 · commit f220a557c6cb · 2024-02-21T14:06:32.000+07:00
diff --git a/ShopMax/.env b/ShopMax/.env
@@ -48,7 +48,7 @@ RAZORPAY_API_KEY=""
 
 # *<! ------ EXTRAS ------!>*
 
-PRODUCT_PLACEHOLDER_IMAGE="https://woosignal.com/images/woocommerce-placeholder.png"
+PRODUCT_PLACEHOLDER_IMAGE="https://woosignal.com/images/shopify-placeholder.png"
 # Sets the default placeholder image for products with no image
 
 AUTH_USER_KEY="AUTH_USER"
diff --git a/ShopMax/CHANGELOG.md b/ShopMax/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [1.1.0] - 2024-02-21
+
+* Ability to add, reorder and show Shopify Collections selected from the WooSignal dashboard
+* Refactor `ForgotPassword` page
+* New `BrowseCategories` page
+* Add missing translations
+* Refactor `Wishlist` page
+* pubspec.yaml updates
+
 ## [1.0.5] - 2024-02-17
 
 * Add missing translations
diff --git a/ShopMax/lang/de.json b/ShopMax/lang/de.json
@@ -230,5 +230,9 @@
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) artikel aus {{appName}}",
   "Shipping is not supported for your location, sorry": "Der Versand wird für Ihren Standort nicht unterstützt, tut mir leid",
   "Order Summary": "Bestellübersicht",
+  "Invalid email address": "Ungültige E-Mail-Adresse",
+  "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",
   "By completing this order, I agree to all": "Mit Abschluss dieser Bestellung stimme ich allem zu"
 }
diff --git a/ShopMax/lang/en.json b/ShopMax/lang/en.json
@@ -236,5 +236,9 @@
   "Login / Create an account": "Login / Create an account",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) items from {{appName}}",
   "Contact us for any questions on your order.": "Contact us for any questions on your order.",
+  "Invalid email address": "Invalid email address",
+  "Send Reset Email": "Send Reset Email",
+  "Password reset email sent": "Password reset email sent",
+  "Failed to send reset email": "Failed to send reset email",
   "By completing this order, I agree to all": "By completing this order, I agree to all"
 }
diff --git a/ShopMax/lang/es.json b/ShopMax/lang/es.json
@@ -230,5 +230,9 @@
   "Shipping is not supported for your location, sorry": "El envío no es compatible para su ubicación, lo siento",
   "Order Summary": "Resumen del pedido",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) artículos de {{appName}}",
+  "Invalid email address": "Dirección de correo electrónico no válida",
+  "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",
   "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
@@ -230,5 +230,9 @@
   "Shipping is not supported for your location, sorry": "L'expédition n'est pas prise en charge pour votre emplacement, désolé",
   "Order Summary": "Récapitulatif de la commande",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) articles de {{appName}}",
+  "Invalid email address": "Adresse e-mail invalide",
+  "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",
   "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
@@ -230,5 +230,9 @@
   "Shipping is not supported for your location, sorry": "aapake sthaan ke lie shiping samarthit nahin hai, kshama karen",
   "Order Summary": "aadesh saaraansh",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) se aaitam {{appName}}",
+  "Invalid email address": "amaany eemel pata",
+  "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",
   "By completing this order, I agree to all": "is aadesh ko poora karake, main sabhee ke lie sahamat hoon"
 }
diff --git a/ShopMax/lang/id.json b/ShopMax/lang/id.json
@@ -236,5 +236,9 @@
   "Login / Create an account": "Masuk / Buat akun",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) item dari {{appName}}",
   "Contact us for any questions on your order.": "Hubungi kami jika ada pertanyaan tentang pesanan Anda.",
+  "Invalid email address": "alamat email salah",
+  "Send Reset Email": "Kirim Reset Email",
+  "Password reset email sent": "Email pengaturan ulang kata sandi terkirim",
+  "Failed to send reset email": "Gagal mengirim email setel ulang",
   "By completing this order, I agree to all": "Dengan menyelesaikan pesanan ini, saya menyetujui semuanya"
 }
diff --git a/ShopMax/lang/it.json b/ShopMax/lang/it.json
@@ -230,5 +230,9 @@
   "Shipping is not supported for your location, sorry": "La spedizione non è supportata per la tua posizione, mi dispiace",
   "Order Summary": "Riepilogo dell'ordine",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) elementi da {{appName}}",
+  "Invalid email address": "indirizzo email non valido",
+  "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",
   "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
@@ -230,5 +230,9 @@
   "Shipping is not supported for your location, sorry": "Verzending wordt niet ondersteund voor uw locatie, sorry",
   "Order Summary": "Overzicht van de bestelling",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) artikelen van {{appName}}",
+  "Invalid email address": "Ongeldig e-mailadres",
+  "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",
   "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
@@ -229,6 +229,10 @@
   "Account deleted": "Conta excluída",
   "Shipping is not supported for your location, sorry": "O envio não é suportado para a sua localização, desculpe",
   "Order Summary": "Resumo do pedido",
+  "Invalid email address": "Endereço de email invalido",
+  "Send Reset Email": "Enviar e-mail de redefinição",
+  "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}}",
   "By completing this order, I agree to all": "Ao concluir este pedido, concordo com todos"
 }
diff --git a/ShopMax/lang/th.json b/ShopMax/lang/th.json
@@ -236,5 +236,9 @@
   "Login / Create an account": "เข้าสู่ระบบ / สร้างบัญชี",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) รายการจาก {{appName}}",
   "Contact us for any questions on your order.": "ติดต่อเราหากมีคำถามเกี่ยวกับคำสั่งซื้อของคุณ",
+  "Invalid email address": "ที่อยู่อีเมลที่ไม่ถูกต้อง",
+  "Send Reset Email": "ส่งอีเมล์รีเซ็ต",
+  "Password reset email sent": "ส่งอีเมลรีเซ็ตรหัสผ่านแล้ว",
+  "Failed to send reset email": "ไม่สามารถส่งอีเมลรีเซ็ตได้",
   "By completing this order, I agree to all": "เมื่อดำเนินการตามคำสั่งซื้อนี้เสร็จสิ้น ฉันยอมรับทุกประการ"
 }
diff --git a/ShopMax/lang/tr.json b/ShopMax/lang/tr.json
@@ -230,5 +230,9 @@
   "Shipping is not supported for your location, sorry": "Bulunduğunuz yer için gönderim desteklenmiyor, üzgünüm",
   "Order Summary": "Sipariş özeti",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) gelen öğeler {{appName}}",
+  "Invalid email address": "Geçersiz e-posta adresi",
+  "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",
   "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
@@ -230,5 +230,9 @@
   "Shipping is not supported for your location, sorry": "您所在的位置不支持送货，抱歉",
   "Order Summary": "订单摘要",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) 物品来自 {{appName}}",
+  "Invalid email address": "无效的邮件地址",
+  "Send Reset Email": "发送重置电子邮件",
+  "Password reset email sent": "密码重置电子邮件已发送",
+  "Failed to send reset email": "发送重置邮件失败",
   "By completing this order, I agree to all": "通过完成此订单，我同意所有"
 }
diff --git a/ShopMax/lib/app/events/delete_account_event.dart b/ShopMax/lib/app/events/delete_account_event.dart
@@ -44,7 +44,8 @@ ${authCustomerInfo.firstName}
 
     final Uri deleteAccount = Uri(
         scheme: 'mailto',
-        path: getEnv('SUPPORT_EMAIL', defaultValue: AppHelper.instance.shopifyAppConfig?.supportEmail),
+        path: getEnv('SUPPORT_EMAIL',
+            defaultValue: AppHelper.instance.shopifyAppConfig?.supportEmail),
         queryParameters: {
           'subject': 'Request for Account Deletion - ${getEnv('APP_NAME')}',
           'body': body
diff --git a/ShopMax/lib/app/providers/app_provider.dart b/ShopMax/lib/app/providers/app_provider.dart
@@ -20,12 +20,11 @@ class AppProvider implements NyProvider {
       DeviceOrientation.portraitUp,
     ]);
 
-    await shopify.WooSignalShopify.instance
-        .init(
-        appKey: getEnv('APP_KEY'),
-        debugMode: getEnv('APP_DEBUG'),
-        encryptKey: getEnv('ENCRYPT_KEY'),
-        encryptSecret: getEnv('ENCRYPT_SECRET'),
+    await shopify.WooSignalShopify.instance.init(
+      appKey: getEnv('APP_KEY'),
+      debugMode: getEnv('APP_DEBUG'),
+      encryptKey: getEnv('ENCRYPT_KEY'),
+      encryptSecret: getEnv('ENCRYPT_SECRET'),
     );
 
     AppHelper.instance.shopifyAppConfig = shopify.WooSignalApp();
diff --git a/ShopMax/lib/app/providers/payments/shopify/paypal_pay.dart b/ShopMax/lib/app/providers/payments/shopify/paypal_pay.dart
@@ -31,9 +31,11 @@ payPalPay(context) async {
     String shippingTotal =
         CheckoutSession.getInstance.shippingType?.getTotal() ?? "0";
 
-    String description =
-        "({{itemCount}}) items from {{appName}}"
-            .tr(arguments: {"appName": getEnv('APP_NAME'), "itemCount": cartLineItems.length.toString()});
+    String description = "({{itemCount}}) items from {{appName}}".tr(
+        arguments: {
+          "appName": getEnv('APP_NAME'),
+          "itemCount": cartLineItems.length.toString()
+        });
 
     Navigator.of(context).push(
       MaterialPageRoute(
diff --git a/ShopMax/lib/resources/pages/browse_categories_page.dart b/ShopMax/lib/resources/pages/browse_categories_page.dart
@@ -0,0 +1,61 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_app/bootstrap/helpers.dart';
+import 'package:flutter_app/resources/widgets/safearea_widget.dart';
+import 'package:nylo_framework/nylo_framework.dart';
+import 'package:woosignal_shopify_api/models/response/collection_item_response.dart';
+import 'package:woosignal_shopify_api/models/response/product_search.dart';
+import 'package:woosignal_shopify_api/models/response/products_by_collection_id_response.dart';
+import '../widgets/woosignal_ui.dart';
+
+class BrowseCategoriesPage extends NyStatefulWidget {
+  static const path = '/browse-categories';
+
+  BrowseCategoriesPage() : super(path, child: _BrowseCategoriesPageState());
+}
+
+class _BrowseCategoriesPageState extends NyState<BrowseCategoriesPage> {
+  Collections? _collection;
+  bool hasNextPage = true;
+  String? cursor;
+
+  @override
+  init() async {
+    _collection = data() as Collections;
+  }
+
+  /// Use boot if you need to load data before the [view] is rendered.
+  @override
+  boot() async {}
+
+  @override
+  Widget view(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Text(_collection?.title ?? "")),
+      body: SafeAreaWidget(
+        child: NyPullToRefresh.grid(
+          crossAxisCount: 2,
+          child: (context, product) {
+            product as ProductSearch;
+            return ProductItem.fromShopifyProductSearch(product);
+          },
+          data: (int iteration) async {
+            if (hasNextPage == false) return [];
+            ProductsByCollectionIdResponse? productsByCollectionIdResponse =
+                await appWooSignalShopify((api) =>
+                    api.getProductsByCollectionId(
+                        id: _collection?.id, after: cursor, first: 50));
+            cursor = productsByCollectionIdResponse?.pageInfo?.endCursor;
+            if (productsByCollectionIdResponse?.pageInfo?.hasNextPage != true) {
+              hasNextPage = false;
+            }
+            return productsByCollectionIdResponse?.products ?? [];
+          },
+          beforeRefresh: () {
+            cursor = null;
+            hasNextPage = true;
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/ShopMax/lib/resources/pages/forgot_password_page.dart b/ShopMax/lib/resources/pages/forgot_password_page.dart
@@ -0,0 +1,111 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_app/bootstrap/helpers.dart';
+import 'package:flutter_app/resources/widgets/buttons.dart';
+import 'package:flutter_app/resources/widgets/woosignal_ui.dart';
+import 'package:nylo_framework/nylo_framework.dart';
+
+class ForgotPasswordPage extends NyStatefulWidget {
+  static const path = '/forgot-password';
+
+  ForgotPasswordPage() : super(path, child: _ForgotPasswordPageState());
+}
+
+class _ForgotPasswordPageState extends NyState<ForgotPasswordPage> {
+  final TextEditingController _tfEmailController = TextEditingController();
+
+  @override
+  Widget view(BuildContext context) {
+    return Scaffold(
+      body: SafeArea(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: <Widget>[
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                mainAxisAlignment: MainAxisAlignment.start,
+                children: <Widget>[
+                  StoreLogo(height: 100),
+                  Flexible(
+                    child: Container(
+                      height: 70,
+                      padding: EdgeInsets.only(bottom: 20),
+                      margin: EdgeInsets.symmetric(horizontal: 20),
+                      alignment: Alignment.bottomLeft,
+                      child: Text(
+                        "Forgot Password".tr(),
+                        textAlign: TextAlign.left,
+                        style: Theme.of(context)
+                            .textTheme
+                            .headlineMedium!
+                            .copyWith(
+                              fontSize: 24,
+                              fontWeight: FontWeight.w700,
+                            ),
+                      ),
+                    ),
+                  ),
+                  Container(
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(8),
+                      boxShadow:
+                          (Theme.of(context).brightness == Brightness.light)
+                              ? wsBoxShadow()
+                              : null,
+                      color: ThemeColor.get(context).backgroundContainer,
+                    ),
+                    padding: EdgeInsets.symmetric(vertical: 18, horizontal: 8),
+                    margin: EdgeInsets.symmetric(horizontal: 16),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                      children: [
+                        NyTextField.emailAddress(
+                          controller: _tfEmailController,
+                          validationRules: "email",
+                          validationErrorMessage: "Invalid email address".tr(),
+                        ),
+                        PrimaryButton(
+                          title: "Send Reset Email".tr(),
+                          isLoading: isLocked('send_reset_email'),
+                          action: _sendResetEmail,
+                        ).paddingOnly(top: 16),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            Divider(),
+            LinkButton(
+              title: trans("Back"),
+              action: pop,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  _sendResetEmail() async {
+    String emailAddress = _tfEmailController.text;
+    validate(
+        rules: {
+          "Email": [emailAddress, "email"]
+        },
+        onSuccess: () async {
+          bool successful = await appWooSignalShopify((api) =>
+              api.authCustomerForgotPassword(email: _tfEmailController.text));
+          if (!successful) {
+            showToastDanger(description: "Failed to send reset email".tr());
+            return;
+          }
+          if (successful) {
+            showToastSuccess(description: "Password reset email sent".tr());
+            pop();
+          }
+        },
+        lockRelease: 'send_reset_email');
+  }
+}
diff --git a/ShopMax/lib/resources/pages/shopify/login_page.dart b/ShopMax/lib/resources/pages/shopify/login_page.dart
@@ -9,7 +9,7 @@
 //  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 import 'package:flutter/material.dart';
-import '/bootstrap/app_helper.dart';
+import 'package:flutter_app/resources/pages/forgot_password_page.dart';
 import '/bootstrap/helpers.dart';
 import '/resources/pages/shopify/register_page.dart';
 import '/resources/widgets/buttons.dart';
@@ -126,14 +126,7 @@ class _LoginPageState extends NyState<LoginPage> {
             LinkButton(
                 title: trans("Forgot Password"),
                 action: () {
-                  String? forgotPasswordUrl = AppHelper
-                      .instance.shopifyAppConfig?.wpLoginForgotPasswordUrl;
-                  if (forgotPasswordUrl != null) {
-                    openBrowserTab(url: forgotPasswordUrl);
-                  } else {
-                    NyLogger.info(
-                        "No URL found for \"forgot password\".\nAdd your forgot password URL here https://woosignal.com/dashboard/apps");
-                  }
+                  routeTo(ForgotPasswordPage.path);
                 }),
             widget.showBackButton
                 ? Column(
diff --git a/ShopMax/lib/resources/pages/shopify/product_search_page.dart b/ShopMax/lib/resources/pages/shopify/product_search_page.dart
diff --git a/ShopMax/lib/resources/pages/shopify/wishlist_page.dart b/ShopMax/lib/resources/pages/shopify/wishlist_page.dart
diff --git a/ShopMax/lib/resources/widgets/shopify/home_drawer_widget.dart b/ShopMax/lib/resources/widgets/shopify/home_drawer_widget.dart
diff --git a/ShopMax/lib/resources/widgets/shopify/mello_theme_widget.dart b/ShopMax/lib/resources/widgets/shopify/mello_theme_widget.dart
diff --git a/ShopMax/lib/resources/widgets/woosignal_ui.dart b/ShopMax/lib/resources/widgets/woosignal_ui.dart
diff --git a/ShopMax/lib/routes/router.dart b/ShopMax/lib/routes/router.dart
diff --git a/ShopMax/pubspec.lock b/ShopMax/pubspec.lock
diff --git a/ShopMax/pubspec.yaml b/ShopMax/pubspec.yaml
