New state options for taxes/shipping, Handle variations better, Code clean up, Bug fixes

Author: WooSignal

LabelStoreMax/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.0.3] - 2020-05-12
+
+* New state options for taxes/shipping
+* Handle variations better
+* Code clean up
+* Bug fixes
+
 ## [2.0.2] - 2020-05-08
 
 * Flutter 1.17.0 support

LabelStoreMax/lang/en.json

@@ -142,5 +142,8 @@
   "Sort results": "Sort results",
   "you're now logged in": "You're now logged in",
   "Hello": "Hello",
-  "Welcome back": "Welcome back"
+  "Welcome back": "Welcome back",
+  "Quantity": "Quantity",
+  "Select a state": "Select a state",
+  "Select state": "Select state"
 }

LabelStoreMax/lib/app_state_options.dart

@@ -0,0 +1,74 @@
+//  Label StoreMAX
+//
+//  Created by Anthony Gordon.
+//  2020, WooSignal Ltd. All rights reserved.
+//
+
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+// STATE OPTIONS
+// ONLY USED IF COUNTRY IS US
+
+var appStateOptions = [
+  {"code": "AL", "name": "Alabama"},
+  {"code": "AK", "name": "Alaska"},
+  {"code": "AS", "name": "American Samoa"},
+  {"code": "AZ", "name": "Arizona"},
+  {"code": "AR", "name": "Arkansas"},
+  {"code": "CA", "name": "California"},
+  {"code": "CO", "name": "Colorado"},
+  {"code": "CT", "name": "Connecticut"},
+  {"code": "DE", "name": "Delaware"},
+  {"code": "DC", "name": "District Of Columbia"},
+  {"code": "FM", "name": "Federated States Of Micronesia"},
+  {"code": "FL", "name": "Florida"},
+  {"code": "GA", "name": "Georgia"},
+  {"code": "GU", "name": "Guam"},
+  {"code": "HI", "name": "Hawaii"},
+  {"code": "ID", "name": "Idaho"},
+  {"code": "IL", "name": "Illinois"},
+  {"code": "IN", "name": "Indiana"},
+  {"code": "IA", "name": "Iowa"},
+  {"code": "KS", "name": "Kansas"},
+  {"code": "KY", "name": "Kentucky"},
+  {"code": "LA", "name": "Louisiana"},
+  {"code": "ME", "name": "Maine"},
+  {"code": "MH", "name": "Marshall Islands"},
+  {"code": "MD", "name": "Maryland"},
+  {"code": "MA", "name": "Massachusetts"},
+  {"code": "MI", "name": "Michigan"},
+  {"code": "MN", "name": "Minnesota"},
+  {"code": "MS", "name": "Mississippi"},
+  {"code": "MO", "name": "Missouri"},
+  {"code": "MT", "name": "Montana"},
+  {"code": "NE", "name": "Nebraska"},
+  {"code": "NV", "name": "Nevada"},
+  {"code": "NH", "name": "New Hampshire"},
+  {"code": "NJ", "name": "New Jersey"},
+  {"code": "NM", "name": "New Mexico"},
+  {"code": "NY", "name": "New York"},
+  {"code": "NC", "name": "North Carolina"},
+  {"code": "ND", "name": "North Dakota"},
+  {"code": "MP", "name": "Northern Mariana Islands"},
+  {"code": "OH", "name": "Ohio"},
+  {"code": "OK", "name": "Oklahoma"},
+  {"code": "OR", "name": "Oregon"},
+  {"code": "PW", "name": "Palau"},
+  {"code": "PA", "name": "Pennsylvania"},
+  {"code": "PR", "name": "Puerto Rico"},
+  {"code": "RI", "name": "Rhode Island"},
+  {"code": "SC", "name": "South Carolina"},
+  {"code": "SD", "name": "South Dakota"},
+  {"code": "TN", "name": "Tennessee"},
+  {"code": "TX", "name": "Texas"},
+  {"code": "UT", "name": "Utah"},
+  {"code": "VT", "name": "Vermont"},
+  {"code": "VI", "name": "Virgin Islands"},
+  {"code": "VA", "name": "Virginia"},
+  {"code": "WA", "name": "Washington"},
+  {"code": "WV", "name": "West Virginia"},
+  {"code": "WI", "name": "Wisconsin"},
+  {"code": "WY", "name": "Wyoming"}
+];

LabelStoreMax/lib/helpers/app_themes.dart

