v2.1.0 update for RazorPay, FreeShipping minimum value, new grid

WooSignal · WooSignal · commit 4269c5b7e016 · 2020-07-22T22:54:12.000+01:00
diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [2.1.0] - 2020-07-22
+
+* Pubspec.yaml update for RazorPay
+* FreeShipping minimum value feature
+* New grid collection layout
+
 ## [2.0.9] - 2020-06-19
 
 * New UI for home products
diff --git a/LabelStoreMax/lang/de.json b/LabelStoreMax/lang/de.json
@@ -169,5 +169,7 @@
   "That email is taken, try another": "Diese E-Mail wird genommen, versuchen Sie es mit einer anderen",
   "The email field is empty": "Das E-Mail-Feld ist leer",
   "No more orders": "Keine Bestellungen mehr",
-  "Account updated": "Konto aktualisiert"
+  "Account updated": "Konto aktualisiert",
+  "Spend a minimum of": "Geben Sie mindestens ein",
+  "for": "zum"
 }
diff --git a/LabelStoreMax/lang/en.json b/LabelStoreMax/lang/en.json
@@ -169,5 +169,7 @@
   "That email is taken, try another": "That email is taken, try another",
   "The email field is empty": "The email field is empty",
   "No more orders": "No more orders",
-  "Account updated": "Account updated"
+  "Account updated": "Account updated",
+  "Spend a minimum of": "Spend a minimum of",
+  "for": "for"
 }
diff --git a/LabelStoreMax/lang/es.json b/LabelStoreMax/lang/es.json
@@ -169,5 +169,7 @@
   "That email is taken, try another": "Ese correo electrónico está tomado, prueba con otro",
   "The email field is empty": "El campo de correo electrónico está vacío.",
   "No more orders": "No mas pedidos",
-  "Account updated": "Cuenta actualizada"
+  "Account updated": "Cuenta actualizada",
+  "Spend a minimum of": "Gasta un mínimo de",
+  "for": "para"
 }
diff --git a/LabelStoreMax/lang/fr.json b/LabelStoreMax/lang/fr.json
@@ -169,5 +169,7 @@
   "That email is taken, try another": "Cet e-mail est pris, essayez un autre",
   "The email field is empty": "Le champ e-mail est vide",
   "No more orders": "Plus de commandes",
-  "Account updated": "Compte mis à jour"
+  "Account updated": "Compte mis à jour",
+  "Spend a minimum of": "Dépensez un minimum de",
+  "for": "pour"
 }
diff --git a/LabelStoreMax/lang/hi.json b/LabelStoreMax/lang/hi.json
@@ -169,5 +169,7 @@
   "That email is taken, try another": "vah eemel liya gaya hai, doosara prayaas karen",
   "The email field is empty": "eemel feeld khaalee hai",
   "No more orders": "aur koee aadesh nahin",
-  "Account updated": "khaata apadet kiya gaya"
+  "Account updated": "khaata apadet kiya gaya",
+  "Spend a minimum of": "kam se kam kharch karen",
+  "for": "ke liye"
 }
diff --git a/LabelStoreMax/lang/it.json b/LabelStoreMax/lang/it.json
@@ -169,5 +169,7 @@
   "That email is taken, try another": "Quell'e-mail è stata presa, provane un'altra",
   "The email field is empty": "Il campo email è vuoto",
   "No more orders": "Niente più ordini",
-  "Account updated": "Account aggiornato"
+  "Account updated": "Account aggiornato",
+  "Spend a minimum of": "Spendi un minimo di",
+  "for": "per"
 }
diff --git a/LabelStoreMax/lang/pt.json b/LabelStoreMax/lang/pt.json
@@ -169,5 +169,7 @@
   "That email is taken, try another": "Esse e-mail foi recebido, tente outro",
   "The email field is empty": "O campo de email está vazio",
   "No more orders": "Não há mais pedidos",
-  "Account updated": "Conta atualizada"
+  "Account updated": "Conta atualizada",
+  "Spend a minimum of": "Gaste um mínimo de",
+  "for": "para"
 }
diff --git a/LabelStoreMax/lib/helpers/tools.dart b/LabelStoreMax/lib/helpers/tools.dart
@@ -11,6 +11,7 @@
 import 'dart:developer';
 
 import 'package:flutter/cupertino.dart';
