From 63244606be1f8591538754f8f105d813bda3d23e Mon Sep 17 00:00:00 2001 From: Anthony Date: Mon, 21 Aug 2023 02:54:18 +0100 Subject: [PATCH] v6.10.0 --- LabelStoreMax/CHANGELOG.md | 5 ++ .../ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../app/providers/payments/razorpay_pay.dart | 6 +- .../resources/widgets/app_version_widget.dart | 2 +- .../resources/widgets/cart_icon_widget.dart | 2 + ...roduct_detail_related_products_widget.dart | 2 + .../product_detail_reviews_widget.dart | 9 ++ LabelStoreMax/pubspec.lock | 82 +++++++++++-------- LabelStoreMax/pubspec.yaml | 2 +- 10 files changed, 74 insertions(+), 40 deletions(-) diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md index d78e937..fdc54d1 100644 --- a/LabelStoreMax/CHANGELOG.md +++ b/LabelStoreMax/CHANGELOG.md @@ -1,3 +1,8 @@ +## [6.10.0] - 2023-08-21 + +* Small refactor to project +* Pubspec.yaml dependency updates + ## [6.9.0] - 2023-07-13 * Pull firebase config via woosignal api diff --git a/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj b/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj index 773787e..6bacc5d 100644 --- a/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj +++ b/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/LabelStoreMax/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/LabelStoreMax/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 3db53b6..b52b2e6 100644 --- a/LabelStoreMax/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/LabelStoreMax/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ api.createOrder(orderWC)); if (order != null) { - Cart.getInstance.clear(); - Navigator.pushNamed(context, "/checkout-status", arguments: order); - } else { showToastNotification( context, title: "Error".tr(), description: trans("Something went wrong, please contact our store"), ); state.reloadState(showLoader: false); + return; } + Cart.getInstance.clear(); + Navigator.pushNamed(context, "/checkout-status", arguments: order); }); razorpay.on(Razorpay.EVENT_PAYMENT_ERROR, (PaymentFailureResponse response) { diff --git a/LabelStoreMax/lib/resources/widgets/app_version_widget.dart b/LabelStoreMax/lib/resources/widgets/app_version_widget.dart index 144379b..767188e 100644 --- a/LabelStoreMax/lib/resources/widgets/app_version_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/app_version_widget.dart @@ -20,7 +20,7 @@ class AppVersionWidget extends StatelessWidget { return NyFutureBuilder( future: PackageInfo.fromPlatform(), child: (BuildContext context, data) => Padding( - child: Text("${trans("Version")}: ${data.version}", + child: Text("${trans("Version")}: ${data?.version}", style: Theme.of(context) .textTheme .bodyMedium! diff --git a/LabelStoreMax/lib/resources/widgets/cart_icon_widget.dart b/LabelStoreMax/lib/resources/widgets/cart_icon_widget.dart index bf4a971..cac9294 100644 --- a/LabelStoreMax/lib/resources/widgets/cart_icon_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/cart_icon_widget.dart @@ -41,6 +41,8 @@ class _CartIconWidgetState extends State { future: Cart.getInstance.getCart(), child: (BuildContext context, data) { + if (data == null) return SizedBox.shrink(); + List cartItems = data.map((e) => e.quantity).toList(); String cartValue = "0"; diff --git a/LabelStoreMax/lib/resources/widgets/product_detail_related_products_widget.dart b/LabelStoreMax/lib/resources/widgets/product_detail_related_products_widget.dart index 9a03872..d384021 100644 --- a/LabelStoreMax/lib/resources/widgets/product_detail_related_products_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/product_detail_related_products_widget.dart @@ -55,6 +55,8 @@ class ProductDetailRelatedProductsWidget extends StatelessWidget { child: NyFutureBuilder>( future: fetchRelated(), child: (context, relatedProducts) { + if (relatedProducts == null) return SizedBox.shrink(); + if (relatedProducts.isEmpty) { return SizedBox.shrink(); } diff --git a/LabelStoreMax/lib/resources/widgets/product_detail_reviews_widget.dart b/LabelStoreMax/lib/resources/widgets/product_detail_reviews_widget.dart index 14890e2..9205306 100644 --- a/LabelStoreMax/lib/resources/widgets/product_detail_reviews_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/product_detail_reviews_widget.dart @@ -93,6 +93,15 @@ class _ProductDetailReviewsWidgetState NyFutureBuilder>( future: fetchReviews(), child: (context, reviews) { + if (reviews == null) { + return Container( + child: ListTile( + title: Text( + trans('There are no reviews yet.'), + ), + ), + ); + } int reviewsCount = reviews.length; List childrenWidgets = []; List children = reviews diff --git a/LabelStoreMax/pubspec.lock b/LabelStoreMax/pubspec.lock index 6845afd..a419c48 100644 --- a/LabelStoreMax/pubspec.lock +++ b/LabelStoreMax/pubspec.lock @@ -149,10 +149,10 @@ packages: dependency: "direct main" description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" convert: dependency: transitive description: @@ -185,14 +185,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" - dart_style: - dependency: transitive - description: - name: dart_style - sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad - url: "https://pub.dev" - source: hosted - version: "2.3.1" device_info_plus: dependency: transitive description: @@ -225,6 +217,22 @@ packages: url: "https://pub.dev" source: hosted version: "5.0.1" + equatable: + dependency: transitive + description: + name: equatable + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" + source: hosted + version: "2.0.5" + event_bus_plus: + dependency: transitive + description: + name: event_bus_plus + sha256: cbd27754d4c567f78fc88e7875e26c31d866d919f220523f34b29bf008f8fb1a + url: "https://pub.dev" + source: hosted + version: "0.6.1" eventify: dependency: transitive description: @@ -553,10 +561,10 @@ packages: dependency: "direct main" description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" js: dependency: transitive description: @@ -573,14 +581,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.8.1" - json_dart_generator: - dependency: transitive - description: - name: json_dart_generator - sha256: "88c710a9278e1f8a9ad65a695350153f517d7deeca293ea45c6f997c066437a5" - url: "https://pub.dev" - source: hosted - version: "1.1.0+1" lints: dependency: "direct dev" description: @@ -589,22 +589,30 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + logger: + dependency: transitive + description: + name: logger + sha256: "7ad7215c15420a102ec687bb320a7312afd449bac63bfb1c60d9787c27b9767f" + url: "https://pub.dev" + source: hosted + version: "1.4.0" matcher: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" math_expressions: dependency: "direct main" description: @@ -633,18 +641,18 @@ packages: dependency: "direct main" description: name: nylo_framework - sha256: cfd9f98313672d06ccee6db7dfe75e584e1f72d7465c649b9bb765b1112f9f2a + sha256: e84667df8af356072e089b9ac2e9ab7dc8e22a3b41e7e59bf83f45ce6bd6c51c url: "https://pub.dev" source: hosted - version: "5.1.2" + version: "5.2.0" nylo_support: dependency: transitive description: name: nylo_support - sha256: "35e4938f7c18f518a9cc09dc02cadd85183530c95217fa05fe6de08d8f25fbfe" + sha256: c036f49f235fa06e42f0d7615f98d522762f428b8f912d2ce819b2d99c3ae780 url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.5.0" octo_image: dependency: transitive description: @@ -894,10 +902,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" sqflite: dependency: transitive description: @@ -990,10 +998,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" theme_provider: dependency: transitive description: @@ -1106,6 +1114,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" webview_flutter: dependency: "direct main" description: @@ -1195,5 +1211,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.10.0" diff --git a/LabelStoreMax/pubspec.yaml b/LabelStoreMax/pubspec.yaml index c2b6966..ff40d63 100644 --- a/LabelStoreMax/pubspec.yaml +++ b/LabelStoreMax/pubspec.yaml @@ -29,7 +29,7 @@ dependencies: google_fonts: ^4.0.5 analyzer: ^5.12.0 intl: ^0.18.0 - nylo_framework: ^5.1.2 + nylo_framework: ^5.2.0 woosignal: ^3.8.0 wp_json_api: ^3.3.2 cached_network_image: ^3.2.3