Skip to content

Commit d70f009

Browse files
agordn52agordn52
committed
v7 updates
1 parent 3271170 commit d70f009

File tree

131 files changed

+2784
-2931
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+2784
-2931
lines changed

‎LabelStoreMax/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## [7.0.0] - 2024-03-26
2+
3+
* Refactor project
4+
* New Notifications page
5+
* Pubspec.yaml dependency updates
6+
17
## [6.15.0] - 2024-03-08
28

39
* Increase minimum ios version to 14.0

‎LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
5757
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>"; };
5858
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>"; };
59+
925D64452BA7F98500C41197 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
5960
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
6061
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
6162
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -152,6 +153,7 @@
152153
97C146F01CF9000F007C117D /* Runner */ = {
153154
isa = PBXGroup;
154155
children = (
156+
925D64452BA7F98500C41197 /* Runner.entitlements */,
155157
97C146FA1CF9000F007C117D /* Main.storyboard */,
156158
97C146FD1CF9000F007C117D /* Assets.xcassets */,
157159
97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -467,7 +469,9 @@
467469
buildSettings = {
468470
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
469471
CLANG_ENABLE_MODULES = YES;
472+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
470473
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
474+
DEVELOPMENT_TEAM = "";
471475
ENABLE_BITCODE = NO;
472476
INFOPLIST_FILE = Runner/Info.plist;
473477
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -647,7 +651,9 @@
647651
buildSettings = {
648652
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
649653
CLANG_ENABLE_MODULES = YES;
654+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
650655
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
656+
DEVELOPMENT_TEAM = "";
651657
ENABLE_BITCODE = NO;
652658
INFOPLIST_FILE = Runner/Info.plist;
653659
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -671,7 +677,9 @@
671677
buildSettings = {
672678
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
673679
CLANG_ENABLE_MODULES = YES;
680+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
674681
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
682+
DEVELOPMENT_TEAM = "";
675683
ENABLE_BITCODE = NO;
676684
INFOPLIST_FILE = Runner/Info.plist;
677685
IPHONEOS_DEPLOYMENT_TARGET = 14.0;

‎LabelStoreMax/ios/Runner/Runner.entitlements

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict/>
5+
</plist>

‎LabelStoreMax/lang/de.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,7 @@
237237
"Delete my account": "Mein Konto löschen",
238238
"({{itemCount}}) items from {{appName}}": "({{itemCount}}) artikel aus {{appName}}",
239239
"Invalid email address": "Ungültige E-Mail-Adresse",
240-
"By completing this order, I agree to all": "Mit Abschluss dieser Bestellung stimme ich allem zu"
240+
"By completing this order, I agree to all": "Mit Abschluss dieser Bestellung stimme ich allem zu",
241+
"Change language": "Sprache ändern",
242+
"Select your language": "Wähle deine Sprache"
241243
}

‎LabelStoreMax/lang/en.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,7 @@
237237
"({{itemCount}}) items from {{appName}}": "({{itemCount}}) items from {{appName}}",
238238
"Contact us for any questions on your order.": "Contact us for any questions on your order.",
239239
"Invalid email address": "Invalid email address",
240-
"By completing this order, I agree to all": "By completing this order, I agree to all"
240+
"By completing this order, I agree to all": "By completing this order, I agree to all",
241+
"Change language": "Change language",
242+
"Select your language": "Select your language"
241243
}

‎LabelStoreMax/lang/es.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,7 @@
237237
"Delete my account": "Borrar mi cuenta",
238238
"({{itemCount}}) items from {{appName}}": "({{itemCount}}) items from {{appName}}",
239239
"Invalid email address": "Dirección de correo electrónico no válida",
240-
"By completing this order, I agree to all": "Al completar este pedido, acepto todos"
240+
"By completing this order, I agree to all": "Al completar este pedido, acepto todos",
241+
"Change language": "Cambiar idioma",
242+
"Select your language": "elige tu idioma"
241243
}

‎LabelStoreMax/lang/fr.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,7 @@
237237
"Delete my account": "Supprimer mon compte",
238238
"({{itemCount}}) items from {{appName}}": "({{itemCount}}) articles de {{appName}}",
239239
"Invalid email address": "Adresse e-mail invalide",
240-
"By completing this order, I agree to all": "En remplissant cette commande, j'accepte toutes"
240+
"By completing this order, I agree to all": "En remplissant cette commande, j'accepte toutes",
241+
"Change language": "Changer de langue",
242+
"Select your language": "choisissez votre langue"
241243
}

‎LabelStoreMax/lang/hi.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,7 @@
237237
"Delete my account": "mera ekaunt hata do",
238238
"({{itemCount}}) items from {{appName}}": "({{itemCount}}) se aaitam {{appName}}",
239239
"Invalid email address": "amaany eemel pata",
240-
"By completing this order, I agree to all": "is aadesh ko poora karake, main sabhee ke lie sahamat hoon"
240+
"By completing this order, I agree to all": "is aadesh ko poora karake, main sabhee ke lie sahamat hoon",
241+
"Change language": "bhaasha badalen",
242+
"Select your language": "apanee bhaasha ka chayan karen"
241243
}

