v7 updates

woosignal · Mar 26, 2024 · d70f009 · d70f009
1 parent 3271170
commit d70f009
Show file tree

Hide file tree

Showing 131 changed files with 2,784 additions and 2,931 deletions.
diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [7.0.0] - 2024-03-26
+
+* Refactor project
+* New Notifications page
+* Pubspec.yaml dependency updates
+
 ## [6.15.0] - 2024-03-08
 
 * Increase minimum ios version to 14.0

diff --git a/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj b/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj
@@ -56,6 +56,7 @@
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		8362715010B1DC025B396ED3 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		8DD46F1E543D90202726C03D /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
+		925D64452BA7F98500C41197 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -152,6 +153,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				925D64452BA7F98500C41197 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -467,7 +469,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -647,7 +651,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -671,7 +677,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;

diff --git a/LabelStoreMax/ios/Runner/Runner.entitlements b/LabelStoreMax/ios/Runner/Runner.entitlements
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/LabelStoreMax/lang/de.json b/LabelStoreMax/lang/de.json
@@ -237,5 +237,7 @@
   "Delete my account": "Mein Konto löschen",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) artikel aus {{appName}}",
   "Invalid email address": "Ungültige E-Mail-Adresse",
-  "By completing this order, I agree to all": "Mit Abschluss dieser Bestellung stimme ich allem zu"
+  "By completing this order, I agree to all": "Mit Abschluss dieser Bestellung stimme ich allem zu",
+  "Change language": "Sprache ändern",
+  "Select your language": "Wähle deine Sprache"
 }
diff --git a/LabelStoreMax/lang/en.json b/LabelStoreMax/lang/en.json
@@ -237,5 +237,7 @@
   "({{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",
-  "By completing this order, I agree to all": "By completing this order, I agree to all"
+  "By completing this order, I agree to all": "By completing this order, I agree to all",
+  "Change language": "Change language",
+  "Select your language": "Select your language"
 }
diff --git a/LabelStoreMax/lang/es.json b/LabelStoreMax/lang/es.json
@@ -237,5 +237,7 @@
   "Delete my account": "Borrar mi cuenta",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) items from {{appName}}",
   "Invalid email address": "Dirección de correo electrónico no válida",
-  "By completing this order, I agree to all": "Al completar este pedido, acepto todos"
+  "By completing this order, I agree to all": "Al completar este pedido, acepto todos",
+  "Change language": "Cambiar idioma",
+  "Select your language": "elige tu idioma"
 }
diff --git a/LabelStoreMax/lang/fr.json b/LabelStoreMax/lang/fr.json
@@ -237,5 +237,7 @@
   "Delete my account": "Supprimer mon compte",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) articles de {{appName}}",
   "Invalid email address": "Adresse e-mail invalide",
-  "By completing this order, I agree to all": "En remplissant cette commande, j'accepte toutes"
+  "By completing this order, I agree to all": "En remplissant cette commande, j'accepte toutes",
+  "Change language": "Changer de langue",
+  "Select your language": "choisissez votre langue"
 }
diff --git a/LabelStoreMax/lang/hi.json b/LabelStoreMax/lang/hi.json
@@ -237,5 +237,7 @@
   "Delete my account": "mera ekaunt hata do",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) se aaitam {{appName}}",
   "Invalid email address": "amaany eemel pata",
-  "By completing this order, I agree to all": "is aadesh ko poora karake, main sabhee ke lie sahamat hoon"
+  "By completing this order, I agree to all": "is aadesh ko poora karake, main sabhee ke lie sahamat hoon",
+  "Change language": "bhaasha badalen",
+  "Select your language": "apanee bhaasha ka chayan karen"
 }
diff --git a/LabelStoreMax/lang/id.json b/LabelStoreMax/lang/id.json
@@ -238,4 +238,6 @@
   "Contact us for any questions on your order.": "Hubungi kami jika ada pertanyaan tentang pesanan Anda.",
   "Invalid email address": "alamat email salah",
   "By completing this order, I agree to all": "Dengan menyelesaikan pesanan ini, saya menyetujui semuanya",
+  "Change language": "Ganti BAHASA",
+  "Select your language": "Pilih bahasamu"
 }
diff --git a/LabelStoreMax/lang/it.json b/LabelStoreMax/lang/it.json
@@ -237,5 +237,7 @@
   "Delete my account": "Cancella il mio account",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) elementi da {{appName}}",
   "Invalid email address": "indirizzo email non valido",
-  "By completing this order, I agree to all": "Completando questo ordine, accetto tutto"
+  "By completing this order, I agree to all": "Completando questo ordine, accetto tutto",
+  "Change language": "Cambia lingua",
+  "Select your language": "seleziona la tua lingua"
 }
diff --git a/LabelStoreMax/lang/nl.json b/LabelStoreMax/lang/nl.json
@@ -237,5 +237,7 @@
   "Delete my account": "Verwijder mijn account",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) artikelen van {{appName}}",
   "Invalid email address": "Ongeldig e-mailadres",
-  "By completing this order, I agree to all": "Door deze bestelling te voltooien, ga ik akkoord met alles"
+  "By completing this order, I agree to all": "Door deze bestelling te voltooien, ga ik akkoord met alles",
+  "Change language": "Taal wijzigen",
+  "Select your language": "Selecteer je taal"
 }
diff --git a/LabelStoreMax/lang/pt.json b/LabelStoreMax/lang/pt.json
@@ -237,5 +237,7 @@
   "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",
   "Invalid email address": "Endereço de email invalido",
-  "By completing this order, I agree to all": "Ao concluir este pedido, concordo com todos"
+  "By completing this order, I agree to all": "Ao concluir este pedido, concordo com todos",
+  "Change language": "Mudar idioma",
+  "Select your language": "selecione sua lingua"
 }