+import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import 'package:intl/intl.dart';
 import 'package:label_storemax/app_payment_methods.dart';
 import 'package:label_storemax/helpers/app_localizations.dart';
@@ -78,7 +79,12 @@ class EdgeAlertStyle {
 }
 
 void showEdgeAlertWith(context,
-    {title = "", desc = "", int gravity = 1, int style = 1, IconData icon}) {
+    {title = "",
+    desc = "",
+    int gravity = 1,
+    int style = 1,
+    IconData icon,
+    int duration}) {
   switch (style) {
     case 1: // SUCCESS
       EdgeAlert.show(context,
@@ -87,7 +93,7 @@ void showEdgeAlertWith(context,
           gravity: gravity,
           backgroundColor: Colors.green,
           icon: icon ?? Icons.check,
-          duration: EdgeAlert.LENGTH_LONG);
+          duration: duration ?? EdgeAlert.LENGTH_LONG);
       break;
     case 2: // WARNING
       EdgeAlert.show(context,
@@ -96,7 +102,7 @@ void showEdgeAlertWith(context,
           gravity: gravity,
           backgroundColor: Colors.orange,
           icon: icon ?? Icons.error_outline,
-          duration: EdgeAlert.LENGTH_LONG);
+          duration: duration ?? EdgeAlert.LENGTH_LONG);
       break;
     case 3: // INFO
       EdgeAlert.show(context,
@@ -105,7 +111,7 @@ void showEdgeAlertWith(context,
           gravity: gravity,
           backgroundColor: Colors.teal,
           icon: icon ?? Icons.info,
-          duration: EdgeAlert.LENGTH_LONG);
+          duration: duration ?? EdgeAlert.LENGTH_LONG);
       break;
     case 4: // DANGER
       EdgeAlert.show(context,
@@ -114,7 +120,7 @@ void showEdgeAlertWith(context,
           gravity: gravity,
           backgroundColor: Colors.redAccent,
           icon: icon ?? Icons.warning,
-          duration: EdgeAlert.LENGTH_LONG);
+          duration: duration ?? EdgeAlert.LENGTH_LONG);
       break;
     default:
       break;
@@ -509,14 +515,24 @@ Widget refreshableScroll(context,
     onRefresh: onRefresh,
     onLoading: onLoading,
     child: (products.length != null && products.length > 0
-        ? GridView.count(
+        ? StaggeredGridView.countBuilder(
             crossAxisCount: 2,
-            shrinkWrap: true,
-            children: List.generate(
-              products.length,
-              (index) => wsCardProductItem(context,
-                  index: index, product: products[index], onTap: onTap),
-            ))
+            itemCount: products.length,
+            itemBuilder: (BuildContext context, int index) {
+              return Container(
+                height: 200,
+                child: wsCardProductItem(
+                  context,
+                  index: (index),
+                  product: products[index],
+                  onTap: onTap,
+                ),
+              );
+            },
+            staggeredTileBuilder: (int index) => new StaggeredTile.fit(1),
+            mainAxisSpacing: 4.0,
+            crossAxisSpacing: 4.0,
+          )
         : wsNoResults(context)),
   );
 }
diff --git a/LabelStoreMax/lib/labelconfig.dart b/LabelStoreMax/lib/labelconfig.dart
@@ -16,7 +16,7 @@ import 'dart:ui';
  Developer Notes
 
  SUPPORT EMAIL - support@woosignal.com
- VERSION - 2.0.9
+ VERSION - 2.1.0
  https://woosignal.com
  */
 
diff --git a/LabelStoreMax/lib/models/shipping_type.dart b/LabelStoreMax/lib/models/shipping_type.dart
@@ -15,12 +15,17 @@ import '../helpers/tools.dart';
 class ShippingType {
   String methodId;
   String cost;
+  String minimumValue;
   dynamic object;
 
-  ShippingType({this.methodId, this.object, this.cost});
+  ShippingType({this.methodId, this.object, this.cost, this.minimumValue});
 
-  Map<String, dynamic> toJson() =>
-      {'methodId': methodId, 'object': object, 'cost': cost};
+  Map<String, dynamic> toJson() => {
+        'methodId': methodId,
+        'object': object,
+        'cost': cost,
+        'minimumValue': minimumValue
+      };
 
   String getTotal({bool withFormatting}) {
     if (this.methodId != null && this.object != null) {
diff --git a/LabelStoreMax/lib/pages/checkout_confirmation.dart b/LabelStoreMax/lib/pages/checkout_confirmation.dart
@@ -12,6 +12,7 @@ import 'package:flutter/material.dart';
 import 'package:label_storemax/app_payment_methods.dart';
 import 'package:label_storemax/app_state_options.dart';
 import 'package:label_storemax/helpers/tools.dart';
+import 'package:label_storemax/models/cart.dart';
 import 'package:label_storemax/models/checkout_session.dart';
 import 'package:label_storemax/models/customer_address.dart';
 import 'package:label_storemax/widgets/app_loader.dart';
@@ -376,6 +377,29 @@ class CheckoutConfirmationPageState extends State<CheckoutConfirmationPage> {
       return;
     }
 
+    if (CheckoutSession.getInstance.shippingType.minimumValue != null) {
+      String total = await Cart.getInstance.getTotal();
+      if (total == null) {
+        return;
+      }
+      double doubleTotal = double.parse(total);
+      double doubleMinimumValue =
+          double.parse(CheckoutSession.getInstance.shippingType.minimumValue);
+
+      if (doubleTotal < doubleMinimumValue) {
+        showEdgeAlertWith(context,
+            title: trans(context, "Sorry"),
+            desc: trans(context, "Spend a minimum of") +
+                " " +
+                formatDoubleCurrency(total: doubleMinimumValue) +
+                " ${trans(context, "for")} " +
+                CheckoutSession.getInstance.shippingType.getTitle(),
+            style: EdgeAlertStyle.INFO,
+            duration: 3);
+        return;
+      }
+    }
+
     if (_isProcessingPayment == true) {
       return;
     }
diff --git a/LabelStoreMax/lib/pages/checkout_shipping_type.dart b/LabelStoreMax/lib/pages/checkout_shipping_type.dart
@@ -119,13 +119,15 @@ class _CheckoutShippingTypePageState extends State<CheckoutShippingTypePage> {
             .where((t) => t != null)
             .toList()
             .forEach((freeShipping) {
-          if (isNumeric(freeShipping.cost)) {
+          if (isNumeric(freeShipping.cost) ||
+              freeShipping.cost == 'min_amount') {
             Map<String, dynamic> tmpShippingOption = {};
             tmpShippingOption = {
               "id": freeShipping.id,
               "method_id": "free_shipping",
               "title": freeShipping.title,
-              "cost": freeShipping.cost,
+              "cost": "0.00",
+              "min_amount": freeShipping.minimumOrderAmount,
               "object": freeShipping
             };
             _wsShippingOptions.add(tmpShippingOption);
@@ -246,11 +248,11 @@ class _CheckoutShippingTypePageState extends State<CheckoutShippingTypePage> {
                                           contentPadding: EdgeInsets.only(
                                               left: 16, right: 16),
                                           title: Text(
-                                              _wsShippingOptions[index]
-                                                  ['title'],
-                                              style: Theme.of(context)
-                                                  .primaryTextTheme
-                                                  .subtitle1),
+                                            _wsShippingOptions[index]['title'],
+                                            style: Theme.of(context)
+                                                .primaryTextTheme
+                                                .subtitle1,
+                                          ),
                                           selected: true,
                                           subtitle: FutureBuilder<String>(
                                             future: _getShippingPrice(index),
@@ -267,14 +269,52 @@ class _CheckoutShippingTypePageState extends State<CheckoutShippingTypePage> {
                                                 case ConnectionState.done:
                                                   if (snapshot.hasError)
                                                     return Text('');
-                                                  return Text(
-                                                      trans(context, "Price") +
-                                                          ": " +
-                                                          formatStringCurrency(
-                                                              total: snapshot
-                                                                  .data));
+                                                  return RichText(
+                                                      text: TextSpan(
+                                                    text: '',
+                                                    style: DefaultTextStyle.of(
+                                                            context)
+                                                        .style,
+                                                    children: <TextSpan>[
+                                                      (_wsShippingOptions[index]
+                                                                  ["object"]
+                                                              is FreeShipping
+                                                          ? TextSpan(
+                                                              text:
+                                                                  "Free postage")
+                                                          : TextSpan(
+                                                              text: trans(
+                                                                      context,
+                                                                      "Price") +
+                                                                  ": " +
+                                                                  formatStringCurrency(
+                                                                      total: snapshot
+                                                                          .data),
+                                                            )),
+                                                      _wsShippingOptions[index][
+                                                                  "min_amount"] !=
+                                                              null
+                                                          ? TextSpan(
+                                                              text: "\nSpend a minimum of " +
+                                                                  formatStringCurrency(
+                                                                      total: _wsShippingOptions[
+                                                                              index]
+                                                                          [
+                                                                          "min_amount"]),
+                                                              style: Theme.of(
+                                                                      context)
+                                                                  .primaryTextTheme
+                                                                  .bodyText2
+                                                                  .copyWith(
+                                                                      fontSize:
+                                                                          14))
+                                                          : null,
+                                                    ]
+                                                        .where((e) => e != null)
+                                                        .toList(),
+                                                  ));
                                               }
-                                              return null; // unreachable
+                                              return null;
                                             },
                                           ),
                                           trailing: (CheckoutSession.getInstance
@@ -288,23 +328,8 @@ class _CheckoutShippingTypePageState extends State<CheckoutShippingTypePage> {
                                                           ["object"]
                                               ? Icon(Icons.check)
                                               : null),
-                                          onTap: () async {
-                                            ShippingType shippingType =
-                                                ShippingType();
-                                            shippingType.object =
-                                                _wsShippingOptions[index]
-                                                    ['object'];
-                                            shippingType.methodId =
-                                                _wsShippingOptions[index]
-                                                    ['method_id'];
-                                            shippingType.cost =
-                                                await _getShippingPrice(index);
-
-                                            CheckoutSession.getInstance
-                                                .shippingType = shippingType;
-
-                                            Navigator.pop(context);
-                                          },
+                                          onTap: () =>
+                                              _handleCheckoutTapped(index),
                                         );
                                       },
                                     ),
@@ -339,4 +364,18 @@ class _CheckoutShippingTypePageState extends State<CheckoutShippingTypePage> {
       ),
     );
   }
+
+  _handleCheckoutTapped(int index) async {
+    ShippingType shippingType = ShippingType();
+    shippingType.object = _wsShippingOptions[index]['object'];
+    shippingType.methodId = _wsShippingOptions[index]['method_id'];
+    if (_wsShippingOptions[index]['min_amount'] != null) {
+      shippingType.minimumValue = _wsShippingOptions[index]['min_amount'];
+    }
+    shippingType.cost = await _getShippingPrice(index);
+
+    CheckoutSession.getInstance.shippingType = shippingType;
+
+    Navigator.pop(context);
+  }
 }
diff --git a/LabelStoreMax/lib/pages/home.dart b/LabelStoreMax/lib/pages/home.dart
@@ -59,7 +59,8 @@ class _HomePageState extends State<HomePage> {
   }
 
   _fetchCategories() async {
-    _categories = await appWooSignal((api) => api.getProductCategories());
+    _categories =
+        await appWooSignal((api) => api.getProductCategories(page: 100));
   }
 
   _fetchMoreProducts() async {
@@ -133,6 +134,7 @@ class _HomePageState extends State<HomePage> {
           wsCartIcon(context, key: _key),
         ],
       ),
+      backgroundColor: Colors.white,
       body: SafeArea(
         minimum: safeAreaDefault(),
         child: Column(
diff --git a/LabelStoreMax/lib/widgets/woosignal_ui.dart b/LabelStoreMax/lib/widgets/woosignal_ui.dart
diff --git a/LabelStoreMax/pubspec.lock b/LabelStoreMax/pubspec.lock
diff --git a/LabelStoreMax/pubspec.yaml b/LabelStoreMax/pubspec.yaml
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -169,5 +169,7 @@`
`169`	`169`	`"That email is taken, try another": "Diese E-Mail wird genommen, versuchen Sie es mit einer anderen",`
`170`	`170`	`"The email field is empty": "Das E-Mail-Feld ist leer",`
`171`	`171`	`"No more orders": "Keine Bestellungen mehr",`
`172`		`- "Account updated": "Konto aktualisiert"`
	`172`	`+ "Account updated": "Konto aktualisiert",`
	`173`	`+ "Spend a minimum of": "Geben Sie mindestens ein",`
	`174`	`+ "for": "zum"`
`173`	`175`	`}`