v2.1.1 changes

LabelStoreMax/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [2.1.1] - 2020-07-23
+
+* Bug fix for categories
+* Changes to FreeShipping
+
 ## [2.1.0] - 2020-07-22
 
 * Pubspec.yaml update for RazorPay

LabelStoreMax/lib/labelconfig.dart

@@ -16,7 +16,7 @@ import 'dart:ui';
  Developer Notes
 
  SUPPORT EMAIL - support@woosignal.com
- VERSION - 2.1.0
+ VERSION - 2.1.1
  https://woosignal.com
  */
 

LabelStoreMax/lib/pages/checkout_confirmation.dart

@@ -389,11 +389,7 @@ class CheckoutConfirmationPageState extends State<CheckoutConfirmationPage> {
       if (doubleTotal < doubleMinimumValue) {
         showEdgeAlertWith(context,
             title: trans(context, "Sorry"),
-            desc: trans(context, "Spend a minimum of") +
+            desc: "${trans(context, "Spend a minimum of")} ${formatDoubleCurrency(total: doubleMinimumValue)} ${trans(context, "for")} ${CheckoutSession.getInstance.shippingType.getTitle()}",
-                " " +
-                formatDoubleCurrency(total: doubleMinimumValue) +
-                " ${trans(context, "for")} " +
-                CheckoutSession.getInstance.shippingType.getTitle(),
             style: EdgeAlertStyle.INFO,
             duration: 3);
         return;

LabelStoreMax/lib/pages/checkout_shipping_type.dart

@@ -115,23 +115,45 @@ class _CheckoutShippingTypePageState extends State<CheckoutShippingTypePage> {
       }
 
       if (_shipping.methods.freeShipping != null) {
-        _shipping.methods.freeShipping
+        List<FreeShipping> freeShipping = _shipping.methods.freeShipping
             .where((t) => t != null)
-            .toList()
+            .toList();
-            .forEach((freeShipping) {
+
-          if (isNumeric(freeShipping.cost) ||
+        for (int i = 0; i < freeShipping.length; i++) {
-              freeShipping.cost == 'min_amount') {
+          if (isNumeric(freeShipping[i].cost) ||
+              freeShipping[i].cost == 'min_amount') {
+
+            if (freeShipping[i].cost == 'min_amount') {
+              String total = await Cart.getInstance.getTotal();
+              if (total != null) {
+                double doubleTotal = double.parse(total);
+                double doubleMinimumValue =
+                double.parse(freeShipping[i].minimumOrderAmount);
+
+                if (doubleTotal < doubleMinimumValue) {
+                  continue;
+                }
+              }
+            }
+
             Map<String, dynamic> tmpShippingOption = {};
             tmpShippingOption = {
-              "id": freeShipping.id,
+              "id": freeShipping[i].id,
               "method_id": "free_shipping",
-              "title": freeShipping.title,
+              "title": freeShipping[i].title,
               "cost": "0.00",
-              "min_amount": freeShipping.minimumOrderAmount,
+              "min_amount": freeShipping[i].minimumOrderAmount,
-              "object": freeShipping
+              "object": freeShipping[i]
             };
             _wsShippingOptions.add(tmpShippingOption);
           }
+        }
+
+        _shipping.methods.freeShipping
+            .where((t) => t != null)
+            .toList()
+            .forEach((freeShipping) async {
+
         });
       }
     }

LabelStoreMax/lib/pages/home.dart

@@ -60,7 +60,7 @@ class _HomePageState extends State<HomePage> {
 
   _fetchCategories() async {
     _categories =
-        await appWooSignal((api) => api.getProductCategories(page: 100));
+        await appWooSignal((api) => api.getProductCategories(perPage: 100));
   }
 
   _fetchMoreProducts() async {

LabelStoreMax/pubspec.yaml

@@ -1,5 +1,5 @@
 # Label StoreMax
-# Version 2.1.0
+# Version 2.1.1
 #authors: - "Anthony Gordon"
 #documentation: https://woosignal.com/docs/app/ios/label-storemax
 #homepage: https://woosignal.com/

README.md

@@ -4,7 +4,7 @@
 	
 # WooCommerce App: Label StoreMax
 
-### Label StoreMax - v2.1.0
+### Label StoreMax - v2.1.1
 
 
 [Official WooSignal WooCommerce App](https://woosignal.com)