diff --git a/LabelStoreMax/lang/th.json b/LabelStoreMax/lang/th.json
@@ -238,4 +238,6 @@
   "Contact us for any questions on your order.": "ติดต่อเราหากมีคำถามเกี่ยวกับคำสั่งซื้อของคุณ",
   "Invalid email address": "ที่อยู่อีเมลที่ไม่ถูกต้อง",
   "By completing this order, I agree to all": "เมื่อดำเนินการตามคำสั่งซื้อนี้เสร็จสิ้น ฉันยอมรับทุกประการ",
+  "Change language": "เปลี่ยนภาษา",
+  "Select your language": "เลือกภาษาของคุณ"
 }
diff --git a/LabelStoreMax/lang/tr.json b/LabelStoreMax/lang/tr.json
@@ -237,5 +237,7 @@
   "Delete my account": "Hesabımı sil",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) gelen öğeler {{appName}}",
   "Invalid email address": "Geçersiz e-posta adresi",
-  "By completing this order, I agree to all": "Bu siparişi tamamlayarak, tümünü kabul ediyorum"
+  "By completing this order, I agree to all": "Bu siparişi tamamlayarak, tümünü kabul ediyorum",
+  "Change language": "Dili değiştir",
+  "Select your language": "Dilinizi seçiniz"
 }
diff --git a/LabelStoreMax/lang/zh.json b/LabelStoreMax/lang/zh.json
@@ -237,5 +237,7 @@
   "Delete my account": "删除我的账户",
   "({{itemCount}}) items from {{appName}}": "({{itemCount}}) 物品来自 {{appName}}",
   "Invalid email address": "无效的邮件地址",
-  "By completing this order, I agree to all": "通过完成此订单，我同意所有"
+  "By completing this order, I agree to all": "通过完成此订单，我同意所有",
+  "Change language": "改变语言",
+  "Select your language": "选择你的语言"
 }
diff --git a/LabelStoreMax/lib/app/controllers/account_order_detail_controller.dart b/LabelStoreMax/lib/app/controllers/account_order_detail_controller.dart
diff --git a/LabelStoreMax/lib/app/controllers/browse_category_controller.dart b/LabelStoreMax/lib/app/controllers/browse_category_controller.dart
diff --git a/LabelStoreMax/lib/app/controllers/browse_search_controller.dart b/LabelStoreMax/lib/app/controllers/browse_search_controller.dart
diff --git a/LabelStoreMax/lib/app/controllers/checkout_status_controller.dart b/LabelStoreMax/lib/app/controllers/checkout_status_controller.dart
diff --git a/LabelStoreMax/lib/app/controllers/controller.dart b/LabelStoreMax/lib/app/controllers/controller.dart
@@ -11,7 +11,7 @@
 import 'package:nylo_framework/nylo_framework.dart';
 
 /// Base Controller for the Nylo
-/// See more on controllers here - https://nylo.dev/docs/2.x/controllers
+/// See more on controllers here - https://nylo.dev/docs/5.20.0/controllers
 class Controller extends NyController {
   Controller();
 }
diff --git a/LabelStoreMax/lib/app/controllers/customer_orders_loader_controller.dart b/LabelStoreMax/lib/app/controllers/customer_orders_loader_controller.dart
diff --git a/LabelStoreMax/lib/app/controllers/leave_review_controller.dart b/LabelStoreMax/lib/app/controllers/leave_review_controller.dart
diff --git a/LabelStoreMax/lib/app/controllers/product_category_search_loader_controller.dart b/LabelStoreMax/lib/app/controllers/product_category_search_loader_controller.dart
diff --git a/LabelStoreMax/lib/app/controllers/product_detail_controller.dart b/LabelStoreMax/lib/app/controllers/product_detail_controller.dart
@@ -70,10 +70,8 @@ class ProductDetailController extends Controller {
       if (onSuccess != null) {
         onSuccess();
       }
-      updateState(ProductQuantity.state, data: {
-        "product_id": product?.id,
-        "quantity": quantity
-      });
+      updateState(ProductQuantity.state,
+          data: {"product_id": product?.id, "quantity": quantity});
     }
   }
 
@@ -83,10 +81,8 @@ class ProductDetailController extends Controller {
       if (onSuccess != null) {
         onSuccess();
       }
-      updateState(ProductQuantity.state, data: {
-        "product_id": product?.id,
-        "quantity": quantity
-      });
+      updateState(ProductQuantity.state,
+          data: {"product_id": product?.id, "quantity": quantity});
     }
   }
 
@@ -134,6 +130,39 @@ class ProductDetailController extends Controller {
       }
     }
 
-    return tmpProductVariation;
+    if (tmpProductVariation != null) {
+      return tmpProductVariation;
+    }
+
+    // attempt to find product variation
+    List<String> tmpKeys = [];
+    for (var productVariation in productVariations) {
+      for (var attr in productVariation.attributes) {
+        String? attrName = attr.name;
+        if (attrName == null) continue;
+        tmpKeys.add(attrName);
+      }
+    }
+
+    // Find matching product variation
+    tmpSelectedObj.removeWhere((key, value) => !tmpKeys.contains(key));
+
+    for (var productVariation in productVariations) {
+      bool hasMatch = false;
+      for (var attr in productVariation.attributes) {
+        if (tmpSelectedObj[attr.name] == attr.option) {
+          hasMatch = true;
+        } else {
+          hasMatch = false;
+          break;
+        }
+      }
+
+      if (hasMatch) {
+        return productVariation;
+      }
+    }
+
+    return null;
   }
 }