@@ -63,7 +63,7 @@ TextTheme textThemeAccent() {
 
 TextTheme textThemePrimary() {
   return TextTheme(
-    headline4: new  TextStyle(
+    headline4: new TextStyle(
         color: Colors.black,
         fontFamily: appFontFamily,
         fontWeight: FontWeight.w800,
@@ -112,7 +112,7 @@ TextTheme textThemePrimary() {
 
 TextTheme textThemeMain() {
   return TextTheme(
-    headline4: new  TextStyle(
+    headline4: new TextStyle(
       color: Colors.black,
       fontFamily: appFontFamily,
     ),
@@ -132,7 +132,7 @@ TextTheme textThemeMain() {
 
 TextTheme textThemeAppBar() {
   return TextTheme(
-    headline4: new  TextStyle(color: Colors.black, fontFamily: appFontFamily),
+    headline4: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
     headline3: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
     headline2: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
     headline1: new TextStyle(color: Colors.black, fontFamily: appFontFamily),

LabelStoreMax/lib/labelconfig.dart

@@ -16,15 +16,17 @@ import 'dart:ui';
  Developer Notes
 
  SUPPORT EMAIL - support@woosignal.com
- VERSION - 2.0.2
+ VERSION - 2.0.3
  https://woosignal.com
  */
 
 /*<! ------ CONFIG ------!>*/
 
 const app_name = "MyApp";
 
-const app_key = "Your app key from WooSingal";
+//const app_key = "Your app key from WooSignal";
+const app_key =
+    "app_affb6434339b34443a297c2e40a3edab7102137e6d67de9abfe612b749bd";
 // Your App key from WooSignal
 // link: https://woosignal.com/dashboard/apps
 
@@ -33,7 +35,6 @@ const app_logo_url = "https://woosignal.com/images/120x120_woosignal.png";
 const app_terms_url = "https://yourdomain.com/terms";
 const app_privacy_url = "https://yourdomain.com/privacy";
 
-
 /*<! ------ APP SETTINGS ------!>*/
 
 const app_currency_symbol = "\£";
@@ -45,15 +46,13 @@ const app_locales_supported = [
 // then create a new lang json file using keys from en.json
 // e.g. lang/es.json
 
-
 /*<! ------ PAYMENT GATEWAYS ------!>*/
 
 // Available: "Stripe", "CashOnDelivery",
 // Add the method to the array below e.g. ["Stripe", "CashOnDelivery"]
 
 const app_payment_methods = ["Stripe"];
 
-
 /*<! ------ STRIPE (OPTIONAL) ------!>*/
 
 // Your StripeAccount key from WooSignal
@@ -67,7 +66,6 @@ const app_stripe_live_mode = false;
 // #2 Next visit https://woosignal.com/dashboard
 // #3 Then change "Environment for Stripe" to Live mode
 
-
 /*<! ------ WP LOGIN (OPTIONAL) ------!>*/
 
 // Allows customers to login/register, view account, purchase items as a user.
@@ -81,7 +79,6 @@ const app_forgot_password_url =
     "https://mysite.com/my-account/lost-password"; // change to your forgot password url
 const app_wp_api_path = "/wp-json"; // By default "/wp-json" should work
 
-
 /*<! ------ DEBUGGER ENABLED ------!>*/
 
 const app_debug = true;

LabelStoreMax/lib/models/cart.dart

@@ -41,15 +41,22 @@ class Cart {
 
   void addToCart({CartLineItem cartLineItem}) async {
     List<CartLineItem> cartLineItems = await getCart();
-    var firstCartItem = cartLineItems.firstWhere(
-        (i) =>
-            i.productId == cartLineItem.productId ||
-            i.productId == cartLineItem.productId &&
-                i.variationId == cartLineItem.variationId, orElse: () {
-      return null;
-    });
-    if (firstCartItem != null) {
-      return;
+
+    if (cartLineItem.variationId != null) {
+      if (cartLineItems.firstWhere(
+              (i) => (i.productId == cartLineItem.productId &&
+                  i.variationId == cartLineItem.variationId),
+              orElse: () => null) !=
+          null) {
+        return;
+      }
+    } else {
+      var firstCartItem = cartLineItems.firstWhere(
+          (i) => i.productId == cartLineItem.productId,
+          orElse: () => null);
+      if (firstCartItem != null) {
+        return;
+      }
     }
     cartLineItems.add(cartLineItem);
 
@@ -60,7 +67,7 @@ class Cart {
     List<CartLineItem> cartLineItems = await getCart();
     double total = 0;
     cartLineItems.forEach((cartItem) {
-      total += (double.parse(cartItem.total) * cartItem.quantity);
+      total += (parseWcPrice(cartItem.total) * cartItem.quantity);
     });
 
     if (withFormat != null && withFormat == true) {
@@ -73,7 +80,7 @@ class Cart {
     List<CartLineItem> cartLineItems = await getCart();
     double subtotal = 0;
     cartLineItems.forEach((cartItem) {
-      subtotal += (double.parse(cartItem.subtotal) * cartItem.quantity);
+      subtotal += (parseWcPrice(cartItem.subtotal) * cartItem.quantity);
     });
     if (withFormat != null && withFormat == true) {
       return formatDoubleCurrency(total: subtotal);
@@ -133,6 +140,7 @@ class Cart {
     double shippingTotal = 0;
 
     List<CartLineItem> cartItems = await Cart.getInstance.getCart();
+
     if (cartItems.every((c) => c.taxStatus == 'none')) {
       return "0";
     }

LabelStoreMax/lib/models/customer_address.dart

@@ -14,6 +14,7 @@ class CustomerAddress {
   String addressLine;
   String city;
   String postalCode;
+  String state;
   String country;
   String emailAddress;
 
@@ -23,6 +24,7 @@ class CustomerAddress {
       this.addressLine,
       this.city,
       this.postalCode,
+      this.state,
       this.country,
       this.emailAddress});
 
@@ -32,30 +34,35 @@ class CustomerAddress {
     addressLine = "";
     city = "";
     postalCode = "";
+    state = "";
     country = "";
     emailAddress = "";
   }
 
   bool hasMissingFields() {
     return (this.firstName.isEmpty ||
-        this.lastName.isEmpty ||
-        this.addressLine.isEmpty ||
-        this.city.isEmpty ||
-        this.postalCode.isEmpty);
+            this.lastName.isEmpty ||
+            this.addressLine.isEmpty ||
+            this.city.isEmpty ||
+            this.postalCode.isEmpty) &&
+        (this.country == "United States" ? this.state.isEmpty : false);
   }
 
   String addressFull() {
     List<String> tmpArrAddress = new List<String>();
-    if (addressLine != "") {
+    if (addressLine != null && addressLine != "") {
       tmpArrAddress.add(addressLine);
     }
-    if (city != "") {
+    if (city != null && city != "") {
       tmpArrAddress.add(city);
     }
-    if (postalCode != "") {
+    if (postalCode != null && postalCode != "") {
       tmpArrAddress.add(postalCode);
     }
-    if (country != "") {
+    if (state != null && state != "") {
+      tmpArrAddress.add(state);
+    }
+    if (country != null && country != "") {
       tmpArrAddress.add(country);
     }
     return tmpArrAddress.join(", ");
@@ -78,6 +85,7 @@ class CustomerAddress {
     addressLine = json['address_line'];
     city = json['city'];
     postalCode = json['postal_code'];
+    state = json['state'];
     country = json['country'];
     emailAddress = json['email_address'];
   }
@@ -89,6 +97,7 @@ class CustomerAddress {
     data['address_line'] = this.addressLine;
     data['city'] = this.city;
     data['postal_code'] = this.postalCode;
+    data['state'] = this.state;
     data['country'] = this.country;
     data['email_address'] = this.emailAddress;
     return data;

LabelStoreMax/lib/pages/about.dart

@@ -37,9 +37,7 @@ class _AboutPageState extends State<AboutPage> {
         backgroundColor: Colors.transparent,
         leading: IconButton(
           icon: Icon(Icons.close),
-          onPressed: () {
-            Navigator.pop(context);
-          },
+          onPressed: () => Navigator.pop(context),
         ),
         title: Text(trans(context, "About"),
             style: Theme.of(context).primaryTextTheme.headline6),
@@ -60,14 +58,18 @@ class _AboutPageState extends State<AboutPage> {
                 crossAxisAlignment: CrossAxisAlignment.center,
                 mainAxisAlignment: MainAxisAlignment.spaceAround,
                 children: <Widget>[
-                  wsMenuItem(context,
-                      title: trans(context, "Privacy policy"),
-                      leading: Icon(Icons.people),
-                      action: _actionPrivacy),
-                  wsMenuItem(context,
-                      title: trans(context, "Terms and conditions"),
-                      leading: Icon(Icons.description),
-                      action: _actionTerms),
+                  wsMenuItem(
+                    context,
+                    title: trans(context, "Privacy policy"),
+                    leading: Icon(Icons.people),
+                    action: _actionPrivacy,
+                  ),
+                  wsMenuItem(
+                    context,
+                    title: trans(context, "Terms and conditions"),
+                    leading: Icon(Icons.description),
+                    action: _actionTerms,
+                  ),
                   FutureBuilder<PackageInfo>(
                     future: PackageInfo.fromPlatform(),
                     builder: (BuildContext context,
@@ -93,7 +95,7 @@ class _AboutPageState extends State<AboutPage> {
                       }
                       return null; // unreachable
                     },
-                  )
+                  ),
                 ],
               ),
               flex: 2,

LabelStoreMax/lib/pages/account_billing_details.dart

@@ -96,9 +96,7 @@ class _AccountBillingDetailsPageState extends State<AccountBillingDetailsPage> {
       body: SafeArea(
         minimum: safeAreaDefault(),
         child: GestureDetector(
-          onTap: () {
-            FocusScope.of(context).requestFocus(new FocusNode());
-          },
+          onTap: () => FocusScope.of(context).requestFocus(new FocusNode()),
           child: _isLoading
               ? showAppLoader()
               : LayoutBuilder(