Merge pull request #6 from woosignal/master

agordn52 · web-flow · commit d5b6aca86251 · 2022-01-03T18:04:22.000Z
v3.0.3 - updates
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [3.0.3] - 2022-01-03
+
+* Update coupon property types
+* Improvements as per analysis
+
 ## [3.0.2] - 2021-12-19
 
 * Update Readme
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2021 by WooSignal Ltd All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Copyright (c) 2022 by WooSignal Ltd All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
 Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ In your flutter project add the dependency:
 ``` dart 
 dependencies:
   ...
-  woosignal: ^3.0.2
+  woosignal: ^3.0.3
 ```
 
 ### Usage example #
diff --git a/lib/helpers/shared_pref.dart b/lib/helpers/shared_pref.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/collection.dart b/lib/models/collection.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/image.dart b/lib/models/image.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/links.dart b/lib/models/links.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
@@ -52,8 +52,7 @@ class Links {
   }
 
   Map<String, dynamic> toJson() {
-    // ignore: prefer_collection_literals
-    final Map<String, dynamic> data = Map<String, dynamic>();
+    final Map<String, dynamic> data = <String, dynamic>{};
     if (self != null) {
       data['self'] = self!.map((v) => v.toJson()).toList();
     }
diff --git a/lib/models/meta_data.dart b/lib/models/meta_data.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/payload/order_wc.dart b/lib/models/payload/order_wc.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/api_data.dart b/lib/models/response/api_data.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/continent.dart b/lib/models/response/continent.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/countries.dart b/lib/models/response/countries.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/coupon.dart b/lib/models/response/coupon.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
@@ -30,19 +30,19 @@ class Coupon {
   String? dateExpiresGmt;
   int? usageCount;
   bool? individualUse;
-  List<dynamic>? productIds;
-  List<dynamic>? excludedProductIds;
+  List<int>? productIds;
+  List<int>? excludedProductIds;
   int? usageLimit;
   int? usageLimitPerUser;
   int? limitUsageToXItems;
   bool? freeShipping;
-  List<dynamic>? productCategories;
-  List<dynamic>? excludedProductCategories;
+  List<int>? productCategories;
+  List<int>? excludedProductCategories;
   bool? excludeSaleItems;
   String? minimumAmount;
   String? maximumAmount;
-  List<dynamic>? emailRestrictions;
-  List<dynamic>? usedBy;
+  List<String>? emailRestrictions;
+  List<String>? usedBy;
   List<MetaData>? metaData;
   Links? links;
 
@@ -90,27 +90,28 @@ class Coupon {
     dateExpiresGmt = json['date_expires_gmt'];
     usageCount = json['usage_count'];
     individualUse = json['individual_use'];
-    productIds = (json['product_ids'] != null) ? json['product_ids'] : null;
+    productIds =
+        (json['product_ids'] != null) ? json['product_ids'].cast<int>() : null;
     excludedProductIds = (json['excluded_product_ids'] != null)
-        ? json['excluded_product_ids']
+        ? json['excluded_product_ids'].cast<int>()
         : null;
     usageLimit = json['usage_limit'];
     usageLimitPerUser = json['usage_limit_per_user'];
     limitUsageToXItems = json['limit_usage_to_x_items'];
     freeShipping = json['free_shipping'];
     productCategories = (json['product_categories'] != null)
-        ? json['product_categories']
+        ? json['product_categories'].cast<int>()
         : null;
-    productCategories = (json['product_categories'] != null)
-        ? json['product_categories']
+    excludedProductCategories = (json['excluded_product_categories'] != null)
+        ? json['excluded_product_categories'].cast<int>()
         : null;
     excludeSaleItems = json['exclude_sale_items'];
     minimumAmount = json['minimum_amount'];
     maximumAmount = json['maximum_amount'];
     emailRestrictions = (json['email_restrictions'] != null)
-        ? json['email_restrictions']
+        ? json['email_restrictions'].cast<String>()
         : null;
-    usedBy = (json['used_by'] != null) ? json['used_by'] : null;
+    usedBy = (json['used_by'] != null) ? json['used_by'].cast<String>() : null;
     if (json['meta_data'] != null) {
       metaData = [];
       json['meta_data'].forEach((v) {
diff --git a/lib/models/response/coupon_batch.dart b/lib/models/response/coupon_batch.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/currencies.dart b/lib/models/response/currencies.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/customer.dart b/lib/models/response/customer.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/customer_batch.dart b/lib/models/response/customer_batch.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/customer_download.dart b/lib/models/response/customer_download.dart
@@ -1,3 +1,18 @@
+// Copyright (c) 2022, WooSignal Ltd.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms are permitted
+// provided that the above copyright notice and this paragraph are
+// duplicated in all such forms and that any documentation,
+// advertising materials, and other materials related to such
+// distribution and use acknowledge that the software was developed
+// by the WooSignal. The name of the
+// WooSignal may not be used to endorse or promote products derived
+// from this software without specific prior written permission.
+// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
 import 'package:woosignal/models/links.dart';
 
 class CustomerDownload {
diff --git a/lib/models/response/order.dart b/lib/models/response/order.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/order_batch.dart b/lib/models/response/order_batch.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/order_notes.dart b/lib/models/response/order_notes.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/payment_gateway.dart b/lib/models/response/payment_gateway.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/product_attribute_term.dart b/lib/models/response/product_attribute_term.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/product_attributes.dart b/lib/models/response/product_attributes.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/product_batch.dart b/lib/models/response/product_batch.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/product_category.dart b/lib/models/response/product_category.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd Ltd
+// Copyright (c) 2022, WooSignal Ltd
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/product_review.dart b/lib/models/response/product_review.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/product_shipping_class.dart b/lib/models/response/product_shipping_class.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/product_variation.dart b/lib/models/response/product_variation.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/products.dart b/lib/models/response/products.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/refund.dart b/lib/models/response/refund.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/reports.dart b/lib/models/response/reports.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/sale_report.dart b/lib/models/response/sale_report.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/setting_option.dart b/lib/models/response/setting_option.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/setting_option_batch.dart b/lib/models/response/setting_option_batch.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/shipping_method.dart b/lib/models/response/shipping_method.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/shipping_zone.dart b/lib/models/response/shipping_zone.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/shipping_zone_location.dart b/lib/models/response/shipping_zone_location.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/system_status.dart b/lib/models/response/system_status.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/tax_classes.dart b/lib/models/response/tax_classes.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/tax_rate.dart b/lib/models/response/tax_rate.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/top_seller_report.dart b/lib/models/response/top_seller_report.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
diff --git a/lib/models/response/woosignal_app.dart b/lib/models/response/woosignal_app.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, WooSignal Ltd.
+// Copyright (c) 2022, WooSignal Ltd.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms are permitted
@@ -25,6 +25,7 @@ class WooSignalApp {
   bool? stripeLiveMode;
   String? stripeAccount;
   int? wpLoginEnabled;
+  bool? couponEnabled;
   String? wpLoginBaseUrl;
   String? wpLoginForgotPasswordUrl;
   String? wpLoginWpApiPath;
@@ -37,6 +38,7 @@ class WooSignalApp {
   bool? stripeEnabled;
   bool? codEnabled;
   bool? paypalEnabled;
+  bool? wishlistEnabled;
   bool? paypalLiveMode;
   String? stripeCountryCode;
   String? themeFont;
@@ -69,6 +71,8 @@ class WooSignalApp {
       this.paypalEnabled,
       this.paypalLiveMode,
       this.stripeCountryCode,
+      this.couponEnabled,
+      this.wishlistEnabled,
       this.themeFont,
       this.socialLinks,
       this.themeColors});
@@ -87,6 +91,16 @@ class WooSignalApp {
     stripeLiveMode = json['stripe_live_mode'];
     stripeAccount = json['stripe_account'];
     wpLoginEnabled = json['wp_login_enabled'];
+    if (json['wishlist_enabled'] is int && json['wishlist_enabled'] == 1) {
+      wishlistEnabled = true;
+    } else {
+      wishlistEnabled = false;
+    }
+    if (json['coupon_enabled'] is int && json['coupon_enabled'] == 1) {
+      couponEnabled = true;
+    } else {
+      couponEnabled = false;
+    }
     wpLoginBaseUrl = json['wp_login_base_url'];
     wpLoginForgotPasswordUrl = json['wp_login_forgot_password_url'];
     wpLoginWpApiPath = json['wp_login_wp_api_path'];
@@ -121,6 +135,8 @@ class WooSignalApp {
     data['app_termslink'] = appTermsLink;
     data['app_privacylink'] = appPrivacyLink;
     data['app_debug'] = appDebug;
+    data['wishlist_enabled'] = wishlistEnabled;
+    data['coupon_enabled'] = couponEnabled;
     data['app_status'] = appStatus;
     if (currencyMeta != null) {
       data['currency_meta'] = currencyMeta!.toJson();
diff --git a/lib/models/self.dart b/lib/models/self.dart
diff --git a/lib/networking/api_provider.dart b/lib/networking/api_provider.dart
diff --git a/lib/woosignal.dart b/lib/woosignal.dart
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2021 by WooSignal Ltd All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:`
	`1`	`+Copyright (c) 2022 by WooSignal Ltd All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:`
`2`	`2`
`3`	`3`	`Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.`
`4`	`4`	`Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2021, WooSignal Ltd.`
	`1`	`+// Copyright (c) 2022, WooSignal Ltd.`
`2`	`2`	`// All rights reserved.`
`3`	`3`	`//`
`4`	`4`	`// Redistribution and use in source and binary forms are permitted`