‎LabelStoreMax/lang/id.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,4 +238,6 @@
238238
"Contact us for any questions on your order.": "Hubungi kami jika ada pertanyaan tentang pesanan Anda.",
239239
"Invalid email address": "alamat email salah",
240240
"By completing this order, I agree to all": "Dengan menyelesaikan pesanan ini, saya menyetujui semuanya",
241+
"Change language": "Ganti BAHASA",
242+
"Select your language": "Pilih bahasamu"
241243
}

‎LabelStoreMax/lang/it.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,7 @@
237237
"Delete my account": "Cancella il mio account",
238238
"({{itemCount}}) items from {{appName}}": "({{itemCount}}) elementi da {{appName}}",
239239
"Invalid email address": "indirizzo email non valido",
240-
"By completing this order, I agree to all": "Completando questo ordine, accetto tutto"
240+
"By completing this order, I agree to all": "Completando questo ordine, accetto tutto",
241+
"Change language": "Cambia lingua",
242+
"Select your language": "seleziona la tua lingua"
241243
}

‎LabelStoreMax/lang/nl.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,7 @@
237237
"Delete my account": "Verwijder mijn account",
238238
"({{itemCount}}) items from {{appName}}": "({{itemCount}}) artikelen van {{appName}}",
239239
"Invalid email address": "Ongeldig e-mailadres",
240-
"By completing this order, I agree to all": "Door deze bestelling te voltooien, ga ik akkoord met alles"
240+
"By completing this order, I agree to all": "Door deze bestelling te voltooien, ga ik akkoord met alles",
241+
"Change language": "Taal wijzigen",
242+
"Select your language": "Selecteer je taal"
241243
}

‎LabelStoreMax/lang/pt.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,7 @@
237237
"Contact us for any questions on your order.": "Entre em contato conosco para qualquer dúvida sobre seu pedido.",
238238
"Delete my account": "Deletar minha conta",
239239
"Invalid email address": "Endereço de email invalido",
240-
"By completing this order, I agree to all": "Ao concluir este pedido, concordo com todos"
240+
"By completing this order, I agree to all": "Ao concluir este pedido, concordo com todos",
241+
"Change language": "Mudar idioma",
242+
"Select your language": "selecione sua lingua"
241243
}

‎LabelStoreMax/lang/th.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,4 +238,6 @@
238238
"Contact us for any questions on your order.": "ติดต่อเราหากมีคำถามเกี่ยวกับคำสั่งซื้อของคุณ",
239239
"Invalid email address": "ที่อยู่อีเมลที่ไม่ถูกต้อง",
240240
"By completing this order, I agree to all": "เมื่อดำเนินการตามคำสั่งซื้อนี้เสร็จสิ้น ฉันยอมรับทุกประการ",
241+
"Change language": "เปลี่ยนภาษา",
242+
"Select your language": "เลือกภาษาของคุณ"
241243
}

‎LabelStoreMax/lang/tr.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,7 @@
237237
"Delete my account": "Hesabımı sil",
238238
"({{itemCount}}) items from {{appName}}": "({{itemCount}}) gelen öğeler {{appName}}",
239239
"Invalid email address": "Geçersiz e-posta adresi",
240-
"By completing this order, I agree to all": "Bu siparişi tamamlayarak, tümünü kabul ediyorum"
240+
"By completing this order, I agree to all": "Bu siparişi tamamlayarak, tümünü kabul ediyorum",
241+
"Change language": "Dili değiştir",
242+
"Select your language": "Dilinizi seçiniz"
241243
}

‎LabelStoreMax/lang/zh.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,7 @@
237237
"Delete my account": "删除我的账户",
238238
"({{itemCount}}) items from {{appName}}": "({{itemCount}}) 物品来自 {{appName}}",
239239
"Invalid email address": "无效的邮件地址",
240-
"By completing this order, I agree to all": "通过完成此订单，我同意所有"
240+
"By completing this order, I agree to all": "通过完成此订单，我同意所有",
241+
"Change language": "改变语言",
242+
"Select your language": "选择你的语言"
241243
}

‎LabelStoreMax/lib/app/controllers/account_order_detail_controller.dart

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎LabelStoreMax/lib/app/controllers/browse_category_controller.dart

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎LabelStoreMax/lib/app/controllers/browse_search_controller.dart

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎LabelStoreMax/lib/app/controllers/checkout_status_controller.dart

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎LabelStoreMax/lib/app/controllers/controller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import 'package:nylo_framework/nylo_framework.dart';
1212

1313
/// Base Controller for the Nylo
14-
/// See more on controllers here - https://nylo.dev/docs/2.x/controllers
14+
/// See more on controllers here - https://nylo.dev/docs/5.20.0/controllers
1515
class Controller extends NyController {
1616
Controller();
1717
}

‎LabelStoreMax/lib/app/controllers/customer_orders_loader_controller.dart

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎LabelStoreMax/lib/app/controllers/leave_review_controller.dart

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎LabelStoreMax/lib/app/controllers/product_category_search_loader_controller.dart

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎LabelStoreMax/lib/app/controllers/product_detail_controller.dart

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,8 @@ class ProductDetailController extends Controller {
7070
if (onSuccess != null) {
7171
onSuccess();
7272
}
73-
updateState(ProductQuantity.state, data: {
74-
"product_id": product?.id,
75-
"quantity": quantity
76-
});
73+
updateState(ProductQuantity.state,
74+
data: {"product_id": product?.id, "quantity": quantity});
7775
}
7876
}
7977

@@ -83,10 +81,8 @@ class ProductDetailController extends Controller {
8381
if (onSuccess != null) {
8482
onSuccess();
8583
}
86-
updateState(ProductQuantity.state, data: {
87-
"product_id": product?.id,
88-
"quantity": quantity
89-
});
84+
updateState(ProductQuantity.state,
85+
data: {"product_id": product?.id, "quantity": quantity});
9086
}
9187
}
9288

@@ -134,6 +130,39 @@ class ProductDetailController extends Controller {
134130
}
135131
}
136132

137-
return tmpProductVariation;
133+
if (tmpProductVariation != null) {
134+
return tmpProductVariation;
135+
}
136+
137+
// attempt to find product variation
138+
List<String> tmpKeys = [];
139+
for (var productVariation in productVariations) {
140+
for (var attr in productVariation.attributes) {
141+
String? attrName = attr.name;
142+
if (attrName == null) continue;
143+
tmpKeys.add(attrName);
144+
}
145+
}
146+
147+
// Find matching product variation
148+
tmpSelectedObj.removeWhere((key, value) => !tmpKeys.contains(key));
149+
150+
for (var productVariation in productVariations) {
151+
bool hasMatch = false;
152+
for (var attr in productVariation.attributes) {
153+
if (tmpSelectedObj[attr.name] == attr.option) {
154+
hasMatch = true;
155+
} else {
156+
hasMatch = false;
157+
break;
158+
}
159+
}
160+
161+
if (hasMatch) {
162+
return productVariation;
163+
}
164+
}
165+
166+
return null;
138167
}
139168
}

0 commit comments

Comments
 (0)