From ffef1e40759c6da7bf0758528403913f515e83ee Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Mon, 2 Nov 2020 12:56:24 +0530
Subject: [PATCH 01/80] checkout emailUpdate

---
 .../mutations/checkout_email_update.dart      |   5 +
 lib/shopify/src/shopify_checkout.dart         | 175 +++++++++++-------
 2 files changed, 110 insertions(+), 70 deletions(-)

diff --git a/lib/graphql_operations/mutations/checkout_email_update.dart b/lib/graphql_operations/mutations/checkout_email_update.dart
index 50ec5062..ba4ec11e 100644
--- a/lib/graphql_operations/mutations/checkout_email_update.dart
+++ b/lib/graphql_operations/mutations/checkout_email_update.dart
@@ -1,8 +1,13 @@
 const String checkoutEmailUpdateMutation = r'''
 mutation checkoutEmailUpdate($checkoutId : ID!, $email : String!) {
   checkoutEmailUpdateV2(checkoutId: $checkoutId, email: $email) {
+    checkout {
+      id
+    }
     checkoutUserErrors {
       code
+      field
+      message
     }
   }
 }
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index a5800435..0699b757 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -1,5 +1,6 @@
 import 'package:flutter_simple_shopify/enums/src/sort_key_order.dart';
 import 'package:flutter_simple_shopify/graphql_operations/mutations/checkout_complete_free.dart';
+import 'package:flutter_simple_shopify/graphql_operations/mutations/checkout_email_update.dart';
 import 'package:flutter_simple_shopify/graphql_operations/mutations/checkout_shipping_address_update.dart';
 import 'package:flutter_simple_shopify/graphql_operations/mutations/create_checkout.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_checkout_info_is_ready.dart';
@@ -23,7 +24,7 @@ import '../../models/src/checkout.dart';
 import '../../shopify_config.dart';
 
 /// ShopifyCheckout provides various method in order to work with checkouts.
-class ShopifyCheckout with ShopifyError{
+class ShopifyCheckout with ShopifyError {
   ShopifyCheckout._();
   static final ShopifyCheckout instance = ShopifyCheckout._();
 
@@ -32,46 +33,56 @@ class ShopifyCheckout with ShopifyError{
   /// Returns a [Checkout] object.
   ///
   /// Returns the Checkout object of the checkout with the [checkoutId].
-  Future<Checkout> getCheckoutInfoQuery(String checkoutId, {bool deleteThisPartOfCache = false}) async {
-    final WatchQueryOptions _optionsRequireShipping =
-    WatchQueryOptions(documentNode: gql(getCheckoutInfoAboutShipping), variables: {
-      'id': checkoutId,
-    });
+  Future<Checkout> getCheckoutInfoQuery(String checkoutId,
+      {bool deleteThisPartOfCache = false}) async {
+    final WatchQueryOptions _optionsRequireShipping = WatchQueryOptions(
+        documentNode: gql(getCheckoutInfoAboutShipping),
+        variables: {
+          'id': checkoutId,
+        });
     QueryResult result = await _graphQLClient.query(_optionsRequireShipping);
     print((result?.data as LazyCacheMap)?.data);
-    final WatchQueryOptions _options =
-    WatchQueryOptions(documentNode: gql(_requiresShipping(result) == true ? getCheckoutInfo : getCheckoutInfoWithoutShipping), variables: {
-      'id': checkoutId,
-    });
+    final WatchQueryOptions _options = WatchQueryOptions(
+        documentNode: gql(_requiresShipping(result) == true
+            ? getCheckoutInfo
+            : getCheckoutInfoWithoutShipping),
+        variables: {
+          'id': checkoutId,
+        });
     final QueryResult _queryResult = (await _graphQLClient.query(_options));
     checkForError(_queryResult);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
-    return Checkout.fromJson(
-        _queryResult?.data['node']);
+    return Checkout.fromJson(_queryResult?.data['node']);
   }
-  Future<Checkout> getCheckoutInfoWithAvailableShippingRatesQuery(String checkoutId, {bool deleteThisPartOfCache = false}) async {
-    final WatchQueryOptions _optionsRequireShipping =
-    WatchQueryOptions(documentNode: gql(getCheckoutInfoAboutShipping), variables: {
-      'id': checkoutId,
-    });
+
+  Future<Checkout> getCheckoutInfoWithAvailableShippingRatesQuery(
+      String checkoutId,
+      {bool deleteThisPartOfCache = false}) async {
+    final WatchQueryOptions _optionsRequireShipping = WatchQueryOptions(
+        documentNode: gql(getCheckoutInfoAboutShipping),
+        variables: {
+          'id': checkoutId,
+        });
     QueryResult result = await _graphQLClient.query(_optionsRequireShipping);
     print((result?.data as LazyCacheMap)?.data);
-    final WatchQueryOptions _options =
-    WatchQueryOptions(documentNode: gql(_requiresShipping(result) == true ? getCheckoutInfoWithShippingRate : getCheckoutInfoWithoutShipping), variables: {
-      'id': checkoutId,
-    });
+    final WatchQueryOptions _options = WatchQueryOptions(
+        documentNode: gql(_requiresShipping(result) == true
+            ? getCheckoutInfoWithShippingRate
+            : getCheckoutInfoWithoutShipping),
+        variables: {
+          'id': checkoutId,
+        });
     final QueryResult _queryResult = (await _graphQLClient.query(_options));
     checkForError(_queryResult);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
-    return Checkout.fromJson(
-        _queryResult?.data['node']);
+    return Checkout.fromJson(_queryResult?.data['node']);
   }
 
-  bool _requiresShipping(QueryResult result){
+  bool _requiresShipping(QueryResult result) {
     return ((result?.data ?? const {})['node'] ?? const {})['requiresShipping'];
   }
 
@@ -91,21 +102,24 @@ class ShopifyCheckout with ShopifyError{
   ///
   /// Returns a List of Orders from the Customer with the [customerAccessToken].
   Future<List<Order>> getAllOrders(String customerAccessToken,
-      { SortKeyOrder sortKey = SortKeyOrder.ID, bool reverse = true, bool deleteThisPartOfCache = false}) async {
-      final QueryOptions _options = WatchQueryOptions(
-          documentNode: gql(getAllOrdersQuery),
-          variables: {
-            'accessToken': customerAccessToken,
-            'sortKey': sortKey.parseToString(),
-            'reverse': reverse
-          }
-      );
-      final QueryResult result = await ShopifyConfig.graphQLClient.query(_options);
-      checkForError(result);
-      Orders orders = Orders.fromJson(((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ?? const {}));
-      if(deleteThisPartOfCache) {
-        _graphQLClient.cache.write(_options.toKey(), null);
-      }
+      {SortKeyOrder sortKey = SortKeyOrder.ID,
+      bool reverse = true,
+      bool deleteThisPartOfCache = false}) async {
+    final QueryOptions _options =
+        WatchQueryOptions(documentNode: gql(getAllOrdersQuery), variables: {
+      'accessToken': customerAccessToken,
+      'sortKey': sortKey.parseToString(),
+      'reverse': reverse
+    });
+    final QueryResult result =
+        await ShopifyConfig.graphQLClient.query(_options);
+    checkForError(result);
+    Orders orders = Orders.fromJson(
+        ((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ??
+            const {}));
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.write(_options.toKey(), null);
+    }
     return orders.orderList;
   }
 
@@ -113,16 +127,17 @@ class ShopifyCheckout with ShopifyError{
   ///
   /// [checkoutLineItems] is a List of Variant Ids
   Future<void> checkoutLineItemsReplace(
-      String checkoutId, List<String> variantIdList, {bool deleteThisPartOfCache = false}) async {
+      String checkoutId, List<String> variantIdList,
+      {bool deleteThisPartOfCache = false}) async {
     var checkoutLineItems = transformVariantIdListIntoListOfMaps(variantIdList);
     final MutationOptions _options =
-    MutationOptions(documentNode: gql(replaceCheckoutItems), variables: {
+        MutationOptions(documentNode: gql(replaceCheckoutItems), variables: {
       'checkoutId': checkoutId,
       'checkoutLineItems': checkoutLineItems,
     });
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
   }
@@ -140,8 +155,7 @@ class ShopifyCheckout with ShopifyError{
       String phone,
       String province,
       String zip,
-      {bool deleteThisPartOfCache = false}
-      ) async {
+      {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(checkoutShippingAddressUpdateMutation),
         variables: {
@@ -158,8 +172,9 @@ class ShopifyCheckout with ShopifyError{
           'zip': zip
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result, key: 'checkoutShippingAddressUpdateV2', errorKey:'checkoutUserErrors');
-    if(deleteThisPartOfCache) {
+    checkForError(result,
+        key: 'checkoutShippingAddressUpdateV2', errorKey: 'checkoutUserErrors');
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
   }
@@ -167,19 +182,23 @@ class ShopifyCheckout with ShopifyError{
   /// Helper method for transforming a list of variant ids into a List Of Map<String, dynamic> which looks like this:
   ///
   /// [{"quantity":AMOUNT,"variantId":"YOUR_VARIANT_ID"}]
-  List<Map<String, dynamic>> transformVariantIdListIntoListOfMaps(List<String> variantIdList){
+  List<Map<String, dynamic>> transformVariantIdListIntoListOfMaps(
+      List<String> variantIdList) {
     List<Map<String, dynamic>> lineItemList = [];
-    variantIdList.forEach((e){
-      if(lineItemList.indexWhere((test) => e == test['variantId']) == -1)
-        lineItemList.add({"quantity": variantIdList.where((id) => e == id).toList().length,"variantId":e}
-        );
+    variantIdList.forEach((e) {
+      if (lineItemList.indexWhere((test) => e == test['variantId']) == -1)
+        lineItemList.add({
+          "quantity": variantIdList.where((id) => e == id).toList().length,
+          "variantId": e
+        });
     });
     return lineItemList;
   }
 
   /// Associates the [Customer] that [customerAccessToken] belongs to, to the [Checkout] that [checkoutId] belongs to.
   Future<void> checkoutCustomerAssociate(
-      String checkoutId, String customerAccessToken, {bool deleteThisPartOfCache = false}) async {
+      String checkoutId, String customerAccessToken,
+      {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(associateCustomer),
         variables: {
@@ -188,57 +207,60 @@ class ShopifyCheckout with ShopifyError{
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
   }
 
   /// Disassociates the [Customer] from the [Checkout] that [checkoutId] belongs to.
-  Future<void> checkoutCustomerDisassociate(String checkoutId, {bool deleteThisPartOfCache = false}) async {
+  Future<void> checkoutCustomerDisassociate(String checkoutId,
+      {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(checkoutCustomerDisassociateMutation),
         variables: {'id': checkoutId});
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
   }
 
   /// Applies [discountCode] to the [Checkout] that [checkoutId] belongs to.
-  Future<void> checkoutDiscountCodeApply(
-      String checkoutId, String discountCode, {bool deleteThisPartOfCache = false}) async {
+  Future<void> checkoutDiscountCodeApply(String checkoutId, String discountCode,
+      {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(checkoutDiscountCodeApplyMutation),
         variables: {'checkoutId': checkoutId, 'discountCode': discountCode});
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
   }
 
   /// Removes the applied discount from the [Checkout] that [checkoutId] belongs to.
-  Future<void> checkoutDiscountCodeRemove(String checkoutId, {bool deleteThisPartOfCache = false}) async {
+  Future<void> checkoutDiscountCodeRemove(String checkoutId,
+      {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(checkoutDiscountCodeRemoveMutation),
         variables: {'checkoutId': checkoutId});
     QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
   }
 
   /// Appends the [giftCardCodes] to the [Checkout] that [checkoutId] belongs to.
   Future<void> checkoutGiftCardAppend(
-      String checkoutId, List<String> giftCardCodes, {bool deleteThisPartOfCache = false}) async {
+      String checkoutId, List<String> giftCardCodes,
+      {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(checkoutGiftCardsAppendMutation),
         variables: {'checkoutId': checkoutId, 'giftCardCodes': giftCardCodes});
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
   }
@@ -252,18 +274,17 @@ class ShopifyCheckout with ShopifyError{
     );
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
-    return ((result?.data['checkoutCreate'] ??
-        const {})['checkout'] ??
+    return ((result?.data['checkoutCreate'] ?? const {})['checkout'] ??
         const {})['id'];
-
   }
 
   /// Removes the Gift card that [appliedGiftCardId] belongs to, from the [Checkout] that [checkoutId] belongs to.
   Future<void> checkoutGiftCardRemove(
-      String appliedGiftCardId, String checkoutId, {bool deleteThisPartOfCache = false}) async {
+      String appliedGiftCardId, String checkoutId,
+      {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(checkoutGiftCardRemoveMutation),
         variables: {
@@ -272,7 +293,7 @@ class ShopifyCheckout with ShopifyError{
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
   }
@@ -307,4 +328,18 @@ class ShopifyCheckout with ShopifyError{
       _graphQLClient.cache.write(_options.toKey(), null);
     }
   }
+
+  Future<void> emailUpdate(String checkoutId, String email,
+      {bool deleteThisPartOfCache = false}) async {
+    final MutationOptions _options = MutationOptions(
+        documentNode: gql(checkoutEmailUpdateMutation),
+        variables: {'checkoutId': checkoutId, 'email': email});
+    final QueryResult result = await _graphQLClient.mutate(_options);
+    checkForError(result,
+        key: 'checkoutEmailUpdateV2', errorKey: 'checkoutUserErrors');
+    print((result?.data as LazyCacheMap)?.data);
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.write(_options.toKey(), null);
+    }
+  }
 }

From c1f1a970dcbfafd963f97fbad7ab467af8bbd6da Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Tue, 10 Nov 2020 11:14:37 +0530
Subject: [PATCH 02/80] Products instead for List<Product>

---
 README.md                          |  6 +++---
 lib/shopify/src/shopify_store.dart | 33 ++++++++++++++----------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index a959d252..6056d529 100644
--- a/README.md
+++ b/README.md
@@ -37,16 +37,16 @@ The goal is to make creating an mobile app from your Shopify website easier.
 ```dart    
   ShopifyStore shopifyStore = ShopifyStore.instance;
      Future<List<Product>> getProductsByIds()
-     Future<List<Product>> getXProductsAfterCursor(int limit,String startCursor)
+     Future<Products> getXProductsAfterCursor(int limit,String startCursor)
      Future<List<Product>> getAllProducts()
      Future<List<Product>> getNProducts({@required int n, @required SortKey sortKey})
      Future<Shop> getShop()
      Future<Collection> getFeaturedCollection()
      Future<List<Collection>> getAllCollections()
-     Future<List<Product>> getXProductsAfterCursorWithinCollection(String id, int limit, String startCursor, SortKeyProduct sortKey)
+     Future<Products> getXProductsAfterCursorWithinCollection(String id, int limit, String startCursor, SortKeyProduct sortKey)
      Future<List<Product>> getAllProductsFromCollectionById(String id)
      Future<List<Product>> getAllProductsOnQuery(String cursor, SortKeyProduct sortKey, String query)
-     Future<List<Product>> getXProductsOnQueryAfterCursor(String cursor, int limit, SortKeyProduct sortKey, String query)
+     Future<Products> getXProductsOnQueryAfterCursor(String cursor, int limit, SortKeyProduct sortKey, String query)
      Future<List<Metafield>> getMetafieldsFromProduct(String productHandle, {String namespace})
 ```
 ```dart
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index ce794641..d21f8917 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -22,6 +22,7 @@ import '../../graphql_operations/queries/get_n_products.dart';
 import '../../graphql_operations/queries/get_products.dart';
 import '../../models/src/collection.dart';
 import '../../shopify_config.dart';
+import 'dart:developer';
 
 /// ShopifyStore provides various methods related to the shopify store.
 class ShopifyStore with ShopifyError{
@@ -60,30 +61,27 @@ class ShopifyStore with ShopifyError{
     return productList;
   }
 
-  /// Returns a List of [Product].
+  /// Returns [Products].
   ///
   /// Returns the first [limit] Products after the given [startCursor].
   /// [limit] has to be in the range of 0 and 250.
-  Future<List<Product>> getXProductsAfterCursor(
+  Future<Products> getXProductsAfterCursor(
       int limit, String startCursor,
       {bool deleteThisPartOfCache = false, bool reverse = false, SortKeyProduct sortKeyProduct = SortKeyProduct.TITLE}) async {
-    List<Product> productList = [];
-    Products tempProduct;
     String cursor = startCursor;
     final WatchQueryOptions _options = WatchQueryOptions(
         documentNode: gql(getXProductsAfterCursorQuery),
         variables: {'x': limit ?? 50, 'cursor': cursor, 'reverse': reverse, 'sortKey': sortKeyProduct.parseToString()});
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
-    tempProduct = (Products.fromJson(
-        (result?.data ??
-            const {})["products"] ??
-            {}));
-    productList += tempProduct?.productList ?? const [];
+    
     if(deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
-    return productList;
+    return (Products.fromJson(
+        (result?.data ??
+            const {})["products"] ??
+            {}));
   }
 
   /// Returns a List of [Product].
@@ -333,11 +331,11 @@ class ShopifyStore with ShopifyError{
     return productList;
   }
 
-  /// Returns a List of [Product].
+  /// Returns [Products].
   ///
   /// Returns the first [limit] Products after the given [startCursor].
   /// [limit] has to be in the range of 0 and 250.
-  Future<List<Product>> getXProductsAfterCursorWithinCollection(
+  Future<Products> getXProductsAfterCursorWithinCollection(
       String id, int limit, String startCursor, {SortKeyProductCollection sortKey = SortKeyProductCollection.BEST_SELLING, bool deleteThisPartOfCache = false, bool reverse = false}) async {
     String cursor = startCursor;
     final WatchQueryOptions _options = WatchQueryOptions(
@@ -356,8 +354,7 @@ class ShopifyStore with ShopifyError{
     }
     return (Collection.fromJson(
         result?.data))
-        .products
-        .productList;
+        .products;
   }
 
   /// Returns a List of [Product].
@@ -395,10 +392,10 @@ class ShopifyStore with ShopifyError{
     return productList;
   }
 
-  /// Returns a List of [Product].
+  /// Returns [Products].
   ///
   /// Gets [limit] amount of [Product] from the [query] search, sorted by [sortKey].
-  Future<List<Product>> getXProductsOnQueryAfterCursor(
+  Future<Products> getXProductsOnQueryAfterCursor(
       String query, int limit, String cursor, {SortKeyProduct sortKey, bool deleteThisPartOfCache = false, bool reverse = false}) async {
     final WatchQueryOptions _options = WatchQueryOptions(
         documentNode: gql(getXProductsOnQueryAfterCursorQuery),
@@ -414,10 +411,10 @@ class ShopifyStore with ShopifyError{
     if(deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
+    
     return Products.fromJson(
         (result?.data ??
-            const {})['products'])
-        ?.productList;
+            const {})['products']);
   }
 
   /// Returns a List of [Metafield].

From 465a47586429914e9f583d2886bbd732c0b9a988 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Tue, 10 Nov 2020 11:48:52 +0530
Subject: [PATCH 03/80] getXOrdersAfterCursor

---
 README.md                                     |   1 +
 example/lib/collection_tab.dart               |   5 +-
 example/lib/home_tab.dart                     |   2 +-
 example/lib/search_tab.dart                   |   4 +-
 .../queries/get_x_orders_after_cursor.dart    | 109 ++++++++++++++++++
 lib/shopify/src/shopify_checkout.dart         |  26 +++++
 6 files changed, 141 insertions(+), 6 deletions(-)
 create mode 100644 lib/graphql_operations/queries/get_x_orders_after_cursor.dart

diff --git a/README.md b/README.md
index 6056d529..53d828f6 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ The goal is to make creating an mobile app from your Shopify website easier.
     Future<Checkout> getCheckoutInfoQuery({String checkoutId})
     Future<Checkout> getCheckoutInfoWithAvailableShippingRatesQuery({String checkoutId})
     Future<List<Order>> getAllOrders({String customerAccessToken})
+    Future<Orders> getXOrdersAfterCursor({String customerAccessToken, int limit, String startCursor})
     Future<void> checkoutLineItemsReplace({String checkoutId, List<Map<String,dynamic>> checkoutLineItems})
     Future<void> checkoutCustomerAssociate({String checkoutId, String customerAccessToken}) 
     Future<void> checkoutCustomerDisassociate({String checkoutId})
diff --git a/example/lib/collection_tab.dart b/example/lib/collection_tab.dart
index 4c0447e2..8ff7a470 100644
--- a/example/lib/collection_tab.dart
+++ b/example/lib/collection_tab.dart
@@ -96,12 +96,11 @@ class _CollectionDetailScreenState extends State<CollectionDetailScreen> {
       final products = await shopifyStore.getXProductsAfterCursorWithinCollection(
         widget.collectionId,
         4,
-        null,
-        SortKeyProduct.RELEVANCE,
+        null
       );
       if(mounted){
         setState(() {
-          this.products = products;
+          this.products = products.productList;
           _isLoading = false;
         });
       }
diff --git a/example/lib/home_tab.dart b/example/lib/home_tab.dart
index e0059023..0348db6a 100644
--- a/example/lib/home_tab.dart
+++ b/example/lib/home_tab.dart
@@ -45,7 +45,7 @@ class _HomeTabState extends State<HomeTab> {
     try {
       ShopifyStore shopifyStore = ShopifyStore.instance;
       final List<Product> bestSellingProducts = await shopifyStore
-          .getNProducts(false, n: 6, sortKey: SortKeyProduct.BEST_SELLING);
+          .getNProducts(6, sortKey: SortKeyProduct.BEST_SELLING);
       if (mounted) {
         setState(() {
           products = bestSellingProducts;
diff --git a/example/lib/search_tab.dart b/example/lib/search_tab.dart
index 8aab4fc7..180db389 100644
--- a/example/lib/search_tab.dart
+++ b/example/lib/search_tab.dart
@@ -61,10 +61,10 @@ class _SearchTabState extends State<SearchTab> {
     try {
       ShopifyStore shopifyStore = ShopifyStore.instance;
       final products = await shopifyStore.getXProductsOnQueryAfterCursor(
-          null, 4, SortKeyProduct.RELEVANCE, searchKeyword);
+          null, 4, searchKeyword);
       if (mounted) {
         setState(() {
-          this.products = products;
+          this.products = products.productList;
           _isLoading = false;
         });
       }
diff --git a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
new file mode 100644
index 00000000..6ea0e5b9
--- /dev/null
+++ b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
@@ -0,0 +1,109 @@
+const String getXOrdersAfterCursorQuery = r'''
+query getOrders($cursor : String, $x : Int,$sortKey : OrderSortKeys, $accessToken : String!, $reverse: Boolean){
+customer(customerAccessToken: $accessToken) {
+    orders(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
+      pageInfo {
+        hasNextPage
+      }
+      edges {
+        node {
+          id
+          email
+          currencyCode
+          customerUrl
+          lineItems(first: 250) {
+            edges {
+              node {
+                currentQuantity
+                discountAllocations {
+                  allocatedAmount {
+                    amount
+                    currencyCode
+                  }
+                }
+                discountedTotalPrice {
+                  amount
+                  currencyCode
+                }
+                originalTotalPrice {
+                  amount
+                  currencyCode
+                }
+                quantity
+                title
+                variant {
+                  priceV2 {
+                    amount
+                    currencyCode
+                  }
+                  title
+                  image {
+                    altText
+                    id
+                    originalSrc
+                  }
+                  compareAtPriceV2 {
+                    amount
+                    currencyCode
+                  }
+                  weight
+                  weightUnit
+                  availableForSale
+                  sku
+                  requiresShipping
+                  id
+                }
+              }
+            }
+          }
+          name
+          orderNumber
+          phone
+          processedAt
+          shippingAddress {
+            address1
+            address2
+            city
+            company
+            country
+            countryCodeV2
+            firstName
+            id
+            lastName
+            latitude
+            longitude
+            name
+            phone
+            province
+            provinceCode
+            zip
+          }
+          statusUrl
+          subtotalPriceV2 {
+            amount
+            currencyCode
+          }
+          totalPriceV2 {
+            amount
+            currencyCode
+          }
+          totalRefundedV2 {
+            amount
+            currencyCode
+          }
+          totalShippingPriceV2 {
+            amount
+            currencyCode
+          }
+          totalTaxV2 {
+            amount
+            currencyCode
+          }
+        }
+        cursor
+      }
+    }
+    id
+  }
+}
+''';
\ No newline at end of file
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index 0699b757..db318ac7 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -123,6 +123,32 @@ class ShopifyCheckout with ShopifyError {
     return orders.orderList;
   }
 
+  Future<Orders> getXOrdersAfterCursor(
+      String customerAccessToken, int limit, String startCursor,
+      {SortKeyOrder sortKey = SortKeyOrder.ID,
+      bool reverse = true,
+      bool deleteThisPartOfCache = false}) async {
+    String cursor = startCursor;
+    final QueryOptions _options =
+        WatchQueryOptions(documentNode: gql(getAllOrdersQuery), variables: {
+      'accessToken': customerAccessToken,
+      'sortKey': sortKey.parseToString(),
+      'reverse': reverse,
+      'cursor': cursor,
+      'x': limit
+    });
+    final QueryResult result =
+        await ShopifyConfig.graphQLClient.query(_options);
+    checkForError(result);
+    Orders orders = Orders.fromJson(
+        ((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ??
+            const {}));
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.write(_options.toKey(), null);
+    }
+    return orders;
+  }
+
   /// Replaces the [LineItems] in the [Checkout] associated to the [checkoutId].
   ///
   /// [checkoutLineItems] is a List of Variant Ids

From 63350e80455176cbdb1ceedb32a6db2e91bb62ab Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Thu, 12 Nov 2020 15:23:47 +0530
Subject: [PATCH 04/80] getXOrdersAfterCursorQuery

---
 lib/shopify/src/shopify_checkout.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index db318ac7..45d024a1 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -7,6 +7,7 @@ import 'package:flutter_simple_shopify/graphql_operations/queries/get_checkout_i
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_checkout_info_requires_shipping.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_checkout_without_shipping_rates.dart';
+import 'package:flutter_simple_shopify/graphql_operations/queries/get_x_orders_after_cursor.dart';
 import 'package:flutter_simple_shopify/mixins/src/shopfiy_error.dart';
 import 'package:flutter_simple_shopify/models/src/order.dart';
 import 'package:graphql/client.dart';
@@ -130,7 +131,7 @@ class ShopifyCheckout with ShopifyError {
       bool deleteThisPartOfCache = false}) async {
     String cursor = startCursor;
     final QueryOptions _options =
-        WatchQueryOptions(documentNode: gql(getAllOrdersQuery), variables: {
+        WatchQueryOptions(documentNode: gql(getXOrdersAfterCursorQuery), variables: {
       'accessToken': customerAccessToken,
       'sortKey': sortKey.parseToString(),
       'reverse': reverse,

From f263e66a35a9832be4fbc3ff67e03239eae7d7f2 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 13 Nov 2020 16:54:44 +0530
Subject: [PATCH 05/80] product variants selectedOptions

---
 .../queries/get_products_by_ids.dart          |  6 +-
 lib/models/src/product.dart                   | 66 +++++++++++++++++--
 2 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/lib/graphql_operations/queries/get_products_by_ids.dart b/lib/graphql_operations/queries/get_products_by_ids.dart
index 2cc9a629..859a9272 100644
--- a/lib/graphql_operations/queries/get_products_by_ids.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids.dart
@@ -6,7 +6,7 @@ query($ids : [ID!]!){
             id
             name
             values
-            } 
+      } 
       id
       handle
       collections(first: 250) {
@@ -59,6 +59,10 @@ query($ids : [ID!]!){
             requiresShipping
             id
             quantityAvailable
+            selectedOptions {
+              name
+              value
+            }
           }
         }
       }
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index a74dc5a2..1547fc6f 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -1,3 +1,5 @@
+import 'package:collection/collection.dart';
+
 class Products {
   final List<Product> productList;
   final bool hasNextPage;
@@ -35,7 +37,7 @@ class Product {
   final String updatedAt;
   final String cursor;
   final List<ShopifyImage> images;
-  final List<Option> option;
+  final List<Option> options;
   final String vendor;
   final List<Metafield> metafields;
 
@@ -56,7 +58,7 @@ class Product {
         this.updatedAt,
         this.cursor,
         this.images,
-        this.option,
+        this.options,
         this.vendor,
         this.metafields});
 
@@ -78,7 +80,7 @@ class Product {
         updatedAt: (json['node'] ?? const {})['updatedAt'],
         images: _getImageList((json['node'] ?? const {})['images'] ?? const {}),
         cursor: json['cursor'],
-        option: _getOptionList((json['node'] ?? const {})),
+        options: _getOptionList((json['node'] ?? const {})),
         vendor: (json['node'] ?? const {})['vendor'],
         metafields: _getMetafieldList((json['node'] ?? const {})['metafields'] ?? const {}));
   }
@@ -93,6 +95,28 @@ class Product {
     return productVariants;
   }
 
+  getProductVariantBySelectedOption(List<SelectedOption> filters){
+    Function unOrdDeepEq = const DeepCollectionEquality.unordered().equals;
+    final productVariant =
+        this.productVariants.firstWhere((ProductVariant productVariant) {
+      bool found = false;
+      List<Map<String, String>> selectedOptionList = [];
+      List<Map<String, String>> filterList = [];
+      productVariant.selectedOptions.forEach((SelectedOption selectedOption) {
+        selectedOptionList.add({selectedOption.name: selectedOption.value});
+      });
+      filters.forEach((SelectedOption selectedOption) {
+        filterList.add({selectedOption.name: selectedOption.value});
+      });
+      if (unOrdDeepEq(selectedOptionList, filterList) == true) {
+        found = true;
+      }
+
+      return found;
+    });
+    return productVariant;
+  }
+
 
   static List<Option> _getOptionList(Map<String, dynamic> json) {
     List<Option> optionList = [];
@@ -188,6 +212,7 @@ class ProductVariant {
   final bool requiresShipping;
   final String id;
   final int quantityAvailable;
+  final List<SelectedOption> selectedOptions;
 
   const ProductVariant(
       {this.price,
@@ -200,7 +225,8 @@ class ProductVariant {
         this.sku,
         this.requiresShipping,
         this.id,
-        this.quantityAvailable});
+        this.quantityAvailable,
+        this.selectedOptions});
 
   static ProductVariant fromJson(Map<String, dynamic> json) {
     return ProductVariant(
@@ -218,8 +244,18 @@ class ProductVariant {
       requiresShipping: (json['node'] ?? const {})['requiresShipping'],
       id: (json['node'] ?? const {})['id'],
       quantityAvailable: (json['node'] ?? const {})['quantityAvailable'],
+      selectedOptions: _getSelectedOptionsList((json['node'] ?? const {})),
     );
   }
+
+  static List<SelectedOption> _getSelectedOptionsList(Map<String, dynamic> json) {
+    List<SelectedOption> selectedOptionsList = [];
+    json['selectedOptions']?.forEach((v) {
+      if (v != null)
+        selectedOptionsList.add(SelectedOption.fromJson(v ?? const {}));
+    });
+    return selectedOptionsList;
+  }
 }
 
 class Metafield {
@@ -271,6 +307,28 @@ class Option {
   }
 }
 
+class SelectedOption {
+  // final String id;
+  final String name;
+  final String value;
+
+  SelectedOption({this.name, this.value});
+
+  static SelectedOption fromJson(Map<String, dynamic> json) {
+    return SelectedOption(
+        // id: json['id'] ?? "",
+        name: json['name'] ?? "",
+        value: json['value'] ?? "",
+    );
+  }
+
+  // static List<String> _getValueList(Map<String, dynamic> json) {
+  //   List<String> values = [];
+  //   json['values']?.forEach((e) => values.add(e ?? ""));
+  //   return values;
+  // }
+}
+
 class PriceV2 {
   final double amount;
   final String currencyCode;

From 6b672592239e0f7e5c0cad65fe0a205d093eb036 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Tue, 17 Nov 2020 16:24:23 +0530
Subject: [PATCH 06/80] exception handling in customer access token create

---
 .../mutations/customer_access_token_create.dart              | 5 +++++
 lib/shopify/src/shopify_auth.dart                            | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/lib/graphql_operations/mutations/customer_access_token_create.dart b/lib/graphql_operations/mutations/customer_access_token_create.dart
index 56944981..e80b643b 100644
--- a/lib/graphql_operations/mutations/customer_access_token_create.dart
+++ b/lib/graphql_operations/mutations/customer_access_token_create.dart
@@ -5,5 +5,10 @@ mutation customerAccessTokenCreate($email : String!, $password: String!) {
       expiresAt
       accessToken
     }
+    customerUserErrors {
+      code
+      field
+      message
+    }
   }
 }''';
\ No newline at end of file
diff --git a/lib/shopify/src/shopify_auth.dart b/lib/shopify/src/shopify_auth.dart
index f8a84d78..04d77f45 100644
--- a/lib/shopify/src/shopify_auth.dart
+++ b/lib/shopify/src/shopify_auth.dart
@@ -89,6 +89,8 @@ class ShopifyAuth with ShopifyError {
         documentNode: gql(customerAccessTokenCreate),
         variables: {'email': email, 'password': password});
     final QueryResult result = await _graphQLClient.mutate(_options);
+    checkForError(result,
+        key: 'customerAccessTokenCreate', errorKey: 'customerUserErrors');
     if(deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }

From f69b52e29fd51faaed2c02edf3b7f6af099bc719 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Wed, 18 Nov 2020 19:33:35 +0530
Subject: [PATCH 07/80] registration

---
 .../mutations/customer_create.dart            |  9 ++-
 lib/shopify/src/shopify_auth.dart             | 72 ++++++++++++-------
 2 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/lib/graphql_operations/mutations/customer_create.dart b/lib/graphql_operations/mutations/customer_create.dart
index 77da7dd0..6b2f117e 100644
--- a/lib/graphql_operations/mutations/customer_create.dart
+++ b/lib/graphql_operations/mutations/customer_create.dart
@@ -1,6 +1,6 @@
 const String customerCreateMutation = r''' 
-mutation MyMutation($email: String!, $password: String!) {
-  customerCreate(input: {email: $email, password: $password}) {
+mutation MyMutation($firstName: String!, $lastName: String!, $email: String!, $password: String!) {
+  customerCreate(input: {firstName: $firstName, lastName: $lastName, email: $email, password: $password}) {
     customer{
       acceptsMarketing
     addresses(first: 10) {
@@ -97,6 +97,11 @@ mutation MyMutation($email: String!, $password: String!) {
         }
       }
   }
+  customerUserErrors {
+      code
+      field
+      message
+    }
   }
 }
 ''';
diff --git a/lib/shopify/src/shopify_auth.dart b/lib/shopify/src/shopify_auth.dart
index 04d77f45..275a02a2 100644
--- a/lib/shopify/src/shopify_auth.dart
+++ b/lib/shopify/src/shopify_auth.dart
@@ -21,28 +21,40 @@ class ShopifyAuth with ShopifyError {
 
   static const String _shopifyKey = 'FLUTTER_SIMPLE_SHOPIFY_ACCESS_TOKEN';
 
-  static get currentCustomerAccessToken async => (await SharedPreferences.getInstance()).getString(_shopifyKey);
+  static get currentCustomerAccessToken async =>
+      (await SharedPreferences.getInstance()).getString(_shopifyKey);
 
   /// Tries to create a new user account with the given email address and password.
-    Future<ShopifyUser> createUserWithEmailAndPassword(
-      {@required String email, @required String password, bool deleteThisPartOfCache = false}) async {
+  Future<ShopifyUser> createUser(
+      {@required String firstName,
+      @required String lastName,
+      @required String email,
+      @required String password,
+      bool deleteThisPartOfCache = false}) async {
+    assert(firstName != null);
+    assert(lastName != null);
     assert(email != null);
     assert(password != null);
     final MutationOptions _options =
-    MutationOptions(documentNode: gql(customerCreateMutation), variables: {
+        MutationOptions(documentNode: gql(customerCreateMutation), variables: {
+      'firstName': firstName,
+      'lastName': lastName,
       'email': email,
       'password': password,
     });
     final QueryResult result = await _graphQLClient.mutate(_options);
     print(result.exception.toString());
-    checkForError(result);
-    if((result?.data['customerCreate'] ?? const {})['customerUserErrors'] != null)
-      throw(result?.data['customerCreate'] ?? const {}['customerUserErrors'].first['message']);
+    checkForError(result, key:'customerCreate', errorKey: 'customerUserErrors');
+    if ((result?.data['customerCreate'] ?? const {})['customerUserErrors'] !=
+        null)
+      throw (result?.data['customerCreate'] ??
+          const {}['customerUserErrors'].first['message']);
     final shopifyUser = ShopifyUser.fromJson(
         (result?.data['customerCreate'] ?? const {})['customer']);
-    final String customerAccessToken = await _createAccessToken(email, password);
+    final String customerAccessToken =
+        await _createAccessToken(email, password);
     await _setShopifyUser(customerAccessToken, _shopifyUser);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     return shopifyUser;
@@ -51,47 +63,51 @@ class ShopifyAuth with ShopifyError {
   /// Triggers the Shopify Authentication backend to send a password-reset
   /// email to the given email address, which must correspond to an existing
   /// user of your app.
-  Future<void> sendPasswordResetEmail({@required String email, bool deleteThisPartOfCache = false}) async {
+  Future<void> sendPasswordResetEmail(
+      {@required String email, bool deleteThisPartOfCache = false}) async {
     assert(email != null);
     final MutationOptions _options = MutationOptions(
         documentNode: gql(customerRecoverMutation),
         variables: {'email': email});
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
-    if(deleteThisPartOfCache) {
+    checkForError(result, key: 'customerRecover', errorKey: 'customerUserErrors');
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
   }
 
   /// Tries to sign in a user with the given email address and password.
   Future<ShopifyUser> signInWithEmailAndPassword(
-      {@required String email, @required String password, bool deleteThisPartOfCache = false}) async {
+      {@required String email,
+      @required String password,
+      bool deleteThisPartOfCache = false}) async {
     assert(email != null);
     assert(password != null);
-    final String customerAccessToken = await _createAccessToken(email, password);
+    final String customerAccessToken =
+        await _createAccessToken(email, password);
     final WatchQueryOptions _getCustomer = WatchQueryOptions(
         documentNode: gql(getCustomerQuery),
         variables: {'customerAccessToken': customerAccessToken});
     final QueryResult result = await _graphQLClient.query(_getCustomer);
     checkForError(result);
-    final shopifyUser = ShopifyUser.fromJson(
-        result?.data['customer']);
-    await  _setShopifyUser(customerAccessToken, shopifyUser);
-    if(deleteThisPartOfCache) {
+    final shopifyUser = ShopifyUser.fromJson(result?.data['customer']);
+    await _setShopifyUser(customerAccessToken, shopifyUser);
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_getCustomer.toKey(), null);
     }
     return shopifyUser;
   }
 
   /// Helper method for creating the accessToken.
-  Future<String> _createAccessToken(String email, String password, {bool deleteThisPartOfCache = false}) async {
+  Future<String> _createAccessToken(String email, String password,
+      {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(customerAccessTokenCreate),
         variables: {'email': email, 'password': password});
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result,
         key: 'customerAccessTokenCreate', errorKey: 'customerUserErrors');
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     return _extractAccessToken(result?.data);
@@ -99,8 +115,9 @@ class ShopifyAuth with ShopifyError {
 
   /// Helper method for extracting the customerAccessToken from the mutation.
   String _extractAccessToken(Map<String, dynamic> mutationData) {
-    return (((mutationData ?? const {})['customerAccessTokenCreate'] ?? const {})['customerAccessToken'] ?? const {})
-    ['accessToken'];
+    return (((mutationData ?? const {})['customerAccessTokenCreate'] ??
+            const {})['customerAccessToken'] ??
+        const {})['accessToken'];
   }
 
   /// Signs out the current user and clears it from the disk cache.
@@ -112,19 +129,19 @@ class ShopifyAuth with ShopifyError {
     await _setShopifyUser(null, null);
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     return result;
   }
 
   /// Returns the currently signed-in [ShopifyUser] or [null] if there is none.
-  Future<ShopifyUser> currentUser({bool deleteThisPartOfCache = false}) async{
+  Future<ShopifyUser> currentUser({bool deleteThisPartOfCache = false}) async {
     SharedPreferences _prefs = await SharedPreferences.getInstance();
     final WatchQueryOptions _getCustomer = WatchQueryOptions(
         documentNode: gql(getCustomerQuery),
         variables: {'customerAccessToken': _prefs.getString(_shopifyKey)});
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_getCustomer.toKey(), null);
     }
     if (_shopifyUser != null) {
@@ -136,12 +153,13 @@ class ShopifyAuth with ShopifyError {
       ShopifyUser user = ShopifyUser.fromJson(
           (result?.data ?? const {})['customer'] ?? const {});
       return user;
-    }else{
+    } else {
       return null;
     }
   }
 
-  Future<void> _setShopifyUser(String sharedPrefsToken, ShopifyUser shopifyUser) async {
+  Future<void> _setShopifyUser(
+      String sharedPrefsToken, ShopifyUser shopifyUser) async {
     SharedPreferences _prefs = await SharedPreferences.getInstance();
     _shopifyUser = shopifyUser;
     _prefs.setString(_shopifyKey, sharedPrefsToken);

From d27c7fb883a6c05a969cdee14dc9654b8fbeee1c Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 20 Nov 2020 10:44:25 +0530
Subject: [PATCH 08/80] removed Exception handling

---
 lib/shopify/src/shopify_auth.dart | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/shopify/src/shopify_auth.dart b/lib/shopify/src/shopify_auth.dart
index 275a02a2..38c12574 100644
--- a/lib/shopify/src/shopify_auth.dart
+++ b/lib/shopify/src/shopify_auth.dart
@@ -43,12 +43,12 @@ class ShopifyAuth with ShopifyError {
       'password': password,
     });
     final QueryResult result = await _graphQLClient.mutate(_options);
-    print(result.exception.toString());
+    // print(result.exception.toString());
     checkForError(result, key:'customerCreate', errorKey: 'customerUserErrors');
-    if ((result?.data['customerCreate'] ?? const {})['customerUserErrors'] !=
-        null)
-      throw (result?.data['customerCreate'] ??
-          const {}['customerUserErrors'].first['message']);
+    // if ((result?.data['customerCreate'] ?? const {})['customerUserErrors'] !=
+    //     null)
+    //   throw (result?.data['customerCreate'] ??
+    //       const {}['customerUserErrors'].first['message']);
     final shopifyUser = ShopifyUser.fromJson(
         (result?.data['customerCreate'] ?? const {})['customer']);
     final String customerAccessToken =

From 33e068816179a11f9c8d72cefb7c410d282a5409 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Mon, 23 Nov 2020 12:25:46 +0530
Subject: [PATCH 09/80] product and variant toJson fn

---
 lib/models/src/product.dart | 178 ++++++++++++++++++++----------------
 1 file changed, 97 insertions(+), 81 deletions(-)

diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 1547fc6f..3f18e154 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -43,24 +43,24 @@ class Product {
 
   const Product(
       {this.collectionList,
-        this.title,
-        this.id,
-        this.availableForSale,
-        this.createdAt,
-        this.description,
-        this.productVariants,
-        this.descriptionHtml,
-        this.handle,
-        this.onlineStoreUrl,
-        this.productType,
-        this.publishedAt,
-        this.tags,
-        this.updatedAt,
-        this.cursor,
-        this.images,
-        this.options,
-        this.vendor,
-        this.metafields});
+      this.title,
+      this.id,
+      this.availableForSale,
+      this.createdAt,
+      this.description,
+      this.productVariants,
+      this.descriptionHtml,
+      this.handle,
+      this.onlineStoreUrl,
+      this.productType,
+      this.publishedAt,
+      this.tags,
+      this.updatedAt,
+      this.cursor,
+      this.images,
+      this.options,
+      this.vendor,
+      this.metafields});
 
   static Product fromJson(Map<String, dynamic> json) {
     return Product(
@@ -82,9 +82,16 @@ class Product {
         cursor: json['cursor'],
         options: _getOptionList((json['node'] ?? const {})),
         vendor: (json['node'] ?? const {})['vendor'],
-        metafields: _getMetafieldList((json['node'] ?? const {})['metafields'] ?? const {}));
+        metafields: _getMetafieldList(
+            (json['node'] ?? const {})['metafields'] ?? const {}));
   }
 
+  Map toJson() => {
+        'id': id,
+        'title': title,
+        'description': description,
+      };
+
   static List<ProductVariant> _getProductVariants(Map<String, dynamic> json) {
     List<ProductVariant> productVariants = [];
     (((json['node'] ?? const {})['variants'] ?? const {})['edges'] ?? const [])
@@ -95,7 +102,7 @@ class Product {
     return productVariants;
   }
 
-  getProductVariantBySelectedOption(List<SelectedOption> filters){
+  getProductVariantBySelectedOption(List<SelectedOption> filters) {
     Function unOrdDeepEq = const DeepCollectionEquality.unordered().equals;
     final productVariant =
         this.productVariants.firstWhere((ProductVariant productVariant) {
@@ -117,12 +124,10 @@ class Product {
     return productVariant;
   }
 
-
   static List<Option> _getOptionList(Map<String, dynamic> json) {
     List<Option> optionList = [];
     json['options']?.forEach((v) {
-      if (v != null)
-        optionList.add(Option.fromJson(v ?? const {}));
+      if (v != null) optionList.add(Option.fromJson(v ?? const {}));
     });
     return optionList;
   }
@@ -137,7 +142,7 @@ class Product {
       Map<String, dynamic> json) {
     List<AssociatedCollections> collectionList = [];
     (((json['node'] ?? const {})['collections'] ?? const {})['edges'] ??
-        const [])
+            const [])
         ?.forEach((v) {
       if (v?.data != null)
         collectionList.add(AssociatedCollections.fromJson(v?.data ?? const {}));
@@ -147,13 +152,15 @@ class Product {
 
   static _getImageList(Map<String, dynamic> json) {
     List<ShopifyImage> imageList = [];
-    json['edges'].forEach((image) => imageList.add(ShopifyImage.fromJson(image['node'] ?? const {})));
+    json['edges'].forEach((image) =>
+        imageList.add(ShopifyImage.fromJson(image['node'] ?? const {})));
     return imageList;
   }
 
   static _getMetafieldList(Map<String, dynamic> json) {
     List<Metafield> metafieldList = [];
-    json['edges']?.forEach((metafield) => metafieldList.add(Metafield.fromJson(metafield ?? const {})));
+    json['edges']?.forEach((metafield) =>
+        metafieldList.add(Metafield.fromJson(metafield ?? const {})));
     return metafieldList;
   }
 }
@@ -168,11 +175,11 @@ class AssociatedCollections {
 
   AssociatedCollections(
       {this.description,
-        this.descriptionHtml,
-        this.id,
-        this.handle,
-        this.updatedAt,
-        this.title});
+      this.descriptionHtml,
+      this.id,
+      this.handle,
+      this.updatedAt,
+      this.title});
 
   static AssociatedCollections fromJson(Map<String, dynamic> json) {
     return AssociatedCollections(
@@ -216,22 +223,22 @@ class ProductVariant {
 
   const ProductVariant(
       {this.price,
-        this.title,
-        this.image,
-        this.compareAtPrice,
-        this.weight,
-        this.weightUnit,
-        this.availableForSale,
-        this.sku,
-        this.requiresShipping,
-        this.id,
-        this.quantityAvailable,
-        this.selectedOptions});
+      this.title,
+      this.image,
+      this.compareAtPrice,
+      this.weight,
+      this.weightUnit,
+      this.availableForSale,
+      this.sku,
+      this.requiresShipping,
+      this.id,
+      this.quantityAvailable,
+      this.selectedOptions});
 
   static ProductVariant fromJson(Map<String, dynamic> json) {
     return ProductVariant(
       price:
-      PriceV2.fromJson((json['node'] ?? const {})['priceV2'] ?? const {}),
+          PriceV2.fromJson((json['node'] ?? const {})['priceV2'] ?? const {}),
       title: (json['node'] ?? const {})['title'],
       image: ShopifyImage.fromJson(
           (json['node'] ?? const {})['image'] ?? const {}),
@@ -248,7 +255,14 @@ class ProductVariant {
     );
   }
 
-  static List<SelectedOption> _getSelectedOptionsList(Map<String, dynamic> json) {
+  Map toJson() => {
+        'id': id,
+        'title': title,
+        // 'weight': weight,
+      };
+
+  static List<SelectedOption> _getSelectedOptionsList(
+      Map<String, dynamic> json) {
     List<SelectedOption> selectedOptionsList = [];
     json['selectedOptions']?.forEach((v) {
       if (v != null)
@@ -296,8 +310,7 @@ class Option {
     return Option(
         id: json['id'] ?? "",
         name: json['name'] ?? "",
-        values: _getValueList(json)
-    );
+        values: _getValueList(json));
   }
 
   static List<String> _getValueList(Map<String, dynamic> json) {
@@ -308,7 +321,6 @@ class Option {
 }
 
 class SelectedOption {
-  // final String id;
   final String name;
   final String value;
 
@@ -316,17 +328,11 @@ class SelectedOption {
 
   static SelectedOption fromJson(Map<String, dynamic> json) {
     return SelectedOption(
-        // id: json['id'] ?? "",
-        name: json['name'] ?? "",
-        value: json['value'] ?? "",
+      // id: json['id'] ?? "",
+      name: json['name'] ?? "",
+      value: json['value'] ?? "",
     );
   }
-
-  // static List<String> _getValueList(Map<String, dynamic> json) {
-  //   List<String> values = [];
-  //   json['values']?.forEach((e) => values.add(e ?? ""));
-  //   return values;
-  // }
 }
 
 class PriceV2 {
@@ -335,38 +341,49 @@ class PriceV2 {
   final String currencySymbol;
   final String formattedPrice;
 
-  const PriceV2({this.formattedPrice, this.currencySymbol, this.amount, this.currencyCode});
+  const PriceV2(
+      {this.formattedPrice,
+      this.currencySymbol,
+      this.amount,
+      this.currencyCode});
 
   static PriceV2 fromJson(Map<String, dynamic> json) {
     return PriceV2(
         amount: json['amount'] != null ? double.parse(json['amount']) : null,
         currencyCode: json['currencyCode'],
         currencySymbol: _simpleCurrencySymbols[json['currencyCode']],
-        formattedPrice: _chooseRightOrderOnCurrencySymbol(json)
-
-    );
+        formattedPrice: _chooseRightOrderOnCurrencySymbol(json));
   }
-  static String _chooseRightOrderOnCurrencySymbol(Map<String, dynamic> json){
-    String currencyString;
-    switch(json['currencyCode']) {
-      case "INR": {
-        currencyString = '${_simpleCurrencySymbols[json['currencyCode']]} ${json['amount']}';
-      }
-      break;
 
-      case "EUR": {
-        currencyString = '${json['amount']} ${_simpleCurrencySymbols[json['currencyCode']]}';
-      }
-      break;
-      case "USD": {
-        currencyString = '${_simpleCurrencySymbols[json['currencyCode']]} ${json['amount']}';
-      }
-      break;
-
-      default: {
-        currencyString = '${json['amount']} ${_simpleCurrencySymbols[json['currencyCode']]}';
-      }
-      break;
+  static String _chooseRightOrderOnCurrencySymbol(Map<String, dynamic> json) {
+    String currencyString;
+    switch (json['currencyCode']) {
+      case "INR":
+        {
+          currencyString =
+              '${_simpleCurrencySymbols[json['currencyCode']]} ${json['amount']}';
+        }
+        break;
+
+      case "EUR":
+        {
+          currencyString =
+              '${json['amount']} ${_simpleCurrencySymbols[json['currencyCode']]}';
+        }
+        break;
+      case "USD":
+        {
+          currencyString =
+              '${_simpleCurrencySymbols[json['currencyCode']]} ${json['amount']}';
+        }
+        break;
+
+      default:
+        {
+          currencyString =
+              '${json['amount']} ${_simpleCurrencySymbols[json['currencyCode']]}';
+        }
+        break;
     }
     return currencyString;
   }
@@ -533,5 +550,4 @@ class PriceV2 {
     'ANG': 'ƒ',
     'TMT': 'TMT',
   };
-
 }

From e1804e3dce64adc6d460ca32f6cf07ffdb14912c Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Thu, 26 Nov 2020 11:33:55 +0530
Subject: [PATCH 10/80] renamed ShippingRates to ShippingRate

---
 lib/models/src/checkout.dart | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index 58e2b69e..2355076c 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -5,7 +5,7 @@ class Checkout{
   final String email;
   final List<AppliedGiftCards> appliedGiftcards;
   final AvailableShippingRates availableShippingrates;
-  final ShippingRates shippingLine;
+  final ShippingRate shippingLine;
   final MailingAddress shippingAddress;
   final String completedAt;
   final String createdAt;
@@ -35,7 +35,7 @@ class Checkout{
         email: json['email'],
         appliedGiftcards: _getAppliedGiftCards(json ?? const {}),
         availableShippingrates: AvailableShippingRates.fromJson(json['availableShippingRates'] ?? const {}),
-        shippingLine: ShippingRates.fromJson(json['shippingLine'] ?? const {}),
+        shippingLine: ShippingRate.fromJson(json['shippingLine'] ?? const {}),
         shippingAddress: MailingAddress.fromJson(json['shippingAddress'] ?? const {}),
         completedAt: json['completedAt'],
         createdAt: json['createdAt'],
@@ -68,7 +68,7 @@ class Checkout{
 
 class AvailableShippingRates {
   final bool ready;
-  final List<ShippingRates> shippingRates;
+  final List<ShippingRate> shippingRates;
 
 
   const AvailableShippingRates({this.ready, this.shippingRates});
@@ -79,9 +79,9 @@ class AvailableShippingRates {
       shippingRates: _getShippingRates(json ?? const {}),
     );
   }
-  static List<ShippingRates> _getShippingRates(Map<String, dynamic> json) {
-    List<ShippingRates> shippingRatesList = [];
-    json['shippingRates']?.forEach((e) => shippingRatesList.add(ShippingRates.fromJson(e ?? const {})));
+  static List<ShippingRate> _getShippingRates(Map<String, dynamic> json) {
+    List<ShippingRate> shippingRatesList = [];
+    json['shippingRates']?.forEach((e) => shippingRatesList.add(ShippingRate.fromJson(e ?? const {})));
     return shippingRatesList;
   }
 
@@ -89,15 +89,15 @@ class AvailableShippingRates {
 
 
 
-class ShippingRates {
+class ShippingRate {
   final String handle;
   final String title;
   final PriceV2 priceV2;
 
-  ShippingRates({this.handle, this.title, this.priceV2});
+  ShippingRate({this.handle, this.title, this.priceV2});
 
-  static ShippingRates fromJson(Map<String, dynamic> json){
-    return ShippingRates(
+  static ShippingRate fromJson(Map<String, dynamic> json){
+    return ShippingRate(
         handle: json['handle'],
         title: json['title'],
         priceV2: PriceV2.fromJson(json['priceV2'] ?? const {})

From 39c174ce3adb9989341f08df85a4f6187f1a2878 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Wed, 2 Dec 2020 16:14:12 +0530
Subject: [PATCH 11/80] checkout missing field added

---
 .../queries/get_checkout_information.dart     |  22 ++
 lib/models/src/checkout.dart                  | 247 ++++++++++++------
 2 files changed, 188 insertions(+), 81 deletions(-)

diff --git a/lib/graphql_operations/queries/get_checkout_information.dart b/lib/graphql_operations/queries/get_checkout_information.dart
index ac3fd700..2fa9cef0 100644
--- a/lib/graphql_operations/queries/get_checkout_information.dart
+++ b/lib/graphql_operations/queries/get_checkout_information.dart
@@ -4,6 +4,24 @@ query($id: ID!){
     ... on Checkout {
       id
       email
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
       appliedGiftCards {
         amountUsedV2 {
           amount
@@ -80,6 +98,10 @@ query($id: ID!){
       note
       webUrl
       updatedAt
+      lineItemsSubtotalPrice {
+        amount
+        currencyCode
+      }
       totalTaxV2 {
         amount
         currencyCode
diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index 2355076c..1f6c081f 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -1,8 +1,9 @@
 import 'package:flutter_simple_shopify/models/src/product.dart';
 
-class Checkout{
+class Checkout {
   final String id;
   final String email;
+  final DiscountApplications discountApplications;
   final List<AppliedGiftCards> appliedGiftcards;
   final AvailableShippingRates availableShippingrates;
   final ShippingRate shippingLine;
@@ -14,6 +15,8 @@ class Checkout{
   final String note;
   final String webUrl;
   final String updatedAt;
+  final PriceV2 lineItemsSubtotalPrice;
+  final PriceV2 discountAmount;
   final PriceV2 totalTaxV2;
   final PriceV2 totalPriceV2;
   final bool taxesIncluded;
@@ -22,21 +25,51 @@ class Checkout{
   final String orderStatusUrl;
   final bool requiresShipping;
 
-  Checkout({this.id, this.email, this.appliedGiftcards,
-    this.availableShippingrates, this.shippingLine,this.shippingAddress, this.completedAt, this.createdAt,
-    this.currencyCode, this.lineItems, this.note, this.webUrl, this.updatedAt,
-    this.totalTaxV2, this.totalPriceV2, this.taxesIncluded, this.taxExempt,
-    this.subtotalPriceV2, this.orderStatusUrl, this.requiresShipping});
-
-
-  static Checkout fromJson(Map<String, dynamic> json){
+  Checkout(
+      {this.id,
+      this.email,
+      this.discountApplications,
+      this.appliedGiftcards,
+      this.availableShippingrates,
+      this.shippingLine,
+      this.shippingAddress,
+      this.completedAt,
+      this.createdAt,
+      this.currencyCode,
+      this.lineItems,
+      this.note,
+      this.webUrl,
+      this.updatedAt,
+      this.totalTaxV2,
+      this.totalPriceV2,
+      this.lineItemsSubtotalPrice,
+      this.discountAmount,
+      this.taxesIncluded,
+      this.taxExempt,
+      this.subtotalPriceV2,
+      this.orderStatusUrl,
+      this.requiresShipping});
+
+  static Checkout fromJson(Map<String, dynamic> json) {
+    PriceV2 lineItemsSubtotalPrice =
+        PriceV2.fromJson(json['lineItemsSubtotalPrice'] ?? const {});
+    PriceV2 totalPriceV2 = PriceV2.fromJson(json['totalPriceV2'] ?? const {});
+    String amount;
+    String currencyCode;
+    if (lineItemsSubtotalPrice.amount != null && totalPriceV2.amount != null) {
+      amount = (totalPriceV2.amount - lineItemsSubtotalPrice.amount).abs().toStringAsFixed(1);
+      currencyCode = totalPriceV2.currencyCode;
+    }
     return Checkout(
         id: json['id'],
         email: json['email'],
+        discountApplications: DiscountApplications.fromJson(json['discountApplications']),
         appliedGiftcards: _getAppliedGiftCards(json ?? const {}),
-        availableShippingrates: AvailableShippingRates.fromJson(json['availableShippingRates'] ?? const {}),
+        availableShippingrates: AvailableShippingRates.fromJson(
+            json['availableShippingRates'] ?? const {}),
         shippingLine: ShippingRate.fromJson(json['shippingLine'] ?? const {}),
-        shippingAddress: MailingAddress.fromJson(json['shippingAddress'] ?? const {}),
+        shippingAddress:
+            MailingAddress.fromJson(json['shippingAddress'] ?? const {}),
         completedAt: json['completedAt'],
         createdAt: json['createdAt'],
         currencyCode: json['currencyCode'],
@@ -44,51 +77,49 @@ class Checkout{
         note: json['note'],
         webUrl: json['webUrl'],
         updatedAt: json['updatedAt'],
+        lineItemsSubtotalPrice:
+            lineItemsSubtotalPrice,
+        discountAmount: PriceV2.fromJson(
+            {'amount': amount, 'currencyCode': currencyCode} ?? const {}),
         totalTaxV2: PriceV2.fromJson(json['totalTaxV2'] ?? const {}),
-        totalPriceV2: PriceV2.fromJson(json['totalPriceV2'] ?? const {}),
+        totalPriceV2: totalPriceV2,
         taxesIncluded: json['taxesIncluded'],
         taxExempt: json['taxExempt'],
         subtotalPriceV2: PriceV2.fromJson(json['subtotalPriceV2'] ?? const {}),
         orderStatusUrl: json['orderStatusUrl'],
-        requiresShipping: json['requiresShipping']
-    );
+        requiresShipping: json['requiresShipping']);
   }
 
-  static List<AppliedGiftCards> _getAppliedGiftCards(Map<String, dynamic> json) {
+  static List<AppliedGiftCards> _getAppliedGiftCards(
+      Map<String, dynamic> json) {
     List<AppliedGiftCards> appliedGiftCardsList = [];
-    json['appliedGiftCards']?.forEach((e) => appliedGiftCardsList.add(AppliedGiftCards.fromJson(e ?? const {})));
+    json['appliedGiftCards']?.forEach((e) =>
+        appliedGiftCardsList.add(AppliedGiftCards.fromJson(e ?? const {})));
     return appliedGiftCardsList;
   }
-
-
-
 }
 
-
-
 class AvailableShippingRates {
   final bool ready;
   final List<ShippingRate> shippingRates;
 
-
   const AvailableShippingRates({this.ready, this.shippingRates});
 
-  static AvailableShippingRates fromJson(Map<String, dynamic> json){
+  static AvailableShippingRates fromJson(Map<String, dynamic> json) {
     return AvailableShippingRates(
       ready: json['ready'],
       shippingRates: _getShippingRates(json ?? const {}),
     );
   }
+
   static List<ShippingRate> _getShippingRates(Map<String, dynamic> json) {
     List<ShippingRate> shippingRatesList = [];
-    json['shippingRates']?.forEach((e) => shippingRatesList.add(ShippingRate.fromJson(e ?? const {})));
+    json['shippingRates']?.forEach(
+        (e) => shippingRatesList.add(ShippingRate.fromJson(e ?? const {})));
     return shippingRatesList;
   }
-
 }
 
-
-
 class ShippingRate {
   final String handle;
   final String title;
@@ -96,14 +127,14 @@ class ShippingRate {
 
   ShippingRate({this.handle, this.title, this.priceV2});
 
-  static ShippingRate fromJson(Map<String, dynamic> json){
+  static ShippingRate fromJson(Map<String, dynamic> json) {
     return ShippingRate(
         handle: json['handle'],
         title: json['title'],
-        priceV2: PriceV2.fromJson(json['priceV2'] ?? const {})
-    );
+        priceV2: PriceV2.fromJson(json['priceV2'] ?? const {}));
   }
 }
+
 class MailingAddress {
   final String address1;
   final String address2;
@@ -123,43 +154,61 @@ class MailingAddress {
   final String provinceCode;
   final String zip;
 
-  MailingAddress({this.address1, this.address2, this.city,this.company, this.country, this.countryCodeV2,this.firstName, this.formattedArea, this.id,this.lastName, this.latitude, this.longitude, this.name, this.phone, this.province, this.provinceCode, this.zip});
-
-  static MailingAddress fromJson(Map<String, dynamic> json){
+  MailingAddress(
+      {this.address1,
+      this.address2,
+      this.city,
+      this.company,
+      this.country,
+      this.countryCodeV2,
+      this.firstName,
+      this.formattedArea,
+      this.id,
+      this.lastName,
+      this.latitude,
+      this.longitude,
+      this.name,
+      this.phone,
+      this.province,
+      this.provinceCode,
+      this.zip});
+
+  static MailingAddress fromJson(Map<String, dynamic> json) {
     return MailingAddress(
-        address1: json['address1'],
-        address2: json['address2'],
-        city: json['city'],
-        company: json['company'],
-        country: json['country'],
-        countryCodeV2: json['countryCodeV2'],
-        firstName: json['firstName'],
-        formattedArea: json['formattedArea'],
-        id: json['id'],
-        lastName: json['lastName'],
-        latitude: json['latitude'],
-        longitude: json['longitude'],
-        name: json['name'],
-        phone: json['phone'],
-        province: json['province'],
-        provinceCode: json['provinceCode'],
-        zip: json['zip'],
+      address1: json['address1'],
+      address2: json['address2'],
+      city: json['city'],
+      company: json['company'],
+      country: json['country'],
+      countryCodeV2: json['countryCodeV2'],
+      firstName: json['firstName'],
+      formattedArea: json['formattedArea'],
+      id: json['id'],
+      lastName: json['lastName'],
+      latitude: json['latitude'],
+      longitude: json['longitude'],
+      name: json['name'],
+      phone: json['phone'],
+      province: json['province'],
+      provinceCode: json['provinceCode'],
+      zip: json['zip'],
     );
   }
 }
-class LineItems{
+
+class LineItems {
   final List<LineItem> lineItemList;
 
   LineItems({this.lineItemList});
 
-  static LineItems fromJson(Map<String, dynamic> json){
-    return LineItems(
-        lineItemList: _getLineItemList(json)
-    );
+  static LineItems fromJson(Map<String, dynamic> json) {
+    return LineItems(lineItemList: _getLineItemList(json));
   }
-  static List<LineItem> _getLineItemList(Map<String, dynamic> json){
+
+  static List<LineItem> _getLineItemList(Map<String, dynamic> json) {
     List<LineItem> lineItemList = [];
-    json['edges']?.forEach((lineItem) => lineItemList.add(LineItem.fromJson(lineItem ?? const {})));
+    json['edges']?.forEach((lineItem) =>
+        lineItemList.add(LineItem.fromJson(lineItem ?? const {})));
     return lineItemList;
   }
 }
@@ -172,16 +221,56 @@ class LineItem {
 
   LineItem({this.id, this.quantity, this.variant, this.title});
 
-  static LineItem fromJson(Map<String, dynamic> json){
+  static LineItem fromJson(Map<String, dynamic> json) {
     return LineItem(
       id: (json['node'] ?? const {})['id'],
       quantity: (json['node'] ?? const {})['quantity'],
-      variant: ProductVariantCheckout.fromJson(((json['node'] ?? const {})['variant'] ?? const{})),
+      variant: ProductVariantCheckout.fromJson(
+          ((json['node'] ?? const {})['variant'] ?? const {})),
       title: (json['node'] ?? const {})['title'],
     );
   }
 }
 
+class DiscountApplications {
+  final List<DiscountApplication> discountApplicationList;
+
+  DiscountApplications({this.discountApplicationList});
+
+  static DiscountApplications fromJson(Map<String, dynamic> json) {
+    return DiscountApplications(discountApplicationList: _getDiscountApplicationList(json));
+  }
+
+  static List<DiscountApplication> _getDiscountApplicationList(Map<String, dynamic> json) {
+    List<DiscountApplication> discountApplicationList = [];
+    json['edges']?.forEach((discountApplication) =>
+        discountApplicationList.add(DiscountApplication.fromJson(discountApplication ?? const {})));
+    return discountApplicationList;
+  }
+}
+
+class DiscountApplication {
+  final String allocationMethod;
+  final String targetSelection;
+  final String targetType;
+  final double percentage;
+  final PriceV2 price;
+
+  DiscountApplication({this.allocationMethod, this.targetSelection, this.targetType, this.percentage, this.price});
+
+  static DiscountApplication fromJson(Map<String, dynamic> json) {
+    print(json);
+    return DiscountApplication(
+      allocationMethod: (json['node'] ?? const {})['allocationMethod'],
+      targetSelection: (json['node'] ?? const {})['targetSelection'],
+      targetType: (json['node'] ?? const {})['targetType'],
+      percentage: (((json['node'] ?? const {})['value'] ?? const {})['percentage'] ?? const {}),
+      price: PriceV2.fromJson(
+          ((json['node'] ?? const {})['value'] ?? const {})),
+    );
+  }
+}
+
 class ProductVariantCheckout {
   final PriceV2 price;
   final String title;
@@ -196,47 +285,43 @@ class ProductVariantCheckout {
 
   const ProductVariantCheckout(
       {this.price,
-        this.title,
-        this.image,
-        this.compareAtPrice,
-        this.weight,
-        this.weightUnit,
-        this.availableForSale,
-        this.sku,
-        this.requiresShipping,
-        this.id});
+      this.title,
+      this.image,
+      this.compareAtPrice,
+      this.weight,
+      this.weightUnit,
+      this.availableForSale,
+      this.sku,
+      this.requiresShipping,
+      this.id});
 
   static ProductVariantCheckout fromJson(Map<String, dynamic> json) {
     return ProductVariantCheckout(
-      price:
-      PriceV2.fromJson(json['priceV2'] ?? const {}),
+      price: PriceV2.fromJson(json['priceV2'] ?? const {}),
       title: json['title'],
       image: ShopifyImage.fromJson(json['image'] ?? const {}),
-      compareAtPrice: PriceV2.fromJson(
-          json['compareAtPriceV2'] ?? const {} ),
-      weight: json['weight'] ,
+      compareAtPrice: PriceV2.fromJson(json['compareAtPriceV2'] ?? const {}),
+      weight: json['weight'],
       weightUnit: json['weightUnit'],
-      availableForSale: json['availableForSale'] ,
-      sku: json['sku'] ,
+      availableForSale: json['availableForSale'],
+      sku: json['sku'],
       requiresShipping: json['requiresShipping'],
-      id: json['id'] ,
+      id: json['id'],
     );
   }
 }
 
 class AppliedGiftCards {
-
   final PriceV2 amountUsedV2;
   final PriceV2 balanceV2;
   final String id;
 
   AppliedGiftCards({this.amountUsedV2, this.balanceV2, this.id});
 
-  static AppliedGiftCards fromJson(Map<String, dynamic> json){
+  static AppliedGiftCards fromJson(Map<String, dynamic> json) {
     return AppliedGiftCards(
         amountUsedV2: PriceV2.fromJson(json['amountUsedV2'] ?? const {}),
         balanceV2: PriceV2.fromJson(json['balanceV2'] ?? const {}),
-        id: json['id']
-    );
+        id: json['id']);
   }
-}
\ No newline at end of file
+}

From 3ecbb33589afe94985309268f2ab4a6dec0ec2cb Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Wed, 2 Dec 2020 17:00:46 +0530
Subject: [PATCH 12/80] discountApplicationList.length

---
 lib/models/src/checkout.dart | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index 1f6c081f..ae1606a6 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -237,6 +237,8 @@ class DiscountApplications {
 
   DiscountApplications({this.discountApplicationList});
 
+  get length => discountApplicationList.length;
+
   static DiscountApplications fromJson(Map<String, dynamic> json) {
     return DiscountApplications(discountApplicationList: _getDiscountApplicationList(json));
   }

From 50d46cf24a31d82da363a3206ad272591f3b0994 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Wed, 2 Dec 2020 17:09:58 +0530
Subject: [PATCH 13/80] discountApplications

---
 ...eckout_information_with_shipping_rate.dart | 22 +++++++++++++++++++
 .../get_checkout_without_shipping_rates.dart  | 22 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart b/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
index be5da0a7..e357ce8a 100644
--- a/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
+++ b/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
@@ -4,6 +4,24 @@ query($id: ID!){
     ... on Checkout {
       id
       email
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
       appliedGiftCards {
         amountUsedV2 {
           amount
@@ -89,6 +107,10 @@ query($id: ID!){
       note
       webUrl
       updatedAt
+      lineItemsSubtotalPrice {
+        amount
+        currencyCode
+      }
       totalTaxV2 {
         amount
         currencyCode
diff --git a/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart b/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
index b6b8e4f2..3ee503ad 100644
--- a/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
+++ b/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
@@ -4,6 +4,24 @@ query($id: ID!){
     ... on Checkout {
       id
       email
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
       appliedGiftCards {
         amountUsedV2 {
           amount
@@ -80,6 +98,10 @@ query($id: ID!){
       note
       webUrl
       updatedAt
+      lineItemsSubtotalPrice {
+        amount
+        currencyCode
+      }
       totalTaxV2 {
         amount
         currencyCode

From 6722caa4a1557c33515c5f85f58b5ae075b49a64 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Wed, 9 Dec 2020 14:53:00 +0530
Subject: [PATCH 14/80] customer with formattedArea

---
 lib/graphql_operations/queries/get_customer.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/graphql_operations/queries/get_customer.dart b/lib/graphql_operations/queries/get_customer.dart
index 9ab649d6..552c23a8 100644
--- a/lib/graphql_operations/queries/get_customer.dart
+++ b/lib/graphql_operations/queries/get_customer.dart
@@ -20,6 +20,7 @@ query($customerAccessToken : String!){
           phone
           province
           provinceCode
+          formattedArea
           zip
         }
       }

From de8be9950f6da1aef95c2fa16f297807ac17782b Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Thu, 10 Dec 2020 14:27:15 +0530
Subject: [PATCH 15/80] order new filed

---
 lib/enums/enums.dart                          |   3 +-
 lib/enums/src/order_enums.dart                |  25 +++
 .../queries/get_x_orders_after_cursor.dart    |   4 +
 lib/models/src/order.dart                     | 144 ++++++++++++------
 4 files changed, 132 insertions(+), 44 deletions(-)
 create mode 100644 lib/enums/src/order_enums.dart

diff --git a/lib/enums/enums.dart b/lib/enums/enums.dart
index 1bba996b..6c47064b 100644
--- a/lib/enums/enums.dart
+++ b/lib/enums/enums.dart
@@ -2,4 +2,5 @@ export 'src/sort_key_product.dart';
 export 'src/sort_key_article.dart';
 export 'src/sort_key_order.dart';
 export 'src/sort_key_blog.dart';
-export 'src/sort_key_product_collection.dart';
\ No newline at end of file
+export 'src/sort_key_product_collection.dart';
+export 'src/order_enums.dart';
\ No newline at end of file
diff --git a/lib/enums/src/order_enums.dart b/lib/enums/src/order_enums.dart
new file mode 100644
index 00000000..b39739ed
--- /dev/null
+++ b/lib/enums/src/order_enums.dart
@@ -0,0 +1,25 @@
+enum OrderCancelReason {
+  CUSTOMER,
+  DECLINED,
+  FRAUD,
+  INVENTORY,
+  OTHER,
+}
+enum OrderFulfillmentStatus {
+  FULFILLED,
+  IN_PROGRESS,
+  OPEN,
+  PARTIALLY_FULFILLED,
+  PENDING_FULFILLMENT,
+  RESTOCKED,
+  UNFULFILLED,
+}
+enum OrderFinancialStatus {
+  AUTHORIZED,
+  PAID,
+  PARTIALLY_PAID,
+  PARTIALLY_REFUNDED,
+  PENDING,
+  REFUNDED,
+  VOIDED,
+}
diff --git a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
index 6ea0e5b9..16e387bc 100644
--- a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
@@ -60,6 +60,10 @@ customer(customerAccessToken: $accessToken) {
           orderNumber
           phone
           processedAt
+          canceledAt
+          cancelReason
+          financialStatus
+          fulfillmentStatus
           shippingAddress {
             address1
             address2
diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index e452178d..aaccdb14 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -1,27 +1,25 @@
+import 'package:flutter_simple_shopify/enums/enums.dart';
 import 'package:flutter_simple_shopify/models/src/product.dart';
 
 import 'checkout.dart';
 
-
 class Orders {
   final List<Order> orderList;
   final bool hasNextPage;
 
   Orders({this.orderList, this.hasNextPage});
 
-  static Orders fromJson(Map<String, dynamic> json){
+  static Orders fromJson(Map<String, dynamic> json) {
     return Orders(
         orderList: _getOrderList(json ?? const {}),
-        hasNextPage: (json['pageInfo'] ?? const {})['hasNextPage']
-    );
+        hasNextPage: (json['pageInfo'] ?? const {})['hasNextPage']);
   }
 
-  static List<Order>_getOrderList(Map<String, dynamic> json) {
+  static List<Order> _getOrderList(Map<String, dynamic> json) {
     List<Order> orderList = [];
     json['edges']?.forEach((e) => orderList.add(Order.fromJson(e ?? const {})));
     return orderList;
   }
-
 }
 
 class Order {
@@ -33,7 +31,11 @@ class Order {
   final String name;
   final int orderNumber;
   final String phone;
-  final String processedAt;
+  final DateTime processedAt;
+  final DateTime canceledAt;
+  final OrderCancelReason cancelReason;
+  final OrderFinancialStatus financialStatus;
+  final OrderFulfillmentStatus fulfillmentStatus;
   final ShippingAddress shippingAddress;
   final String statusUrl;
   final PriceV2 subtotalPriceV2;
@@ -43,28 +45,63 @@ class Order {
   final PriceV2 totalTaxV2;
   final String cursor;
 
-  Order({this.id, this.email, this.currencyCode, this.customerUrl, this.lineItems, this.name, this.orderNumber, this.phone, this.processedAt, this.shippingAddress, this.statusUrl, this.subtotalPriceV2, this.totalPriceV2, this.totalRefundedV2, this.totalShippingPriceV2, this.totalTaxV2, this.cursor});
-
-  static Order fromJson(Map<String, dynamic> json){
+  Order(
+      {this.id,
+      this.email,
+      this.currencyCode,
+      this.customerUrl,
+      this.lineItems,
+      this.name,
+      this.orderNumber,
+      this.phone,
+      this.processedAt,
+      this.canceledAt,
+      this.cancelReason,
+      this.financialStatus,
+      this.fulfillmentStatus,
+      this.shippingAddress,
+      this.statusUrl,
+      this.subtotalPriceV2,
+      this.totalPriceV2,
+      this.totalRefundedV2,
+      this.totalShippingPriceV2,
+      this.totalTaxV2,
+      this.cursor});
+
+  static Order fromJson(Map<String, dynamic> json) {
+    DateTime processedAt =
+        DateTime.parse((json['node'] ?? const {})['processedAt']);
+    DateTime canceledAt =
+        DateTime.parse((json['node'] ?? const {})['canceledAt']) ?? null;
     return Order(
         id: (json['node'] ?? const {})['id'],
         email: (json['node'] ?? const {})['email'],
         currencyCode: (json['node'] ?? const {})['currencyCode'],
         customerUrl: (json['node'] ?? const {})['customerUrl'],
-        lineItems: LineItemsOrder.fromJson((json['node'] ?? const {})['lineItems']),
+        lineItems:
+            LineItemsOrder.fromJson((json['node'] ?? const {})['lineItems']),
         name: (json['node'] ?? const {})['name'],
         orderNumber: (json['node'] ?? const {})['orderNumber'],
         phone: (json['node'] ?? const {})['phone'],
-        processedAt: (json['node'] ?? const {})['processedAt'],
-        shippingAddress: ShippingAddress.fromJson((json['node'] ?? const {})['shippingAddress'] ?? const {}),
+        processedAt: processedAt,
+        canceledAt: canceledAt,
+        cancelReason: (json['node'] ?? const {})['cancelReason'],
+        financialStatus: (json['node'] ?? const {})['financialStatus'],
+        fulfillmentStatus: (json['node'] ?? const {})['fulfillmentStatus'],
+        shippingAddress: ShippingAddress.fromJson(
+            (json['node'] ?? const {})['shippingAddress'] ?? const {}),
         statusUrl: (json['node'] ?? const {})['statusUrl'],
-        subtotalPriceV2: PriceV2.fromJson((json['node'] ?? const {})['subtotalPriceV2'] ?? const {}),
-        totalPriceV2: PriceV2.fromJson((json['node'] ?? const {})['totalPriceV2'] ?? const {}),
-        totalRefundedV2: PriceV2.fromJson((json['node'] ?? const {})['totalRefundedV2'] ?? const {}),
-        totalShippingPriceV2: PriceV2.fromJson((json['node'] ?? const {})['totalShippingPriceV2'] ?? const {}),
-        totalTaxV2: PriceV2.fromJson((json['node'] ?? const {})['totalTaxV2'] ?? const {}),
-        cursor: json['cursor']
-    );
+        subtotalPriceV2: PriceV2.fromJson(
+            (json['node'] ?? const {})['subtotalPriceV2'] ?? const {}),
+        totalPriceV2: PriceV2.fromJson(
+            (json['node'] ?? const {})['totalPriceV2'] ?? const {}),
+        totalRefundedV2: PriceV2.fromJson(
+            (json['node'] ?? const {})['totalRefundedV2'] ?? const {}),
+        totalShippingPriceV2: PriceV2.fromJson(
+            (json['node'] ?? const {})['totalShippingPriceV2'] ?? const {}),
+        totalTaxV2: PriceV2.fromJson(
+            (json['node'] ?? const {})['totalTaxV2'] ?? const {}),
+        cursor: json['cursor']);
   }
 }
 
@@ -73,18 +110,16 @@ class LineItemsOrder {
 
   LineItemsOrder({this.lineItemOrderList});
 
-  static LineItemsOrder fromJson(Map<String, dynamic> json){
-    return LineItemsOrder(
-        lineItemOrderList: _getLineItemOrderList(json)
-    );
+  static LineItemsOrder fromJson(Map<String, dynamic> json) {
+    return LineItemsOrder(lineItemOrderList: _getLineItemOrderList(json));
   }
 
   static _getLineItemOrderList(Map<String, dynamic> json) {
     List<LineItemOrder> lineItemListOrder = [];
-    json['edges']?.forEach((lineItemOrder) => lineItemListOrder.add(LineItemOrder.fromJson(lineItemOrder)));
+    json['edges']?.forEach((lineItemOrder) =>
+        lineItemListOrder.add(LineItemOrder.fromJson(lineItemOrder)));
     return lineItemListOrder;
   }
-
 }
 
 class LineItemOrder {
@@ -96,26 +131,35 @@ class LineItemOrder {
   final String title;
   final ProductVariantCheckout variant;
 
-  LineItemOrder({this.currentQuantity, this.discountAllocations, this.discountedTotalPrice, this.originalTotalPrice, this.quantity, this.title, this.variant});
+  LineItemOrder(
+      {this.currentQuantity,
+      this.discountAllocations,
+      this.discountedTotalPrice,
+      this.originalTotalPrice,
+      this.quantity,
+      this.title,
+      this.variant});
 
-  static LineItemOrder fromJson(Map<String, dynamic> json){
+  static LineItemOrder fromJson(Map<String, dynamic> json) {
     return LineItemOrder(
         currentQuantity: (json['node'] ?? const {})['currentQuantity'],
         discountAllocations: _getDiscountAllocationsList(json),
-        discountedTotalPrice: PriceV2.fromJson((json['node'] ?? const {})['discountedTotalPrice']),
-        originalTotalPrice: PriceV2.fromJson((json['node'] ?? const {})['originalTotalPrice']),
+        discountedTotalPrice: PriceV2.fromJson(
+            (json['node'] ?? const {})['discountedTotalPrice']),
+        originalTotalPrice:
+            PriceV2.fromJson((json['node'] ?? const {})['originalTotalPrice']),
         quantity: (json['node'] ?? const {})['quantity'],
         title: (json['node'] ?? const {})['title'],
-        variant: ProductVariantCheckout.fromJson((json['node'] ?? const {})['variant'] ?? const {})
-    );
+        variant: ProductVariantCheckout.fromJson(
+            (json['node'] ?? const {})['variant'] ?? const {}));
   }
 
   static _getDiscountAllocationsList(Map<String, dynamic> json) {
     List<DiscountAllocations> discountList = [];
-    (json['node'] ?? const {})['discountAllocations']?.forEach((discount) => discountList.add(DiscountAllocations.fromJson(discount)));
+    (json['node'] ?? const {})['discountAllocations']?.forEach(
+        (discount) => discountList.add(DiscountAllocations.fromJson(discount)));
     return discountList;
   }
-
 }
 
 class DiscountAllocations {
@@ -123,10 +167,9 @@ class DiscountAllocations {
 
   DiscountAllocations({this.allocatedAmount});
 
-  static DiscountAllocations fromJson(Map<String, dynamic> json){
+  static DiscountAllocations fromJson(Map<String, dynamic> json) {
     return DiscountAllocations(
-        allocatedAmount: PriceV2.fromJson(json['allocatedAmount'] ?? const {})
-    );
+        allocatedAmount: PriceV2.fromJson(json['allocatedAmount'] ?? const {}));
   }
 }
 
@@ -148,9 +191,25 @@ class ShippingAddress {
   final String provinceCode;
   final String zip;
 
-  ShippingAddress({this.address1, this.address2, this.city, this.company, this.country, this.countryCodeV2, this.firstName, this.id, this.lastName, this.latitude, this.longitude, this.name, this.phone, this.province, this.provinceCode, this.zip});
-
-  static ShippingAddress fromJson(Map<String, dynamic> json){
+  ShippingAddress(
+      {this.address1,
+      this.address2,
+      this.city,
+      this.company,
+      this.country,
+      this.countryCodeV2,
+      this.firstName,
+      this.id,
+      this.lastName,
+      this.latitude,
+      this.longitude,
+      this.name,
+      this.phone,
+      this.province,
+      this.provinceCode,
+      this.zip});
+
+  static ShippingAddress fromJson(Map<String, dynamic> json) {
     return ShippingAddress(
         address1: json['address1'],
         address2: json['address2'],
@@ -167,7 +226,6 @@ class ShippingAddress {
         phone: json['phone'],
         province: json['province'],
         provinceCode: json['provinceCode'],
-        zip: json['zip']
-    );
+        zip: json['zip']);
   }
-}
\ No newline at end of file
+}

From 52ff8d94f90e809f71cc66e341635a5550c4b586 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Thu, 10 Dec 2020 15:00:31 +0530
Subject: [PATCH 16/80] EnumToString

---
 lib/models/src/order.dart | 15 ++++++++++++---
 pubspec.lock              |  7 +++++++
 pubspec.yaml              |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index aaccdb14..155c57bf 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -1,3 +1,4 @@
+import 'package:enum_to_string/enum_to_string.dart';
 import 'package:flutter_simple_shopify/enums/enums.dart';
 import 'package:flutter_simple_shopify/models/src/product.dart';
 
@@ -73,6 +74,14 @@ class Order {
         DateTime.parse((json['node'] ?? const {})['processedAt']);
     DateTime canceledAt =
         DateTime.parse((json['node'] ?? const {})['canceledAt']) ?? null;
+    OrderFinancialStatus financialStatus = EnumToString.fromString(
+        OrderFinancialStatus.values,
+        (json['node'] ?? const {})['financialStatus']);
+    OrderFulfillmentStatus fulfillmentStatus = EnumToString.fromString(
+        OrderFulfillmentStatus.values,
+        (json['node'] ?? const {})['fulfillmentStatus']);
+    OrderCancelReason cancelReason = EnumToString.fromString(
+        OrderCancelReason.values, (json['node'] ?? const {})['cancelReason']);
     return Order(
         id: (json['node'] ?? const {})['id'],
         email: (json['node'] ?? const {})['email'],
@@ -85,9 +94,9 @@ class Order {
         phone: (json['node'] ?? const {})['phone'],
         processedAt: processedAt,
         canceledAt: canceledAt,
-        cancelReason: (json['node'] ?? const {})['cancelReason'],
-        financialStatus: (json['node'] ?? const {})['financialStatus'],
-        fulfillmentStatus: (json['node'] ?? const {})['fulfillmentStatus'],
+        cancelReason: cancelReason,
+        financialStatus: financialStatus,
+        fulfillmentStatus: fulfillmentStatus,
         shippingAddress: ShippingAddress.fromJson(
             (json['node'] ?? const {})['shippingAddress'] ?? const {}),
         statusUrl: (json['node'] ?? const {})['statusUrl'],
diff --git a/pubspec.lock b/pubspec.lock
index 7d5d9433..7ddc4549 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -57,6 +57,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
+  enum_to_string:
+    dependency: "direct main"
+    description:
+      name: enum_to_string
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.14"
   fake_async:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 90e025b9..7491257e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,6 +11,7 @@ dependencies:
     sdk: flutter
   graphql: ^3.0.0
   shared_preferences: ^0.5.7
+  enum_to_string: ^1.0.14
 
 
 dev_dependencies:

From 162f35bc5a1f390e63c45b2f7e436cd6eb93aea8 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Thu, 10 Dec 2020 15:13:01 +0530
Subject: [PATCH 17/80] order exception handled

---
 lib/models/src/order.dart | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index 155c57bf..a583a9c0 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -72,8 +72,9 @@ class Order {
   static Order fromJson(Map<String, dynamic> json) {
     DateTime processedAt =
         DateTime.parse((json['node'] ?? const {})['processedAt']);
-    DateTime canceledAt =
-        DateTime.parse((json['node'] ?? const {})['canceledAt']) ?? null;
+    DateTime canceledAt = (json['node'] ?? const {})['canceledAt'] != null
+        ? DateTime.parse((json['node'] ?? const {})['canceledAt'])
+        : null;
     OrderFinancialStatus financialStatus = EnumToString.fromString(
         OrderFinancialStatus.values,
         (json['node'] ?? const {})['financialStatus']);

From b9888147a52c11f8a8c128a23c9966af3c530f6e Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Thu, 10 Dec 2020 15:16:14 +0530
Subject: [PATCH 18/80] order enum parseToString

---
 lib/enums/src/order_enums.dart | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/enums/src/order_enums.dart b/lib/enums/src/order_enums.dart
index b39739ed..baf5b62f 100644
--- a/lib/enums/src/order_enums.dart
+++ b/lib/enums/src/order_enums.dart
@@ -5,6 +5,12 @@ enum OrderCancelReason {
   INVENTORY,
   OTHER,
 }
+extension ParseToStringOrderCancelReason on OrderCancelReason{
+  String parseToString(){
+    return this.toString().split('.')[1];
+  }
+}
+
 enum OrderFulfillmentStatus {
   FULFILLED,
   IN_PROGRESS,
@@ -14,6 +20,12 @@ enum OrderFulfillmentStatus {
   RESTOCKED,
   UNFULFILLED,
 }
+extension ParseToStringOrderFulfillmentStatus on OrderFulfillmentStatus{
+  String parseToString(){
+    return this.toString().split('.')[1];
+  }
+}
+
 enum OrderFinancialStatus {
   AUTHORIZED,
   PAID,
@@ -23,3 +35,9 @@ enum OrderFinancialStatus {
   REFUNDED,
   VOIDED,
 }
+extension ParseToStringOrderFinancialStatus on OrderFinancialStatus{
+  String parseToString(){
+    return this.toString().split('.')[1];
+  }
+}
+

From 6c39a8690c6ecb86771f2c997f08cb63591edad2 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 11 Dec 2020 11:28:49 +0530
Subject: [PATCH 19/80] discountApplications & discountAmount in order

---
 .../queries/get_x_orders_after_cursor.dart    | 18 ++++++++++++++++
 lib/models/src/order.dart                     | 21 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
index 16e387bc..60351e68 100644
--- a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
@@ -64,6 +64,24 @@ customer(customerAccessToken: $accessToken) {
           cancelReason
           financialStatus
           fulfillmentStatus
+          discountApplications(first: 10) {
+            edges {
+              node {
+                allocationMethod
+                targetSelection
+                targetType
+                value {
+                  ... on MoneyV2 {
+                    amount
+                    currencyCode
+                  }
+                  ... on PricingPercentageValue {
+                    percentage
+                  }
+                }
+              }
+            }
+          }
           shippingAddress {
             address1
             address2
diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index a583a9c0..c9389a42 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -1,5 +1,6 @@
 import 'package:enum_to_string/enum_to_string.dart';
-import 'package:flutter_simple_shopify/enums/enums.dart';
+import 'package:flutter_simple_shopify/enums/src/order_enums.dart';
+// import 'package:flutter_simple_shopify/enums/enums.dart';
 import 'package:flutter_simple_shopify/models/src/product.dart';
 
 import 'checkout.dart';
@@ -39,6 +40,8 @@ class Order {
   final OrderFulfillmentStatus fulfillmentStatus;
   final ShippingAddress shippingAddress;
   final String statusUrl;
+  final DiscountApplications discountApplications;
+  final PriceV2 discountAmount;
   final PriceV2 subtotalPriceV2;
   final PriceV2 totalPriceV2;
   final PriceV2 totalRefundedV2;
@@ -62,6 +65,8 @@ class Order {
       this.fulfillmentStatus,
       this.shippingAddress,
       this.statusUrl,
+      this.discountApplications,
+      this.discountAmount,
       this.subtotalPriceV2,
       this.totalPriceV2,
       this.totalRefundedV2,
@@ -83,6 +88,17 @@ class Order {
         (json['node'] ?? const {})['fulfillmentStatus']);
     OrderCancelReason cancelReason = EnumToString.fromString(
         OrderCancelReason.values, (json['node'] ?? const {})['cancelReason']);
+    
+    PriceV2 lineItemsSubtotalPrice =
+        PriceV2.fromJson(json['lineItemsSubtotalPrice'] ?? const {});
+    PriceV2 totalPriceV2 = PriceV2.fromJson(json['totalPriceV2'] ?? const {});
+    String amount;
+    String currencyCode;
+    if (lineItemsSubtotalPrice.amount != null && totalPriceV2.amount != null) {
+      amount = (totalPriceV2.amount - lineItemsSubtotalPrice.amount).abs().toStringAsFixed(1);
+      currencyCode = totalPriceV2.currencyCode;
+    }
+
     return Order(
         id: (json['node'] ?? const {})['id'],
         email: (json['node'] ?? const {})['email'],
@@ -101,6 +117,9 @@ class Order {
         shippingAddress: ShippingAddress.fromJson(
             (json['node'] ?? const {})['shippingAddress'] ?? const {}),
         statusUrl: (json['node'] ?? const {})['statusUrl'],
+        discountApplications: DiscountApplications.fromJson(json['discountApplications']),
+        discountAmount: PriceV2.fromJson(
+            {'amount': amount, 'currencyCode': currencyCode} ?? const {}),
         subtotalPriceV2: PriceV2.fromJson(
             (json['node'] ?? const {})['subtotalPriceV2'] ?? const {}),
         totalPriceV2: PriceV2.fromJson(

From 04d69c8967d07a55c43be0d9c30d660d8f0ee77b Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 11 Dec 2020 11:45:42 +0530
Subject: [PATCH 20/80] discountApplications & discountAmount in order

---
 lib/models/src/order.dart | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index c9389a42..fe037870 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -89,13 +89,15 @@ class Order {
     OrderCancelReason cancelReason = EnumToString.fromString(
         OrderCancelReason.values, (json['node'] ?? const {})['cancelReason']);
     
-    PriceV2 lineItemsSubtotalPrice =
-        PriceV2.fromJson(json['lineItemsSubtotalPrice'] ?? const {});
-    PriceV2 totalPriceV2 = PriceV2.fromJson(json['totalPriceV2'] ?? const {});
+    PriceV2 subtotalPriceV2 =
+        PriceV2.fromJson(
+            (json['node'] ?? const {})['subtotalPriceV2'] ?? const {});
+    PriceV2 totalPriceV2 = PriceV2.fromJson(
+            (json['node'] ?? const {})['totalPriceV2'] ?? const {});
     String amount;
     String currencyCode;
-    if (lineItemsSubtotalPrice.amount != null && totalPriceV2.amount != null) {
-      amount = (totalPriceV2.amount - lineItemsSubtotalPrice.amount).abs().toStringAsFixed(1);
+    if (subtotalPriceV2.amount != null && totalPriceV2.amount != null) {
+      amount = (totalPriceV2.amount - subtotalPriceV2.amount).abs().toStringAsFixed(1);
       currencyCode = totalPriceV2.currencyCode;
     }
 
@@ -120,10 +122,8 @@ class Order {
         discountApplications: DiscountApplications.fromJson(json['discountApplications']),
         discountAmount: PriceV2.fromJson(
             {'amount': amount, 'currencyCode': currencyCode} ?? const {}),
-        subtotalPriceV2: PriceV2.fromJson(
-            (json['node'] ?? const {})['subtotalPriceV2'] ?? const {}),
-        totalPriceV2: PriceV2.fromJson(
-            (json['node'] ?? const {})['totalPriceV2'] ?? const {}),
+        subtotalPriceV2: subtotalPriceV2,
+        totalPriceV2: totalPriceV2,
         totalRefundedV2: PriceV2.fromJson(
             (json['node'] ?? const {})['totalRefundedV2'] ?? const {}),
         totalShippingPriceV2: PriceV2.fromJson(

From 78cbd8405103255052e50a39d21f2b4dd126a461 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 11 Dec 2020 12:05:34 +0530
Subject: [PATCH 21/80] discountApplications & discountAmount in order

---
 lib/models/src/order.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index fe037870..674cf9ea 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -119,7 +119,8 @@ class Order {
         shippingAddress: ShippingAddress.fromJson(
             (json['node'] ?? const {})['shippingAddress'] ?? const {}),
         statusUrl: (json['node'] ?? const {})['statusUrl'],
-        discountApplications: DiscountApplications.fromJson(json['discountApplications']),
+        discountApplications: DiscountApplications.fromJson(
+          (json['node'] ?? const {})['discountApplications']),
         discountAmount: PriceV2.fromJson(
             {'amount': amount, 'currencyCode': currencyCode} ?? const {}),
         subtotalPriceV2: subtotalPriceV2,

From 16529070a01ab4338019351acead4909bff6042a Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 11 Dec 2020 12:18:31 +0530
Subject: [PATCH 22/80] current prices in orders

---
 .../queries/get_x_orders_after_cursor.dart    | 10 ++++++-
 lib/models/src/order.dart                     | 30 +++++++++++++------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
index 60351e68..456c2376 100644
--- a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
@@ -101,7 +101,15 @@ customer(customerAccessToken: $accessToken) {
             zip
           }
           statusUrl
-          subtotalPriceV2 {
+          currentSubtotalPrice {
+            amount
+            currencyCode
+          }
+          currentTotalPrice {
+            amount
+            currencyCode
+          }
+          currentTotalTax {
             amount
             currencyCode
           }
diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index 674cf9ea..999e2bd6 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -43,6 +43,9 @@ class Order {
   final DiscountApplications discountApplications;
   final PriceV2 discountAmount;
   final PriceV2 subtotalPriceV2;
+  final PriceV2 currentSubtotalPrice;
+  final PriceV2 currentTotalPrice;
+  final PriceV2 currentTotalTax;
   final PriceV2 totalPriceV2;
   final PriceV2 totalRefundedV2;
   final PriceV2 totalShippingPriceV2;
@@ -67,6 +70,9 @@ class Order {
       this.statusUrl,
       this.discountApplications,
       this.discountAmount,
+      this.currentSubtotalPrice,
+      this.currentTotalPrice,
+      this.currentTotalTax,
       this.subtotalPriceV2,
       this.totalPriceV2,
       this.totalRefundedV2,
@@ -89,16 +95,16 @@ class Order {
     OrderCancelReason cancelReason = EnumToString.fromString(
         OrderCancelReason.values, (json['node'] ?? const {})['cancelReason']);
     
-    PriceV2 subtotalPriceV2 =
+    PriceV2 currentSubtotalPrice =
         PriceV2.fromJson(
-            (json['node'] ?? const {})['subtotalPriceV2'] ?? const {});
-    PriceV2 totalPriceV2 = PriceV2.fromJson(
-            (json['node'] ?? const {})['totalPriceV2'] ?? const {});
+            (json['node'] ?? const {})['currentSubtotalPrice'] ?? const {});
+    PriceV2 currentTotalPrice = PriceV2.fromJson(
+            (json['node'] ?? const {})['currentTotalPrice'] ?? const {});
     String amount;
     String currencyCode;
-    if (subtotalPriceV2.amount != null && totalPriceV2.amount != null) {
-      amount = (totalPriceV2.amount - subtotalPriceV2.amount).abs().toStringAsFixed(1);
-      currencyCode = totalPriceV2.currencyCode;
+    if (currentSubtotalPrice.amount != null && currentTotalPrice.amount != null) {
+      amount = (currentTotalPrice.amount - currentSubtotalPrice.amount).abs().toStringAsFixed(1);
+      currencyCode = currentTotalPrice.currencyCode;
     }
 
     return Order(
@@ -123,8 +129,14 @@ class Order {
           (json['node'] ?? const {})['discountApplications']),
         discountAmount: PriceV2.fromJson(
             {'amount': amount, 'currencyCode': currencyCode} ?? const {}),
-        subtotalPriceV2: subtotalPriceV2,
-        totalPriceV2: totalPriceV2,
+        currentSubtotalPrice: currentSubtotalPrice,
+        currentTotalPrice: currentTotalPrice,
+        currentTotalTax: PriceV2.fromJson(
+            (json['node'] ?? const {})['currentTotalTax'] ?? const {}),
+        subtotalPriceV2: PriceV2.fromJson(
+            (json['node'] ?? const {})['subtotalPriceV2'] ?? const {}),
+        totalPriceV2: PriceV2.fromJson(
+            (json['node'] ?? const {})['totalPriceV2'] ?? const {}),
         totalRefundedV2: PriceV2.fromJson(
             (json['node'] ?? const {})['totalRefundedV2'] ?? const {}),
         totalShippingPriceV2: PriceV2.fromJson(

From 74c9ec82a66028d340609e9da236102293337dcd Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 11 Dec 2020 12:22:20 +0530
Subject: [PATCH 23/80] current prices in orders

---
 lib/graphql_operations/queries/get_x_orders_after_cursor.dart | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
index 456c2376..49a324c2 100644
--- a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
@@ -113,6 +113,10 @@ customer(customerAccessToken: $accessToken) {
             amount
             currencyCode
           }
+          subtotalPriceV2 {
+            amount
+            currencyCode
+          }
           totalPriceV2 {
             amount
             currencyCode

From 052f3d300b9bda91a2eff8e39b6b1451da496422 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 11 Dec 2020 12:48:14 +0530
Subject: [PATCH 24/80] current prices & discount amount removed from orders

---
 .../queries/get_x_orders_after_cursor.dart    | 12 --------
 lib/models/src/order.dart                     | 28 +------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
index 49a324c2..60351e68 100644
--- a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
@@ -101,18 +101,6 @@ customer(customerAccessToken: $accessToken) {
             zip
           }
           statusUrl
-          currentSubtotalPrice {
-            amount
-            currencyCode
-          }
-          currentTotalPrice {
-            amount
-            currencyCode
-          }
-          currentTotalTax {
-            amount
-            currencyCode
-          }
           subtotalPriceV2 {
             amount
             currencyCode
diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index 999e2bd6..9184df86 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -41,11 +41,7 @@ class Order {
   final ShippingAddress shippingAddress;
   final String statusUrl;
   final DiscountApplications discountApplications;
-  final PriceV2 discountAmount;
   final PriceV2 subtotalPriceV2;
-  final PriceV2 currentSubtotalPrice;
-  final PriceV2 currentTotalPrice;
-  final PriceV2 currentTotalTax;
   final PriceV2 totalPriceV2;
   final PriceV2 totalRefundedV2;
   final PriceV2 totalShippingPriceV2;
@@ -68,11 +64,7 @@ class Order {
       this.fulfillmentStatus,
       this.shippingAddress,
       this.statusUrl,
-      this.discountApplications,
-      this.discountAmount,
-      this.currentSubtotalPrice,
-      this.currentTotalPrice,
-      this.currentTotalTax,
+      this.discountApplications,     
       this.subtotalPriceV2,
       this.totalPriceV2,
       this.totalRefundedV2,
@@ -94,18 +86,6 @@ class Order {
         (json['node'] ?? const {})['fulfillmentStatus']);
     OrderCancelReason cancelReason = EnumToString.fromString(
         OrderCancelReason.values, (json['node'] ?? const {})['cancelReason']);
-    
-    PriceV2 currentSubtotalPrice =
-        PriceV2.fromJson(
-            (json['node'] ?? const {})['currentSubtotalPrice'] ?? const {});
-    PriceV2 currentTotalPrice = PriceV2.fromJson(
-            (json['node'] ?? const {})['currentTotalPrice'] ?? const {});
-    String amount;
-    String currencyCode;
-    if (currentSubtotalPrice.amount != null && currentTotalPrice.amount != null) {
-      amount = (currentTotalPrice.amount - currentSubtotalPrice.amount).abs().toStringAsFixed(1);
-      currencyCode = currentTotalPrice.currencyCode;
-    }
 
     return Order(
         id: (json['node'] ?? const {})['id'],
@@ -127,12 +107,6 @@ class Order {
         statusUrl: (json['node'] ?? const {})['statusUrl'],
         discountApplications: DiscountApplications.fromJson(
           (json['node'] ?? const {})['discountApplications']),
-        discountAmount: PriceV2.fromJson(
-            {'amount': amount, 'currencyCode': currencyCode} ?? const {}),
-        currentSubtotalPrice: currentSubtotalPrice,
-        currentTotalPrice: currentTotalPrice,
-        currentTotalTax: PriceV2.fromJson(
-            (json['node'] ?? const {})['currentTotalTax'] ?? const {}),
         subtotalPriceV2: PriceV2.fromJson(
             (json['node'] ?? const {})['subtotalPriceV2'] ?? const {}),
         totalPriceV2: PriceV2.fromJson(

From 721eccab2a0819c7fb61a9d356252a60bc4b257b Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 11 Dec 2020 13:07:52 +0530
Subject: [PATCH 25/80] order shippingaddress converted to mailing address

---
 .../queries/get_x_orders_after_cursor.dart    |   1 +
 lib/models/src/order.dart                     | 116 +++++++++---------
 2 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
index 60351e68..6a180fdc 100644
--- a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
@@ -90,6 +90,7 @@ customer(customerAccessToken: $accessToken) {
             country
             countryCodeV2
             firstName
+            formattedArea
             id
             lastName
             latitude
diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index 9184df86..9e207020 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -38,7 +38,7 @@ class Order {
   final OrderCancelReason cancelReason;
   final OrderFinancialStatus financialStatus;
   final OrderFulfillmentStatus fulfillmentStatus;
-  final ShippingAddress shippingAddress;
+  final MailingAddress shippingAddress;
   final String statusUrl;
   final DiscountApplications discountApplications;
   final PriceV2 subtotalPriceV2;
@@ -102,7 +102,7 @@ class Order {
         cancelReason: cancelReason,
         financialStatus: financialStatus,
         fulfillmentStatus: fulfillmentStatus,
-        shippingAddress: ShippingAddress.fromJson(
+        shippingAddress: MailingAddress.fromJson(
             (json['node'] ?? const {})['shippingAddress'] ?? const {}),
         statusUrl: (json['node'] ?? const {})['statusUrl'],
         discountApplications: DiscountApplications.fromJson(
@@ -189,59 +189,59 @@ class DiscountAllocations {
   }
 }
 
-class ShippingAddress {
-  final String address1;
-  final String address2;
-  final String city;
-  final String company;
-  final String country;
-  final String countryCodeV2;
-  final String firstName;
-  final String id;
-  final String lastName;
-  final double latitude;
-  final double longitude;
-  final String name;
-  final String phone;
-  final String province;
-  final String provinceCode;
-  final String zip;
-
-  ShippingAddress(
-      {this.address1,
-      this.address2,
-      this.city,
-      this.company,
-      this.country,
-      this.countryCodeV2,
-      this.firstName,
-      this.id,
-      this.lastName,
-      this.latitude,
-      this.longitude,
-      this.name,
-      this.phone,
-      this.province,
-      this.provinceCode,
-      this.zip});
-
-  static ShippingAddress fromJson(Map<String, dynamic> json) {
-    return ShippingAddress(
-        address1: json['address1'],
-        address2: json['address2'],
-        city: json['city'],
-        company: json['company'],
-        country: json['country'],
-        countryCodeV2: json['countryCodeV2'],
-        firstName: json['firstName'],
-        id: json['id'],
-        lastName: json['lastName'],
-        latitude: json['latitude'],
-        longitude: json['longitude'],
-        name: json['name'],
-        phone: json['phone'],
-        province: json['province'],
-        provinceCode: json['provinceCode'],
-        zip: json['zip']);
-  }
-}
+// class ShippingAddress {
+//   final String address1;
+//   final String address2;
+//   final String city;
+//   final String company;
+//   final String country;
+//   final String countryCodeV2;
+//   final String firstName;
+//   final String id;
+//   final String lastName;
+//   final double latitude;
+//   final double longitude;
+//   final String name;
+//   final String phone;
+//   final String province;
+//   final String provinceCode;
+//   final String zip;
+
+//   ShippingAddress(
+//       {this.address1,
+//       this.address2,
+//       this.city,
+//       this.company,
+//       this.country,
+//       this.countryCodeV2,
+//       this.firstName,
+//       this.id,
+//       this.lastName,
+//       this.latitude,
+//       this.longitude,
+//       this.name,
+//       this.phone,
+//       this.province,
+//       this.provinceCode,
+//       this.zip});
+
+//   static ShippingAddress fromJson(Map<String, dynamic> json) {
+//     return ShippingAddress(
+//         address1: json['address1'],
+//         address2: json['address2'],
+//         city: json['city'],
+//         company: json['company'],
+//         country: json['country'],
+//         countryCodeV2: json['countryCodeV2'],
+//         firstName: json['firstName'],
+//         id: json['id'],
+//         lastName: json['lastName'],
+//         latitude: json['latitude'],
+//         longitude: json['longitude'],
+//         name: json['name'],
+//         phone: json['phone'],
+//         province: json['province'],
+//         provinceCode: json['provinceCode'],
+//         zip: json['zip']);
+//   }
+// }

From 6359e7c7b0465ec98f40682854477d527620df36 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 11 Dec 2020 14:17:05 +0530
Subject: [PATCH 26/80] discountAmount with tax

---
 lib/models/src/checkout.dart | 40 ++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index ae1606a6..f55963e5 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -51,19 +51,25 @@ class Checkout {
       this.requiresShipping});
 
   static Checkout fromJson(Map<String, dynamic> json) {
+    PriceV2 totalTaxV2 = PriceV2.fromJson(json['totalTaxV2'] ?? const {});
     PriceV2 lineItemsSubtotalPrice =
         PriceV2.fromJson(json['lineItemsSubtotalPrice'] ?? const {});
     PriceV2 totalPriceV2 = PriceV2.fromJson(json['totalPriceV2'] ?? const {});
     String amount;
     String currencyCode;
     if (lineItemsSubtotalPrice.amount != null && totalPriceV2.amount != null) {
-      amount = (totalPriceV2.amount - lineItemsSubtotalPrice.amount).abs().toStringAsFixed(1);
+      double amt = (totalPriceV2.amount - lineItemsSubtotalPrice.amount);
+      if (totalTaxV2.amount != null) {
+        amt -= totalTaxV2.amount;
+      }
+      amount = amt.abs().toStringAsFixed(2);
       currencyCode = totalPriceV2.currencyCode;
     }
     return Checkout(
         id: json['id'],
         email: json['email'],
-        discountApplications: DiscountApplications.fromJson(json['discountApplications']),
+        discountApplications:
+            DiscountApplications.fromJson(json['discountApplications']),
         appliedGiftcards: _getAppliedGiftCards(json ?? const {}),
         availableShippingrates: AvailableShippingRates.fromJson(
             json['availableShippingRates'] ?? const {}),
@@ -77,11 +83,10 @@ class Checkout {
         note: json['note'],
         webUrl: json['webUrl'],
         updatedAt: json['updatedAt'],
-        lineItemsSubtotalPrice:
-            lineItemsSubtotalPrice,
+        lineItemsSubtotalPrice: lineItemsSubtotalPrice,
         discountAmount: PriceV2.fromJson(
             {'amount': amount, 'currencyCode': currencyCode} ?? const {}),
-        totalTaxV2: PriceV2.fromJson(json['totalTaxV2'] ?? const {}),
+        totalTaxV2: totalTaxV2,
         totalPriceV2: totalPriceV2,
         taxesIncluded: json['taxesIncluded'],
         taxExempt: json['taxExempt'],
@@ -240,13 +245,15 @@ class DiscountApplications {
   get length => discountApplicationList.length;
 
   static DiscountApplications fromJson(Map<String, dynamic> json) {
-    return DiscountApplications(discountApplicationList: _getDiscountApplicationList(json));
+    return DiscountApplications(
+        discountApplicationList: _getDiscountApplicationList(json));
   }
 
-  static List<DiscountApplication> _getDiscountApplicationList(Map<String, dynamic> json) {
+  static List<DiscountApplication> _getDiscountApplicationList(
+      Map<String, dynamic> json) {
     List<DiscountApplication> discountApplicationList = [];
-    json['edges']?.forEach((discountApplication) =>
-        discountApplicationList.add(DiscountApplication.fromJson(discountApplication ?? const {})));
+    json['edges']?.forEach((discountApplication) => discountApplicationList
+        .add(DiscountApplication.fromJson(discountApplication ?? const {})));
     return discountApplicationList;
   }
 }
@@ -258,7 +265,12 @@ class DiscountApplication {
   final double percentage;
   final PriceV2 price;
 
-  DiscountApplication({this.allocationMethod, this.targetSelection, this.targetType, this.percentage, this.price});
+  DiscountApplication(
+      {this.allocationMethod,
+      this.targetSelection,
+      this.targetType,
+      this.percentage,
+      this.price});
 
   static DiscountApplication fromJson(Map<String, dynamic> json) {
     print(json);
@@ -266,9 +278,11 @@ class DiscountApplication {
       allocationMethod: (json['node'] ?? const {})['allocationMethod'],
       targetSelection: (json['node'] ?? const {})['targetSelection'],
       targetType: (json['node'] ?? const {})['targetType'],
-      percentage: (((json['node'] ?? const {})['value'] ?? const {})['percentage'] ?? const {}),
-      price: PriceV2.fromJson(
-          ((json['node'] ?? const {})['value'] ?? const {})),
+      percentage:
+          (((json['node'] ?? const {})['value'] ?? const {})['percentage'] ??
+              const {}),
+      price:
+          PriceV2.fromJson(((json['node'] ?? const {})['value'] ?? const {})),
     );
   }
 }

From d634250e2a7f589d711487b0a8b1d615a81a9b49 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Thu, 17 Dec 2020 10:48:04 +0530
Subject: [PATCH 27/80] product and collection by handle

---
 .../queries/get_collection_by_handle.dart     |  89 ++++++
 .../queries/get_product_by_handle.dart        |  77 +++++
 lib/models/src/collection.dart                |  15 +
 lib/models/src/product.dart                   |  29 +-
 lib/shopify/src/shopify_store.dart            | 283 ++++++++++--------
 5 files changed, 360 insertions(+), 133 deletions(-)
 create mode 100644 lib/graphql_operations/queries/get_collection_by_handle.dart
 create mode 100644 lib/graphql_operations/queries/get_product_by_handle.dart

diff --git a/lib/graphql_operations/queries/get_collection_by_handle.dart b/lib/graphql_operations/queries/get_collection_by_handle.dart
new file mode 100644
index 00000000..c44f4b05
--- /dev/null
+++ b/lib/graphql_operations/queries/get_collection_by_handle.dart
@@ -0,0 +1,89 @@
+const String getCollectionByHandleQuery = r'''
+query($handle: String!) {
+    collectionByHandle(handle: $handle) {
+        title
+        description
+        descriptionHtml
+        handle
+        id
+        updatedAt
+        image {
+            altText
+            id
+            originalSrc
+        }
+        products(first: 20) {
+            edges {
+                node {
+                    variants(first: 1) {
+                        edges {
+                            node {
+                                title
+                                image {
+                                    altText
+                                    id
+                                    originalSrc
+                                }
+                                priceV2 {
+                                    amount
+                                    currencyCode
+                                }
+                                compareAtPriceV2 {
+                                    amount
+                                    currencyCode
+                                }
+                                weight
+                                weightUnit
+                                sku
+                                requiresShipping
+                                availableForSale
+                                quantityAvailable
+                            }
+                        }
+                    }
+                    availableForSale
+                    collections(first: 1) {
+                        edges {
+                            node {
+                                description
+                                descriptionHtml
+                                id
+                                handle
+                                title
+                                updatedAt
+                            }
+                        }
+                    }
+                    createdAt
+                    description
+                    descriptionHtml
+                    handle
+                    id
+                    images(first: 10) {
+                        edges {
+                            node {
+                                altText
+                                id
+                                originalSrc
+                            }
+                        }
+                    }
+                    onlineStoreUrl
+                    productType
+                    publishedAt
+                    tags
+                    title
+                    updatedAt
+                    vendor
+                }
+                cursor
+            }
+            pageInfo {
+                hasNextPage
+            }
+        }
+    }
+}
+
+
+''';
diff --git a/lib/graphql_operations/queries/get_product_by_handle.dart b/lib/graphql_operations/queries/get_product_by_handle.dart
new file mode 100644
index 00000000..591b2529
--- /dev/null
+++ b/lib/graphql_operations/queries/get_product_by_handle.dart
@@ -0,0 +1,77 @@
+const String getProductByHandleQuery = r'''
+query($handle: String!) {
+    productByHandle(handle: $handle) {
+
+        options(first: 50) {
+            id
+            name
+            values
+        }
+        variants(first: 250) {
+            edges {
+                node {
+                    id
+                    title
+                    image {
+                        altText
+                        id
+                        originalSrc
+                    }
+                    priceV2 {
+                        amount
+                        currencyCode
+                    }
+                    compareAtPriceV2 {
+                        amount
+                        currencyCode
+                    }
+                    weight
+                    weightUnit
+                    availableForSale
+                    sku
+                    requiresShipping
+                    quantityAvailable
+                }
+            }
+            pageInfo {
+                hasNextPage
+            }
+        }
+        availableForSale
+        collections(first: 250) {
+            edges {
+                node {
+                    description
+                    descriptionHtml
+                    id
+                    handle
+                    updatedAt
+                    title
+                }
+            }
+        }
+        createdAt
+        description
+        descriptionHtml
+        handle
+        id
+        onlineStoreUrl
+        productType
+        publishedAt
+        tags
+        title
+        updatedAt
+        vendor
+        images(first: 250) {
+            edges {
+                node {
+                    altText
+                    id
+                    originalSrc
+                }
+            }
+        }
+    }
+}
+
+''';
diff --git a/lib/models/src/collection.dart b/lib/models/src/collection.dart
index 1a9daca2..6376ea75 100644
--- a/lib/models/src/collection.dart
+++ b/lib/models/src/collection.dart
@@ -57,4 +57,19 @@ class Collection {
       cursor: json['cursor'],
     );
   }
+  static Collection fromCollectionHandleJson(Map<String, dynamic> json) {
+    return Collection(
+      title: json['title'],
+      description: json['description'],
+      descriptionHtml: json['descriptionHtml'],
+      handle: json['handle'],
+      id: json['id'],
+      updatedAt: json['updatedAt'],
+      image: ShopifyImage.fromJson(
+          json['image'] ?? const {}),
+      products:
+          Products.fromJson(json['products'] ?? const {}),
+      cursor: json['cursor'],
+    );
+  }
 }
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 3f18e154..e04bf4b5 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -70,7 +70,7 @@ class Product {
         availableForSale: (json['node'] ?? const {})['availableForSale'],
         createdAt: (json['node'] ?? const {})['createdAt'],
         description: (json['node'] ?? const {})['description'],
-        productVariants: _getProductVariants(json ?? const {}),
+        productVariants: _getProductVariants(json['node'] ?? const {}),
         descriptionHtml: (json['node'] ?? const {})['descriptionHtml'],
         handle: (json['node'] ?? const {})['handle'],
         onlineStoreUrl: (json['node'] ?? const {})['onlineStoreUrl'],
@@ -85,6 +85,29 @@ class Product {
         metafields: _getMetafieldList(
             (json['node'] ?? const {})['metafields'] ?? const {}));
   }
+  static Product fromProductHandleJson(Map<String, dynamic> json) {
+    return Product(
+        collectionList: _getCollectionList(json ?? const {}),
+        id: json['id'],
+        title: json['title'],
+        availableForSale: json['availableForSale'],
+        createdAt: json['createdAt'],
+        description: json['description'],
+        productVariants: _getProductVariants(json ?? const {}),
+        descriptionHtml: json['descriptionHtml'],
+        handle: json['handle'],
+        onlineStoreUrl: json['onlineStoreUrl'],
+        productType: json['productType'],
+        publishedAt: json['publishedAt'],
+        tags: _getTags(json ?? const {}),
+        updatedAt: json['updatedAt'],
+        images: _getImageList(json['images'] ?? const {}),
+        cursor: json['cursor'],
+        options: _getOptionList(json),
+        vendor: json['vendor'],
+        metafields: _getMetafieldList(
+            json['metafields'] ?? const {}));
+  }
 
   Map toJson() => {
         'id': id,
@@ -94,7 +117,7 @@ class Product {
 
   static List<ProductVariant> _getProductVariants(Map<String, dynamic> json) {
     List<ProductVariant> productVariants = [];
-    (((json['node'] ?? const {})['variants'] ?? const {})['edges'] ?? const [])
+    ((json['variants'] ?? const {})['edges'] ?? const [])
         ?.forEach((v) {
       if (v?.data != null)
         productVariants.add(ProductVariant.fromJson(v?.data ?? const {}));
@@ -152,7 +175,7 @@ class Product {
 
   static _getImageList(Map<String, dynamic> json) {
     List<ShopifyImage> imageList = [];
-    json['edges'].forEach((image) =>
+    json['edges']?.forEach((image) =>
         imageList.add(ShopifyImage.fromJson(image['node'] ?? const {})));
     return imageList;
   }
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index d21f8917..67904bf6 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -3,7 +3,9 @@ import 'package:flutter_simple_shopify/enums/src/sort_key_collection.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_all_collections_optimized.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_all_products_from_collection_by_id.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_all_products_on_query.dart';
+import 'package:flutter_simple_shopify/graphql_operations/queries/get_collection_by_handle.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_collections_by_ids.dart';
+import 'package:flutter_simple_shopify/graphql_operations/queries/get_product_by_handle.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_product_recommendations.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_products_by_ids.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_metafileds_from_product.dart';
@@ -22,10 +24,9 @@ import '../../graphql_operations/queries/get_n_products.dart';
 import '../../graphql_operations/queries/get_products.dart';
 import '../../models/src/collection.dart';
 import '../../shopify_config.dart';
-import 'dart:developer';
 
 /// ShopifyStore provides various methods related to the shopify store.
-class ShopifyStore with ShopifyError{
+class ShopifyStore with ShopifyError {
   ShopifyStore._();
 
   static final ShopifyStore instance = ShopifyStore._();
@@ -35,59 +36,84 @@ class ShopifyStore with ShopifyError{
   /// Returns a List of [Product].
   ///
   /// Simply returns all Products from your Store.
-  Future<List<Product>> getAllProducts({String metafieldsNamespace, bool deleteThisPartOfCache = false}) async {
+  Future<List<Product>> getAllProducts(
+      {String metafieldsNamespace, bool deleteThisPartOfCache = false}) async {
     List<Product> productList = [];
     Products tempProduct;
     String cursor;
     WatchQueryOptions _options;
     do {
-      _options = WatchQueryOptions(
-          documentNode: gql(getProductsQuery),
-          variables: {'cursor': cursor, 'shouldFetchMetafields': metafieldsNamespace != null, 'metafieldsNamespace': metafieldsNamespace}
-        );
+      _options =
+          WatchQueryOptions(documentNode: gql(getProductsQuery), variables: {
+        'cursor': cursor,
+        'shouldFetchMetafields': metafieldsNamespace != null,
+        'metafieldsNamespace': metafieldsNamespace
+      });
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
-      tempProduct = (Products.fromJson(
-          (result?.data ??
-              const {})["products"] ??
-              {}));
+      tempProduct =
+          (Products.fromJson((result?.data ?? const {})["products"] ?? {}));
 
       productList += tempProduct?.productList ?? const [];
       cursor = productList.isNotEmpty ? productList.last.cursor : null;
     } while ((tempProduct?.hasNextPage == true));
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     return productList;
   }
 
+  Future<Product> getProductByHandle(String handle,
+      {bool deleteThisPartOfCache = false}) async {
+    try {
+      final WatchQueryOptions _options = WatchQueryOptions(
+          documentNode: gql(getProductByHandleQuery),
+          variables: {'handle': handle});
+      final QueryResult result = await _graphQLClient.query(_options);
+      checkForError(result);
+      if (deleteThisPartOfCache) {
+        _graphQLClient.cache.write(_options.toKey(), null);
+      }
+      // Map<String, dynamic> a = (result?.data ?? const {})['productByHandle'] ?? {};
+      return Product.fromProductHandleJson(
+          (result?.data ?? const {})['productByHandle'] ?? {});
+    } catch (e) {
+      print(e);
+    }
+    return Product.fromJson({});
+  }
+
   /// Returns [Products].
   ///
   /// Returns the first [limit] Products after the given [startCursor].
   /// [limit] has to be in the range of 0 and 250.
-  Future<Products> getXProductsAfterCursor(
-      int limit, String startCursor,
-      {bool deleteThisPartOfCache = false, bool reverse = false, SortKeyProduct sortKeyProduct = SortKeyProduct.TITLE}) async {
+  Future<Products> getXProductsAfterCursor(int limit, String startCursor,
+      {bool deleteThisPartOfCache = false,
+      bool reverse = false,
+      SortKeyProduct sortKeyProduct = SortKeyProduct.TITLE}) async {
     String cursor = startCursor;
     final WatchQueryOptions _options = WatchQueryOptions(
         documentNode: gql(getXProductsAfterCursorQuery),
-        variables: {'x': limit ?? 50, 'cursor': cursor, 'reverse': reverse, 'sortKey': sortKeyProduct.parseToString()});
+        variables: {
+          'x': limit ?? 50,
+          'cursor': cursor,
+          'reverse': reverse,
+          'sortKey': sortKeyProduct.parseToString()
+        });
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
-    
-    if(deleteThisPartOfCache) {
+
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
-    return (Products.fromJson(
-        (result?.data ??
-            const {})["products"] ??
-            {}));
+    return (Products.fromJson((result?.data ?? const {})["products"] ?? {}));
   }
 
   /// Returns a List of [Product].
   ///
   /// Returns the Products associated to the given id's in [idList]
-  Future<List<Product>> getProductsByIds(List<String> idList, {bool deleteThisPartOfCache = false}) async {
+  Future<List<Product>> getProductsByIds(List<String> idList,
+      {bool deleteThisPartOfCache = false}) async {
     List<Product> productList = [];
     final QueryOptions _options = WatchQueryOptions(
         documentNode: gql(getProductsByIdsQuery), variables: {'ids': idList});
@@ -96,10 +122,10 @@ class ShopifyStore with ShopifyError{
     var response = result?.data;
     var newResponse = {
       'edges': List.generate(response['nodes'].length,
-              (index) => {'node': response['nodes'][index]})
+          (index) => {'node': response['nodes'][index]})
     };
     productList = Products.fromJson(newResponse).productList;
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     return productList;
@@ -120,81 +146,79 @@ class ShopifyStore with ShopifyError{
   ///  SortKey.PRICE,
   ///  SortKey.ID,
   ///  SortKey.RELEVANCE,
-  Future<List<Product>> getNProducts(
-       int n, {bool deleteThisPartOfCache = false, bool reverse, SortKeyProduct sortKey = SortKeyProduct.PRODUCT_TYPE}) async {
+  Future<List<Product>> getNProducts(int n,
+      {bool deleteThisPartOfCache = false,
+      bool reverse,
+      SortKeyProduct sortKey = SortKeyProduct.PRODUCT_TYPE}) async {
     assert(n != null);
     assert(sortKey != null);
     List<Product> productList = [];
-    final WatchQueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getNProductsQuery),
-        variables: {'n': n,
-          'sortKey': sortKey.parseToString(),
-          'reverse': reverse,
-        });
+    final WatchQueryOptions _options =
+        WatchQueryOptions(documentNode: gql(getNProductsQuery), variables: {
+      'n': n,
+      'sortKey': sortKey.parseToString(),
+      'reverse': reverse,
+    });
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
-    productList = (Products.fromJson(
-        (result?.data ??
-            const {})["products"] ??
-            {}))
-        .productList;
-    if(deleteThisPartOfCache) {
+    productList =
+        (Products.fromJson((result?.data ?? const {})["products"] ?? {}))
+            .productList;
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     return productList;
   }
+
   /// Returns a list of recommended [Product] by given id.
-  Future<List<Product>> getProductRecommendations(String productId, {bool deleteThisPartOfCache = false}) async {
-    try{
+  Future<List<Product>> getProductRecommendations(String productId,
+      {bool deleteThisPartOfCache = false}) async {
+    try {
       final WatchQueryOptions _options = WatchQueryOptions(
           documentNode: gql(getProductRecommendationsQuery),
-          variables: {
-            'id' : productId
-          }
-      );
+          variables: {'id': productId});
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
-      if(deleteThisPartOfCache) {
+      if (deleteThisPartOfCache) {
         _graphQLClient.cache.write(_options.toKey(), null);
       }
-      var newResponse = List.generate(result?.data['productRecommendations']?.length ?? 0, (index) => {"node":(result?.data['productRecommendations'] ?? const {})[index]});
-      var tempProducts = {"edges":newResponse};
-      return Products.fromJson(
-          tempProducts)
-          ?.productList;
-    } catch(e){
+      var newResponse = List.generate(
+          result?.data['productRecommendations']?.length ?? 0,
+          (index) => {
+                "node":
+                    (result?.data['productRecommendations'] ?? const {})[index]
+              });
+      var tempProducts = {"edges": newResponse};
+      return Products.fromJson(tempProducts)?.productList;
+    } catch (e) {
       print(e);
     }
     return [Product.fromJson({})];
   }
 
   /// Returns a List of [Collection]
-  Future<List<Collection>> getCollectionsByIds(List<String> idList, {bool deleteThisPartOfCache = false}) async {
-    try{
+  Future<List<Collection>> getCollectionsByIds(List<String> idList,
+      {bool deleteThisPartOfCache = false}) async {
+    try {
       final WatchQueryOptions _options = WatchQueryOptions(
           documentNode: gql(getCollectionsByIdsQuery),
-          variables: {
-            'ids' : idList
-          }
-      );
+          variables: {'ids': idList});
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
-      if(deleteThisPartOfCache) {
+      if (deleteThisPartOfCache) {
         _graphQLClient.cache.write(_options.toKey(), null);
       }
 
-      var newResponse = List.generate(result?.data['nodes']?.length ?? 0, (index) => {"node":(result?.data['nodes'] ?? const {})[index]});
-      var tempCollection = {"edges":newResponse};
-      return Collections.fromJson(
-          tempCollection ?? const {})
-          ?.collectionList;
-    } catch(e){
+      var newResponse = List.generate(result?.data['nodes']?.length ?? 0,
+          (index) => {"node": (result?.data['nodes'] ?? const {})[index]});
+      var tempCollection = {"edges": newResponse};
+      return Collections.fromJson(tempCollection ?? const {})?.collectionList;
+    } catch (e) {
       print(e);
     }
     return [Collection.fromJson({})];
   }
 
-
   /// Returns the Shop.
   Future<Shop> getShop({bool deleteThisPartOfCache = false}) async {
     final WatchQueryOptions _options = WatchQueryOptions(
@@ -202,42 +226,39 @@ class ShopifyStore with ShopifyError{
     );
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     return Shop.fromJson(result?.data);
   }
 
   /// Returns a collection by handle.
-  Future<Collection> getCollectionByHandle(String collectionName, {bool deleteThisPartOfCache = false}) async {
-    try{
+  Future<Collection> getCollectionByHandle(String handle,
+      {bool deleteThisPartOfCache = false}) async {
+    try {
       final WatchQueryOptions _options = WatchQueryOptions(
-          documentNode: gql(getFeaturedCollectionQuery),
-          variables: {
-            'query' : collectionName
-          }
-      );
+          documentNode: gql(getCollectionByHandleQuery),
+          variables: {'handle': handle});
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
-      if(deleteThisPartOfCache) {
+      if (deleteThisPartOfCache) {
         _graphQLClient.cache.write(_options.toKey(), null);
       }
-      return Collections.fromJson(
-          result?.data['collections'])
-          .collectionList[0];
-    } catch(e){
+      return Collection.fromCollectionHandleJson(
+          (result?.data ?? const {})['collectionByHandle'] ?? {});
+    } catch (e) {
       print(e);
     }
     return Collection.fromJson({});
   }
 
-
-
   /// Returns all available collections.
   ///
   /// Tip: When editing Collections you can choose on which channel or app you want to make them available.
-  Future<List<Collection>> getAllCollections({bool deleteThisPartOfCache = false,
-    SortKeyCollection sortKeyCollection = SortKeyCollection.UPDATED_AT, bool reverse = false}) async {
+  Future<List<Collection>> getAllCollections(
+      {bool deleteThisPartOfCache = false,
+      SortKeyCollection sortKeyCollection = SortKeyCollection.UPDATED_AT,
+      bool reverse = false}) async {
     List<Collection> collectionList = [];
     Collections tempCollection;
     String cursor;
@@ -253,13 +274,11 @@ class ShopifyStore with ShopifyError{
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
       tempCollection = (Collections.fromJson(
-          (result?.data ??
-              const {})['collections'] ??
-              {}));
+          (result?.data ?? const {})['collections'] ?? {}));
       collectionList = tempCollection.collectionList + collectionList;
       cursor = collectionList.isNotEmpty ? collectionList.last.cursor : null;
     } while ((tempCollection?.hasNextPage == true));
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     return collectionList;
@@ -269,10 +288,14 @@ class ShopifyStore with ShopifyError{
   ///
   /// Tip: When editing Collections you can choose on which channel or app you want to make them available.
   Future<List<Collection>> getXCollectionsAndNProductsSorted(
-      int n, int x,
-      {bool deleteThisPartOfCache = false,
-        SortKeyProductCollection sortKeyProductCollection = SortKeyProductCollection.CREATED,
-        SortKeyCollection sortKeyCollection = SortKeyCollection.UPDATED_AT, bool reverse = false, }) async {
+    int n,
+    int x, {
+    bool deleteThisPartOfCache = false,
+    SortKeyProductCollection sortKeyProductCollection =
+        SortKeyProductCollection.CREATED,
+    SortKeyCollection sortKeyCollection = SortKeyCollection.UPDATED_AT,
+    bool reverse = false,
+  }) async {
     List<Collection> collectionList;
     String cursor;
     WatchQueryOptions _options;
@@ -282,17 +305,16 @@ class ShopifyStore with ShopifyError{
           'cursor': cursor,
           'sortKey': sortKeyCollection.parseToString(),
           'reverse': reverse,
-          'sortKeyProduct' : sortKeyProductCollection.parseToString(),
+          'sortKeyProduct': sortKeyProductCollection.parseToString(),
           'x': x,
           'n': n
         });
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
-    collectionList = (Collections.fromJson(
-        (result?.data ??
-            const {})['collections'] ??
-            {})).collectionList;
-    if(deleteThisPartOfCache) {
+    collectionList =
+        (Collections.fromJson((result?.data ?? const {})['collections'] ?? {}))
+            .collectionList;
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     return collectionList;
@@ -302,30 +324,29 @@ class ShopifyStore with ShopifyError{
   ///
   /// Returns all Products from the [Collection] with the [id].
   Future<List<Product>> getAllProductsFromCollectionById(String id,
-      {bool deleteThisPartOfCache = false, SortKeyProductCollection sortKeyProductCollection = SortKeyProductCollection.CREATED}) async {
+      {bool deleteThisPartOfCache = false,
+      SortKeyProductCollection sortKeyProductCollection =
+          SortKeyProductCollection.CREATED}) async {
     String cursor;
     List<Product> productList = [];
     Collection collection;
     QueryOptions _options;
     do {
-     _options = WatchQueryOptions(
+      _options = WatchQueryOptions(
           documentNode: gql(getCollectionByIdQuery),
           variables: {
             'id': id,
             'cursor': cursor,
-            'sortKey' : sortKeyProductCollection.parseToString()
+            'sortKey': sortKeyProductCollection.parseToString()
           });
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
-      productList.addAll((Collection.fromJson(
-          result?.data)
-          .products)
-          .productList);
-      collection = (Collection.fromJson(
-          result?.data));
+      productList
+          .addAll((Collection.fromJson(result?.data).products).productList);
+      collection = (Collection.fromJson(result?.data));
       cursor = productList.isNotEmpty ? productList.last.cursor : null;
     } while (collection?.products?.hasNextPage == true);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     return productList;
@@ -336,7 +357,10 @@ class ShopifyStore with ShopifyError{
   /// Returns the first [limit] Products after the given [startCursor].
   /// [limit] has to be in the range of 0 and 250.
   Future<Products> getXProductsAfterCursorWithinCollection(
-      String id, int limit, String startCursor, {SortKeyProductCollection sortKey = SortKeyProductCollection.BEST_SELLING, bool deleteThisPartOfCache = false, bool reverse = false}) async {
+      String id, int limit, String startCursor,
+      {SortKeyProductCollection sortKey = SortKeyProductCollection.BEST_SELLING,
+      bool deleteThisPartOfCache = false,
+      bool reverse = false}) async {
     String cursor = startCursor;
     final WatchQueryOptions _options = WatchQueryOptions(
         documentNode: gql(getXProductsAfterCursorWithinCollectionQuery),
@@ -349,25 +373,25 @@ class ShopifyStore with ShopifyError{
         });
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
-    return (Collection.fromJson(
-        result?.data))
-        .products;
+    return (Collection.fromJson(result?.data)).products;
   }
 
   /// Returns a List of [Product].
   ///
   /// Gets all [Product] from a [query] search sorted by [sortKey].
-  Future<List<Product>> getAllProductsOnQuery(
-      String cursor, String query, {SortKeyProduct sortKey, bool deleteThisPartOfCache = false, bool reverse = false}) async {
+  Future<List<Product>> getAllProductsOnQuery(String cursor, String query,
+      {SortKeyProduct sortKey,
+      bool deleteThisPartOfCache = false,
+      bool reverse = false}) async {
     String cursor;
     List<Product> productList = [];
     Products products;
     WatchQueryOptions _options;
     do {
-       _options = WatchQueryOptions(
+      _options = WatchQueryOptions(
           documentNode: gql(getAllProductsOnQueryQuery),
           variables: {
             'cursor': cursor,
@@ -377,16 +401,13 @@ class ShopifyStore with ShopifyError{
           });
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
-      productList.addAll((Products.fromJson(
-          (result?.data ??
-              const {})['products']))
-          ?.productList);
-      products = (Products.fromJson(
-          (result?.data ??
-              const {})['products']));
+      productList.addAll(
+          (Products.fromJson((result?.data ?? const {})['products']))
+              ?.productList);
+      products = (Products.fromJson((result?.data ?? const {})['products']));
       cursor = productList.isNotEmpty ? productList.last.cursor : null;
     } while (products?.hasNextPage == true);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     return productList;
@@ -396,7 +417,10 @@ class ShopifyStore with ShopifyError{
   ///
   /// Gets [limit] amount of [Product] from the [query] search, sorted by [sortKey].
   Future<Products> getXProductsOnQueryAfterCursor(
-      String query, int limit, String cursor, {SortKeyProduct sortKey, bool deleteThisPartOfCache = false, bool reverse = false}) async {
+      String query, int limit, String cursor,
+      {SortKeyProduct sortKey,
+      bool deleteThisPartOfCache = false,
+      bool reverse = false}) async {
     final WatchQueryOptions _options = WatchQueryOptions(
         documentNode: gql(getXProductsOnQueryAfterCursorQuery),
         variables: {
@@ -406,15 +430,14 @@ class ShopifyStore with ShopifyError{
           'query': query,
           'reverse': reverse
         });
-    final QueryResult result = await ShopifyConfig.graphQLClient.query(_options);
+    final QueryResult result =
+        await ShopifyConfig.graphQLClient.query(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
-    
-    return Products.fromJson(
-        (result?.data ??
-            const {})['products']);
+
+    return Products.fromJson((result?.data ?? const {})['products']);
   }
 
   /// Returns a List of [Metafield].

From 29ae7febc8f18ccb11f9fba1f258f2721be5f9ea Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 18 Dec 2020 18:15:59 +0530
Subject: [PATCH 28/80] product & collection by handle

---
 README.md                                     |   9 ++
 .../queries/get_product_by_handle.dart        |   4 +
 ...cts_after_cursor_by_collection_handle.dart | 102 ++++++++++++++++++
 lib/models/src/product.dart                   |  22 ++--
 lib/shopify/src/shopify_store.dart            |  30 ++++++
 5 files changed, 158 insertions(+), 9 deletions(-)
 create mode 100644 lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart

diff --git a/README.md b/README.md
index 53d828f6..36622575 100644
--- a/README.md
+++ b/README.md
@@ -37,13 +37,22 @@ The goal is to make creating an mobile app from your Shopify website easier.
 ```dart    
   ShopifyStore shopifyStore = ShopifyStore.instance;
      Future<List<Product>> getProductsByIds()
+     Future<Product> getProductByHandle(String handle,
+      {bool deleteThisPartOfCache = false})
      Future<Products> getXProductsAfterCursor(int limit,String startCursor)
      Future<List<Product>> getAllProducts()
      Future<List<Product>> getNProducts({@required int n, @required SortKey sortKey})
      Future<Shop> getShop()
      Future<Collection> getFeaturedCollection()
      Future<List<Collection>> getAllCollections()
+     Future<Collection> getCollectionByHandle(String handle,
+      {bool deleteThisPartOfCache = false})
      Future<Products> getXProductsAfterCursorWithinCollection(String id, int limit, String startCursor, SortKeyProduct sortKey)
+     Future<Collection> getXProductsAfterCursorByCollectionHandle(
+      String handle, int limit, String startCursor,
+      {bool deleteThisPartOfCache = false,
+      bool reverse = false,
+      SortKeyProductCollection sortKeyProductCollection = SortKeyProductCollection.RELEVANCE})
      Future<List<Product>> getAllProductsFromCollectionById(String id)
      Future<List<Product>> getAllProductsOnQuery(String cursor, SortKeyProduct sortKey, String query)
      Future<Products> getXProductsOnQueryAfterCursor(String cursor, int limit, SortKeyProduct sortKey, String query)
diff --git a/lib/graphql_operations/queries/get_product_by_handle.dart b/lib/graphql_operations/queries/get_product_by_handle.dart
index 591b2529..f03f3ec6 100644
--- a/lib/graphql_operations/queries/get_product_by_handle.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle.dart
@@ -31,6 +31,10 @@ query($handle: String!) {
                     sku
                     requiresShipping
                     quantityAvailable
+                    selectedOptions {
+                      name
+                      value
+                    }
                 }
             }
             pageInfo {
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
new file mode 100644
index 00000000..b8c02e42
--- /dev/null
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
@@ -0,0 +1,102 @@
+const String getXProductAfterCursorByCollectionHandleQuery = r'''
+query($handle: String!, $cursor : String, $x : Int, $reverse: Boolean, $sortKey: ProductCollectionSortKeys) {
+    collectionByHandle(handle: $handle) {
+        title
+        description
+        descriptionHtml
+        handle
+        id
+        updatedAt
+        image {
+            altText
+            id
+            originalSrc
+        }
+        products(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
+            pageInfo {
+                hasNextPage
+            }
+            edges {
+                cursor
+                node {
+                    options(first: 50) {
+                        id
+                        name
+                        values
+                    }
+                    variants(first: 250) {
+                        edges {
+                            node {
+                                id
+                                title
+                                image {
+                                    altText
+                                    id
+                                    originalSrc
+                                }
+                                priceV2 {
+                                    amount
+                                    currencyCode
+                                }
+                                compareAtPriceV2 {
+                                    amount
+                                    currencyCode
+                                }
+                                weight
+                                weightUnit
+                                availableForSale
+                                sku
+                                requiresShipping
+                                quantityAvailable
+                                selectedOptions {
+                                  name
+                                  value
+                                }
+                            }
+                        }
+                        pageInfo {
+                            hasNextPage
+                        }
+                    }
+                    availableForSale
+                    collections(first: 250) {
+                        edges {
+                            node {
+                                description
+                                descriptionHtml
+                                id
+                                handle
+                                updatedAt
+                                title
+                            }
+                        }
+                    }
+                    createdAt
+                    description
+                    descriptionHtml
+                    handle
+                    id
+                    onlineStoreUrl
+                    productType
+                    publishedAt
+                    tags
+                    title
+                    updatedAt
+                    vendor
+                    images(first: 250) {
+                        edges {
+                            node {
+                                altText
+                                id
+                                originalSrc
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+''';
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index e04bf4b5..c6948bbd 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -85,6 +85,7 @@ class Product {
         metafields: _getMetafieldList(
             (json['node'] ?? const {})['metafields'] ?? const {}));
   }
+
   static Product fromProductHandleJson(Map<String, dynamic> json) {
     return Product(
         collectionList: _getCollectionList(json ?? const {}),
@@ -105,8 +106,7 @@ class Product {
         cursor: json['cursor'],
         options: _getOptionList(json),
         vendor: json['vendor'],
-        metafields: _getMetafieldList(
-            json['metafields'] ?? const {}));
+        metafields: _getMetafieldList(json['metafields'] ?? const {}));
   }
 
   Map toJson() => {
@@ -117,27 +117,31 @@ class Product {
 
   static List<ProductVariant> _getProductVariants(Map<String, dynamic> json) {
     List<ProductVariant> productVariants = [];
-    ((json['variants'] ?? const {})['edges'] ?? const [])
-        ?.forEach((v) {
+    ((json['variants'] ?? const {})['edges'] ?? const [])?.forEach((v) {
       if (v?.data != null)
         productVariants.add(ProductVariant.fromJson(v?.data ?? const {}));
     });
     return productVariants;
   }
 
-  getProductVariantBySelectedOption(List<SelectedOption> filters) {
+  ProductVariant getProductVariantBySelectedOption(
+      List<SelectedOption> filters) {
     Function unOrdDeepEq = const DeepCollectionEquality.unordered().equals;
+
+    List<Map<String, String>> filterList = [];
+    filters.forEach((SelectedOption selectedOption) {
+      filterList.add({selectedOption.name: selectedOption.value});
+    });
+
     final productVariant =
         this.productVariants.firstWhere((ProductVariant productVariant) {
       bool found = false;
       List<Map<String, String>> selectedOptionList = [];
-      List<Map<String, String>> filterList = [];
+
       productVariant.selectedOptions.forEach((SelectedOption selectedOption) {
         selectedOptionList.add({selectedOption.name: selectedOption.value});
       });
-      filters.forEach((SelectedOption selectedOption) {
-        filterList.add({selectedOption.name: selectedOption.value});
-      });
+
       if (unOrdDeepEq(selectedOptionList, filterList) == true) {
         found = true;
       }
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index 67904bf6..7d4635ac 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -12,6 +12,7 @@ import 'package:flutter_simple_shopify/graphql_operations/queries/get_metafileds
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_shop.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_x_collections_and_n_products_sorted.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_x_products_after_cursor.dart';
+import 'package:flutter_simple_shopify/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_x_products_on_query_after_cursor.dart';
 import 'package:flutter_simple_shopify/mixins/src/shopfiy_error.dart';
@@ -252,6 +253,35 @@ class ShopifyStore with ShopifyError {
     return Collection.fromJson({});
   }
 
+  Future<Collection> getXProductsAfterCursorByCollectionHandle(
+      String handle, int limit, String startCursor,
+      {bool deleteThisPartOfCache = false,
+      bool reverse = false,
+      SortKeyProductCollection sortKeyProductCollection = SortKeyProductCollection.RELEVANCE}) async {
+    String cursor = startCursor;
+    try {
+      final WatchQueryOptions _options = WatchQueryOptions(
+          documentNode: gql(getXProductAfterCursorByCollectionHandleQuery),
+          variables: {
+            'handle': handle,
+            'x': limit ?? 50,
+            'cursor': cursor,
+            'reverse': reverse,
+            'sortKey': sortKeyProductCollection.parseToString()
+          });
+      final QueryResult result = await _graphQLClient.query(_options);
+      checkForError(result);
+      if (deleteThisPartOfCache) {
+        _graphQLClient.cache.write(_options.toKey(), null);
+      }
+      return Collection.fromCollectionHandleJson(
+          (result?.data ?? const {})['collectionByHandle'] ?? {});
+    } catch (e) {
+      print(e);
+    }
+    return Collection.fromJson({});
+  }
+
   /// Returns all available collections.
   ///
   /// Tip: When editing Collections you can choose on which channel or app you want to make them available.

From 1be7747a579d422d99f39a4377b61c3106e37103 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Mon, 21 Dec 2020 13:31:32 +0530
Subject: [PATCH 29/80] collection by handle

---
 lib/graphql_operations/queries/get_collection_by_handle.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/graphql_operations/queries/get_collection_by_handle.dart b/lib/graphql_operations/queries/get_collection_by_handle.dart
index c44f4b05..23e9f20e 100644
--- a/lib/graphql_operations/queries/get_collection_by_handle.dart
+++ b/lib/graphql_operations/queries/get_collection_by_handle.dart
@@ -18,6 +18,7 @@ query($handle: String!) {
                     variants(first: 1) {
                         edges {
                             node {
+                                id
                                 title
                                 image {
                                     altText

From d914bebabcc00a944d0a80b1f6ba96dbdf212e33 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Mon, 11 Jan 2021 19:27:17 +0530
Subject: [PATCH 30/80] product tags

---
 lib/models/src/product.dart | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index f12dd8dc..7adbde48 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -76,7 +76,7 @@ class Product {
         onlineStoreUrl: (json['node'] ?? const {})['onlineStoreUrl'],
         productType: (json['node'] ?? const {})['productType'],
         publishedAt: (json['node'] ?? const {})['publishedAt'],
-        tags: _getTags(json ?? const {}),
+        tags: _getTags((json['node'] ?? const {})['tags']),
         updatedAt: (json['node'] ?? const {})['updatedAt'],
         images: _getImageList((json['node'] ?? const {})['images'] ?? const {}),
         cursor: json['cursor'],
@@ -100,7 +100,7 @@ class Product {
         onlineStoreUrl: json['onlineStoreUrl'],
         productType: json['productType'],
         publishedAt: json['publishedAt'],
-        tags: _getTags(json ?? const {}),
+        tags: _getTags(json['tags'] ?? []),
         updatedAt: json['updatedAt'],
         images: _getImageList(json['images'] ?? const {}),
         cursor: json['cursor'],
@@ -159,9 +159,9 @@ class Product {
     return optionList;
   }
 
-  static List<String> _getTags(Map<String, dynamic> json) {
+  static List<String> _getTags(List<dynamic> list) {
     List<String> tags = [];
-    (json['node'] ?? const {})['tags']?.forEach((e) => tags.add(e ?? const {}));
+    list?.forEach((e) => tags.add(e ?? const {}));
     return tags;
   }
 

From e9c7c60c0236703543e4ab838b3e9c5cbbfa7e27 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Tue, 12 Jan 2021 11:53:32 +0530
Subject: [PATCH 31/80] product collection list

---
 lib/models/src/product.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 7adbde48..e821d45a 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -64,7 +64,7 @@ class Product {
 
   static Product fromJson(Map<String, dynamic> json) {
     return Product(
-        collectionList: _getCollectionList(json ?? const {}),
+        collectionList: _getCollectionList(json['node'] ?? const {} ?? const {}),
         id: (json['node'] ?? const {})['id'],
         title: (json['node'] ?? const {})['title'],
         availableForSale: (json['node'] ?? const {})['availableForSale'],
@@ -168,7 +168,7 @@ class Product {
   static List<AssociatedCollections> _getCollectionList(
       Map<String, dynamic> json) {
     List<AssociatedCollections> collectionList = [];
-    (((json['node'] ?? const {})['collections'] ?? const {})['edges'] ??
+    ((json['collections'] ?? const {})['edges'] ??
             const [])
         ?.forEach((v) {
       if (v?.data != null)

From 4ef033fe033c3330dc7d532bf9c9fb3cedfbd9d3 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Fri, 15 Jan 2021 19:09:22 +0530
Subject: [PATCH 32/80] CustomerAccessToken class

---
 lib/models/src/shopify_user.dart  | 98 ++++++++++++++++++++++---------
 lib/shopify/src/shopify_auth.dart | 34 ++++-------
 2 files changed, 83 insertions(+), 49 deletions(-)

diff --git a/lib/models/src/shopify_user.dart b/lib/models/src/shopify_user.dart
index f4b24178..f0758217 100644
--- a/lib/models/src/shopify_user.dart
+++ b/lib/models/src/shopify_user.dart
@@ -2,7 +2,6 @@ import 'package:flutter_simple_shopify/models/src/checkout.dart';
 import 'package:flutter_simple_shopify/models/src/product.dart';
 
 class ShopifyUser {
-
   final Addresses address;
   final String createdAt;
   final String displayName;
@@ -14,7 +13,17 @@ class ShopifyUser {
   final List<String> tags;
   final LastIncompleteCheckout lastIncompleteCheckout;
 
-  ShopifyUser({this.address, this.createdAt, this.displayName, this.email, this.firstName, this.id, this.lastName, this.phone, this.tags, this.lastIncompleteCheckout});
+  ShopifyUser(
+      {this.address,
+      this.createdAt,
+      this.displayName,
+      this.email,
+      this.firstName,
+      this.id,
+      this.lastName,
+      this.phone,
+      this.tags,
+      this.lastIncompleteCheckout});
 
   static ShopifyUser fromJson(Map<String, dynamic> json) {
     return ShopifyUser(
@@ -27,7 +36,8 @@ class ShopifyUser {
       lastName: json['lastName'],
       phone: json['phone'],
       tags: _getTagList(json ?? const []),
-      lastIncompleteCheckout: LastIncompleteCheckout.fromJson(json['lastIncompleteCheckout'] ?? const {}),
+      lastIncompleteCheckout: LastIncompleteCheckout.fromJson(
+          json['lastIncompleteCheckout'] ?? const {}),
     );
   }
 
@@ -36,31 +46,26 @@ class ShopifyUser {
     json['tags']?.forEach((tag) => tagsList.add(tag));
     return tagsList;
   }
-
 }
 
-class Addresses{
+class Addresses {
   final List<Address> addressList;
 
   Addresses({this.addressList});
 
-  static Addresses fromJson(Map<String, dynamic> json){
-    return Addresses(
-        addressList: _getAddressList(json)
-    );
+  static Addresses fromJson(Map<String, dynamic> json) {
+    return Addresses(addressList: _getAddressList(json));
   }
 
   static _getAddressList(Map<String, dynamic> json) {
     List<Address> addressList = [];
-    json['edges']?.forEach((address) => addressList.add(Address.fromJson(address ?? const [])));
+    json['edges']?.forEach(
+        (address) => addressList.add(Address.fromJson(address ?? const [])));
     return addressList;
   }
-
-
 }
 
 class Address {
-
   final String id;
   final String address1;
   final String address2;
@@ -79,9 +84,26 @@ class Address {
   final String provinceCode;
   final String zip;
 
-  Address({this.id, this.address1, this.address2, this.city, this.company, this.country, this.countryCode, this.firstName, this.lastName, this.formattedArea, this.latitude, this.longitude, this.name, this.phone, this.province, this.provinceCode, this.zip});
-
-  static Address fromJson(Map<String, dynamic> json){
+  Address(
+      {this.id,
+      this.address1,
+      this.address2,
+      this.city,
+      this.company,
+      this.country,
+      this.countryCode,
+      this.firstName,
+      this.lastName,
+      this.formattedArea,
+      this.latitude,
+      this.longitude,
+      this.name,
+      this.phone,
+      this.province,
+      this.provinceCode,
+      this.zip});
+
+  static Address fromJson(Map<String, dynamic> json) {
     return Address(
         id: (json['node'] ?? const {})['id'],
         address1: (json['node'] ?? const {})['address1'],
@@ -99,14 +121,11 @@ class Address {
         phone: (json['node'] ?? const {})['phone'],
         province: (json['node'] ?? const {})['province'],
         provinceCode: (json['node'] ?? const {})['provinceCode'],
-        zip: (json['node'] ?? const {})['zip']
-    );
+        zip: (json['node'] ?? const {})['zip']);
   }
-
 }
 
 class LastIncompleteCheckout {
-
   final String completedAt;
   final String createdAt;
   final String email;
@@ -117,9 +136,18 @@ class LastIncompleteCheckout {
   final PriceV2 lineItemsSubtotalPrice;
   final LineItems lineItems;
 
-  LastIncompleteCheckout({this.completedAt, this.createdAt, this.email, this.id, this.currencyCode, this.webUrl, this.totalPriceV2, this.lineItemsSubtotalPrice, this.lineItems});
-
-  static LastIncompleteCheckout fromJson(Map<String, dynamic> json){
+  LastIncompleteCheckout(
+      {this.completedAt,
+      this.createdAt,
+      this.email,
+      this.id,
+      this.currencyCode,
+      this.webUrl,
+      this.totalPriceV2,
+      this.lineItemsSubtotalPrice,
+      this.lineItems});
+
+  static LastIncompleteCheckout fromJson(Map<String, dynamic> json) {
     return LastIncompleteCheckout(
         completedAt: json['completedAt'],
         createdAt: json['createdAt'],
@@ -127,10 +155,24 @@ class LastIncompleteCheckout {
         id: json['id'],
         currencyCode: json['currencyCode'],
         webUrl: json['webUrl'],
-        totalPriceV2: PriceV2.fromJson(json['totalPriceV2']?? const {}),
-        lineItemsSubtotalPrice: PriceV2.fromJson(json['lineItemsSubtotalPrice'] ?? const {}),
-        lineItems: LineItems.fromJson(json['lineItems']?? const {})
-    );
+        totalPriceV2: PriceV2.fromJson(json['totalPriceV2'] ?? const {}),
+        lineItemsSubtotalPrice:
+            PriceV2.fromJson(json['lineItemsSubtotalPrice'] ?? const {}),
+        lineItems: LineItems.fromJson(json['lineItems'] ?? const {}));
   }
+}
 
-}
\ No newline at end of file
+class CustomerAccessToken {
+  final String accessToken;
+  final DateTime expiresAt;
+
+  CustomerAccessToken(this.accessToken, this.expiresAt);
+
+  static CustomerAccessToken fromJson(Map<String, dynamic> json) {
+    json = ((json ?? const {})['customerAccessToken'] ?? const {});
+    print(json['accessToken']);
+    print(DateTime.parse(json['expiresAt']));
+    return CustomerAccessToken(
+        json['accessToken'], DateTime.parse(json['expiresAt']));
+  }
+}
diff --git a/lib/shopify/src/shopify_auth.dart b/lib/shopify/src/shopify_auth.dart
index 38c12574..2f447a20 100644
--- a/lib/shopify/src/shopify_auth.dart
+++ b/lib/shopify/src/shopify_auth.dart
@@ -43,17 +43,14 @@ class ShopifyAuth with ShopifyError {
       'password': password,
     });
     final QueryResult result = await _graphQLClient.mutate(_options);
-    // print(result.exception.toString());
-    checkForError(result, key:'customerCreate', errorKey: 'customerUserErrors');
-    // if ((result?.data['customerCreate'] ?? const {})['customerUserErrors'] !=
-    //     null)
-    //   throw (result?.data['customerCreate'] ??
-    //       const {}['customerUserErrors'].first['message']);
+
+    checkForError(result,
+        key: 'customerCreate', errorKey: 'customerUserErrors');
     final shopifyUser = ShopifyUser.fromJson(
         (result?.data['customerCreate'] ?? const {})['customer']);
-    final String customerAccessToken =
+    final CustomerAccessToken customerAccessToken =
         await _createAccessToken(email, password);
-    await _setShopifyUser(customerAccessToken, _shopifyUser);
+    await _setShopifyUser(customerAccessToken.accessToken, _shopifyUser);
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
@@ -70,7 +67,8 @@ class ShopifyAuth with ShopifyError {
         documentNode: gql(customerRecoverMutation),
         variables: {'email': email});
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result, key: 'customerRecover', errorKey: 'customerUserErrors');
+    checkForError(result,
+        key: 'customerRecover', errorKey: 'customerUserErrors');
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
@@ -83,15 +81,15 @@ class ShopifyAuth with ShopifyError {
       bool deleteThisPartOfCache = false}) async {
     assert(email != null);
     assert(password != null);
-    final String customerAccessToken =
+    final CustomerAccessToken customerAccessToken =
         await _createAccessToken(email, password);
     final WatchQueryOptions _getCustomer = WatchQueryOptions(
         documentNode: gql(getCustomerQuery),
-        variables: {'customerAccessToken': customerAccessToken});
+        variables: {'customerAccessToken': customerAccessToken.accessToken});
     final QueryResult result = await _graphQLClient.query(_getCustomer);
     checkForError(result);
     final shopifyUser = ShopifyUser.fromJson(result?.data['customer']);
-    await _setShopifyUser(customerAccessToken, shopifyUser);
+    await _setShopifyUser(customerAccessToken.accessToken, shopifyUser);
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_getCustomer.toKey(), null);
     }
@@ -99,7 +97,7 @@ class ShopifyAuth with ShopifyError {
   }
 
   /// Helper method for creating the accessToken.
-  Future<String> _createAccessToken(String email, String password,
+  Future<CustomerAccessToken> _createAccessToken(String email, String password,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(customerAccessTokenCreate),
@@ -110,14 +108,8 @@ class ShopifyAuth with ShopifyError {
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
-    return _extractAccessToken(result?.data);
-  }
-
-  /// Helper method for extracting the customerAccessToken from the mutation.
-  String _extractAccessToken(Map<String, dynamic> mutationData) {
-    return (((mutationData ?? const {})['customerAccessTokenCreate'] ??
-            const {})['customerAccessToken'] ??
-        const {})['accessToken'];
+    return CustomerAccessToken.fromJson(
+        result?.data['customerAccessTokenCreate']);
   }
 
   /// Signs out the current user and clears it from the disk cache.

From 78b04b53f1e013c53698a5aaf4bc349b9fcbf410 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Mon, 18 Jan 2021 19:47:23 +0530
Subject: [PATCH 33/80] customer access token renewal

---
 .../customer_access_token_renew.dart          | 14 +++++
 lib/models/src/product.dart                   |  9 +--
 lib/models/src/shopify_user.dart              |  7 ++-
 lib/shopify/src/shopify_auth.dart             | 58 +++++++++++++++----
 4 files changed, 71 insertions(+), 17 deletions(-)
 create mode 100644 lib/graphql_operations/mutations/customer_access_token_renew.dart

diff --git a/lib/graphql_operations/mutations/customer_access_token_renew.dart b/lib/graphql_operations/mutations/customer_access_token_renew.dart
new file mode 100644
index 00000000..12faf056
--- /dev/null
+++ b/lib/graphql_operations/mutations/customer_access_token_renew.dart
@@ -0,0 +1,14 @@
+const String customerAccessTokenRenewMutation = r'''
+mutation customerAccessTokenRenew($customerAccessToken: String!) {
+  customerAccessTokenRenew(customerAccessToken: $customerAccessToken) {
+    customerAccessToken {
+      accessToken
+      expiresAt
+    }
+    userErrors {
+      field
+      message
+    }
+  }
+}
+''';
\ No newline at end of file
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index e821d45a..ab32cda5 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -384,31 +384,32 @@ class PriceV2 {
 
   static String _chooseRightOrderOnCurrencySymbol(Map<String, dynamic> json) {
     String currencyString;
+    String amount = json['amount'] != null ? double.parse(json['amount']).toStringAsFixed(2) : '';
     switch (json['currencyCode']) {
       case "INR":
         {
           currencyString =
-              '${_simpleCurrencySymbols[json['currencyCode']]} ${json['amount']}';
+              '${_simpleCurrencySymbols[json['currencyCode']]} $amount';
         }
         break;
 
       case "EUR":
         {
           currencyString =
-              '${json['amount']} ${_simpleCurrencySymbols[json['currencyCode']]}';
+              '$amount ${_simpleCurrencySymbols[json['currencyCode']]}';
         }
         break;
       case "USD":
         {
           currencyString =
-              '${_simpleCurrencySymbols[json['currencyCode']]} ${json['amount']}';
+              '${_simpleCurrencySymbols[json['currencyCode']]} $amount';
         }
         break;
 
       default:
         {
           currencyString =
-              '${json['amount']} ${_simpleCurrencySymbols[json['currencyCode']]}';
+              '$amount ${_simpleCurrencySymbols[json['currencyCode']]}';
         }
         break;
     }
diff --git a/lib/models/src/shopify_user.dart b/lib/models/src/shopify_user.dart
index f0758217..01ba135b 100644
--- a/lib/models/src/shopify_user.dart
+++ b/lib/models/src/shopify_user.dart
@@ -170,9 +170,12 @@ class CustomerAccessToken {
 
   static CustomerAccessToken fromJson(Map<String, dynamic> json) {
     json = ((json ?? const {})['customerAccessToken'] ?? const {});
-    print(json['accessToken']);
-    print(DateTime.parse(json['expiresAt']));
     return CustomerAccessToken(
         json['accessToken'], DateTime.parse(json['expiresAt']));
   }
+
+  Map toJson() => {
+        'accessToken': accessToken,
+        'expiresAt': expiresAt.toString(),
+      };
 }
diff --git a/lib/shopify/src/shopify_auth.dart b/lib/shopify/src/shopify_auth.dart
index 2f447a20..db49f2e2 100644
--- a/lib/shopify/src/shopify_auth.dart
+++ b/lib/shopify/src/shopify_auth.dart
@@ -1,4 +1,7 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
+import 'package:flutter_simple_shopify/graphql_operations/mutations/customer_access_token_renew.dart';
 import 'package:flutter_simple_shopify/mixins/src/shopfiy_error.dart';
 import 'package:graphql/client.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -21,8 +24,20 @@ class ShopifyAuth with ShopifyError {
 
   static const String _shopifyKey = 'FLUTTER_SIMPLE_SHOPIFY_ACCESS_TOKEN';
 
-  static get currentCustomerAccessToken async =>
-      (await SharedPreferences.getInstance()).getString(_shopifyKey);
+  static Future<String> get currentCustomerAccessToken async =>
+      (await currentCustomer).accessToken;
+
+  static Future<CustomerAccessToken> get currentCustomer async {
+    String string =
+        (await SharedPreferences.getInstance()).getString(_shopifyKey);
+    if (string != null) {
+      Map<String, dynamic> json = jsonDecode(string);
+      return CustomerAccessToken(
+          json['accessToken'].toString(), DateTime.parse(json['expiresAt']));
+    } else {
+      return null;
+    }
+  }
 
   /// Tries to create a new user account with the given email address and password.
   Future<ShopifyUser> createUser(
@@ -50,7 +65,7 @@ class ShopifyAuth with ShopifyError {
         (result?.data['customerCreate'] ?? const {})['customer']);
     final CustomerAccessToken customerAccessToken =
         await _createAccessToken(email, password);
-    await _setShopifyUser(customerAccessToken.accessToken, _shopifyUser);
+    await _setShopifyUser(customerAccessToken);
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
@@ -89,7 +104,7 @@ class ShopifyAuth with ShopifyError {
     final QueryResult result = await _graphQLClient.query(_getCustomer);
     checkForError(result);
     final shopifyUser = ShopifyUser.fromJson(result?.data['customer']);
-    await _setShopifyUser(customerAccessToken.accessToken, shopifyUser);
+    await _setShopifyUser(customerAccessToken);
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_getCustomer.toKey(), null);
     }
@@ -114,11 +129,11 @@ class ShopifyAuth with ShopifyError {
 
   /// Signs out the current user and clears it from the disk cache.
   Future<void> signOutCurrentUser({bool deleteThisPartOfCache = false}) async {
-    SharedPreferences _prefs = await SharedPreferences.getInstance();
+    String cat = await currentCustomerAccessToken;
     final MutationOptions _options = MutationOptions(
         documentNode: gql(accessTokenDeleteMutation),
-        variables: {'customerAccessToken': _prefs.getString(_shopifyKey)});
-    await _setShopifyUser(null, null);
+        variables: {'customerAccessToken': cat});
+    await _setShopifyUser(null);
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
@@ -127,6 +142,23 @@ class ShopifyAuth with ShopifyError {
     return result;
   }
 
+  Future<CustomerAccessToken> renewCurrentUser(
+      {bool deleteThisPartOfCache = false}) async {
+    String cat = await currentCustomerAccessToken;
+    final MutationOptions _options = MutationOptions(
+        documentNode: gql(customerAccessTokenRenewMutation),
+        variables: {'customerAccessToken': cat});
+    final QueryResult result = await _graphQLClient.mutate(_options);
+    CustomerAccessToken customerAccessToken =
+        CustomerAccessToken.fromJson(result?.data['customerAccessTokenRenew']);
+    await _setShopifyUser(customerAccessToken);
+    checkForError(result);
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.write(_options.toKey(), null);
+    }
+    return customerAccessToken;
+  }
+
   /// Returns the currently signed-in [ShopifyUser] or [null] if there is none.
   Future<ShopifyUser> currentUser({bool deleteThisPartOfCache = false}) async {
     SharedPreferences _prefs = await SharedPreferences.getInstance();
@@ -150,10 +182,14 @@ class ShopifyAuth with ShopifyError {
     }
   }
 
-  Future<void> _setShopifyUser(
-      String sharedPrefsToken, ShopifyUser shopifyUser) async {
+  Future<void> _setShopifyUser(CustomerAccessToken customerAccessToken) async {
     SharedPreferences _prefs = await SharedPreferences.getInstance();
-    _shopifyUser = shopifyUser;
-    _prefs.setString(_shopifyKey, sharedPrefsToken);
+    if (customerAccessToken != null) {
+      String jsonString = jsonEncode(customerAccessToken);
+      print('_setShopifyUser $jsonString');
+      _prefs.setString(_shopifyKey, jsonString);
+    } else {
+      _prefs.remove(_shopifyKey);
+    }
   }
 }

From 945d738fc64f0e5ca3c20f7cbaf4a5daee37ca5c Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Mon, 18 Jan 2021 20:03:23 +0530
Subject: [PATCH 34/80] current user

---
 lib/shopify/src/shopify_auth.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/shopify/src/shopify_auth.dart b/lib/shopify/src/shopify_auth.dart
index db49f2e2..7e4dd57e 100644
--- a/lib/shopify/src/shopify_auth.dart
+++ b/lib/shopify/src/shopify_auth.dart
@@ -162,9 +162,10 @@ class ShopifyAuth with ShopifyError {
   /// Returns the currently signed-in [ShopifyUser] or [null] if there is none.
   Future<ShopifyUser> currentUser({bool deleteThisPartOfCache = false}) async {
     SharedPreferences _prefs = await SharedPreferences.getInstance();
+    String cat = await currentCustomerAccessToken;
     final WatchQueryOptions _getCustomer = WatchQueryOptions(
         documentNode: gql(getCustomerQuery),
-        variables: {'customerAccessToken': _prefs.getString(_shopifyKey)});
+        variables: {'customerAccessToken': cat});
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_getCustomer.toKey(), null);
     }

From 0c3acf9592aefc7213b6d3c3042e33a918aa9e35 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Tue, 19 Jan 2021 16:20:05 +0530
Subject: [PATCH 35/80] registration last name, discount issue, formatted price
 without space

---
 lib/graphql_operations/mutations/customer_create.dart | 1 +
 lib/models/src/checkout.dart                          | 6 +++++-
 lib/models/src/product.dart                           | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/graphql_operations/mutations/customer_create.dart b/lib/graphql_operations/mutations/customer_create.dart
index 6b2f117e..cbace0d8 100644
--- a/lib/graphql_operations/mutations/customer_create.dart
+++ b/lib/graphql_operations/mutations/customer_create.dart
@@ -48,6 +48,7 @@ mutation MyMutation($firstName: String!, $lastName: String!, $email: String!, $p
     displayName
     email
     firstName
+    lastName
     id
     lastIncompleteCheckout {
         completedAt
diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index f55963e5..90b7a5a3 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -55,6 +55,7 @@ class Checkout {
     PriceV2 lineItemsSubtotalPrice =
         PriceV2.fromJson(json['lineItemsSubtotalPrice'] ?? const {});
     PriceV2 totalPriceV2 = PriceV2.fromJson(json['totalPriceV2'] ?? const {});
+    ShippingRate shippingLine= ShippingRate.fromJson(json['shippingLine'] ?? const {});
     String amount;
     String currencyCode;
     if (lineItemsSubtotalPrice.amount != null && totalPriceV2.amount != null) {
@@ -62,6 +63,9 @@ class Checkout {
       if (totalTaxV2.amount != null) {
         amt -= totalTaxV2.amount;
       }
+      if (shippingLine.priceV2?.amount != null) {
+        amt -= shippingLine.priceV2.amount;
+      }
       amount = amt.abs().toStringAsFixed(2);
       currencyCode = totalPriceV2.currencyCode;
     }
@@ -73,7 +77,7 @@ class Checkout {
         appliedGiftcards: _getAppliedGiftCards(json ?? const {}),
         availableShippingrates: AvailableShippingRates.fromJson(
             json['availableShippingRates'] ?? const {}),
-        shippingLine: ShippingRate.fromJson(json['shippingLine'] ?? const {}),
+        shippingLine: shippingLine,
         shippingAddress:
             MailingAddress.fromJson(json['shippingAddress'] ?? const {}),
         completedAt: json['completedAt'],
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index ab32cda5..6d79a1e1 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -389,27 +389,27 @@ class PriceV2 {
       case "INR":
         {
           currencyString =
-              '${_simpleCurrencySymbols[json['currencyCode']]} $amount';
+              '${_simpleCurrencySymbols[json['currencyCode']]}$amount';
         }
         break;
 
       case "EUR":
         {
           currencyString =
-              '$amount ${_simpleCurrencySymbols[json['currencyCode']]}';
+              '$amount${_simpleCurrencySymbols[json['currencyCode']]}';
         }
         break;
       case "USD":
         {
           currencyString =
-              '${_simpleCurrencySymbols[json['currencyCode']]} $amount';
+              '${_simpleCurrencySymbols[json['currencyCode']]}$amount';
         }
         break;
 
       default:
         {
           currencyString =
-              '$amount ${_simpleCurrencySymbols[json['currencyCode']]}';
+              '$amount${_simpleCurrencySymbols[json['currencyCode']]}';
         }
         break;
     }

From 3b9a8d720d24878c8dd01229ca2dede36def3f30 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Wed, 20 Jan 2021 14:59:25 +0530
Subject: [PATCH 36/80] transformedSrc for all images

---
 lib/graphql_operations/queries/get_all_blogs.dart             | 1 +
 lib/graphql_operations/queries/get_all_orders.dart            | 1 +
 .../queries/get_all_products_from_collection_by_id.dart       | 3 +++
 lib/graphql_operations/queries/get_all_products_on_query.dart | 2 ++
 lib/graphql_operations/queries/get_blog_by_handle.dart        | 1 +
 lib/graphql_operations/queries/get_checkout_information.dart  | 1 +
 .../queries/get_checkout_information_with_shipping_rate.dart  | 1 +
 .../queries/get_checkout_without_shipping_rates.dart          | 1 +
 lib/graphql_operations/queries/get_collection_by_handle.dart  | 3 +++
 lib/graphql_operations/queries/get_collections.dart           | 3 +++
 lib/graphql_operations/queries/get_collections_by_ids.dart    | 1 +
 lib/graphql_operations/queries/get_customer.dart              | 1 +
 lib/graphql_operations/queries/get_featured_collections.dart  | 3 +++
 lib/graphql_operations/queries/get_n_articles_sorted.dart     | 1 +
 lib/graphql_operations/queries/get_n_products.dart            | 2 ++
 lib/graphql_operations/queries/get_product_by_handle.dart     | 2 ++
 .../queries/get_product_recommendations.dart                  | 2 ++
 lib/graphql_operations/queries/get_products.dart              | 2 ++
 lib/graphql_operations/queries/get_products_by_handle.dart    | 3 +++
 lib/graphql_operations/queries/get_products_by_ids.dart       | 2 ++
 .../queries/get_x_collections_and_n_products_sorted.dart      | 3 +++
 lib/graphql_operations/queries/get_x_orders_after_cursor.dart | 1 +
 .../queries/get_x_products_after_cursor.dart                  | 2 ++
 .../get_x_products_after_cursor_by_collection_handle.dart     | 3 +++
 .../get_x_products_after_cursor_within_collection.dart        | 3 +++
 .../queries/get_x_products_on_query_after_cursor.dart         | 2 ++
 lib/models/src/product.dart                                   | 4 +++-
 27 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/lib/graphql_operations/queries/get_all_blogs.dart b/lib/graphql_operations/queries/get_all_blogs.dart
index 330b73cf..772b687c 100644
--- a/lib/graphql_operations/queries/get_all_blogs.dart
+++ b/lib/graphql_operations/queries/get_all_blogs.dart
@@ -40,6 +40,7 @@ query getBlogs($reverseBlogs: Boolean, $reverseArticles: Boolean, $sortKey: Blog
                 altText
                 id
                 originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
               }
               publishedAt
               tags
diff --git a/lib/graphql_operations/queries/get_all_orders.dart b/lib/graphql_operations/queries/get_all_orders.dart
index 5bdcb1db..a5dbf9a0 100644
--- a/lib/graphql_operations/queries/get_all_orders.dart
+++ b/lib/graphql_operations/queries/get_all_orders.dart
@@ -38,6 +38,7 @@ customer(customerAccessToken: $accessToken) {
                     altText
                     id
                     originalSrc
+                    transformedSrc(maxWidth: 200, crop: CENTER)
                   }
                   compareAtPriceV2 {
                     amount
diff --git a/lib/graphql_operations/queries/get_all_products_from_collection_by_id.dart b/lib/graphql_operations/queries/get_all_products_from_collection_by_id.dart
index 0ad287b3..fb648a5d 100644
--- a/lib/graphql_operations/queries/get_all_products_from_collection_by_id.dart
+++ b/lib/graphql_operations/queries/get_all_products_from_collection_by_id.dart
@@ -12,6 +12,7 @@ query($id : ID!, $cursor : String, $sortKey: ProductCollectionSortKeys){
         altText
         id
         originalSrc
+        transformedSrc(maxWidth: 200, crop: CENTER)
       }
       products(first: 10, sortKey: $sortKey, after: $cursor) {
         edges {
@@ -46,6 +47,7 @@ query($id : ID!, $cursor : String, $sortKey: ProductCollectionSortKeys){
                   altText
                   id
                   originalSrc
+                  transformedSrc(maxWidth: 200, crop: CENTER)
                 }
               }
             }
@@ -64,6 +66,7 @@ query($id : ID!, $cursor : String, $sortKey: ProductCollectionSortKeys){
                     altText
                     id
                     originalSrc
+                    transformedSrc(maxWidth: 200, crop: CENTER)
                   }
                   priceV2 {
                     amount
diff --git a/lib/graphql_operations/queries/get_all_products_on_query.dart b/lib/graphql_operations/queries/get_all_products_on_query.dart
index c0cd709b..dab783a5 100644
--- a/lib/graphql_operations/queries/get_all_products_on_query.dart
+++ b/lib/graphql_operations/queries/get_all_products_on_query.dart
@@ -27,6 +27,7 @@ query( $cursor: String, $sortKey : ProductSortKeys, $query: String, $reverse: Bo
               altText
               id
               originalSrc
+              transformedSrc(maxWidth: 200, crop: CENTER)
             }
           }
         }
@@ -38,6 +39,7 @@ query( $cursor: String, $sortKey : ProductSortKeys, $query: String, $reverse: Bo
                 altText
                 id
                 originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
               }
               priceV2 {
                 amount
diff --git a/lib/graphql_operations/queries/get_blog_by_handle.dart b/lib/graphql_operations/queries/get_blog_by_handle.dart
index 2c20992b..18e97655 100644
--- a/lib/graphql_operations/queries/get_blog_by_handle.dart
+++ b/lib/graphql_operations/queries/get_blog_by_handle.dart
@@ -34,6 +34,7 @@ query($handle : String!, $sortKey: ArticleSortKeys, $reverseArticles: Boolean){
             altText
             id
             originalSrc
+            transformedSrc(maxWidth: 200, crop: CENTER)
           }
           publishedAt
           tags
diff --git a/lib/graphql_operations/queries/get_checkout_information.dart b/lib/graphql_operations/queries/get_checkout_information.dart
index 2fa9cef0..8ba24192 100644
--- a/lib/graphql_operations/queries/get_checkout_information.dart
+++ b/lib/graphql_operations/queries/get_checkout_information.dart
@@ -80,6 +80,7 @@ query($id: ID!){
               image {
                 altText
                 originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
                 id
               }
               compareAtPriceV2 {
diff --git a/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart b/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
index e357ce8a..1baea2c8 100644
--- a/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
+++ b/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
@@ -89,6 +89,7 @@ query($id: ID!){
               image {
                 altText
                 originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
                 id
               }
               compareAtPriceV2 {
diff --git a/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart b/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
index 3ee503ad..81ba5f95 100644
--- a/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
+++ b/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
@@ -80,6 +80,7 @@ query($id: ID!){
               image {
                 altText
                 originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
                 id
               }
               compareAtPriceV2 {
diff --git a/lib/graphql_operations/queries/get_collection_by_handle.dart b/lib/graphql_operations/queries/get_collection_by_handle.dart
index 23e9f20e..3a5b52e4 100644
--- a/lib/graphql_operations/queries/get_collection_by_handle.dart
+++ b/lib/graphql_operations/queries/get_collection_by_handle.dart
@@ -11,6 +11,7 @@ query($handle: String!) {
             altText
             id
             originalSrc
+            transformedSrc(maxWidth: 200, crop: CENTER)
         }
         products(first: 20) {
             edges {
@@ -24,6 +25,7 @@ query($handle: String!) {
                                     altText
                                     id
                                     originalSrc
+                                    transformedSrc(maxWidth: 200, crop: CENTER)
                                 }
                                 priceV2 {
                                     amount
@@ -66,6 +68,7 @@ query($handle: String!) {
                                 altText
                                 id
                                 originalSrc
+                                transformedSrc(maxWidth: 200, crop: CENTER)
                             }
                         }
                     }
diff --git a/lib/graphql_operations/queries/get_collections.dart b/lib/graphql_operations/queries/get_collections.dart
index 52471bd9..6468f45d 100644
--- a/lib/graphql_operations/queries/get_collections.dart
+++ b/lib/graphql_operations/queries/get_collections.dart
@@ -17,6 +17,7 @@ query($cursor: String, $sortKey: CollectionSortKeys, $reverse: Boolean){
           altText
           id
           originalSrc
+          transformedSrc(maxWidth: 200, crop: CENTER)
         }
         products(first: 250) {
           edges {
@@ -29,6 +30,7 @@ query($cursor: String, $sortKey: CollectionSortKeys, $reverse: Boolean){
                       altText
                       id
                       originalSrc
+                      transformedSrc(maxWidth: 200, crop: CENTER)
                     }
                     priceV2 {
                       amount
@@ -71,6 +73,7 @@ query($cursor: String, $sortKey: CollectionSortKeys, $reverse: Boolean){
                     altText
                     id
                     originalSrc
+                    transformedSrc(maxWidth: 200, crop: CENTER)
                   }
                 }
               }
diff --git a/lib/graphql_operations/queries/get_collections_by_ids.dart b/lib/graphql_operations/queries/get_collections_by_ids.dart
index 4966ded4..fa7e4a22 100644
--- a/lib/graphql_operations/queries/get_collections_by_ids.dart
+++ b/lib/graphql_operations/queries/get_collections_by_ids.dart
@@ -8,6 +8,7 @@ query getCollectionsByIds($ids: [ID!]!){
       image {
         src
         originalSrc
+        transformedSrc(maxWidth: 200, crop: CENTER)
         id
         altText
       }
diff --git a/lib/graphql_operations/queries/get_customer.dart b/lib/graphql_operations/queries/get_customer.dart
index 70e153a2..f52c5b4a 100644
--- a/lib/graphql_operations/queries/get_customer.dart
+++ b/lib/graphql_operations/queries/get_customer.dart
@@ -81,6 +81,7 @@ query($customerAccessToken : String!){
                   altText
                   id
                   originalSrc
+                  transformedSrc(maxWidth: 200, crop: CENTER)
                 }
                 compareAtPriceV2 {
                   amount
diff --git a/lib/graphql_operations/queries/get_featured_collections.dart b/lib/graphql_operations/queries/get_featured_collections.dart
index 4467a78b..b8668fb0 100644
--- a/lib/graphql_operations/queries/get_featured_collections.dart
+++ b/lib/graphql_operations/queries/get_featured_collections.dart
@@ -13,6 +13,7 @@ query getFeaturedCollectionQuery($query: String!){
           altText
           id
           originalSrc
+          transformedSrc(maxWidth: 200, crop: CENTER)
         }
         products(first: 20) {
           edges {
@@ -25,6 +26,7 @@ query getFeaturedCollectionQuery($query: String!){
                       altText
                       id
                       originalSrc
+                      transformedSrc(maxWidth: 200, crop: CENTER)
                     }
                     priceV2 {
                       amount
@@ -67,6 +69,7 @@ query getFeaturedCollectionQuery($query: String!){
                     altText
                     id
                     originalSrc
+                    transformedSrc(maxWidth: 200, crop: CENTER)
                   }
                 }
               }
diff --git a/lib/graphql_operations/queries/get_n_articles_sorted.dart b/lib/graphql_operations/queries/get_n_articles_sorted.dart
index 0fef3abd..8bbf910d 100644
--- a/lib/graphql_operations/queries/get_n_articles_sorted.dart
+++ b/lib/graphql_operations/queries/get_n_articles_sorted.dart
@@ -33,6 +33,7 @@ query($x : Int, $sortKey : ArticleSortKeys, $reverse: Boolean){
           altText
           id
           originalSrc
+          transformedSrc(maxWidth: 200, crop: CENTER)
         }
         publishedAt
         tags
diff --git a/lib/graphql_operations/queries/get_n_products.dart b/lib/graphql_operations/queries/get_n_products.dart
index 1b25206c..363fbbb3 100644
--- a/lib/graphql_operations/queries/get_n_products.dart
+++ b/lib/graphql_operations/queries/get_n_products.dart
@@ -21,6 +21,7 @@ query($n : Int, $sortKey : ProductSortKeys, $reverse: Boolean){
                 altText
                 id
                 originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
               }
               priceV2 {
                 amount
@@ -73,6 +74,7 @@ query($n : Int, $sortKey : ProductSortKeys, $reverse: Boolean){
               altText
               id
               originalSrc
+              transformedSrc(maxWidth: 200, crop: CENTER)
             }
           }
         }
diff --git a/lib/graphql_operations/queries/get_product_by_handle.dart b/lib/graphql_operations/queries/get_product_by_handle.dart
index f03f3ec6..7782329e 100644
--- a/lib/graphql_operations/queries/get_product_by_handle.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle.dart
@@ -16,6 +16,7 @@ query($handle: String!) {
                         altText
                         id
                         originalSrc
+                        transformedSrc(maxWidth: 200, crop: CENTER)
                     }
                     priceV2 {
                         amount
@@ -72,6 +73,7 @@ query($handle: String!) {
                     altText
                     id
                     originalSrc
+                    transformedSrc(maxWidth: 200, crop: CENTER)
                 }
             }
         }
diff --git a/lib/graphql_operations/queries/get_product_recommendations.dart b/lib/graphql_operations/queries/get_product_recommendations.dart
index b55902a0..5cbe9cc8 100644
--- a/lib/graphql_operations/queries/get_product_recommendations.dart
+++ b/lib/graphql_operations/queries/get_product_recommendations.dart
@@ -13,6 +13,7 @@ query getProductRecommentationsQuery($id: ID!){
           altText
           id
           originalSrc
+          transformedSrc(maxWidth: 200, crop: CENTER)
         }
       }
     }
@@ -37,6 +38,7 @@ query getProductRecommentationsQuery($id: ID!){
             altText
             id
             originalSrc
+            transformedSrc(maxWidth: 200, crop: CENTER)
           }
           priceV2 {
             amount
diff --git a/lib/graphql_operations/queries/get_products.dart b/lib/graphql_operations/queries/get_products.dart
index 13506d79..96f672d2 100644
--- a/lib/graphql_operations/queries/get_products.dart
+++ b/lib/graphql_operations/queries/get_products.dart
@@ -33,6 +33,7 @@ query($cursor : String,  $shouldFetchMetafields : Boolean = false, $metafieldsNa
                 altText
                 id
                 originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
               }
               priceV2 {
                 amount
@@ -85,6 +86,7 @@ query($cursor : String,  $shouldFetchMetafields : Boolean = false, $metafieldsNa
               altText
               id
               originalSrc
+              transformedSrc(maxWidth: 200, crop: CENTER)
             }
           }
         }
diff --git a/lib/graphql_operations/queries/get_products_by_handle.dart b/lib/graphql_operations/queries/get_products_by_handle.dart
index 920461fe..7d158cc3 100644
--- a/lib/graphql_operations/queries/get_products_by_handle.dart
+++ b/lib/graphql_operations/queries/get_products_by_handle.dart
@@ -6,7 +6,10 @@ query getProductByHandle($handle : String!){
     images(first: 250) {
       edges {
         node {
+          altText
+          id
           originalSrc
+          transformedSrc(maxWidth: 200, crop: CENTER)
         }
       }
     }
diff --git a/lib/graphql_operations/queries/get_products_by_ids.dart b/lib/graphql_operations/queries/get_products_by_ids.dart
index 859a9272..7ffc9d39 100644
--- a/lib/graphql_operations/queries/get_products_by_ids.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids.dart
@@ -32,6 +32,7 @@ query($ids : [ID!]!){
               altText
               id
               originalSrc
+              transformedSrc(maxWidth: 200, crop: CENTER)
             }
           }
         }
@@ -46,6 +47,7 @@ query($ids : [ID!]!){
             image {
               altText
               originalSrc
+              transformedSrc(maxWidth: 200, crop: CENTER)
               id
             }
             compareAtPriceV2 {
diff --git a/lib/graphql_operations/queries/get_x_collections_and_n_products_sorted.dart b/lib/graphql_operations/queries/get_x_collections_and_n_products_sorted.dart
index c4238ab9..e0ae585d 100644
--- a/lib/graphql_operations/queries/get_x_collections_and_n_products_sorted.dart
+++ b/lib/graphql_operations/queries/get_x_collections_and_n_products_sorted.dart
@@ -17,6 +17,7 @@ query($cursor: String, $sortKey: CollectionSortKeys, $sortKeyProduct: ProductCol
           altText
           id
           originalSrc
+          transformedSrc(maxWidth: 200, crop: CENTER)
         }
         products(first: $n, sortKey: $sortKeyProduct) {
           edges {
@@ -29,6 +30,7 @@ query($cursor: String, $sortKey: CollectionSortKeys, $sortKeyProduct: ProductCol
                       altText
                       id
                       originalSrc
+                      transformedSrc(maxWidth: 200, crop: CENTER)
                     }
                     priceV2 {
                       amount
@@ -59,6 +61,7 @@ query($cursor: String, $sortKey: CollectionSortKeys, $sortKeyProduct: ProductCol
                     altText
                     id
                     originalSrc
+                    transformedSrc(maxWidth: 200, crop: CENTER)
                   }
                 }
               }
diff --git a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
index 6a180fdc..d897cd2b 100644
--- a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
@@ -41,6 +41,7 @@ customer(customerAccessToken: $accessToken) {
                     altText
                     id
                     originalSrc
+                    transformedSrc(maxWidth: 200, crop: CENTER)
                   }
                   compareAtPriceV2 {
                     amount
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
index 004fd63a..51fb21a7 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
@@ -21,6 +21,7 @@ query($cursor : String, $x : Int, $reverse: Boolean, $sortKey: ProductSortKeys){
                 altText
                 id
                 originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
               }
               priceV2 {
                 amount
@@ -73,6 +74,7 @@ query($cursor : String, $x : Int, $reverse: Boolean, $sortKey: ProductSortKeys){
               altText
               id
               originalSrc
+              transformedSrc(maxWidth: 200, crop: CENTER)
             }
           }
         }
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
index b8c02e42..a75f1321 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
@@ -11,6 +11,7 @@ query($handle: String!, $cursor : String, $x : Int, $reverse: Boolean, $sortKey:
             altText
             id
             originalSrc
+            transformedSrc(maxWidth: 200, crop: CENTER)
         }
         products(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
             pageInfo {
@@ -33,6 +34,7 @@ query($handle: String!, $cursor : String, $x : Int, $reverse: Boolean, $sortKey:
                                     altText
                                     id
                                     originalSrc
+                                    transformedSrc(maxWidth: 200, crop: CENTER)
                                 }
                                 priceV2 {
                                     amount
@@ -89,6 +91,7 @@ query($handle: String!, $cursor : String, $x : Int, $reverse: Boolean, $sortKey:
                                 altText
                                 id
                                 originalSrc
+                                transformedSrc(maxWidth: 200, crop: CENTER)
                             }
                         }
                     }
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart b/lib/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart
index 57f0168a..f825da53 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart
@@ -12,6 +12,7 @@ query($id : ID!, $cursor : String, $limit : Int, $sortKey : ProductCollectionSor
         altText
         id
         originalSrc
+        transformedSrc(maxWidth: 200, crop: CENTER)
       }
       products(first: $limit, sortKey: $sortKey, after: $cursor, reverse: $reverse) {
         edges {
@@ -46,6 +47,7 @@ query($id : ID!, $cursor : String, $limit : Int, $sortKey : ProductCollectionSor
                   altText
                   id
                   originalSrc
+                  transformedSrc(maxWidth: 200, crop: CENTER)
                 }
               }
             }
@@ -64,6 +66,7 @@ query($id : ID!, $cursor : String, $limit : Int, $sortKey : ProductCollectionSor
                     altText
                     id
                     originalSrc
+                    transformedSrc(maxWidth: 200, crop: CENTER)
                   }
                   priceV2 {
                     amount
diff --git a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
index 2e6d75be..603f7e89 100644
--- a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
@@ -27,6 +27,7 @@ query( $cursor: String, $limit : Int, $sortKey : ProductSortKeys, $query: String
               altText
               id
               originalSrc
+              transformedSrc(maxWidth: 200, crop: CENTER)
             }
           }
         }
@@ -38,6 +39,7 @@ query( $cursor: String, $limit : Int, $sortKey : ProductSortKeys, $query: String
                 altText
                 id
                 originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
               }
               priceV2 {
                 amount
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 6d79a1e1..9d3025a3 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -222,14 +222,16 @@ class AssociatedCollections {
 class ShopifyImage {
   final String altText;
   final String originalSource;
+  final String transformedSrc;
   final String id;
 
-  const ShopifyImage({this.altText, this.originalSource, this.id});
+  const ShopifyImage({this.altText, this.originalSource, this.transformedSrc, this.id});
 
   static ShopifyImage fromJson(Map<String, dynamic> json) {
     return ShopifyImage(
         altText: json['altText'],
         originalSource: json['originalSrc'],
+        transformedSrc: json['transformedSrc'],
         id: json['id']);
   }
 }

From 4e099d0ce7868695da07536dc5df7402833dda53 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Wed, 20 Jan 2021 18:06:16 +0530
Subject: [PATCH 37/80] removed print statements

---
 lib/graphql_operations/mutations/customer_update.dart | 2 +-
 lib/models/src/checkout.dart                          | 2 +-
 lib/shopify/src/shopify_auth.dart                     | 2 +-
 lib/shopify/src/shopify_checkout.dart                 | 8 ++++----
 lib/shopify/src/shopify_customer.dart                 | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/graphql_operations/mutations/customer_update.dart b/lib/graphql_operations/mutations/customer_update.dart
index c79109ba..edd92f23 100644
--- a/lib/graphql_operations/mutations/customer_update.dart
+++ b/lib/graphql_operations/mutations/customer_update.dart
@@ -55,6 +55,6 @@ mutation myNewMutation($firstString) {
   }
 }
 ''';
-  print(customerUpdateMutation);
+  // print(customerUpdateMutation);
   return customerUpdateMutation;
 }
diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index 90b7a5a3..64ec1954 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -277,7 +277,7 @@ class DiscountApplication {
       this.price});
 
   static DiscountApplication fromJson(Map<String, dynamic> json) {
-    print(json);
+    // print(json);
     return DiscountApplication(
       allocationMethod: (json['node'] ?? const {})['allocationMethod'],
       targetSelection: (json['node'] ?? const {})['targetSelection'],
diff --git a/lib/shopify/src/shopify_auth.dart b/lib/shopify/src/shopify_auth.dart
index 7e4dd57e..98d8a2d5 100644
--- a/lib/shopify/src/shopify_auth.dart
+++ b/lib/shopify/src/shopify_auth.dart
@@ -187,7 +187,7 @@ class ShopifyAuth with ShopifyError {
     SharedPreferences _prefs = await SharedPreferences.getInstance();
     if (customerAccessToken != null) {
       String jsonString = jsonEncode(customerAccessToken);
-      print('_setShopifyUser $jsonString');
+      // print('_setShopifyUser $jsonString');
       _prefs.setString(_shopifyKey, jsonString);
     } else {
       _prefs.remove(_shopifyKey);
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index 967a8231..2e7b127b 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -41,7 +41,7 @@ class ShopifyCheckout with ShopifyError {
           'id': checkoutId,
         });
     QueryResult result = await _graphQLClient.query(_optionsRequireShipping);
-    print((result?.data as LazyCacheMap)?.data);
+    // print((result?.data as LazyCacheMap)?.data);
     final WatchQueryOptions _options = WatchQueryOptions(
         documentNode: gql(_requiresShipping(result) == true
             ? getCheckoutInfo
@@ -66,7 +66,7 @@ class ShopifyCheckout with ShopifyError {
           'id': checkoutId,
         });
     QueryResult result = await _graphQLClient.query(_optionsRequireShipping);
-    print((result?.data as LazyCacheMap)?.data);
+    // print((result?.data as LazyCacheMap)?.data);
     final WatchQueryOptions _options = WatchQueryOptions(
         documentNode: gql(_requiresShipping(result) == true
             ? getCheckoutInfoWithShippingRate
@@ -334,7 +334,7 @@ class ShopifyCheckout with ShopifyError {
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
-    print((result?.data as LazyCacheMap)?.data);
+    // print((result?.data as LazyCacheMap)?.data);
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
@@ -348,7 +348,7 @@ class ShopifyCheckout with ShopifyError {
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result,
         key: 'checkoutEmailUpdateV2', errorKey: 'checkoutUserErrors');
-    print((result?.data as LazyCacheMap)?.data);
+    // print((result?.data as LazyCacheMap)?.data);
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
diff --git a/lib/shopify/src/shopify_customer.dart b/lib/shopify/src/shopify_customer.dart
index f294ca42..b4875aee 100644
--- a/lib/shopify/src/shopify_customer.dart
+++ b/lib/shopify/src/shopify_customer.dart
@@ -72,7 +72,7 @@ class ShopifyCustomer with ShopifyError{
       'acceptsMarketing': acceptsMarketing,
       'customerAccessToken': customerAccessToken
     }).forEach((k,v) => v != null ? variableMap[k] = v:null);
-    print(variableMap);
+    // print(variableMap);
     final MutationOptions _options =
     MutationOptions(documentNode: gql(createValidMutationString(variableMap)), variables: variableMap);
     QueryResult result = await _graphQLClient.mutate(_options);

From 354a5bbbe76705c63293a9333a125fa26833163c Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Thu, 21 Jan 2021 18:35:42 +0530
Subject: [PATCH 38/80] article pagination

---
 .../queries/get_x_articles_after_cursor.dart  | 53 +++++++++++
 lib/models/src/article.dart                   | 17 +++-
 lib/shopify/src/shopify_blog.dart             | 91 ++++++++++++-------
 3 files changed, 122 insertions(+), 39 deletions(-)
 create mode 100644 lib/graphql_operations/queries/get_x_articles_after_cursor.dart

diff --git a/lib/graphql_operations/queries/get_x_articles_after_cursor.dart b/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
new file mode 100644
index 00000000..f158fe4d
--- /dev/null
+++ b/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
@@ -0,0 +1,53 @@
+const String getXArticlesAfterCursorQuery = r'''
+query($cursor : String, $x : Int, $reverse: Boolean, $sortKey: ArticleSortKeys){
+  articles(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
+    pageInfo {
+      hasNextPage
+    }
+    edges {
+      cursor
+      node {
+      
+        authorV2 {
+          bio
+          email
+          firstName
+          lastName
+          name
+        }
+        comments(first: 250) {
+          edges {
+            node {
+              author {
+                email
+                name
+              }
+              content
+              contentHtml
+              id
+            }
+          }
+        }
+        content
+        contentHtml
+        excerpt
+        excerptHtml
+        handle
+        id
+        image {
+          altText
+          id
+          originalSrc
+          transformedSrc(maxWidth: 200, crop: CENTER)
+        }
+        publishedAt
+        tags
+        title
+        url
+        
+        
+        
+      }
+    }
+  }
+}''';
diff --git a/lib/models/src/article.dart b/lib/models/src/article.dart
index 6fa44957..03740670 100644
--- a/lib/models/src/article.dart
+++ b/lib/models/src/article.dart
@@ -2,12 +2,14 @@ import 'package:flutter_simple_shopify/models/src/product.dart';
 
 class Articles {
   final List<Article> articleList;
+  final bool hasNextPage;
 
-  Articles({this.articleList});
+  Articles({this.articleList, this.hasNextPage});
 
   static Articles fromJson(Map<String, dynamic> json){
     return Articles(
-        articleList: _getArticleList(json ?? const {})
+        articleList: _getArticleList(json ?? const {}),
+        hasNextPage: (json['pageInfo'] ?? const {})['hasNextPage']
     );
   }
 
@@ -19,6 +21,7 @@ class Articles {
 }
 
 class Article {
+  final String cursor;
   final AuthorV2 author;
   final List<Comment> commentList;
   final String content;
@@ -28,15 +31,19 @@ class Article {
   final String handle;
   final String id;
   final ShopifyImage image;
-  final String publishedAt;
+  final DateTime publishedAt;
   final List<String> tags;
   final String title;
   final String url;
 
-  Article({this.author, this.commentList, this.content, this.contentHtml, this.excerpt, this.excerptHtml, this.handle, this.id, this.image, this.publishedAt, this.tags, this.title, this.url});
+  Article({this.cursor, this.author, this.commentList, this.content, this.contentHtml, this.excerpt, this.excerptHtml, this.handle, this.id, this.image, this.publishedAt, this.tags, this.title, this.url});
 
   static Article fromJson(Map<String, dynamic> json){
+    DateTime publishedAt = (json['node'] ?? const {})['publishedAt'] != null
+        ? DateTime.parse((json['node'] ?? const {})['publishedAt'])
+        : null;
     return Article(
+      cursor: json['cursor'],
       author: AuthorV2.fromJson(((json['node'] ?? const {})['authorV2']) ?? const {}),
       commentList: _getCommentList((json['node'] ?? const {})['comments'] ?? const {}),
       content: (json['node'] ?? const {})['content'],
@@ -46,7 +53,7 @@ class Article {
       handle: (json['node'] ?? const {})['handle'],
       id: (json['node'] ?? const {})['id'],
       image: ShopifyImage.fromJson((json['node'] ?? const {})['image'] ?? const {}),
-      publishedAt: (json['node'] ?? const {})['publishedAt'],
+      publishedAt: publishedAt,
       tags: _getTagsList(json ?? const {}),
       title: (json['node'] ?? const {})['title'],
       url: (json['node'] ?? const {})['url'],
diff --git a/lib/shopify/src/shopify_blog.dart b/lib/shopify/src/shopify_blog.dart
index de8efaeb..4c341732 100644
--- a/lib/shopify/src/shopify_blog.dart
+++ b/lib/shopify/src/shopify_blog.dart
@@ -3,6 +3,7 @@ import 'package:flutter_simple_shopify/enums/src/sort_key_article.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_all_blogs.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_blog_by_handle.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_n_articles_sorted.dart';
+import 'package:flutter_simple_shopify/graphql_operations/queries/get_x_articles_after_cursor.dart';
 import 'package:flutter_simple_shopify/mixins/src/shopfiy_error.dart';
 import 'package:flutter_simple_shopify/models/src/article.dart';
 import 'package:flutter_simple_shopify/models/src/blog.dart';
@@ -11,7 +12,7 @@ import 'package:graphql/client.dart';
 import '../../shopify_config.dart';
 
 /// ShopifyBlog class handles all Blog related things.
-class ShopifyBlog with ShopifyError{
+class ShopifyBlog with ShopifyError {
   ShopifyBlog._();
 
   final GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient;
@@ -20,24 +21,23 @@ class ShopifyBlog with ShopifyError{
   /// Returns a List of [Blog].
   ///
   /// Returns All [Blog] of the Shop.
-  Future<List<Blog>> getAllBlogs({bool deleteThisPartOfCache = false, SortKeyBlog sortKeyBlog = SortKeyBlog.HANDLE,
-    bool reverseBlogs = false, bool reverseArticles = false }) async {
-    final WatchQueryOptions _options = WatchQueryOptions(
-      documentNode: gql(getAllBlogsQuery),
-      variables: {
-        'reverseBlogs' : reverseBlogs,
-        'reverseArticles' : reverseArticles,
-        'sortKey' : sortKeyBlog.parseToString(),
-      }
-    );
+  Future<List<Blog>> getAllBlogs(
+      {bool deleteThisPartOfCache = false,
+      SortKeyBlog sortKeyBlog = SortKeyBlog.HANDLE,
+      bool reverseBlogs = false,
+      bool reverseArticles = false}) async {
+    final WatchQueryOptions _options =
+        WatchQueryOptions(documentNode: gql(getAllBlogsQuery), variables: {
+      'reverseBlogs': reverseBlogs,
+      'reverseArticles': reverseArticles,
+      'sortKey': sortKeyBlog.parseToString(),
+    });
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
-    return (Blogs.fromJson((result?.data ??
-        const {})["blogs"] ??
-        const {}))
+    return (Blogs.fromJson((result?.data ?? const {})["blogs"] ?? const {}))
         .blogList;
   }
 
@@ -45,22 +45,21 @@ class ShopifyBlog with ShopifyError{
   ///
   /// Returns the [Blog] that is associated to the [handle].
   /// [sortKeyArticle] is meant for the List of [Article] in the [Blog].
-  Future<Blog> getBlogByHandle(
-      String handle, {SortKeyArticle sortKeyArticle = SortKeyArticle.RELEVANCE, bool deleteThisPartOfCache = false, bool reverse = false}) async {
-    final QueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getBlogByHandleQuery),
-        variables: {
-          'handle': handle,
-          'sortKey': sortKeyArticle.parseToString(),
-          'reverseArticles': reverse
-        });
+  Future<Blog> getBlogByHandle(String handle,
+      {SortKeyArticle sortKeyArticle = SortKeyArticle.RELEVANCE,
+      bool deleteThisPartOfCache = false,
+      bool reverse = false}) async {
+    final QueryOptions _options =
+        WatchQueryOptions(documentNode: gql(getBlogByHandleQuery), variables: {
+      'handle': handle,
+      'sortKey': sortKeyArticle.parseToString(),
+      'reverseArticles': reverse
+    });
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
-    var response = (result?.data['blogByHandle']
-    as LazyCacheMap)
-        ?.data;
+    var response = (result?.data['blogByHandle'] as LazyCacheMap)?.data;
     var newResponse = {'node': response};
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     return Blog.fromJson(newResponse);
@@ -69,8 +68,9 @@ class ShopifyBlog with ShopifyError{
   /// Returns a List of [Article].
   ///
   /// Returns a the first [articleAmount] of [Article] sorted by [sortKeyArticle].
-  Future<List<Article>> getXArticlesSorted(
-      int articleAmount, {SortKeyArticle sortKeyArticle = SortKeyArticle.RELEVANCE, bool deleteThisPartOfCache = false}) async {
+  Future<List<Article>> getXArticlesSorted(int articleAmount,
+      {SortKeyArticle sortKeyArticle = SortKeyArticle.RELEVANCE,
+      bool deleteThisPartOfCache = false}) async {
     final QueryOptions _options = WatchQueryOptions(
         documentNode: gql(getNArticlesSortedQuery),
         variables: {
@@ -79,12 +79,35 @@ class ShopifyBlog with ShopifyError{
         });
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
-    if(deleteThisPartOfCache) {
+    if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
-    return (Articles.fromJson(((result?.data ??
-        const {}))['articles'] ??
-        const {}))
+    return (Articles.fromJson(
+            ((result?.data ?? const {}))['articles'] ?? const {}))
         .articleList;
   }
+
+  Future<Articles> getXArticlesAfterCursor(int limit, String startCursor,
+      {bool deleteThisPartOfCache = false,
+      bool reverse = false,
+      SortKeyArticle sortKey = SortKeyArticle.TITLE}) async {
+    String cursor = startCursor;
+    final WatchQueryOptions _options = WatchQueryOptions(
+        documentNode: gql(getXArticlesAfterCursorQuery),
+        variables: {
+          'x': limit ?? 50,
+          'cursor': cursor,
+          'reverse': reverse,
+          'sortKey': sortKey.parseToString()
+        });
+    final QueryResult result = await _graphQLClient.query(_options);
+    checkForError(result);
+
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.write(_options.toKey(), null);
+    }
+    Articles articles =
+        (Articles.fromJson((result?.data ?? const {})["articles"] ?? {}));
+    return articles;
+  }
 }

From e0f4e3440042ab2cd51c1eb05ce2f5db4fb0701d Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Tue, 9 Feb 2021 19:15:15 +0530
Subject: [PATCH 39/80] query optimized

---
 .../mutations/customer_create.dart            | 132 +++++----------
 .../queries/get_checkout_information.dart     | 140 +++++++++++-----
 .../queries/get_collection_by_handle.dart     |  78 ---------
 ...et_collection_by_handle_with_products.dart |  66 ++++++++
 .../queries/get_customer.dart                 |  80 +--------
 .../queries/get_product_by_handle.dart        | 121 ++++++--------
 .../get_product_by_handle_minimum_data.dart   |  41 +++++
 .../queries/get_product_recommendations.dart  |  40 +----
 .../queries/get_products_by_ids.dart          |  74 +++------
 .../get_products_by_ids_minimum_data.dart     |  45 +++++
 .../queries/get_x_articles_after_cursor.dart  |  37 +----
 .../queries/get_x_orders_after_cursor.dart    |  80 +++------
 .../queries/get_x_products_after_cursor.dart  |  71 +++-----
 ...cts_after_cursor_by_collection_handle.dart | 155 +++++++-----------
 ...oducts_after_cursor_within_collection.dart |  77 +++------
 .../get_x_products_on_query_after_cursor.dart |  31 +---
 lib/models/src/checkout.dart                  |  12 +-
 lib/models/src/order.dart                     |  52 +++---
 lib/models/src/product.dart                   |   8 +
 lib/shopify/src/shopify_checkout.dart         | 106 ++++++------
 lib/shopify/src/shopify_store.dart            |  26 ++-
 21 files changed, 644 insertions(+), 828 deletions(-)
 create mode 100644 lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
 create mode 100644 lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
 create mode 100644 lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart

diff --git a/lib/graphql_operations/mutations/customer_create.dart b/lib/graphql_operations/mutations/customer_create.dart
index cbace0d8..7879e6b4 100644
--- a/lib/graphql_operations/mutations/customer_create.dart
+++ b/lib/graphql_operations/mutations/customer_create.dart
@@ -1,108 +1,52 @@
 const String customerCreateMutation = r''' 
-mutation MyMutation($firstName: String!, $lastName: String!, $email: String!, $password: String!) {
-  customerCreate(input: {firstName: $firstName, lastName: $lastName, email: $email, password: $password}) {
-    customer{
-      acceptsMarketing
-    addresses(first: 10) {
-      edges {
-        node {
-          address1
-          address2
-          city
-          company
-          country
-          countryCodeV2
-          firstName
-          id
-          lastName
-          latitude
-          longitude
-          name
-          phone
-          province
-          provinceCode
-          zip
-        }
-      }
+mutation MyMutation(
+  $firstName: String!
+  $lastName: String!
+  $email: String!
+  $password: String!
+) {
+  customerCreate(
+    input: {
+      firstName: $firstName
+      lastName: $lastName
+      email: $email
+      password: $password
     }
-    createdAt
-    defaultAddress {
-      address1
-      address2
-      city
-      company
-      country
-      countryCodeV2
-      firstName
+  ) {
+    customer {
       id
+      email
+      firstName
       lastName
-      latitude
-      longitude
-      name
-      phone
-      province
-      zip
-      provinceCode
-    }
-    tags
-    displayName
-    email
-    firstName
-    lastName
-    id
-    lastIncompleteCheckout {
-        completedAt
-        createdAt
-        currencyCode
-        email
-        id
-        webUrl
-        totalPriceV2 {
-          amount
-          currencyCode
-        }
-        lineItemsSubtotalPrice {
-          amount
-          currencyCode
-        }
-        lineItems(first: 250) {
-          edges {
-            node {
-              id
-              quantity
-              title
-              variant {
-                priceV2 {
-                  amount
-                  currencyCode
-                }
-                title
-                image {
-                  altText
-                  id
-                  originalSrc
-                }
-                compareAtPriceV2 {
-                  amount
-                  currencyCode
-                }
-                weight
-                weightUnit
-                availableForSale
-                sku
-                requiresShipping
-                id
-              }
-            }
+      addresses(first: 10) {
+        edges {
+          node {
+            address1
+            address2
+            city
+            company
+            country
+            countryCodeV2
+            firstName
+            id
+            lastName
+            latitude
+            longitude
+            name
+            phone
+            province
+            provinceCode
+            zip
           }
         }
       }
-  }
-  customerUserErrors {
+    }
+    customerUserErrors {
       code
       field
       message
     }
   }
 }
+
 ''';
diff --git a/lib/graphql_operations/queries/get_checkout_information.dart b/lib/graphql_operations/queries/get_checkout_information.dart
index 8ba24192..48e93d62 100644
--- a/lib/graphql_operations/queries/get_checkout_information.dart
+++ b/lib/graphql_operations/queries/get_checkout_information.dart
@@ -1,46 +1,97 @@
-const String getCheckoutInfo = r'''
-query($id: ID!){
-  node(id: $id) {
+const String getCheckoutInfo =
+  '''
+query(\$id: ID!) {
+  node(id: \$id) {
     ... on Checkout {
       id
       email
-      discountApplications(first: 10) {
-        edges {
-          node {
-            allocationMethod
-            targetSelection
-            targetType
-            value {
-              ... on MoneyV2 {
-                amount
-                currencyCode
-              }
-              ... on PricingPercentageValue {
-                percentage
+      requiresShipping
+      currencyCode
+      webUrl
+      orderStatusUrl
+      order {
+          id
+          email
+          currencyCode
+          customerUrl
+          name
+          orderNumber
+          phone
+          processedAt
+          canceledAt
+          cancelReason
+          financialStatus
+          fulfillmentStatus
+          statusUrl
+          lineItems(first: 250) {
+            edges {
+              node {
+                title
+                variant {
+                  id
+                  title
+                  availableForSale
+                  priceV2 {
+                    amount
+                    currencyCode
+                  }
+                  image {
+                    altText
+                    id
+                    originalSrc
+                    transformedSrc(maxWidth: 200, crop: CENTER)
+                  }
+                }
               }
             }
           }
-        }
-      }
-      appliedGiftCards {
-        amountUsedV2 {
-          amount
-          currencyCode
-        }
-        balanceV2 {
-          amount
-          currencyCode
-        }
-        id
+          shippingAddress {
+            address1
+            address2
+            city
+            company
+            country
+            countryCodeV2
+            firstName
+            formattedArea
+            id
+            lastName
+            latitude
+            longitude
+            name
+            phone
+            province
+            provinceCode
+            zip
+          }
+          subtotalPriceV2 {
+            amount
+            currencyCode
+          }
+          totalPriceV2 {
+            amount
+            currencyCode
+          }
+          totalRefundedV2 {
+            amount
+            currencyCode
+          }
+          totalShippingPriceV2 {
+            amount
+            currencyCode
+          }
+          totalTaxV2 {
+            amount
+            currencyCode
+          }
       }
-      requiresShipping
       shippingLine {
         handle
+        title
         priceV2 {
           amount
           currencyCode
         }
-        title
       }
       shippingAddress {
         address1
@@ -61,9 +112,6 @@ query($id: ID!){
         provinceCode
         zip
       }
-      completedAt
-      createdAt
-      currencyCode
       lineItems(first: 10) {
         edges {
           node {
@@ -96,9 +144,24 @@ query($id: ID!){
           }
         }
       }
-      note
-      webUrl
-      updatedAt
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
       lineItemsSubtotalPrice {
         amount
         currencyCode
@@ -111,18 +174,17 @@ query($id: ID!){
         amount
         currencyCode
       }
-      taxesIncluded
-      taxExempt
       subtotalPriceV2 {
         amount
         currencyCode
       }
-      orderStatusUrl
     }
   }
 }
+
 ''';
 
+
 /* availableShippingRates {
         ready
         shippingRates {
diff --git a/lib/graphql_operations/queries/get_collection_by_handle.dart b/lib/graphql_operations/queries/get_collection_by_handle.dart
index 3a5b52e4..f561458b 100644
--- a/lib/graphql_operations/queries/get_collection_by_handle.dart
+++ b/lib/graphql_operations/queries/get_collection_by_handle.dart
@@ -2,92 +2,14 @@ const String getCollectionByHandleQuery = r'''
 query($handle: String!) {
     collectionByHandle(handle: $handle) {
         title
-        description
-        descriptionHtml
         handle
         id
-        updatedAt
         image {
             altText
             id
             originalSrc
             transformedSrc(maxWidth: 200, crop: CENTER)
         }
-        products(first: 20) {
-            edges {
-                node {
-                    variants(first: 1) {
-                        edges {
-                            node {
-                                id
-                                title
-                                image {
-                                    altText
-                                    id
-                                    originalSrc
-                                    transformedSrc(maxWidth: 200, crop: CENTER)
-                                }
-                                priceV2 {
-                                    amount
-                                    currencyCode
-                                }
-                                compareAtPriceV2 {
-                                    amount
-                                    currencyCode
-                                }
-                                weight
-                                weightUnit
-                                sku
-                                requiresShipping
-                                availableForSale
-                                quantityAvailable
-                            }
-                        }
-                    }
-                    availableForSale
-                    collections(first: 1) {
-                        edges {
-                            node {
-                                description
-                                descriptionHtml
-                                id
-                                handle
-                                title
-                                updatedAt
-                            }
-                        }
-                    }
-                    createdAt
-                    description
-                    descriptionHtml
-                    handle
-                    id
-                    images(first: 10) {
-                        edges {
-                            node {
-                                altText
-                                id
-                                originalSrc
-                                transformedSrc(maxWidth: 200, crop: CENTER)
-                            }
-                        }
-                    }
-                    onlineStoreUrl
-                    productType
-                    publishedAt
-                    tags
-                    title
-                    updatedAt
-                    vendor
-                }
-                cursor
-            }
-            pageInfo {
-                hasNextPage
-            }
-        }
     }
 }
-
-
 ''';
diff --git a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
new file mode 100644
index 00000000..3cc4c48b
--- /dev/null
+++ b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
@@ -0,0 +1,66 @@
+String getCollectionByHandleWithProductsQuery(int productsCount) {
+  return '''
+query(\$handle: String!) {
+  collectionByHandle(handle: \$handle) {
+    title
+    handle
+    id
+    image {
+      altText
+      id
+      originalSrc
+      transformedSrc(maxWidth: 200, crop: CENTER)
+    }
+    products(first: $productsCount) {
+      edges {
+        node {
+          id
+          handle
+          title
+          availableForSale
+          variants(first: 1) {
+            edges {
+              node {
+                id
+                title
+                requiresShipping
+                availableForSale
+                quantityAvailable
+                image {
+                  altText
+                  id
+                  originalSrc
+                  transformedSrc(maxWidth: 200, crop: CENTER)
+                }
+                priceV2 {
+                  amount
+                  currencyCode
+                }
+                compareAtPriceV2 {
+                  amount
+                  currencyCode
+                }
+              }
+            }
+          }
+          images(first: 10) {
+            edges {
+              node {
+                altText
+                id
+                originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
+              }
+            }
+          }
+        }
+        cursor
+      }
+      pageInfo {
+        hasNextPage
+      }
+    }
+  }
+}
+''';
+}
diff --git a/lib/graphql_operations/queries/get_customer.dart b/lib/graphql_operations/queries/get_customer.dart
index f52c5b4a..0af16cff 100644
--- a/lib/graphql_operations/queries/get_customer.dart
+++ b/lib/graphql_operations/queries/get_customer.dart
@@ -1,7 +1,10 @@
 const String getCustomerQuery = r'''
-query($customerAccessToken : String!){
+query($customerAccessToken: String!) {
   customer(customerAccessToken: $customerAccessToken) {
-    acceptsMarketing
+    id
+    email
+    firstName
+    lastName
     addresses(first: 10) {
       edges {
         node {
@@ -25,79 +28,6 @@ query($customerAccessToken : String!){
         }
       }
     }
-    createdAt
-    defaultAddress {
-      address1
-      address2
-      city
-      company
-      country
-      countryCodeV2
-      firstName
-      id
-      lastName
-      latitude
-      longitude
-      name
-      phone
-      province
-      zip
-      provinceCode
-    }
-    displayName
-    email
-    tags
-    firstName
-    id
-    lastName
-    lastIncompleteCheckout {
-        completedAt
-        createdAt
-        currencyCode
-        email
-        id
-        webUrl
-        totalPriceV2 {
-          amount
-          currencyCode
-        }
-        lineItemsSubtotalPrice {
-          amount
-          currencyCode
-        }
-        lineItems(first: 250) {
-          edges {
-            node {
-              id
-              quantity
-              title
-              variant {
-                priceV2 {
-                  amount
-                  currencyCode
-                }
-                title
-                image {
-                  altText
-                  id
-                  originalSrc
-                  transformedSrc(maxWidth: 200, crop: CENTER)
-                }
-                compareAtPriceV2 {
-                  amount
-                  currencyCode
-                }
-                weight
-                weightUnit
-                availableForSale
-                sku
-                requiresShipping
-                id
-              }
-            }
-          }
-        }
-      }
   }
 }
 ''';
diff --git a/lib/graphql_operations/queries/get_product_by_handle.dart b/lib/graphql_operations/queries/get_product_by_handle.dart
index 7782329e..7196cf30 100644
--- a/lib/graphql_operations/queries/get_product_by_handle.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle.dart
@@ -1,83 +1,56 @@
 const String getProductByHandleQuery = r'''
 query($handle: String!) {
-    productByHandle(handle: $handle) {
-
-        options(first: 50) {
-            id
+  productByHandle(handle: $handle) {
+    id
+    handle
+    title
+    availableForSale
+    options(first: 50) {
+      id
+      name
+      values
+    }
+    variants(first: 250) {
+      edges {
+        node {
+          id
+          title
+          availableForSale
+          sku
+          requiresShipping
+          quantityAvailable
+          priceV2 {
+            amount
+            currencyCode
+          }
+          compareAtPriceV2 {
+            amount
+            currencyCode
+          }
+          selectedOptions {
             name
-            values
-        }
-        variants(first: 250) {
-            edges {
-                node {
-                    id
-                    title
-                    image {
-                        altText
-                        id
-                        originalSrc
-                        transformedSrc(maxWidth: 200, crop: CENTER)
-                    }
-                    priceV2 {
-                        amount
-                        currencyCode
-                    }
-                    compareAtPriceV2 {
-                        amount
-                        currencyCode
-                    }
-                    weight
-                    weightUnit
-                    availableForSale
-                    sku
-                    requiresShipping
-                    quantityAvailable
-                    selectedOptions {
-                      name
-                      value
-                    }
-                }
-            }
-            pageInfo {
-                hasNextPage
-            }
-        }
-        availableForSale
-        collections(first: 250) {
-            edges {
-                node {
-                    description
-                    descriptionHtml
-                    id
-                    handle
-                    updatedAt
-                    title
-                }
-            }
+            value
+          }
+          image {
+            altText
+            id
+            originalSrc
+            transformedSrc(maxWidth: 200, crop: CENTER)
+          }
         }
-        createdAt
-        description
-        descriptionHtml
-        handle
-        id
-        onlineStoreUrl
-        productType
-        publishedAt
-        tags
-        title
-        updatedAt
-        vendor
-        images(first: 250) {
-            edges {
-                node {
-                    altText
-                    id
-                    originalSrc
-                    transformedSrc(maxWidth: 200, crop: CENTER)
-                }
-            }
+      }
+    }
+    images(first: 20) {
+      edges {
+        node {
+          altText
+          id
+          originalSrc
+          transformedSrc(maxWidth: 200, crop: CENTER)
         }
+      }
     }
+  }
 }
 
 ''';
diff --git a/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart b/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
new file mode 100644
index 00000000..0884df64
--- /dev/null
+++ b/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
@@ -0,0 +1,41 @@
+const String getProductByHandleMinimumDataQuery = r'''
+query($handle: String!) {
+  productByHandle(handle: $handle) {
+    id
+    handle
+    title
+    availableForSale
+    variants(first: 1) {
+      edges {
+        node {
+          id
+          title
+          availableForSale
+          sku
+          requiresShipping
+          quantityAvailable
+          priceV2 {
+            amount
+            currencyCode
+          }
+          compareAtPriceV2 {
+            amount
+            currencyCode
+          }
+        }
+      }
+    }
+    images(first: 1) {
+      edges {
+        node {
+          altText
+          id
+          originalSrc
+          transformedSrc(maxWidth: 200, crop: CENTER)
+        }
+      }
+    }
+  }
+}
+
+''';
diff --git a/lib/graphql_operations/queries/get_product_recommendations.dart b/lib/graphql_operations/queries/get_product_recommendations.dart
index 5cbe9cc8..e8ef2807 100644
--- a/lib/graphql_operations/queries/get_product_recommendations.dart
+++ b/lib/graphql_operations/queries/get_product_recommendations.dart
@@ -1,13 +1,11 @@
 const String getProductRecommendationsQuery = r'''
 query getProductRecommentationsQuery($id: ID!){
   productRecommendations(productId: $id) {
-    availableForSale
-    createdAt
-    description
-    descriptionHtml
-    handle
     id
-    images(first: 250) {
+    handle
+    title
+    availableForSale
+    images(first: 1) {
       edges {
         node {
           altText
@@ -17,29 +15,15 @@ query getProductRecommentationsQuery($id: ID!){
         }
       }
     }
-    onlineStoreUrl
-    options(first: 50) {
-      id
-      name
-      values
-    }
-    productType
-    publishedAt
-    tags
-    title
-    updatedAt
-    vendor
-    variants(first: 250) {
+    variants(first: 1) {
       edges {
         node {
           id
           title
-          image {
-            altText
-            id
-            originalSrc
-            transformedSrc(maxWidth: 200, crop: CENTER)
-          }
+          availableForSale
+          requiresShipping
+          quantityAvailable
+          sku
           priceV2 {
             amount
             currencyCode
@@ -48,12 +32,6 @@ query getProductRecommentationsQuery($id: ID!){
             amount
             currencyCode
           }
-          weight
-          weightUnit
-          availableForSale
-          sku
-          requiresShipping
-          quantityAvailable
         }
       }
     }
diff --git a/lib/graphql_operations/queries/get_products_by_ids.dart b/lib/graphql_operations/queries/get_products_by_ids.dart
index 7ffc9d39..fef64b5f 100644
--- a/lib/graphql_operations/queries/get_products_by_ids.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids.dart
@@ -1,80 +1,60 @@
 const String getProductsByIdsQuery = r'''
-query($ids : [ID!]!){
+query($ids: [ID!]!) {
   nodes(ids: $ids) {
     ... on Product {
-    options(first: 50) {
-            id
-            name
-            values
-      } 
       id
       handle
-      collections(first: 250) {
+      title
+      availableForSale
+      descriptionHtml
+      productType
+      options(first: 50) {
+        id
+        name
+        values
+      }
+      images(first: 20) {
         edges {
           node {
-            description
-            descriptionHtml
-            handle
+            altText
             id
-            updatedAt
-            title
+            originalSrc
+            transformedSrc(maxWidth: 200, crop: CENTER)
           }
         }
       }
-      title
-      availableForSale
-      createdAt
-      description
-      descriptionHtml
-      images(first: 250) {
-          edges {
-            node {
-              altText
-              id
-              originalSrc
-              transformedSrc(maxWidth: 200, crop: CENTER)
-            }
-          }
-        }
       variants(first: 250) {
         edges {
           node {
+            id
+            title
+            availableForSale
+            quantityAvailable
+            requiresShipping
+            sku
             priceV2 {
               amount
               currencyCode
             }
-            title
-            image {
-              altText
-              originalSrc
-              transformedSrc(maxWidth: 200, crop: CENTER)
-              id
-            }
             compareAtPriceV2 {
               amount
               currencyCode
             }
-            weightUnit
-            weight
-            availableForSale
-            sku
-            requiresShipping
-            id
-            quantityAvailable
             selectedOptions {
               name
               value
             }
+            image {
+              altText
+              id
+              originalSrc
+              transformedSrc(maxWidth: 200, crop: CENTER)
+            }
           }
         }
       }
-      onlineStoreUrl
-      productType
-      publishedAt
-      tags
-      updatedAt
-      vendor
     }
   }
 }
+
 ''';
diff --git a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
new file mode 100644
index 00000000..d957bfb4
--- /dev/null
+++ b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
@@ -0,0 +1,45 @@
+const String getProductsByIdsMinimumDataQuery = r'''
+query($ids: [ID!]!) {
+  nodes(ids: $ids) {
+    ... on Product {
+      id
+      handle
+      title
+      availableForSale
+      descriptionHtml
+      productType
+      images(first: 1) {
+        edges {
+          node {
+            altText
+            id
+            originalSrc
+            transformedSrc(maxWidth: 200, crop: CENTER)
+          }
+        }
+      }
+      variants(first: 1) {
+        edges {
+          node {
+            id
+            title
+            availableForSale
+            quantityAvailable
+            requiresShipping
+            sku
+            priceV2 {
+              amount
+              currencyCode
+            }
+            compareAtPriceV2 {
+              amount
+              currencyCode
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+''';
diff --git a/lib/graphql_operations/queries/get_x_articles_after_cursor.dart b/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
index f158fe4d..d2c0f654 100644
--- a/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
@@ -1,5 +1,5 @@
 const String getXArticlesAfterCursorQuery = r'''
-query($cursor : String, $x : Int, $reverse: Boolean, $sortKey: ArticleSortKeys){
+query($cursor: String, $x: Int, $reverse: Boolean, $sortKey: ArticleSortKeys) {
   articles(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
     pageInfo {
       hasNextPage
@@ -7,7 +7,11 @@ query($cursor : String, $x : Int, $reverse: Boolean, $sortKey: ArticleSortKeys){
     edges {
       cursor
       node {
-      
+        id
+        handle
+        title
+        publishedAt
+        url
         authorV2 {
           bio
           email
@@ -15,39 +19,16 @@ query($cursor : String, $x : Int, $reverse: Boolean, $sortKey: ArticleSortKeys){
           lastName
           name
         }
-        comments(first: 250) {
-          edges {
-            node {
-              author {
-                email
-                name
-              }
-              content
-              contentHtml
-              id
-            }
-          }
-        }
-        content
         contentHtml
-        excerpt
-        excerptHtml
-        handle
-        id
         image {
           altText
           id
           originalSrc
           transformedSrc(maxWidth: 200, crop: CENTER)
         }
-        publishedAt
-        tags
-        title
-        url
-        
-        
-        
       }
     }
   }
-}''';
+}
+
+''';
diff --git a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
index d897cd2b..32d62df2 100644
--- a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
@@ -1,6 +1,13 @@
 const String getXOrdersAfterCursorQuery = r'''
-query getOrders($cursor : String, $x : Int,$sortKey : OrderSortKeys, $accessToken : String!, $reverse: Boolean){
-customer(customerAccessToken: $accessToken) {
+query getOrders(
+  $cursor: String
+  $x: Int
+  $sortKey: OrderSortKeys
+  $accessToken: String!
+  $reverse: Boolean
+) {
+  customer(customerAccessToken: $accessToken) {
+    id
     orders(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
       pageInfo {
         hasNextPage
@@ -11,74 +18,29 @@ customer(customerAccessToken: $accessToken) {
           email
           currencyCode
           customerUrl
+          name
+          orderNumber
+          phone
+          processedAt
+          canceledAt
+          cancelReason
+          financialStatus
+          fulfillmentStatus
+          statusUrl
           lineItems(first: 250) {
             edges {
               node {
-                currentQuantity
-                discountAllocations {
-                  allocatedAmount {
-                    amount
-                    currencyCode
-                  }
-                }
-                discountedTotalPrice {
-                  amount
-                  currencyCode
-                }
-                originalTotalPrice {
-                  amount
-                  currencyCode
-                }
-                quantity
                 title
                 variant {
-                  priceV2 {
-                    amount
-                    currencyCode
-                  }
+                  id
                   title
+                  availableForSale
                   image {
                     altText
                     id
                     originalSrc
                     transformedSrc(maxWidth: 200, crop: CENTER)
                   }
-                  compareAtPriceV2 {
-                    amount
-                    currencyCode
-                  }
-                  weight
-                  weightUnit
-                  availableForSale
-                  sku
-                  requiresShipping
-                  id
-                }
-              }
-            }
-          }
-          name
-          orderNumber
-          phone
-          processedAt
-          canceledAt
-          cancelReason
-          financialStatus
-          fulfillmentStatus
-          discountApplications(first: 10) {
-            edges {
-              node {
-                allocationMethod
-                targetSelection
-                targetType
-                value {
-                  ... on MoneyV2 {
-                    amount
-                    currencyCode
-                  }
-                  ... on PricingPercentageValue {
-                    percentage
-                  }
                 }
               }
             }
@@ -102,7 +64,6 @@ customer(customerAccessToken: $accessToken) {
             provinceCode
             zip
           }
-          statusUrl
           subtotalPriceV2 {
             amount
             currencyCode
@@ -127,7 +88,6 @@ customer(customerAccessToken: $accessToken) {
         cursor
       }
     }
-    id
   }
 }
 ''';
\ No newline at end of file
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
index 51fb21a7..9311d4ec 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
@@ -1,5 +1,5 @@
 const String getXProductsAfterCursorQuery = r'''
-query($cursor : String, $x : Int, $reverse: Boolean, $sortKey: ProductSortKeys){
+query($cursor: String, $x: Int, $reverse: Boolean, $sortKey: ProductSortKeys) {
   products(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
     pageInfo {
       hasNextPage
@@ -7,16 +7,29 @@ query($cursor : String, $x : Int, $reverse: Boolean, $sortKey: ProductSortKeys){
     edges {
       cursor
       node {
-      options(first: 50) {
-            id
-            name
-            values
-            } 
-        variants(first: 250) {
+        id
+        handle
+        title
+        availableForSale
+        images(first: 1) {
+          edges {
+            node {
+              altText
+              id
+              originalSrc
+              transformedSrc(maxWidth: 200, crop: CENTER)
+            }
+          }
+        }
+        variants(first: 1) {
           edges {
             node {
               id
               title
+              sku
+              availableForSale
+              quantityAvailable
+              requiresShipping
               image {
                 altText
                 id
@@ -31,54 +44,14 @@ query($cursor : String, $x : Int, $reverse: Boolean, $sortKey: ProductSortKeys){
                 amount
                 currencyCode
               }
-              weight
-              weightUnit
-              availableForSale
-              sku
-              requiresShipping
-              quantityAvailable
             }
           }
           pageInfo {
             hasNextPage
           }
         }
-        availableForSale
-        collections(first: 250) {
-          edges {
-            node {
-              description
-              descriptionHtml
-              id
-              handle
-              updatedAt
-              title
-            }
-          }
-        }
-        createdAt
-        description
-        descriptionHtml
-        handle
-        id
-        onlineStoreUrl
-        productType
-        publishedAt
-        tags
-        title
-        updatedAt
-        vendor
-        images(first: 250) {
-          edges {
-            node {
-              altText
-              id
-              originalSrc
-              transformedSrc(maxWidth: 200, crop: CENTER)
-            }
-          }
-        }
       }
     }
   }
-}''';
+}
+''';
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
index a75f1321..06bf5d5f 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
@@ -1,105 +1,68 @@
 const String getXProductAfterCursorByCollectionHandleQuery = r'''
-query($handle: String!, $cursor : String, $x : Int, $reverse: Boolean, $sortKey: ProductCollectionSortKeys) {
-    collectionByHandle(handle: $handle) {
-        title
-        description
-        descriptionHtml
-        handle
-        id
-        updatedAt
-        image {
-            altText
-            id
-            originalSrc
-            transformedSrc(maxWidth: 200, crop: CENTER)
-        }
-        products(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
-            pageInfo {
-                hasNextPage
+query(
+  $handle: String!
+  $cursor: String
+  $x: Int
+  $reverse: Boolean
+  $sortKey: ProductCollectionSortKeys
+) {
+  collectionByHandle(handle: $handle) {
+    id
+    handle
+    title
+    image {
+      altText
+      id
+      originalSrc
+      transformedSrc(maxWidth: 200, crop: CENTER)
+    }
+    products(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
+      pageInfo {
+        hasNextPage
+      }
+      edges {
+        cursor
+        node {
+          id
+          handle
+          availableForSale
+          title
+          tags
+          images(first: 1) {
+            edges {
+              node {
+                altText
+                id
+                originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
+              }
             }
+          }
+          variants(first: 1) {
             edges {
-                cursor
-                node {
-                    options(first: 50) {
-                        id
-                        name
-                        values
-                    }
-                    variants(first: 250) {
-                        edges {
-                            node {
-                                id
-                                title
-                                image {
-                                    altText
-                                    id
-                                    originalSrc
-                                    transformedSrc(maxWidth: 200, crop: CENTER)
-                                }
-                                priceV2 {
-                                    amount
-                                    currencyCode
-                                }
-                                compareAtPriceV2 {
-                                    amount
-                                    currencyCode
-                                }
-                                weight
-                                weightUnit
-                                availableForSale
-                                sku
-                                requiresShipping
-                                quantityAvailable
-                                selectedOptions {
-                                  name
-                                  value
-                                }
-                            }
-                        }
-                        pageInfo {
-                            hasNextPage
-                        }
-                    }
-                    availableForSale
-                    collections(first: 250) {
-                        edges {
-                            node {
-                                description
-                                descriptionHtml
-                                id
-                                handle
-                                updatedAt
-                                title
-                            }
-                        }
-                    }
-                    createdAt
-                    description
-                    descriptionHtml
-                    handle
-                    id
-                    onlineStoreUrl
-                    productType
-                    publishedAt
-                    tags
-                    title
-                    updatedAt
-                    vendor
-                    images(first: 250) {
-                        edges {
-                            node {
-                                altText
-                                id
-                                originalSrc
-                                transformedSrc(maxWidth: 200, crop: CENTER)
-                            }
-                        }
-                    }
+              node {
+                id
+                title
+                availableForSale
+                requiresShipping
+                quantityAvailable
+                priceV2 {
+                  amount
+                  currencyCode
                 }
+                compareAtPriceV2 {
+                  amount
+                  currencyCode
+                }
+              }
+            }
+            pageInfo {
+              hasNextPage
             }
+          }
         }
+      }
     }
+  }
 }
-
-
 ''';
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart b/lib/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart
index f825da53..973a2d3f 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart
@@ -1,47 +1,36 @@
 const String getXProductsAfterCursorWithinCollectionQuery = r'''
-query($id : ID!, $cursor : String, $limit : Int, $sortKey : ProductCollectionSortKeys, $reverse: Boolean){
+query(
+  $id: ID!
+  $cursor: String
+  $limit: Int
+  $sortKey: ProductCollectionSortKeys
+  $reverse: Boolean
+) {
   node(id: $id) {
     ... on Collection {
       id
-      description
-      descriptionHtml
       handle
       title
-      updatedAt
       image {
         altText
         id
         originalSrc
         transformedSrc(maxWidth: 200, crop: CENTER)
       }
-      products(first: $limit, sortKey: $sortKey, after: $cursor, reverse: $reverse) {
+      products(
+        first: $limit
+        sortKey: $sortKey
+        after: $cursor
+        reverse: $reverse
+      ) {
         edges {
           cursor
           node {
-          options(first: 50) {
             id
-            name
-            values
-            } 
-            availableForSale
-            collections(first: 1) {
-              edges {
-                node {
-                  description
-                  descriptionHtml
-                  handle
-                  id
-                  title
-                  updatedAt
-                }
-              }
-            }
-            createdAt
-            description
-            descriptionHtml
             handle
-            id
-            images(first: 20) {
+            title
+            availableForSale
+            images(first: 1) {
               edges {
                 node {
                   altText
@@ -51,23 +40,14 @@ query($id : ID!, $cursor : String, $limit : Int, $sortKey : ProductCollectionSor
                 }
               }
             }
-            onlineStoreUrl
-            productType
-            publishedAt
-            tags
-            title
-            updatedAt
-            vendor
-            variants(first: 25) {
+            variants(first: 1) {
               edges {
                 node {
+                  id
                   title
-                  image {
-                    altText
-                    id
-                    originalSrc
-                    transformedSrc(maxWidth: 200, crop: CENTER)
-                  }
+                  requiresShipping
+                  availableForSale
+                  quantityAvailable
                   priceV2 {
                     amount
                     currencyCode
@@ -76,22 +56,17 @@ query($id : ID!, $cursor : String, $limit : Int, $sortKey : ProductCollectionSor
                     amount
                     currencyCode
                   }
-                  weight
-                  weightUnit
-                  sku
-                  requiresShipping
-                  availableForSale
-                  id
-                  quantityAvailable
                 }
               }
             }
           }
         }
-      pageInfo{
-        hasNextPage
-        }}
+        pageInfo {
+          hasNextPage
+        }
+      }
     }
   }
 }
+
 ''';
diff --git a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
index 603f7e89..1cd03cf9 100644
--- a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
@@ -3,25 +3,13 @@ query( $cursor: String, $limit : Int, $sortKey : ProductSortKeys, $query: String
   products(query: $query, first: $limit, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
     edges {
       node {
-      options(first: 50) {
-            id
-            name
-            values
-            } 
         id
         handle
+        title
         availableForSale
-        createdAt
-        description
-        descriptionHtml
         onlineStoreUrl
         productType
-        publishedAt
-        tags
-        title
-        updatedAt
-        vendor
-        images(first: 250) {
+        images(first: 1) {
           edges {
             node {
               altText
@@ -34,7 +22,11 @@ query( $cursor: String, $limit : Int, $sortKey : ProductSortKeys, $query: String
         variants(first: 250) {
           edges {
             node {
+              id
               title
+              requiresShipping
+              quantityAvailable
+              availableForSale
               image {
                 altText
                 id
@@ -49,13 +41,7 @@ query( $cursor: String, $limit : Int, $sortKey : ProductSortKeys, $query: String
                 amount
                 currencyCode
               }
-              weight
-              weightUnit
-              availableForSale
-              sku
-              requiresShipping
-              id
-              quantityAvailable
+              
             }
           }
         }
@@ -66,4 +52,5 @@ query( $cursor: String, $limit : Int, $sortKey : ProductSortKeys, $query: String
       hasNextPage
     }
   }
-}''';
+}
+''';
diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index 64ec1954..ec0f0a85 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -1,3 +1,4 @@
+import 'package:flutter_simple_shopify/models/src/order.dart';
 import 'package:flutter_simple_shopify/models/src/product.dart';
 
 class Checkout {
@@ -23,6 +24,7 @@ class Checkout {
   final bool taxExempt;
   final PriceV2 subtotalPriceV2;
   final String orderStatusUrl;
+  final Order order;
   final bool requiresShipping;
 
   Checkout(
@@ -48,6 +50,7 @@ class Checkout {
       this.taxExempt,
       this.subtotalPriceV2,
       this.orderStatusUrl,
+      this.order,
       this.requiresShipping});
 
   static Checkout fromJson(Map<String, dynamic> json) {
@@ -55,7 +58,8 @@ class Checkout {
     PriceV2 lineItemsSubtotalPrice =
         PriceV2.fromJson(json['lineItemsSubtotalPrice'] ?? const {});
     PriceV2 totalPriceV2 = PriceV2.fromJson(json['totalPriceV2'] ?? const {});
-    ShippingRate shippingLine= ShippingRate.fromJson(json['shippingLine'] ?? const {});
+    ShippingRate shippingLine =
+        ShippingRate.fromJson(json['shippingLine'] ?? const {});
     String amount;
     String currencyCode;
     if (lineItemsSubtotalPrice.amount != null && totalPriceV2.amount != null) {
@@ -96,6 +100,7 @@ class Checkout {
         taxExempt: json['taxExempt'],
         subtotalPriceV2: PriceV2.fromJson(json['subtotalPriceV2'] ?? const {}),
         orderStatusUrl: json['orderStatusUrl'],
+        order: json['order']!=null ? Order.fromJson(json['order']) : null,
         requiresShipping: json['requiresShipping']);
   }
 
@@ -256,8 +261,9 @@ class DiscountApplications {
   static List<DiscountApplication> _getDiscountApplicationList(
       Map<String, dynamic> json) {
     List<DiscountApplication> discountApplicationList = [];
-    json['edges']?.forEach((discountApplication) => discountApplicationList
-        .add(DiscountApplication.fromJson(discountApplication ?? const {})));
+    if (json != null)
+      json['edges']?.forEach((discountApplication) => discountApplicationList
+          .add(DiscountApplication.fromJson(discountApplication ?? const {})));
     return discountApplicationList;
   }
 }
diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index 9e207020..7110465c 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -19,7 +19,7 @@ class Orders {
 
   static List<Order> _getOrderList(Map<String, dynamic> json) {
     List<Order> orderList = [];
-    json['edges']?.forEach((e) => orderList.add(Order.fromJson(e ?? const {})));
+    json['edges']?.forEach((e) => orderList.add(Order.fromJson(e['node'] ?? const {})));
     return orderList;
   }
 }
@@ -74,49 +74,49 @@ class Order {
 
   static Order fromJson(Map<String, dynamic> json) {
     DateTime processedAt =
-        DateTime.parse((json['node'] ?? const {})['processedAt']);
-    DateTime canceledAt = (json['node'] ?? const {})['canceledAt'] != null
-        ? DateTime.parse((json['node'] ?? const {})['canceledAt'])
+        DateTime.parse((json ?? const {})['processedAt']);
+    DateTime canceledAt = (json ?? const {})['canceledAt'] != null
+        ? DateTime.parse((json ?? const {})['canceledAt'])
         : null;
     OrderFinancialStatus financialStatus = EnumToString.fromString(
         OrderFinancialStatus.values,
-        (json['node'] ?? const {})['financialStatus']);
+        (json ?? const {})['financialStatus']);
     OrderFulfillmentStatus fulfillmentStatus = EnumToString.fromString(
         OrderFulfillmentStatus.values,
-        (json['node'] ?? const {})['fulfillmentStatus']);
+        (json ?? const {})['fulfillmentStatus']);
     OrderCancelReason cancelReason = EnumToString.fromString(
-        OrderCancelReason.values, (json['node'] ?? const {})['cancelReason']);
+        OrderCancelReason.values, (json ?? const {})['cancelReason']);
 
     return Order(
-        id: (json['node'] ?? const {})['id'],
-        email: (json['node'] ?? const {})['email'],
-        currencyCode: (json['node'] ?? const {})['currencyCode'],
-        customerUrl: (json['node'] ?? const {})['customerUrl'],
+        id: (json ?? const {})['id'],
+        email: (json ?? const {})['email'],
+        currencyCode: (json ?? const {})['currencyCode'],
+        customerUrl: (json ?? const {})['customerUrl'],
         lineItems:
-            LineItemsOrder.fromJson((json['node'] ?? const {})['lineItems']),
-        name: (json['node'] ?? const {})['name'],
-        orderNumber: (json['node'] ?? const {})['orderNumber'],
-        phone: (json['node'] ?? const {})['phone'],
+            LineItemsOrder.fromJson((json ?? const {})['lineItems']),
+        name: (json ?? const {})['name'],
+        orderNumber: (json ?? const {})['orderNumber'],
+        phone: (json ?? const {})['phone'],
         processedAt: processedAt,
         canceledAt: canceledAt,
         cancelReason: cancelReason,
         financialStatus: financialStatus,
         fulfillmentStatus: fulfillmentStatus,
         shippingAddress: MailingAddress.fromJson(
-            (json['node'] ?? const {})['shippingAddress'] ?? const {}),
-        statusUrl: (json['node'] ?? const {})['statusUrl'],
+            (json ?? const {})['shippingAddress'] ?? const {}),
+        statusUrl: (json ?? const {})['statusUrl'],
         discountApplications: DiscountApplications.fromJson(
-          (json['node'] ?? const {})['discountApplications']),
+          (json ?? const {})['discountApplications']),
         subtotalPriceV2: PriceV2.fromJson(
-            (json['node'] ?? const {})['subtotalPriceV2'] ?? const {}),
+            (json ?? const {})['subtotalPriceV2'] ?? const {}),
         totalPriceV2: PriceV2.fromJson(
-            (json['node'] ?? const {})['totalPriceV2'] ?? const {}),
+            (json ?? const {})['totalPriceV2'] ?? const {}),
         totalRefundedV2: PriceV2.fromJson(
-            (json['node'] ?? const {})['totalRefundedV2'] ?? const {}),
+            (json ?? const {})['totalRefundedV2'] ?? const {}),
         totalShippingPriceV2: PriceV2.fromJson(
-            (json['node'] ?? const {})['totalShippingPriceV2'] ?? const {}),
+            (json ?? const {})['totalShippingPriceV2'] ?? const {}),
         totalTaxV2: PriceV2.fromJson(
-            (json['node'] ?? const {})['totalTaxV2'] ?? const {}),
+            (json ?? const {})['totalTaxV2'] ?? const {}),
         cursor: json['cursor']);
   }
 }
@@ -161,9 +161,9 @@ class LineItemOrder {
         currentQuantity: (json['node'] ?? const {})['currentQuantity'],
         discountAllocations: _getDiscountAllocationsList(json),
         discountedTotalPrice: PriceV2.fromJson(
-            (json['node'] ?? const {})['discountedTotalPrice']),
+            (json['node'] ?? const {})['discountedTotalPrice'] ?? const {}),
         originalTotalPrice:
-            PriceV2.fromJson((json['node'] ?? const {})['originalTotalPrice']),
+            PriceV2.fromJson((json['node'] ?? const {})['originalTotalPrice'] ?? const {}),
         quantity: (json['node'] ?? const {})['quantity'],
         title: (json['node'] ?? const {})['title'],
         variant: ProductVariantCheckout.fromJson(
@@ -173,7 +173,7 @@ class LineItemOrder {
   static _getDiscountAllocationsList(Map<String, dynamic> json) {
     List<DiscountAllocations> discountList = [];
     (json['node'] ?? const {})['discountAllocations']?.forEach(
-        (discount) => discountList.add(DiscountAllocations.fromJson(discount)));
+        (discount) => discountList.add(DiscountAllocations.fromJson(discount ?? const {})));
     return discountList;
   }
 }
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 9d3025a3..82fdcbd1 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -234,6 +234,13 @@ class ShopifyImage {
         transformedSrc: json['transformedSrc'],
         id: json['id']);
   }
+
+  Map toJson() => {
+        'id': id,
+        'altText': altText,
+        'originalSource': originalSource,
+        'transformedSrc': transformedSrc,
+      };
 }
 
 class ProductVariant {
@@ -287,6 +294,7 @@ class ProductVariant {
   Map toJson() => {
         'id': id,
         'title': title,
+        'image': image.toJson()
         // 'weight': weight,
       };
 
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index 2e7b127b..30c32a1e 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -35,18 +35,20 @@ class ShopifyCheckout with ShopifyError {
   /// Returns the Checkout object of the checkout with the [checkoutId].
   Future<Checkout> getCheckoutInfoQuery(String checkoutId,
       {bool deleteThisPartOfCache = false}) async {
-    final WatchQueryOptions _optionsRequireShipping = WatchQueryOptions(
-        documentNode: gql(getCheckoutInfoAboutShipping),
-        variables: {
-          'id': checkoutId,
-        });
-    QueryResult result = await _graphQLClient.query(_optionsRequireShipping);
+    // final WatchQueryOptions _optionsRequireShipping = WatchQueryOptions(
+    //     documentNode: gql(getCheckoutInfoAboutShipping),
+    //     variables: {
+    //       'id': checkoutId,
+    //     });
+    // QueryResult result = await _graphQLClient.query(_optionsRequireShipping);
     // print((result?.data as LazyCacheMap)?.data);
-    final WatchQueryOptions _options = WatchQueryOptions(
-        documentNode: gql(_requiresShipping(result) == true
-            ? getCheckoutInfo
-            : getCheckoutInfoWithoutShipping),
-        variables: {
+    final WatchQueryOptions _options =
+        WatchQueryOptions(documentNode: gql(getCheckoutInfo),
+            // gql(_requiresShipping(result) == true
+            //     ? getCheckoutInfo
+            //     : getCheckoutInfoWithoutShipping
+            // ),
+            variables: {
           'id': checkoutId,
         });
     final QueryResult _queryResult = (await _graphQLClient.query(_options));
@@ -60,18 +62,22 @@ class ShopifyCheckout with ShopifyError {
   Future<Checkout> getCheckoutInfoWithAvailableShippingRatesQuery(
       String checkoutId,
       {bool deleteThisPartOfCache = false}) async {
-    final WatchQueryOptions _optionsRequireShipping = WatchQueryOptions(
-        documentNode: gql(getCheckoutInfoAboutShipping),
-        variables: {
-          'id': checkoutId,
-        });
-    QueryResult result = await _graphQLClient.query(_optionsRequireShipping);
+    // final WatchQueryOptions _optionsRequireShipping = WatchQueryOptions(
+    //     documentNode: gql(getCheckoutInfoAboutShipping),
+    //     variables: {
+    //       'id': checkoutId,
+    //     });
+    // QueryResult result = await _graphQLClient.query(_optionsRequireShipping);
     // print((result?.data as LazyCacheMap)?.data);
-    final WatchQueryOptions _options = WatchQueryOptions(
-        documentNode: gql(_requiresShipping(result) == true
-            ? getCheckoutInfoWithShippingRate
-            : getCheckoutInfoWithoutShipping),
-        variables: {
+    final WatchQueryOptions _options =
+        WatchQueryOptions(documentNode: gql(getCheckoutInfoWithShippingRate),
+
+            // gql(_requiresShipping(result) == true
+            //     ? getCheckoutInfoWithShippingRate
+            //     : getCheckoutInfoWithoutShipping
+
+            // ),
+            variables: {
           'id': checkoutId,
         });
     final QueryResult _queryResult = (await _graphQLClient.query(_options));
@@ -82,29 +88,32 @@ class ShopifyCheckout with ShopifyError {
     return Checkout.fromJson(_queryResult?.data['node']);
   }
 
-  bool _requiresShipping(QueryResult result) {
-    return ((result?.data ?? const {})['node'] ?? const {})['requiresShipping'];
-  }
+  // bool _requiresShipping(QueryResult result) {
+  //   return ((result?.data ?? const {})['node'] ?? const {})['requiresShipping'];
+  // }
 
   /// Returns all [Order] in a List of Orders.
   ///
   /// Returns a List of Orders from the Customer with the [customerAccessToken].
   Future<List<Order>> getAllOrders(String customerAccessToken,
-      { SortKeyOrder sortKey = SortKeyOrder.PROCESSED_AT, bool reverse = true, bool deleteThisPartOfCache = false}) async {
-      final QueryOptions _options = WatchQueryOptions(
-          documentNode: gql(getAllOrdersQuery),
-          variables: {
-            'accessToken': customerAccessToken,
-            'sortKey': sortKey.parseToString(),
-            'reverse': reverse
-          }
-      );
-      final QueryResult result = await ShopifyConfig.graphQLClient.query(_options);
-      checkForError(result);
-      Orders orders = Orders.fromJson(((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ?? const {}));
-      if(deleteThisPartOfCache) {
-        _graphQLClient.cache.write(_options.toKey(), null);
-      }
+      {SortKeyOrder sortKey = SortKeyOrder.PROCESSED_AT,
+      bool reverse = true,
+      bool deleteThisPartOfCache = false}) async {
+    final QueryOptions _options =
+        WatchQueryOptions(documentNode: gql(getAllOrdersQuery), variables: {
+      'accessToken': customerAccessToken,
+      'sortKey': sortKey.parseToString(),
+      'reverse': reverse
+    });
+    final QueryResult result =
+        await ShopifyConfig.graphQLClient.query(_options);
+    checkForError(result);
+    Orders orders = Orders.fromJson(
+        ((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ??
+            const {}));
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.write(_options.toKey(), null);
+    }
     return orders.orderList;
   }
 
@@ -114,14 +123,15 @@ class ShopifyCheckout with ShopifyError {
       bool reverse = true,
       bool deleteThisPartOfCache = false}) async {
     String cursor = startCursor;
-    final QueryOptions _options =
-        WatchQueryOptions(documentNode: gql(getXOrdersAfterCursorQuery), variables: {
-      'accessToken': customerAccessToken,
-      'sortKey': sortKey.parseToString(),
-      'reverse': reverse,
-      'cursor': cursor,
-      'x': limit
-    });
+    final QueryOptions _options = WatchQueryOptions(
+        documentNode: gql(getXOrdersAfterCursorQuery),
+        variables: {
+          'accessToken': customerAccessToken,
+          'sortKey': sortKey.parseToString(),
+          'reverse': reverse,
+          'cursor': cursor,
+          'x': limit
+        });
     final QueryResult result =
         await ShopifyConfig.graphQLClient.query(_options);
     checkForError(result);
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index 7d4635ac..c410a98f 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -4,11 +4,14 @@ import 'package:flutter_simple_shopify/graphql_operations/queries/get_all_collec
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_all_products_from_collection_by_id.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_all_products_on_query.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_collection_by_handle.dart';
+import 'package:flutter_simple_shopify/graphql_operations/queries/get_collection_by_handle_with_products.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_collections_by_ids.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_product_by_handle.dart';
+import 'package:flutter_simple_shopify/graphql_operations/queries/get_product_by_handle_minimum_data.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_product_recommendations.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_products_by_ids.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_metafileds_from_product.dart';
+import 'package:flutter_simple_shopify/graphql_operations/queries/get_products_by_ids_minimum_data.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_shop.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_x_collections_and_n_products_sorted.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_x_products_after_cursor.dart';
@@ -65,10 +68,12 @@ class ShopifyStore with ShopifyError {
   }
 
   Future<Product> getProductByHandle(String handle,
-      {bool deleteThisPartOfCache = false}) async {
+      {bool deleteThisPartOfCache = false, minimumData = true}) async {
     try {
       final WatchQueryOptions _options = WatchQueryOptions(
-          documentNode: gql(getProductByHandleQuery),
+          documentNode: minimumData
+              ? gql(getProductByHandleMinimumDataQuery)
+              : gql(getProductByHandleQuery),
           variables: {'handle': handle});
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
@@ -114,10 +119,13 @@ class ShopifyStore with ShopifyError {
   ///
   /// Returns the Products associated to the given id's in [idList]
   Future<List<Product>> getProductsByIds(List<String> idList,
-      {bool deleteThisPartOfCache = false}) async {
+      {bool deleteThisPartOfCache = false, minimumData = true}) async {
     List<Product> productList = [];
     final QueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getProductsByIdsQuery), variables: {'ids': idList});
+        documentNode: minimumData
+            ? gql(getProductsByIdsMinimumDataQuery)
+            : gql(getProductsByIdsQuery),
+        variables: {'ids': idList});
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
     var response = result?.data;
@@ -235,10 +243,13 @@ class ShopifyStore with ShopifyError {
 
   /// Returns a collection by handle.
   Future<Collection> getCollectionByHandle(String handle,
-      {bool deleteThisPartOfCache = false}) async {
+      {bool deleteThisPartOfCache = false, productsCount}) async {
     try {
+      final a = getCollectionByHandleWithProductsQuery(productsCount);
       final WatchQueryOptions _options = WatchQueryOptions(
-          documentNode: gql(getCollectionByHandleQuery),
+          documentNode: productsCount != null
+              ? gql(getCollectionByHandleWithProductsQuery(productsCount))
+              : gql(getCollectionByHandleQuery),
           variables: {'handle': handle});
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
@@ -257,7 +268,8 @@ class ShopifyStore with ShopifyError {
       String handle, int limit, String startCursor,
       {bool deleteThisPartOfCache = false,
       bool reverse = false,
-      SortKeyProductCollection sortKeyProductCollection = SortKeyProductCollection.RELEVANCE}) async {
+      SortKeyProductCollection sortKeyProductCollection =
+          SortKeyProductCollection.RELEVANCE}) async {
     String cursor = startCursor;
     try {
       final WatchQueryOptions _options = WatchQueryOptions(

From a18ad80d8e0d19a654ad993277d9cc95b17826ba Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Fri, 12 Feb 2021 19:41:10 +0530
Subject: [PATCH 40/80] query optimized

---
 .../checkout_discount_code_apply.dart         | 109 +++++++-
 .../checkout_shipping_address_update.dart     | 148 +++++++++-
 .../checkout_shipping_line_update.dart        | 120 +++++++-
 lib/shopify/src/shopify_checkout.dart         | 264 ++++++++----------
 4 files changed, 492 insertions(+), 149 deletions(-)

diff --git a/lib/graphql_operations/mutations/checkout_discount_code_apply.dart b/lib/graphql_operations/mutations/checkout_discount_code_apply.dart
index ef3001b1..f903063f 100644
--- a/lib/graphql_operations/mutations/checkout_discount_code_apply.dart
+++ b/lib/graphql_operations/mutations/checkout_discount_code_apply.dart
@@ -1,6 +1,110 @@
 const String checkoutDiscountCodeApplyMutation = r'''
-mutation checkoutDiscountCodeApply($checkoutId : ID!, $discountCode : String!) {
-  checkoutDiscountCodeApplyV2(checkoutId: $checkoutId, discountCode: $discountCode) {
+mutation checkoutDiscountCodeApplyV2($checkoutId: ID!, $discountCode: String!) {
+  checkoutDiscountCodeApplyV2(
+    checkoutId: $checkoutId
+    discountCode: $discountCode
+  ) {
+    checkout {
+      id
+      email
+      requiresShipping
+      currencyCode
+      webUrl
+      orderStatusUrl
+      shippingLine {
+        handle
+        title
+        priceV2 {
+          amount
+          currencyCode
+        }
+      }
+      shippingAddress {
+        address1
+        address2
+        city
+        company
+        country
+        countryCodeV2
+        firstName
+        formattedArea
+        id
+        lastName
+        latitude
+        longitude
+        name
+        phone
+        province
+        provinceCode
+        zip
+      }
+      lineItems(first: 10) {
+        edges {
+          node {
+            id
+            quantity
+            title
+            variant {
+              id
+              priceV2 {
+                amount
+                currencyCode
+              }
+              title
+              image {
+                altText
+                originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
+                id
+              }
+              compareAtPriceV2 {
+                amount
+                currencyCode
+              }
+              weight
+              weightUnit
+              availableForSale
+              sku
+              requiresShipping
+            }
+          }
+        }
+      }
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
+      lineItemsSubtotalPrice {
+        amount
+        currencyCode
+      }
+      totalTaxV2 {
+        amount
+        currencyCode
+      }
+      totalPriceV2 {
+        amount
+        currencyCode
+      }
+      subtotalPriceV2 {
+        amount
+        currencyCode
+      }
+    }
     checkoutUserErrors {
       message
       field
@@ -8,4 +112,5 @@ mutation checkoutDiscountCodeApply($checkoutId : ID!, $discountCode : String!) {
     }
   }
 }
+
 ''';
\ No newline at end of file
diff --git a/lib/graphql_operations/mutations/checkout_shipping_address_update.dart b/lib/graphql_operations/mutations/checkout_shipping_address_update.dart
index 3b391bd9..c89b4c0a 100644
--- a/lib/graphql_operations/mutations/checkout_shipping_address_update.dart
+++ b/lib/graphql_operations/mutations/checkout_shipping_address_update.dart
@@ -1,11 +1,151 @@
 const String checkoutShippingAddressUpdateMutation = r'''
-mutation checkoutShippingAddressUpdate($checkoutId : ID!, $address1 : String, $address2 : String, $company : String, $city : String, $country : String, $firstName: String, $lastName : String, $phone : String, $province : String, $zip : String) {
-  checkoutShippingAddressUpdateV2(checkoutId: $checkoutId, shippingAddress: {address1: $address1, address2: $address2, company: $company, city: $city, country: $country, firstName: $firstName, lastName: $lastName, phone: $phone, province: $province, zip: $zip}) {
-     checkoutUserErrors {
+mutation checkoutShippingAddressUpdateV2(
+  $checkoutId: ID!
+  $address1: String
+  $address2: String
+  $company: String
+  $city: String
+  $country: String
+  $firstName: String
+  $lastName: String
+  $phone: String
+  $province: String
+  $zip: String
+) {
+  checkoutShippingAddressUpdateV2(
+    checkoutId: $checkoutId
+    shippingAddress: {
+      address1: $address1
+      address2: $address2
+      company: $company
+      city: $city
+      country: $country
+      firstName: $firstName
+      lastName: $lastName
+      phone: $phone
+      province: $province
+      zip: $zip
+    }
+  ) {
+    checkout {
+      id
+      email
+      requiresShipping
+      currencyCode
+      webUrl
+      orderStatusUrl
+      shippingLine {
+        handle
+        title
+        priceV2 {
+          amount
+          currencyCode
+        }
+      }
+      availableShippingRates {
+        ready
+        shippingRates {
+          handle
+          title
+          priceV2 {
+            amount
+            currencyCode
+          }
+        }
+      }
+      shippingAddress {
+        address1
+        address2
+        city
+        company
+        country
+        countryCodeV2
+        firstName
+        formattedArea
+        id
+        lastName
+        latitude
+        longitude
+        name
+        phone
+        province
+        provinceCode
+        zip
+      }
+      lineItems(first: 10) {
+        edges {
+          node {
+            id
+            quantity
+            title
+            variant {
+              id
+              priceV2 {
+                amount
+                currencyCode
+              }
+              title
+              image {
+                altText
+                originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
+                id
+              }
+              compareAtPriceV2 {
+                amount
+                currencyCode
+              }
+              weight
+              weightUnit
+              availableForSale
+              sku
+              requiresShipping
+            }
+          }
+        }
+      }
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
+      lineItemsSubtotalPrice {
+        amount
+        currencyCode
+      }
+      totalTaxV2 {
+        amount
+        currencyCode
+      }
+      totalPriceV2 {
+        amount
+        currencyCode
+      }
+      subtotalPriceV2 {
+        amount
+        currencyCode
+      }
+    }
+    checkoutUserErrors {
       code
       field
       message
     }
   }
-}''';
+}
+
+''';
 
diff --git a/lib/graphql_operations/mutations/checkout_shipping_line_update.dart b/lib/graphql_operations/mutations/checkout_shipping_line_update.dart
index 2366b302..16c98be4 100644
--- a/lib/graphql_operations/mutations/checkout_shipping_line_update.dart
+++ b/lib/graphql_operations/mutations/checkout_shipping_line_update.dart
@@ -1,8 +1,123 @@
 const String checkoutShippingLineUpdateMutation = r'''
-mutation checkoutShippingLineUpdate($checkoutId: ID!, $shippingRateHandle: String!) {
-  checkoutShippingLineUpdate(checkoutId: $checkoutId, shippingRateHandle: $shippingRateHandle) {
+mutation checkoutShippingLineUpdate(
+  $checkoutId: ID!
+  $shippingRateHandle: String!
+) {
+  checkoutShippingLineUpdate(
+    checkoutId: $checkoutId
+    shippingRateHandle: $shippingRateHandle
+  ) {
     checkout {
       id
+      email
+      requiresShipping
+      currencyCode
+      webUrl
+      orderStatusUrl
+      shippingLine {
+        handle
+        title
+        priceV2 {
+          amount
+          currencyCode
+        }
+      }
+      availableShippingRates {
+        ready
+        shippingRates {
+          handle
+          title
+          priceV2 {
+            amount
+            currencyCode
+          }
+        }
+      }
+      shippingAddress {
+        address1
+        address2
+        city
+        company
+        country
+        countryCodeV2
+        firstName
+        formattedArea
+        id
+        lastName
+        latitude
+        longitude
+        name
+        phone
+        province
+        provinceCode
+        zip
+      }
+      lineItems(first: 10) {
+        edges {
+          node {
+            id
+            quantity
+            title
+            variant {
+              id
+              priceV2 {
+                amount
+                currencyCode
+              }
+              title
+              image {
+                altText
+                originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
+                id
+              }
+              compareAtPriceV2 {
+                amount
+                currencyCode
+              }
+              weight
+              weightUnit
+              availableForSale
+              sku
+              requiresShipping
+            }
+          }
+        }
+      }
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
+      lineItemsSubtotalPrice {
+        amount
+        currencyCode
+      }
+      totalTaxV2 {
+        amount
+        currencyCode
+      }
+      totalPriceV2 {
+        amount
+        currencyCode
+      }
+      subtotalPriceV2 {
+        amount
+        currencyCode
+      }
     }
     checkoutUserErrors {
       code
@@ -11,4 +126,5 @@ mutation checkoutShippingLineUpdate($checkoutId: ID!, $shippingRateHandle: Strin
     }
   }
 }
+
 ''';
\ No newline at end of file
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index 30c32a1e..21c6c51a 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -30,118 +30,20 @@ class ShopifyCheckout with ShopifyError {
 
   GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient;
 
-  /// Returns a [Checkout] object.
-  ///
-  /// Returns the Checkout object of the checkout with the [checkoutId].
-  Future<Checkout> getCheckoutInfoQuery(String checkoutId,
-      {bool deleteThisPartOfCache = false}) async {
-    // final WatchQueryOptions _optionsRequireShipping = WatchQueryOptions(
-    //     documentNode: gql(getCheckoutInfoAboutShipping),
-    //     variables: {
-    //       'id': checkoutId,
-    //     });
-    // QueryResult result = await _graphQLClient.query(_optionsRequireShipping);
-    // print((result?.data as LazyCacheMap)?.data);
-    final WatchQueryOptions _options =
-        WatchQueryOptions(documentNode: gql(getCheckoutInfo),
-            // gql(_requiresShipping(result) == true
-            //     ? getCheckoutInfo
-            //     : getCheckoutInfoWithoutShipping
-            // ),
-            variables: {
-          'id': checkoutId,
-        });
-    final QueryResult _queryResult = (await _graphQLClient.query(_options));
-    checkForError(_queryResult);
-    if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
-    }
-    return Checkout.fromJson(_queryResult?.data['node']);
-  }
-
-  Future<Checkout> getCheckoutInfoWithAvailableShippingRatesQuery(
-      String checkoutId,
-      {bool deleteThisPartOfCache = false}) async {
-    // final WatchQueryOptions _optionsRequireShipping = WatchQueryOptions(
-    //     documentNode: gql(getCheckoutInfoAboutShipping),
-    //     variables: {
-    //       'id': checkoutId,
-    //     });
-    // QueryResult result = await _graphQLClient.query(_optionsRequireShipping);
-    // print((result?.data as LazyCacheMap)?.data);
-    final WatchQueryOptions _options =
-        WatchQueryOptions(documentNode: gql(getCheckoutInfoWithShippingRate),
-
-            // gql(_requiresShipping(result) == true
-            //     ? getCheckoutInfoWithShippingRate
-            //     : getCheckoutInfoWithoutShipping
-
-            // ),
-            variables: {
-          'id': checkoutId,
-        });
-    final QueryResult _queryResult = (await _graphQLClient.query(_options));
-    checkForError(_queryResult);
-    if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
-    }
-    return Checkout.fromJson(_queryResult?.data['node']);
-  }
-
-  // bool _requiresShipping(QueryResult result) {
-  //   return ((result?.data ?? const {})['node'] ?? const {})['requiresShipping'];
-  // }
-
-  /// Returns all [Order] in a List of Orders.
+  /// Returns the Checkout Id.
   ///
-  /// Returns a List of Orders from the Customer with the [customerAccessToken].
-  Future<List<Order>> getAllOrders(String customerAccessToken,
-      {SortKeyOrder sortKey = SortKeyOrder.PROCESSED_AT,
-      bool reverse = true,
-      bool deleteThisPartOfCache = false}) async {
-    final QueryOptions _options =
-        WatchQueryOptions(documentNode: gql(getAllOrdersQuery), variables: {
-      'accessToken': customerAccessToken,
-      'sortKey': sortKey.parseToString(),
-      'reverse': reverse
-    });
-    final QueryResult result =
-        await ShopifyConfig.graphQLClient.query(_options);
-    checkForError(result);
-    Orders orders = Orders.fromJson(
-        ((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ??
-            const {}));
-    if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
-    }
-    return orders.orderList;
-  }
-
-  Future<Orders> getXOrdersAfterCursor(
-      String customerAccessToken, int limit, String startCursor,
-      {SortKeyOrder sortKey = SortKeyOrder.ID,
-      bool reverse = true,
-      bool deleteThisPartOfCache = false}) async {
-    String cursor = startCursor;
-    final QueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getXOrdersAfterCursorQuery),
-        variables: {
-          'accessToken': customerAccessToken,
-          'sortKey': sortKey.parseToString(),
-          'reverse': reverse,
-          'cursor': cursor,
-          'x': limit
-        });
-    final QueryResult result =
-        await ShopifyConfig.graphQLClient.query(_options);
+  /// Creates a new [Checkout].
+  Future<String> createCheckout({bool deleteThisPartOfCache = false}) async {
+    final MutationOptions _options = MutationOptions(
+      documentNode: gql(createCheckoutMutation),
+    );
+    final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
-    Orders orders = Orders.fromJson(
-        ((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ??
-            const {}));
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
-    return orders;
+    return ((result?.data['checkoutCreate'] ?? const {})['checkout'] ??
+        const {})['id'];
   }
 
   /// Replaces the [LineItems] in the [Checkout] associated to the [checkoutId].
@@ -163,8 +65,25 @@ class ShopifyCheckout with ShopifyError {
     }
   }
 
+  /// Returns a [Checkout] object.
+  ///
+  /// Returns the Checkout object of the checkout with the [checkoutId].
+  Future<Checkout> getCheckoutInfoQuery(String checkoutId,
+      {bool deleteThisPartOfCache = false}) async {
+    final WatchQueryOptions _options =
+        WatchQueryOptions(documentNode: gql(getCheckoutInfo), variables: {
+      'id': checkoutId,
+    });
+    final QueryResult _queryResult = (await _graphQLClient.query(_options));
+    checkForError(_queryResult);
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.write(_options.toKey(), null);
+    }
+    return Checkout.fromJson(_queryResult?.data['node']);
+  }
+
   /// Updates the shipping address on given [checkoutId]
-  Future<void> shippingAddressUpdate(
+  Future<Checkout> shippingAddressUpdate(
       String checkoutId,
       String address1,
       String address2,
@@ -198,22 +117,24 @@ class ShopifyCheckout with ShopifyError {
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
+    return Checkout.fromJson(
+        result?.data['checkoutShippingAddressUpdateV2']?.data['checkout']);
   }
 
-  /// Helper method for transforming a list of variant ids into a List Of Map<String, dynamic> which looks like this:
-  ///
-  /// [{"quantity":AMOUNT,"variantId":"YOUR_VARIANT_ID"}]
-  List<Map<String, dynamic>> transformVariantIdListIntoListOfMaps(
-      List<String> variantIdList) {
-    List<Map<String, dynamic>> lineItemList = [];
-    variantIdList.forEach((e) {
-      if (lineItemList.indexWhere((test) => e == test['variantId']) == -1)
-        lineItemList.add({
-          "quantity": variantIdList.where((id) => e == id).toList().length,
-          "variantId": e
+  Future<Checkout> getCheckoutInfoWithAvailableShippingRatesQuery(
+      String checkoutId,
+      {bool deleteThisPartOfCache = false}) async {
+    final WatchQueryOptions _options = WatchQueryOptions(
+        documentNode: gql(getCheckoutInfoWithShippingRate),
+        variables: {
+          'id': checkoutId,
         });
-    });
-    return lineItemList;
+    final QueryResult _queryResult = (await _graphQLClient.query(_options));
+    checkForError(_queryResult);
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.write(_options.toKey(), null);
+    }
+    return Checkout.fromJson(_queryResult?.data['node']);
   }
 
   /// Associates the [Customer] that [customerAccessToken] belongs to, to the [Checkout] that [checkoutId] belongs to.
@@ -247,16 +168,21 @@ class ShopifyCheckout with ShopifyError {
   }
 
   /// Applies [discountCode] to the [Checkout] that [checkoutId] belongs to.
-  Future<void> checkoutDiscountCodeApply(String checkoutId, String discountCode,
+  Future<Checkout> checkoutDiscountCodeApply(
+      String checkoutId, String discountCode,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(checkoutDiscountCodeApplyMutation),
         variables: {'checkoutId': checkoutId, 'discountCode': discountCode});
     final QueryResult result = await _graphQLClient.mutate(_options);
+
     checkForError(result);
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
+
+    return Checkout.fromJson(
+        result?.data['checkoutDiscountCodeApplyV2']?.data['checkout']);
   }
 
   /// Removes the applied discount from the [Checkout] that [checkoutId] belongs to.
@@ -286,22 +212,6 @@ class ShopifyCheckout with ShopifyError {
     }
   }
 
-  /// Returns the Checkout Id.
-  ///
-  /// Creates a new [Checkout].
-  Future<String> createCheckout({bool deleteThisPartOfCache = false}) async {
-    final MutationOptions _options = MutationOptions(
-      documentNode: gql(createCheckoutMutation),
-    );
-    final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
-    if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
-    }
-    return ((result?.data['checkoutCreate'] ?? const {})['checkout'] ??
-        const {})['id'];
-  }
-
   /// Removes the Gift card that [appliedGiftCardId] belongs to, from the [Checkout] that [checkoutId] belongs to.
   Future<void> checkoutGiftCardRemove(
       String appliedGiftCardId, String checkoutId,
@@ -334,7 +244,7 @@ class ShopifyCheckout with ShopifyError {
     }
   }
 
-  Future<void> shippingLineUpdate(String checkoutId, String shippingRateHandle,
+  Future<Checkout> shippingLineUpdate(String checkoutId, String shippingRateHandle,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(checkoutShippingLineUpdateMutation),
@@ -344,10 +254,11 @@ class ShopifyCheckout with ShopifyError {
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
-    // print((result?.data as LazyCacheMap)?.data);
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
+    return Checkout.fromJson(
+        result?.data['checkoutShippingLineUpdate']?.data['checkout']);
   }
 
   Future<void> emailUpdate(String checkoutId, String email,
@@ -358,9 +269,80 @@ class ShopifyCheckout with ShopifyError {
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result,
         key: 'checkoutEmailUpdateV2', errorKey: 'checkoutUserErrors');
-    // print((result?.data as LazyCacheMap)?.data);
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
   }
+
+  // bool _requiresShipping(QueryResult result) {
+  //   return ((result?.data ?? const {})['node'] ?? const {})['requiresShipping'];
+  // }
+
+  /// Returns all [Order] in a List of Orders.
+  ///
+  /// Returns a List of Orders from the Customer with the [customerAccessToken].
+  Future<List<Order>> getAllOrders(String customerAccessToken,
+      {SortKeyOrder sortKey = SortKeyOrder.PROCESSED_AT,
+      bool reverse = true,
+      bool deleteThisPartOfCache = false}) async {
+    final QueryOptions _options =
+        WatchQueryOptions(documentNode: gql(getAllOrdersQuery), variables: {
+      'accessToken': customerAccessToken,
+      'sortKey': sortKey.parseToString(),
+      'reverse': reverse
+    });
+    final QueryResult result =
+        await ShopifyConfig.graphQLClient.query(_options);
+    checkForError(result);
+    Orders orders = Orders.fromJson(
+        ((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ??
+            const {}));
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.write(_options.toKey(), null);
+    }
+    return orders.orderList;
+  }
+
+  Future<Orders> getXOrdersAfterCursor(
+      String customerAccessToken, int limit, String startCursor,
+      {SortKeyOrder sortKey = SortKeyOrder.ID,
+      bool reverse = true,
+      bool deleteThisPartOfCache = false}) async {
+    String cursor = startCursor;
+    final QueryOptions _options = WatchQueryOptions(
+        documentNode: gql(getXOrdersAfterCursorQuery),
+        variables: {
+          'accessToken': customerAccessToken,
+          'sortKey': sortKey.parseToString(),
+          'reverse': reverse,
+          'cursor': cursor,
+          'x': limit
+        });
+    final QueryResult result =
+        await ShopifyConfig.graphQLClient.query(_options);
+    checkForError(result);
+    Orders orders = Orders.fromJson(
+        ((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ??
+            const {}));
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.write(_options.toKey(), null);
+    }
+    return orders;
+  }
+
+  /// Helper method for transforming a list of variant ids into a List Of Map<String, dynamic> which looks like this:
+  ///
+  /// [{"quantity":AMOUNT,"variantId":"YOUR_VARIANT_ID"}]
+  List<Map<String, dynamic>> transformVariantIdListIntoListOfMaps(
+      List<String> variantIdList) {
+    List<Map<String, dynamic>> lineItemList = [];
+    variantIdList.forEach((e) {
+      if (lineItemList.indexWhere((test) => e == test['variantId']) == -1)
+        lineItemList.add({
+          "quantity": variantIdList.where((id) => e == id).toList().length,
+          "variantId": e
+        });
+    });
+    return lineItemList;
+  }
 }

From 195743ce022d9bdb34d647cf8533d13f9a870d47 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Mon, 15 Feb 2021 14:28:51 +0530
Subject: [PATCH 41/80] error

---
 lib/mixins/src/shopfiy_error.dart | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/mixins/src/shopfiy_error.dart b/lib/mixins/src/shopfiy_error.dart
index ee925588..84b7a4c9 100644
--- a/lib/mixins/src/shopfiy_error.dart
+++ b/lib/mixins/src/shopfiy_error.dart
@@ -2,8 +2,7 @@ import 'package:graphql/client.dart';
 
 mixin ShopifyError {
   void checkForError(QueryResult queryResult, {String key, String errorKey}) {
-    if (queryResult.hasException)
-      throw Exception(queryResult.exception.toString());
+    
     if (key != null && errorKey != null) {
       Map<String, Object> data = (queryResult?.data as LazyCacheMap)?.data;
       Map<String, Object> content = data[key];
@@ -12,6 +11,8 @@ mixin ShopifyError {
         throw Exception(errors);
       }
     }
+    if (queryResult.hasException)
+      throw Exception(queryResult.exception.toString());
   }
 
   /// Checks and throws an [CheckoutCompleteException] when

From 55b1e621b5a906604781d7460a732c30b7e999e3 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Sat, 20 Feb 2021 14:00:36 +0530
Subject: [PATCH 42/80] collection descriptionHtml

---
 .../get_x_products_after_cursor_by_collection_handle.dart        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
index 06bf5d5f..01a24c00 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
@@ -10,6 +10,7 @@ query(
     id
     handle
     title
+    descriptionHtml
     image {
       altText
       id

From d509b7d066237f2ce03934a648104b3048c62ba7 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Mon, 22 Feb 2021 11:21:33 +0530
Subject: [PATCH 43/80] product details with tags

---
 lib/graphql_operations/queries/get_product_by_handle.dart | 1 +
 lib/graphql_operations/queries/get_products_by_ids.dart   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/graphql_operations/queries/get_product_by_handle.dart b/lib/graphql_operations/queries/get_product_by_handle.dart
index 7196cf30..63b32612 100644
--- a/lib/graphql_operations/queries/get_product_by_handle.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle.dart
@@ -5,6 +5,7 @@ query($handle: String!) {
     handle
     title
     availableForSale
+    tags
     options(first: 50) {
       id
       name
diff --git a/lib/graphql_operations/queries/get_products_by_ids.dart b/lib/graphql_operations/queries/get_products_by_ids.dart
index fef64b5f..12c6c7f6 100644
--- a/lib/graphql_operations/queries/get_products_by_ids.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids.dart
@@ -8,6 +8,7 @@ query($ids: [ID!]!) {
       availableForSale
       descriptionHtml
       productType
+      tags
       options(first: 50) {
         id
         name

From 3bea2ed7ad8700daa2f47db3860944c1502340a3 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Wed, 24 Feb 2021 17:45:22 +0530
Subject: [PATCH 44/80] DiscountApplication bug fixed

---
 lib/models/src/checkout.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index ec0f0a85..f0982bd9 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -290,7 +290,7 @@ class DiscountApplication {
       targetType: (json['node'] ?? const {})['targetType'],
       percentage:
           (((json['node'] ?? const {})['value'] ?? const {})['percentage'] ??
-              const {}),
+              null),
       price:
           PriceV2.fromJson(((json['node'] ?? const {})['value'] ?? const {})),
     );

From 9f7cb9135535a5212d61a2e23857125b9849664a Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Fri, 26 Feb 2021 10:09:35 +0530
Subject: [PATCH 45/80] products query

---
 .../queries/get_products_by_handle.dart       | 45 +++++++++++++++++--
 .../queries/get_products_by_ids.dart          |  9 ++++
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/lib/graphql_operations/queries/get_products_by_handle.dart b/lib/graphql_operations/queries/get_products_by_handle.dart
index 7d158cc3..8152c000 100644
--- a/lib/graphql_operations/queries/get_products_by_handle.dart
+++ b/lib/graphql_operations/queries/get_products_by_handle.dart
@@ -1,9 +1,19 @@
 const String getProductByHandle = r'''
-query getProductByHandle($handle : String!){
+query getProductByHandle($handle: String!) {
   productByHandle(handle: $handle) {
     id
     handle
-    images(first: 250) {
+    title
+    availableForSale
+    descriptionHtml
+    productType
+    tags
+    options(first: 50) {
+      id
+      name
+      values
+    }
+    images(first: 20) {
       edges {
         node {
           altText
@@ -16,14 +26,43 @@ query getProductByHandle($handle : String!){
     variants(first: 250) {
       edges {
         node {
+          id
+          title
+          availableForSale
+          quantityAvailable
+          requiresShipping
+          sku
           priceV2 {
             amount
             currencyCode
           }
-          quantityAvailable
+          compareAtPriceV2 {
+            amount
+            currencyCode
+          }
+          selectedOptions {
+            name
+            value
+          }
+          image {
+            altText
+            id
+            originalSrc
+            transformedSrc(maxWidth: 200, crop: CENTER)
+          }
+        }
+      }
+    }
+    collections(first: 250) {
+      edges {
+        node {
+          id
+          handle
+          title
         }
       }
     }
   }
 }
+
 ''';
\ No newline at end of file
diff --git a/lib/graphql_operations/queries/get_products_by_ids.dart b/lib/graphql_operations/queries/get_products_by_ids.dart
index 12c6c7f6..3f89fd0b 100644
--- a/lib/graphql_operations/queries/get_products_by_ids.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids.dart
@@ -54,6 +54,15 @@ query($ids: [ID!]!) {
           }
         }
       }
+      collections(first: 250) {
+        edges {
+          node {
+            id
+            handle
+            title
+          }
+        }
+      }
     }
   }
 }

From 8cd5c1f96a079f84a5f2dad4bf8b916ea3c47c4e Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Fri, 5 Mar 2021 11:36:30 +0530
Subject: [PATCH 46/80] line items variant price

---
 lib/graphql_operations/queries/get_x_orders_after_cursor.dart | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
index 32d62df2..d01206b6 100644
--- a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
@@ -35,6 +35,10 @@ query getOrders(
                   id
                   title
                   availableForSale
+                  priceV2 {
+                    amount
+                    currencyCode
+                  }
                   image {
                     altText
                     id

From cc3536150d5d686cecae2211ed30dcf971730511 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Mon, 8 Mar 2021 15:14:03 +0530
Subject: [PATCH 47/80] fetch tags with products

---
 .../queries/get_collection_by_handle_with_products.dart          | 1 +
 .../queries/get_product_by_handle_minimum_data.dart              | 1 +
 lib/graphql_operations/queries/get_x_products_after_cursor.dart  | 1 +
 .../queries/get_x_products_on_query_after_cursor.dart            | 1 +
 4 files changed, 4 insertions(+)

diff --git a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
index 3cc4c48b..925747f4 100644
--- a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
+++ b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
@@ -18,6 +18,7 @@ query(\$handle: String!) {
           handle
           title
           availableForSale
+          tags
           variants(first: 1) {
             edges {
               node {
diff --git a/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart b/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
index 0884df64..3e75dc2a 100644
--- a/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
@@ -5,6 +5,7 @@ query($handle: String!) {
     handle
     title
     availableForSale
+    tags
     variants(first: 1) {
       edges {
         node {
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
index 9311d4ec..5c1d119f 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
@@ -11,6 +11,7 @@ query($cursor: String, $x: Int, $reverse: Boolean, $sortKey: ProductSortKeys) {
         handle
         title
         availableForSale
+        tags
         images(first: 1) {
           edges {
             node {
diff --git a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
index 1cd03cf9..a26ab540 100644
--- a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
@@ -9,6 +9,7 @@ query( $cursor: String, $limit : Int, $sortKey : ProductSortKeys, $query: String
         availableForSale
         onlineStoreUrl
         productType
+        tags
         images(first: 1) {
           edges {
             node {

From 47f6d8c5d525c0f4486ab89603530a48b18eb310 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Tue, 16 Mar 2021 18:29:43 +0530
Subject: [PATCH 48/80] aed currency & tag in product rec

---
 .../queries/get_product_recommendations.dart              | 1 +
 lib/models/src/product.dart                               | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/graphql_operations/queries/get_product_recommendations.dart b/lib/graphql_operations/queries/get_product_recommendations.dart
index e8ef2807..478b6f93 100644
--- a/lib/graphql_operations/queries/get_product_recommendations.dart
+++ b/lib/graphql_operations/queries/get_product_recommendations.dart
@@ -5,6 +5,7 @@ query getProductRecommentationsQuery($id: ID!){
     handle
     title
     availableForSale
+    tags
     images(first: 1) {
       edges {
         node {
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 82fdcbd1..28986d65 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -415,6 +415,12 @@ class PriceV2 {
               '${_simpleCurrencySymbols[json['currencyCode']]}$amount';
         }
         break;
+      case "AED":
+        {
+          currencyString =
+              '${_simpleCurrencySymbols[json['currencyCode']]}$amount';
+        }
+        break;
 
       default:
         {
@@ -448,7 +454,7 @@ class PriceV2 {
     'LYD': 'din',
     'RSD': 'din',
     'TND': 'din',
-    'AED': 'dh',
+    'AED': 'AED',
     'MAD': 'dh',
     'STD': 'Db',
     'BSD': r'$',

From 9bc3f9105a912cd6572a0c10989823ab07348b29 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Thu, 18 Mar 2021 18:53:06 +0530
Subject: [PATCH 49/80] added missing fields

---
 .../mutations/create_checkout.dart                |  9 +++++++--
 .../queries/get_checkout_information.dart         |  1 +
 .../queries/get_product_by_handle.dart            |  1 +
 .../queries/get_products_by_ids.dart              |  1 +
 lib/shopify/src/shopify_checkout.dart             | 15 ++++++++++-----
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/lib/graphql_operations/mutations/create_checkout.dart b/lib/graphql_operations/mutations/create_checkout.dart
index 8881de58..91a18609 100644
--- a/lib/graphql_operations/mutations/create_checkout.dart
+++ b/lib/graphql_operations/mutations/create_checkout.dart
@@ -1,9 +1,14 @@
 const String createCheckoutMutation = r'''
-mutation MyMutation {
-  checkoutCreate(input: {}) {
+mutation checkoutCreate($input: CheckoutCreateInput!) {
+  checkoutCreate(input: $input) {
     checkout {
       id
     }
+    checkoutUserErrors {
+      code
+      field
+      message
+    }
   }
 }
 ''';
\ No newline at end of file
diff --git a/lib/graphql_operations/queries/get_checkout_information.dart b/lib/graphql_operations/queries/get_checkout_information.dart
index 48e93d62..bcb6557e 100644
--- a/lib/graphql_operations/queries/get_checkout_information.dart
+++ b/lib/graphql_operations/queries/get_checkout_information.dart
@@ -9,6 +9,7 @@ query(\$id: ID!) {
       currencyCode
       webUrl
       orderStatusUrl
+      note
       order {
           id
           email
diff --git a/lib/graphql_operations/queries/get_product_by_handle.dart b/lib/graphql_operations/queries/get_product_by_handle.dart
index 63b32612..594b025f 100644
--- a/lib/graphql_operations/queries/get_product_by_handle.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle.dart
@@ -6,6 +6,7 @@ query($handle: String!) {
     title
     availableForSale
     tags
+    onlineStoreUrl
     options(first: 50) {
       id
       name
diff --git a/lib/graphql_operations/queries/get_products_by_ids.dart b/lib/graphql_operations/queries/get_products_by_ids.dart
index 3f89fd0b..a639f6bc 100644
--- a/lib/graphql_operations/queries/get_products_by_ids.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids.dart
@@ -9,6 +9,7 @@ query($ids: [ID!]!) {
       descriptionHtml
       productType
       tags
+      onlineStoreUrl
       options(first: 50) {
         id
         name
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index 21c6c51a..de1a88fa 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -33,10 +33,14 @@ class ShopifyCheckout with ShopifyError {
   /// Returns the Checkout Id.
   ///
   /// Creates a new [Checkout].
-  Future<String> createCheckout({bool deleteThisPartOfCache = false}) async {
-    final MutationOptions _options = MutationOptions(
-      documentNode: gql(createCheckoutMutation),
-    );
+  Future<String> createCheckout(
+      {String note, bool deleteThisPartOfCache = false}) async {
+    final MutationOptions _options =
+        MutationOptions(documentNode: gql(createCheckoutMutation), variables: {
+      "input": {
+        'note': note
+      }
+    });
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
@@ -244,7 +248,8 @@ class ShopifyCheckout with ShopifyError {
     }
   }
 
-  Future<Checkout> shippingLineUpdate(String checkoutId, String shippingRateHandle,
+  Future<Checkout> shippingLineUpdate(
+      String checkoutId, String shippingRateHandle,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(checkoutShippingLineUpdateMutation),

From 2abc84acb463d51b39554dcc747fbd9bedf29bf6 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Thu, 25 Mar 2021 18:09:27 +0530
Subject: [PATCH 50/80] customer tags

---
 lib/graphql_operations/queries/get_customer.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/graphql_operations/queries/get_customer.dart b/lib/graphql_operations/queries/get_customer.dart
index 0af16cff..7ee249a7 100644
--- a/lib/graphql_operations/queries/get_customer.dart
+++ b/lib/graphql_operations/queries/get_customer.dart
@@ -5,6 +5,7 @@ query($customerAccessToken: String!) {
     email
     firstName
     lastName
+    tags
     addresses(first: 10) {
       edges {
         node {

From 3c1c567ddbf00b0e4e9a3e966ad986f28fbb30b6 Mon Sep 17 00:00:00 2001
From: rupamjbordoloi <rupamjbordoloi@gmail.com>
Date: Mon, 5 Apr 2021 19:27:56 +0530
Subject: [PATCH 51/80] checkout info with shipping rates

---
 ...eckout_information_with_shipping_rate.dart | 73 ++++++++-----------
 1 file changed, 29 insertions(+), 44 deletions(-)

diff --git a/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart b/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
index 1baea2c8..de2b4a14 100644
--- a/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
+++ b/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
@@ -4,36 +4,18 @@ query($id: ID!){
     ... on Checkout {
       id
       email
-      discountApplications(first: 10) {
-        edges {
-          node {
-            allocationMethod
-            targetSelection
-            targetType
-            value {
-              ... on MoneyV2 {
-                amount
-                currencyCode
-              }
-              ... on PricingPercentageValue {
-                percentage
-              }
-            }
-          }
-        }
-      }
-      appliedGiftCards {
-        amountUsedV2 {
-          amount
-          currencyCode
-        }
-        balanceV2 {
+      requiresShipping
+      currencyCode
+      webUrl
+      orderStatusUrl
+      shippingLine {
+        handle
+        title
+        priceV2 {
           amount
           currencyCode
         }
-        id
       }
-      requiresShipping
       availableShippingRates {
         ready
         shippingRates {
@@ -42,7 +24,9 @@ query($id: ID!){
           priceV2 {
             amount
             currencyCode
-       }}}
+          }
+        }
+      }
       shippingAddress {
         address1
         address2
@@ -62,17 +46,6 @@ query($id: ID!){
         provinceCode
         zip
       }
-      shippingLine {
-        handle
-        priceV2 {
-          amount
-          currencyCode
-        }
-        title
-      }
-      completedAt
-      createdAt
-      currencyCode
       lineItems(first: 10) {
         edges {
           node {
@@ -105,9 +78,24 @@ query($id: ID!){
           }
         }
       }
-      note
-      webUrl
-      updatedAt
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
       lineItemsSubtotalPrice {
         amount
         currencyCode
@@ -120,13 +108,10 @@ query($id: ID!){
         amount
         currencyCode
       }
-      taxesIncluded
-      taxExempt
       subtotalPriceV2 {
         amount
         currencyCode
       }
-      orderStatusUrl
     }
   }
 }

From 2f5b8fe95c5639a1efda987fcaddd2295ccd1f12 Mon Sep 17 00:00:00 2001
From: rupam <rupam@claritytech.io>
Date: Fri, 14 May 2021 15:00:46 +0530
Subject: [PATCH 52/80] rating & review count metafields

---
 ...et_collection_by_handle_with_products.dart | 12 ++++++
 .../queries/get_product_by_handle.dart        | 12 ++++++
 .../get_product_by_handle_minimum_data.dart   | 12 ++++++
 .../queries/get_product_recommendations.dart  | 12 ++++++
 .../queries/get_products_by_handle.dart       | 12 ++++++
 .../queries/get_products_by_ids.dart          | 12 ++++++
 .../get_products_by_ids_minimum_data.dart     | 12 ++++++
 .../queries/get_x_products_after_cursor.dart  | 12 ++++++
 ...cts_after_cursor_by_collection_handle.dart | 12 ++++++
 .../get_x_products_on_query_after_cursor.dart | 12 ++++++
 lib/models/src/product.dart                   | 40 ++++++++++++++-----
 11 files changed, 150 insertions(+), 10 deletions(-)

diff --git a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
index 925747f4..55e308e8 100644
--- a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
+++ b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
@@ -19,6 +19,18 @@ query(\$handle: String!) {
           title
           availableForSale
           tags
+          rating: metafield(namespace: "rview", key: "rating") {
+            key 
+            namespace 
+            value 
+            valueType 
+          }
+          review_count: metafield(namespace: "rview", key: "review-count") {
+            key 
+            namespace 
+            value 
+            valueType 
+          }
           variants(first: 1) {
             edges {
               node {
diff --git a/lib/graphql_operations/queries/get_product_by_handle.dart b/lib/graphql_operations/queries/get_product_by_handle.dart
index 594b025f..4680bad7 100644
--- a/lib/graphql_operations/queries/get_product_by_handle.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle.dart
@@ -12,6 +12,18 @@ query($handle: String!) {
       name
       values
     }
+    rating: metafield(namespace: "rview", key: "rating") {
+      key 
+      namespace 
+      value 
+      valueType 
+    }
+    review_count: metafield(namespace: "rview", key: "review-count") {
+      key 
+      namespace 
+      value 
+      valueType 
+    }
     variants(first: 250) {
       edges {
         node {
diff --git a/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart b/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
index 3e75dc2a..14a5ad30 100644
--- a/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
@@ -6,6 +6,18 @@ query($handle: String!) {
     title
     availableForSale
     tags
+    rating: metafield(namespace: "rview", key: "rating") {
+      key 
+      namespace 
+      value 
+      valueType 
+    }
+    review_count: metafield(namespace: "rview", key: "review-count") {
+      key 
+      namespace 
+      value 
+      valueType 
+    }
     variants(first: 1) {
       edges {
         node {
diff --git a/lib/graphql_operations/queries/get_product_recommendations.dart b/lib/graphql_operations/queries/get_product_recommendations.dart
index 478b6f93..c3c70cc2 100644
--- a/lib/graphql_operations/queries/get_product_recommendations.dart
+++ b/lib/graphql_operations/queries/get_product_recommendations.dart
@@ -6,6 +6,18 @@ query getProductRecommentationsQuery($id: ID!){
     title
     availableForSale
     tags
+    rating: metafield(namespace: "rview", key: "rating") {
+      key 
+      namespace 
+      value 
+      valueType 
+    }
+    review_count: metafield(namespace: "rview", key: "review-count") {
+      key 
+      namespace 
+      value 
+      valueType 
+    }
     images(first: 1) {
       edges {
         node {
diff --git a/lib/graphql_operations/queries/get_products_by_handle.dart b/lib/graphql_operations/queries/get_products_by_handle.dart
index 8152c000..0935f221 100644
--- a/lib/graphql_operations/queries/get_products_by_handle.dart
+++ b/lib/graphql_operations/queries/get_products_by_handle.dart
@@ -8,6 +8,18 @@ query getProductByHandle($handle: String!) {
     descriptionHtml
     productType
     tags
+    rating: metafield(namespace: "rview", key: "rating") {
+      key 
+      namespace 
+      value 
+      valueType 
+    }
+    review_count: metafield(namespace: "rview", key: "review-count") {
+      key 
+      namespace 
+      value 
+      valueType 
+    }
     options(first: 50) {
       id
       name
diff --git a/lib/graphql_operations/queries/get_products_by_ids.dart b/lib/graphql_operations/queries/get_products_by_ids.dart
index a639f6bc..0fade5af 100644
--- a/lib/graphql_operations/queries/get_products_by_ids.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids.dart
@@ -10,6 +10,18 @@ query($ids: [ID!]!) {
       productType
       tags
       onlineStoreUrl
+      rating: metafield(namespace: "rview", key: "rating") {
+        key 
+        namespace 
+        value 
+        valueType 
+      }
+      review_count: metafield(namespace: "rview", key: "review-count") {
+        key 
+        namespace 
+        value 
+        valueType 
+      }
       options(first: 50) {
         id
         name
diff --git a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
index d957bfb4..2ac2c5fe 100644
--- a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
@@ -8,6 +8,18 @@ query($ids: [ID!]!) {
       availableForSale
       descriptionHtml
       productType
+      rating: metafield(namespace: "rview", key: "rating") {
+        key 
+        namespace 
+        value 
+        valueType 
+      }
+      review_count: metafield(namespace: "rview", key: "review-count") {
+        key 
+        namespace 
+        value 
+        valueType 
+      }
       images(first: 1) {
         edges {
           node {
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
index 5c1d119f..4af4c53e 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
@@ -12,6 +12,18 @@ query($cursor: String, $x: Int, $reverse: Boolean, $sortKey: ProductSortKeys) {
         title
         availableForSale
         tags
+        rating: metafield(namespace: "rview", key: "rating") {
+          key 
+          namespace 
+          value 
+          valueType 
+        }
+        review_count: metafield(namespace: "rview", key: "review-count") {
+          key 
+          namespace 
+          value 
+          valueType 
+        }
         images(first: 1) {
           edges {
             node {
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
index 01a24c00..701d84ec 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
@@ -29,6 +29,18 @@ query(
           availableForSale
           title
           tags
+          rating: metafield(namespace: "rview", key: "rating") {
+            key 
+            namespace 
+            value 
+            valueType 
+          }
+          review_count: metafield(namespace: "rview", key: "review-count") {
+            key 
+            namespace 
+            value 
+            valueType 
+          }
           images(first: 1) {
             edges {
               node {
diff --git a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
index a26ab540..6122b01e 100644
--- a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
@@ -10,6 +10,18 @@ query( $cursor: String, $limit : Int, $sortKey : ProductSortKeys, $query: String
         onlineStoreUrl
         productType
         tags
+        rating: metafield(namespace: "rview", key: "rating") {
+          key 
+          namespace 
+          value 
+          valueType 
+        }
+        review_count: metafield(namespace: "rview", key: "review-count") {
+          key 
+          namespace 
+          value 
+          valueType 
+        }
         images(first: 1) {
           edges {
             node {
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 28986d65..2deb1d73 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -40,6 +40,8 @@ class Product {
   final List<Option> options;
   final String vendor;
   final List<Metafield> metafields;
+  final double rating;
+  final int reviewCount;
 
   const Product(
       {this.collectionList,
@@ -60,11 +62,14 @@ class Product {
       this.images,
       this.options,
       this.vendor,
-      this.metafields});
+      this.metafields,
+      this.rating,
+      this.reviewCount});
 
   static Product fromJson(Map<String, dynamic> json) {
     return Product(
-        collectionList: _getCollectionList(json['node'] ?? const {} ?? const {}),
+        collectionList:
+            _getCollectionList(json['node'] ?? const {} ?? const {}),
         id: (json['node'] ?? const {})['id'],
         title: (json['node'] ?? const {})['title'],
         availableForSale: (json['node'] ?? const {})['availableForSale'],
@@ -83,7 +88,10 @@ class Product {
         options: _getOptionList((json['node'] ?? const {})),
         vendor: (json['node'] ?? const {})['vendor'],
         metafields: _getMetafieldList(
-            (json['node'] ?? const {})['metafields'] ?? const {}));
+            (json['node'] ?? const {})['metafields'] ?? const {}),
+        rating: _getRating((json['node'] ?? const {})['rating'] ?? const {}),
+        reviewCount: _getReviewCount(
+            (json['node'] ?? const {})['review_count'] ?? const {}));
   }
 
   static Product fromProductHandleJson(Map<String, dynamic> json) {
@@ -106,7 +114,9 @@ class Product {
         cursor: json['cursor'],
         options: _getOptionList(json),
         vendor: json['vendor'],
-        metafields: _getMetafieldList(json['metafields'] ?? const {}));
+        metafields: _getMetafieldList(json['metafields'] ?? const {}),
+        rating: _getRating(json['rating'] ?? const {}),
+        reviewCount: _getReviewCount(json['review_count'] ?? const {}));
   }
 
   Map toJson() => {
@@ -115,6 +125,14 @@ class Product {
         'description': description,
       };
 
+  static double _getRating(Map<String, dynamic> json) {
+    return json['value'] != null ? double.parse(json['value']) : 0;
+  }
+
+  static int _getReviewCount(Map<String, dynamic> json) {
+    return json['value'] != null ? int.parse(json['value']) : 0;
+  }
+
   static List<ProductVariant> _getProductVariants(Map<String, dynamic> json) {
     List<ProductVariant> productVariants = [];
     ((json['variants'] ?? const {})['edges'] ?? const [])?.forEach((v) {
@@ -168,9 +186,7 @@ class Product {
   static List<AssociatedCollections> _getCollectionList(
       Map<String, dynamic> json) {
     List<AssociatedCollections> collectionList = [];
-    ((json['collections'] ?? const {})['edges'] ??
-            const [])
-        ?.forEach((v) {
+    ((json['collections'] ?? const {})['edges'] ?? const [])?.forEach((v) {
       if (v?.data != null)
         collectionList.add(AssociatedCollections.fromJson(v?.data ?? const {}));
     });
@@ -180,7 +196,8 @@ class Product {
   static _getImageList(Map<String, dynamic> json) {
     List<ShopifyImage> imageList = [];
     if (json != null && json['edges'] != null)
-    json['edges'].forEach((image) => imageList.add(ShopifyImage.fromJson(image['node'] ?? const {})));
+      json['edges'].forEach((image) =>
+          imageList.add(ShopifyImage.fromJson(image['node'] ?? const {})));
     return imageList;
   }
 
@@ -225,7 +242,8 @@ class ShopifyImage {
   final String transformedSrc;
   final String id;
 
-  const ShopifyImage({this.altText, this.originalSource, this.transformedSrc, this.id});
+  const ShopifyImage(
+      {this.altText, this.originalSource, this.transformedSrc, this.id});
 
   static ShopifyImage fromJson(Map<String, dynamic> json) {
     return ShopifyImage(
@@ -394,7 +412,9 @@ class PriceV2 {
 
   static String _chooseRightOrderOnCurrencySymbol(Map<String, dynamic> json) {
     String currencyString;
-    String amount = json['amount'] != null ? double.parse(json['amount']).toStringAsFixed(2) : '';
+    String amount = json['amount'] != null
+        ? double.parse(json['amount']).toStringAsFixed(2)
+        : '';
     switch (json['currencyCode']) {
       case "INR":
         {

From 7b8bfa7d9c202685050d94713563cb587b3c0343 Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Mon, 17 May 2021 19:54:50 +0530
Subject: [PATCH 53/80] recently ordered products

---
 example/lib/collection_tab.dart               | 112 ------------------
 example/lib/home_tab.dart                     |  88 --------------
 example/lib/main.dart                         |  73 ------------
 example/lib/product_detail_screen.dart        |  54 ---------
 example/lib/profile_tab.dart                  |  15 ---
 example/lib/search_tab.dart                   |  83 -------------
 .../get_recently_ordered_products.dart        |  87 ++++++++++++++
 lib/models/src/checkout.dart                  |   7 +-
 lib/shopify/src/shopify_checkout.dart         |  37 +++++-
 9 files changed, 128 insertions(+), 428 deletions(-)
 delete mode 100644 example/lib/collection_tab.dart
 delete mode 100644 example/lib/home_tab.dart
 delete mode 100644 example/lib/main.dart
 delete mode 100644 example/lib/product_detail_screen.dart
 delete mode 100644 example/lib/profile_tab.dart
 delete mode 100644 example/lib/search_tab.dart
 create mode 100644 lib/graphql_operations/queries/get_recently_ordered_products.dart

diff --git a/example/lib/collection_tab.dart b/example/lib/collection_tab.dart
deleted file mode 100644
index 8ff7a470..00000000
--- a/example/lib/collection_tab.dart
+++ /dev/null
@@ -1,112 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_simple_shopify/flutter_simple_shopify.dart';
-
-class CollectionTab extends StatefulWidget {
-  @override
-  _CollectionTabState createState() => _CollectionTabState();
-}
-
-class _CollectionTabState extends State<CollectionTab> {
-  List<Collection> collections = [];
-  bool _isLoading = true;
-
-  @override
-  void initState() {
-    _fetchCollections();
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(title: Text("Collections")),
-      body: Center(
-        child: _isLoading ? CircularProgressIndicator() :
-        ListView.builder(
-          itemCount: collections.length,
-            itemBuilder: (_,int index) => ListTile(
-              onTap: () => _navigateToCollectionDetailScreen(collections[index].id,collections[index].title),
-              title: Text(collections[index].title),
-            ),
-        ),
-      ),
-    );
-  }
-
-  Future<void> _fetchCollections() async {
-    try{
-      ShopifyStore shopifyStore = ShopifyStore.instance;
-      final collections = await shopifyStore.getAllCollections();
-      if(mounted){
-        setState(() {
-          this.collections = collections;
-          _isLoading = false;
-        });
-      }
-    }catch(e){
-      print(e);
-    }
-  }
-
-  void _navigateToCollectionDetailScreen(String collectionId,String collectionTitle){
-    Navigator.push(context, MaterialPageRoute(
-        builder: (context) => CollectionDetailScreen(
-            collectionId: collectionId,
-            collectionTitle: collectionTitle)));
-  }
-}
-
-class CollectionDetailScreen extends StatefulWidget {
-  final String collectionId;
-  final String collectionTitle;
-
-  const CollectionDetailScreen({Key key,@required this.collectionId,@required this.collectionTitle})
-      : super(key: key);
-  @override
-  _CollectionDetailScreenState createState() => _CollectionDetailScreenState();
-}
-
-class _CollectionDetailScreenState extends State<CollectionDetailScreen> {
-  List<Product> products = [];
-  bool _isLoading = true;
-
-  @override
-  void initState() {
-    _fetchProductsByCollectionId();
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(title: Text(widget.collectionTitle),),
-      body: Center(
-        child: _isLoading ? CircularProgressIndicator() :
-        ListView.builder(
-          itemCount: products.length,
-            itemBuilder: (_,int index) =>
-                ListTile(title: Text(products[index].title),)),
-      ),
-    );
-  }
-
-  Future<void> _fetchProductsByCollectionId() async{
-    try{
-      ShopifyStore shopifyStore = ShopifyStore.instance;
-      final products = await shopifyStore.getXProductsAfterCursorWithinCollection(
-        widget.collectionId,
-        4,
-        null
-      );
-      if(mounted){
-        setState(() {
-          this.products = products.productList;
-          _isLoading = false;
-        });
-      }
-    }catch(e){
-      print(e);
-    }
-  }
-}
-
diff --git a/example/lib/home_tab.dart b/example/lib/home_tab.dart
deleted file mode 100644
index 0348db6a..00000000
--- a/example/lib/home_tab.dart
+++ /dev/null
@@ -1,88 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_simple_shopify/flutter_simple_shopify.dart';
-import 'product_detail_screen.dart';
-
-class HomeTab extends StatefulWidget {
-  @override
-  _HomeTabState createState() => _HomeTabState();
-}
-
-class _HomeTabState extends State<HomeTab> {
-  List<Product> products = [];
-  bool _isLoading = true;
-
-  @override
-  void initState() {
-    _fetchProducts();
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text("Home"),
-      ),
-      body: Center(
-        child: _isLoading
-            ? CircularProgressIndicator()
-            : GridView.builder(
-                padding: const EdgeInsets.all(8),
-                gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                  crossAxisCount: 2,
-                  mainAxisSpacing: 8,
-                  crossAxisSpacing: 8,
-                ),
-                itemCount: products.length,
-                itemBuilder: (_, int index) =>
-                    _buildProductThumbnail(products[index]),
-              ),
-      ),
-    );
-  }
-
-  Future<void> _fetchProducts() async {
-    try {
-      ShopifyStore shopifyStore = ShopifyStore.instance;
-      final List<Product> bestSellingProducts = await shopifyStore
-          .getNProducts(6, sortKey: SortKeyProduct.BEST_SELLING);
-      if (mounted) {
-        setState(() {
-          products = bestSellingProducts;
-          _isLoading = false;
-        });
-      }
-    } catch (e) {
-      print(e);
-    }
-  }
-
-  Widget _buildProductThumbnail(Product product) {
-    return InkWell(
-      onTap: () => _navigateToProductDetailScreen(product),
-      child: Container(
-        alignment: Alignment.bottomCenter,
-        width: MediaQuery.of(context).size.width,
-        height: MediaQuery.of(context).size.height,
-        decoration: product?.images?.first?.originalSource != null
-            ? BoxDecoration(
-                image: DecorationImage(
-                    fit: BoxFit.cover,
-                    image: NetworkImage(
-                      product.images.first.originalSource,
-                    )))
-            : BoxDecoration(),
-        child: Container(
-          width: MediaQuery.of(context).size.width,
-          alignment: Alignment.bottomCenter,
-          child: Text(product.title,style: TextStyle(color: Colors.white,fontSize: 20,fontWeight: FontWeight.bold),),
-        ),
-      ),
-    );
-  }
-
-  void _navigateToProductDetailScreen(Product product) {
-    Navigator.push(context,
-        MaterialPageRoute(builder: (context) => ProductDetailScreen(product: product,)));
-  }
-}
diff --git a/example/lib/main.dart b/example/lib/main.dart
deleted file mode 100644
index 1c190276..00000000
--- a/example/lib/main.dart
+++ /dev/null
@@ -1,73 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_simple_shopify/flutter_simple_shopify.dart';
-import 'collection_tab.dart';
-import 'home_tab.dart';
-import 'profile_tab.dart';
-import 'search_tab.dart';
-
-void main() {
-  ShopifyConfig.setConfig(
-    "STOREFRONT-API-ACCESS-TOKEN",
-    "YOUR-SHOPIFY-WEBSITE",
-    "2020-04",
-  );
-  runApp(MyApp());
-}
-
-class MyApp extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      title: 'Shopify Example',
-      theme: ThemeData(primaryColor: Colors.redAccent),
-      home: MyHomePage(),
-    );
-  }
-}
-
-class MyHomePage extends StatefulWidget {
-  @override
-  _MyHomePageState createState() => _MyHomePageState();
-}
-
-class _MyHomePageState extends State<MyHomePage> {
-  int _currentIndex = 0;
-
-  final _tabs = [
-    HomeTab(),
-    CollectionTab(),
-    SearchTab(),
-    ProfileTab(),
-  ];
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: IndexedStack(
-        index: _currentIndex,
-        children: _tabs,
-      ),
-      bottomNavigationBar: BottomNavigationBar(
-        currentIndex: _currentIndex,
-        onTap: _onNavigationBarItemClick,
-        fixedColor: Theme.of(context).primaryColor,
-        unselectedItemColor: Colors.black,
-        items: [
-          BottomNavigationBarItem(icon: Icon(Icons.home), title: Text("Home")),
-          BottomNavigationBarItem(
-              icon: Icon(Icons.category), title: Text("Collections")),
-          BottomNavigationBarItem(
-              icon: Icon(Icons.search), title: Text("Search")),
-          BottomNavigationBarItem(
-              icon: Icon(Icons.person), title: Text("Profile")),
-        ],
-      ),
-    );
-  }
-
-  void _onNavigationBarItemClick(int index) {
-    setState(() {
-      _currentIndex = index;
-    });
-  }
-}
diff --git a/example/lib/product_detail_screen.dart b/example/lib/product_detail_screen.dart
deleted file mode 100644
index 1c55157f..00000000
--- a/example/lib/product_detail_screen.dart
+++ /dev/null
@@ -1,54 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_simple_shopify/flutter_simple_shopify.dart';
-
-class ProductDetailScreen extends StatefulWidget {
-  final Product product;
-
-  const ProductDetailScreen({Key key,@required this.product}) : super(key: key);
-  @override
-  _ProductDetailScreenState createState() => _ProductDetailScreenState(product);
-}
-
-class _ProductDetailScreenState extends State<ProductDetailScreen> {
-  final Product product;
-
-  _ProductDetailScreenState(this.product);
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(title: Text(product.title),),
-      body: ListView(
-        children: <Widget>[
-          product?.images?.first?.originalSource != null ?
-          Image.network(product.images.first.originalSource,
-            width: MediaQuery.of(context).size.width,
-            height: MediaQuery.of(context).size.height/3,
-            fit: BoxFit.cover,
-          ) :
-              Container(),
-          Column(children: _buildProductVariants(),)
-        ],
-      ),
-    );
-  }
-
-  List<Widget> _buildProductVariants(){
-    List<Widget> widgetList = [];
-    product.productVariants.forEach(
-            (variant) => widgetList.add(ListTile(
-              title: Text(variant.title),
-              trailing: Text(variant.price.formattedPrice),
-            )));
-    return widgetList;
-  }
-
-  ///Adds a product variant to the checkout
-  Future<void> _addProductToShoppingCart(ProductVariant variant)async{
-    ShopifyCheckout shopifyCheckout = ShopifyCheckout.instance;
-    String checkoutId = await shopifyCheckout.createCheckout();
-    print(checkoutId);
-    //Adds a product variant to a specific checkout id
-    await shopifyCheckout.checkoutLineItemsReplace(checkoutId, [variant.id]);
-  }
-}
diff --git a/example/lib/profile_tab.dart b/example/lib/profile_tab.dart
deleted file mode 100644
index dc7e135d..00000000
--- a/example/lib/profile_tab.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ProfileTab extends StatefulWidget {
-  @override
-  _ProfileTabState createState() => _ProfileTabState();
-}
-
-class _ProfileTabState extends State<ProfileTab> {
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(title: Text("Profile"),),
-    );
-  }
-}
diff --git a/example/lib/search_tab.dart b/example/lib/search_tab.dart
deleted file mode 100644
index 180db389..00000000
--- a/example/lib/search_tab.dart
+++ /dev/null
@@ -1,83 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_simple_shopify/flutter_simple_shopify.dart';
-
-class SearchTab extends StatefulWidget {
-  @override
-  _SearchTabState createState() => _SearchTabState();
-}
-
-class _SearchTabState extends State<SearchTab> {
-  final _controller = TextEditingController(text: "");
-  List<Product> products = [];
-  bool _isLoading = false;
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text("Search"),
-      ),
-      body: Padding(
-        padding: const EdgeInsets.all(8.0),
-        child: Column(
-          children: <Widget>[
-            Row(
-              children: <Widget>[
-                Expanded(
-                  child: TextFormField(
-                      controller: _controller,
-                      decoration: InputDecoration(
-                        labelText: "Search...",
-                        fillColor: Colors.white,
-                        border: OutlineInputBorder(
-                          borderRadius: BorderRadius.circular(12.0),
-                          borderSide: BorderSide(),
-                        ),
-                        //fillColor: Colors.green
-                      )),
-                ),
-                Padding(padding: const EdgeInsets.all(8)),
-                IconButton(
-                    icon: Icon(Icons.search),
-                    onPressed: () => _searchForProduct(_controller.text)),
-              ],
-            ),
-            Padding(padding: const EdgeInsets.all(10)),
-            Center(
-              child: _isLoading ? CircularProgressIndicator() : Column(
-                children: _buildProductList(),
-              ),
-            )
-          ],
-        ),
-      ),
-    );
-  }
-
-  Future<void> _searchForProduct(String searchKeyword) async {
-    setState(() {
-      _isLoading = true;
-    });
-    try {
-      ShopifyStore shopifyStore = ShopifyStore.instance;
-      final products = await shopifyStore.getXProductsOnQueryAfterCursor(
-          null, 4, searchKeyword);
-      if (mounted) {
-        setState(() {
-          this.products = products.productList;
-          _isLoading = false;
-        });
-      }
-    } catch (e) {
-      print(e);
-    }
-  }
-
-  List<Widget> _buildProductList() {
-    List<Widget> widgetList = [];
-    products.forEach((product) => widgetList.add(ListTile(
-          title: Text(product.title),
-        )));
-    return widgetList;
-  }
-}
diff --git a/lib/graphql_operations/queries/get_recently_ordered_products.dart b/lib/graphql_operations/queries/get_recently_ordered_products.dart
new file mode 100644
index 00000000..73786844
--- /dev/null
+++ b/lib/graphql_operations/queries/get_recently_ordered_products.dart
@@ -0,0 +1,87 @@
+const String getRecentlyOrderedProductsQuery = r'''
+query getOrders(
+  $cursor: String
+  $x: Int
+  $sortKey: OrderSortKeys
+  $accessToken: String!
+  $reverse: Boolean
+) {
+  customer(customerAccessToken: $accessToken) {
+    id
+    orders(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
+      pageInfo {
+        hasNextPage
+      }
+      edges {
+        node {
+          id
+          processedAt
+          canceledAt
+          cancelReason
+          financialStatus
+          fulfillmentStatus
+          lineItems(first: 250) {
+            edges {
+              node {
+                title
+                variant {
+                  product {
+                    id
+                    title
+                    handle
+                    availableForSale
+                    rating: metafield(namespace: "rview", key: "rating") {
+                      key 
+                      namespace 
+                      value 
+                      valueType 
+                    }
+                    review_count: metafield(namespace: "rview", key: "review-count") {
+                      key 
+                      namespace 
+                      value 
+                      valueType 
+                    }
+                    images(first: 1) {
+                      edges {
+                        node {
+                          altText
+                          id
+                          originalSrc
+                          transformedSrc(maxWidth: 200, crop: CENTER)
+                        }
+                      }
+                    }
+                    variants(first: 1) {
+                      edges {
+                        node {
+                          id
+                          title
+                          availableForSale
+                          quantityAvailable
+                          requiresShipping
+                          sku
+                          priceV2 {
+                            amount
+                            currencyCode
+                          }
+                          compareAtPriceV2 {
+                            amount
+                            currencyCode
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+          
+        }
+        cursor
+      }
+    }
+  }
+}
+''';
\ No newline at end of file
diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index f0982bd9..fec03a1f 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -1,6 +1,8 @@
 import 'package:flutter_simple_shopify/models/src/order.dart';
 import 'package:flutter_simple_shopify/models/src/product.dart';
 
+import '../../flutter_simple_shopify.dart';
+
 class Checkout {
   final String id;
   final String email;
@@ -308,6 +310,7 @@ class ProductVariantCheckout {
   final String sku;
   final bool requiresShipping;
   final String id;
+  final Product product;
 
   const ProductVariantCheckout(
       {this.price,
@@ -319,7 +322,8 @@ class ProductVariantCheckout {
       this.availableForSale,
       this.sku,
       this.requiresShipping,
-      this.id});
+      this.id, 
+      this.product});
 
   static ProductVariantCheckout fromJson(Map<String, dynamic> json) {
     return ProductVariantCheckout(
@@ -333,6 +337,7 @@ class ProductVariantCheckout {
       sku: json['sku'],
       requiresShipping: json['requiresShipping'],
       id: json['id'],
+      product: Product.fromProductHandleJson(json['product'])
     );
   }
 }
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index de1a88fa..e75205f7 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -4,13 +4,13 @@ import 'package:flutter_simple_shopify/graphql_operations/mutations/checkout_ema
 import 'package:flutter_simple_shopify/graphql_operations/mutations/checkout_shipping_address_update.dart';
 import 'package:flutter_simple_shopify/graphql_operations/mutations/checkout_shipping_line_update.dart';
 import 'package:flutter_simple_shopify/graphql_operations/mutations/create_checkout.dart';
-import 'package:flutter_simple_shopify/graphql_operations/queries/get_checkout_info_requires_shipping.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart';
-import 'package:flutter_simple_shopify/graphql_operations/queries/get_checkout_without_shipping_rates.dart';
+import 'package:flutter_simple_shopify/graphql_operations/queries/get_recently_ordered_products.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_x_orders_after_cursor.dart';
 import 'package:flutter_simple_shopify/mixins/src/shopfiy_error.dart';
 import 'package:flutter_simple_shopify/models/src/order.dart';
 import 'package:graphql/client.dart';
+import '../../flutter_simple_shopify.dart';
 import '../../graphql_operations/mutations/add_item(s)_to_checkout.dart';
 import '../../graphql_operations/mutations/checkout_associate_customer.dart';
 import '../../graphql_operations/mutations/checkout_customer_disassociate.dart';
@@ -335,6 +335,39 @@ class ShopifyCheckout with ShopifyError {
     return orders;
   }
 
+  Future<List<Product>> getRecentlyOrderedProducts(
+      String customerAccessToken, int limit, 
+      {SortKeyOrder sortKey = SortKeyOrder.ID,
+      bool reverse = true,
+      bool deleteThisPartOfCache = false}) async {
+    String cursor;
+    final QueryOptions _options = WatchQueryOptions(
+        documentNode: gql(getRecentlyOrderedProductsQuery),
+        variables: {
+          'accessToken': customerAccessToken,
+          'sortKey': sortKey.parseToString(),
+          'reverse': reverse,
+          'cursor': cursor,
+          'x': limit
+        });
+    final QueryResult result =
+        await ShopifyConfig.graphQLClient.query(_options);
+    checkForError(result);
+    Orders orders = Orders.fromJson(
+        ((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ??
+            const {}));
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.write(_options.toKey(), null);
+    }
+    List<Product> pList = [];
+    orders.orderList.forEach((order) { 
+      order.lineItems.lineItemOrderList.forEach((lineItem) { 
+        pList.add(lineItem.variant.product);
+      });
+    });
+    return pList;
+  }
+
   /// Helper method for transforming a list of variant ids into a List Of Map<String, dynamic> which looks like this:
   ///
   /// [{"quantity":AMOUNT,"variantId":"YOUR_VARIANT_ID"}]

From 0d335e9fa1daa75015bf81a66b80bb16b2377938 Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Tue, 18 May 2021 20:10:46 +0530
Subject: [PATCH 54/80] textIncluded

---
 .../mutations/checkout_discount_code_apply.dart            | 1 +
 .../mutations/checkout_shipping_address_update.dart        | 1 +
 .../mutations/checkout_shipping_line_update.dart           | 1 +
 .../queries/get_checkout_information.dart                  | 1 +
 .../get_checkout_information_with_shipping_rate.dart       | 1 +
 lib/models/src/checkout.dart                               | 7 ++++---
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/graphql_operations/mutations/checkout_discount_code_apply.dart b/lib/graphql_operations/mutations/checkout_discount_code_apply.dart
index f903063f..c190d344 100644
--- a/lib/graphql_operations/mutations/checkout_discount_code_apply.dart
+++ b/lib/graphql_operations/mutations/checkout_discount_code_apply.dart
@@ -92,6 +92,7 @@ mutation checkoutDiscountCodeApplyV2($checkoutId: ID!, $discountCode: String!) {
         amount
         currencyCode
       }
+      taxesIncluded
       totalTaxV2 {
         amount
         currencyCode
diff --git a/lib/graphql_operations/mutations/checkout_shipping_address_update.dart b/lib/graphql_operations/mutations/checkout_shipping_address_update.dart
index c89b4c0a..61de142a 100644
--- a/lib/graphql_operations/mutations/checkout_shipping_address_update.dart
+++ b/lib/graphql_operations/mutations/checkout_shipping_address_update.dart
@@ -126,6 +126,7 @@ mutation checkoutShippingAddressUpdateV2(
         amount
         currencyCode
       }
+      taxesIncluded 
       totalTaxV2 {
         amount
         currencyCode
diff --git a/lib/graphql_operations/mutations/checkout_shipping_line_update.dart b/lib/graphql_operations/mutations/checkout_shipping_line_update.dart
index 16c98be4..595af906 100644
--- a/lib/graphql_operations/mutations/checkout_shipping_line_update.dart
+++ b/lib/graphql_operations/mutations/checkout_shipping_line_update.dart
@@ -106,6 +106,7 @@ mutation checkoutShippingLineUpdate(
         amount
         currencyCode
       }
+      taxesIncluded 
       totalTaxV2 {
         amount
         currencyCode
diff --git a/lib/graphql_operations/queries/get_checkout_information.dart b/lib/graphql_operations/queries/get_checkout_information.dart
index bcb6557e..996e186c 100644
--- a/lib/graphql_operations/queries/get_checkout_information.dart
+++ b/lib/graphql_operations/queries/get_checkout_information.dart
@@ -167,6 +167,7 @@ query(\$id: ID!) {
         amount
         currencyCode
       }
+      taxesIncluded
       totalTaxV2 {
         amount
         currencyCode
diff --git a/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart b/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
index de2b4a14..43a5c6fd 100644
--- a/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
+++ b/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
@@ -100,6 +100,7 @@ query($id: ID!){
         amount
         currencyCode
       }
+      taxesIncluded
       totalTaxV2 {
         amount
         currencyCode
diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index fec03a1f..200f22c7 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -56,6 +56,7 @@ class Checkout {
       this.requiresShipping});
 
   static Checkout fromJson(Map<String, dynamic> json) {
+    bool taxesIncluded = json['taxesIncluded'];
     PriceV2 totalTaxV2 = PriceV2.fromJson(json['totalTaxV2'] ?? const {});
     PriceV2 lineItemsSubtotalPrice =
         PriceV2.fromJson(json['lineItemsSubtotalPrice'] ?? const {});
@@ -66,7 +67,7 @@ class Checkout {
     String currencyCode;
     if (lineItemsSubtotalPrice.amount != null && totalPriceV2.amount != null) {
       double amt = (totalPriceV2.amount - lineItemsSubtotalPrice.amount);
-      if (totalTaxV2.amount != null) {
+      if (totalTaxV2.amount != null && !taxesIncluded) {
         amt -= totalTaxV2.amount;
       }
       if (shippingLine.priceV2?.amount != null) {
@@ -98,7 +99,7 @@ class Checkout {
             {'amount': amount, 'currencyCode': currencyCode} ?? const {}),
         totalTaxV2: totalTaxV2,
         totalPriceV2: totalPriceV2,
-        taxesIncluded: json['taxesIncluded'],
+        taxesIncluded: taxesIncluded,
         taxExempt: json['taxExempt'],
         subtotalPriceV2: PriceV2.fromJson(json['subtotalPriceV2'] ?? const {}),
         orderStatusUrl: json['orderStatusUrl'],
@@ -337,7 +338,7 @@ class ProductVariantCheckout {
       sku: json['sku'],
       requiresShipping: json['requiresShipping'],
       id: json['id'],
-      product: Product.fromProductHandleJson(json['product'])
+      product: json['product'] !=null ? Product.fromProductHandleJson(json['product']) : null
     );
   }
 }

From 551ed66f7c338e0859d65924e8f1aff152172925 Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Wed, 19 May 2021 19:20:13 +0530
Subject: [PATCH 55/80] checkout refactored

---
 .../checkout_discount_code_apply.dart         |  32 ------
 .../mutations/checkout_email_update.dart      |  70 +++++++++++-
 .../mutations/create_checkout.dart            | 100 ++++++++++++++++++
 ...eckout_information_with_shipping_rate.dart |  33 +-----
 .../get_checkout_without_shipping_rates.dart  |   2 +-
 lib/models/src/checkout.dart                  |   2 +-
 lib/shopify/src/shopify_checkout.dart         |  42 +++++---
 lib/shopify/src/shopify_store.dart            |   2 -
 8 files changed, 201 insertions(+), 82 deletions(-)

diff --git a/lib/graphql_operations/mutations/checkout_discount_code_apply.dart b/lib/graphql_operations/mutations/checkout_discount_code_apply.dart
index c190d344..f2e5d391 100644
--- a/lib/graphql_operations/mutations/checkout_discount_code_apply.dart
+++ b/lib/graphql_operations/mutations/checkout_discount_code_apply.dart
@@ -38,38 +38,6 @@ mutation checkoutDiscountCodeApplyV2($checkoutId: ID!, $discountCode: String!) {
         provinceCode
         zip
       }
-      lineItems(first: 10) {
-        edges {
-          node {
-            id
-            quantity
-            title
-            variant {
-              id
-              priceV2 {
-                amount
-                currencyCode
-              }
-              title
-              image {
-                altText
-                originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
-                id
-              }
-              compareAtPriceV2 {
-                amount
-                currencyCode
-              }
-              weight
-              weightUnit
-              availableForSale
-              sku
-              requiresShipping
-            }
-          }
-        }
-      }
       discountApplications(first: 10) {
         edges {
           node {
diff --git a/lib/graphql_operations/mutations/checkout_email_update.dart b/lib/graphql_operations/mutations/checkout_email_update.dart
index ba4ec11e..e1301bd4 100644
--- a/lib/graphql_operations/mutations/checkout_email_update.dart
+++ b/lib/graphql_operations/mutations/checkout_email_update.dart
@@ -1,8 +1,75 @@
 const String checkoutEmailUpdateMutation = r'''
-mutation checkoutEmailUpdate($checkoutId : ID!, $email : String!) {
+mutation checkoutEmailUpdate($checkoutId: ID!, $email: String!) {
   checkoutEmailUpdateV2(checkoutId: $checkoutId, email: $email) {
     checkout {
       id
+      email
+      requiresShipping
+      currencyCode
+      webUrl
+      orderStatusUrl
+      shippingLine {
+        handle
+        title
+        priceV2 {
+          amount
+          currencyCode
+        }
+      }
+      shippingAddress {
+        address1
+        address2
+        city
+        company
+        country
+        countryCodeV2
+        firstName
+        formattedArea
+        id
+        lastName
+        latitude
+        longitude
+        name
+        phone
+        province
+        provinceCode
+        zip
+      }
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
+      lineItemsSubtotalPrice {
+        amount
+        currencyCode
+      }
+      taxesIncluded
+      totalTaxV2 {
+        amount
+        currencyCode
+      }
+      totalPriceV2 {
+        amount
+        currencyCode
+      }
+      subtotalPriceV2 {
+        amount
+        currencyCode
+      }
     }
     checkoutUserErrors {
       code
@@ -11,4 +78,5 @@ mutation checkoutEmailUpdate($checkoutId : ID!, $email : String!) {
     }
   }
 }
+
 ''';
\ No newline at end of file
diff --git a/lib/graphql_operations/mutations/create_checkout.dart b/lib/graphql_operations/mutations/create_checkout.dart
index 91a18609..70a1f38a 100644
--- a/lib/graphql_operations/mutations/create_checkout.dart
+++ b/lib/graphql_operations/mutations/create_checkout.dart
@@ -3,6 +3,106 @@ mutation checkoutCreate($input: CheckoutCreateInput!) {
   checkoutCreate(input: $input) {
     checkout {
       id
+      email
+      requiresShipping
+      currencyCode
+      webUrl
+      orderStatusUrl
+      note
+      shippingLine {
+        handle
+        title
+        priceV2 {
+          amount
+          currencyCode
+        }
+      }
+      shippingAddress {
+        address1
+        address2
+        city
+        company
+        country
+        countryCodeV2
+        firstName
+        formattedArea
+        id
+        lastName
+        latitude
+        longitude
+        name
+        phone
+        province
+        provinceCode
+        zip
+      }
+      lineItems(first: 250) {
+        edges {
+          node {
+            id
+            quantity
+            title
+            variant {
+              id
+              priceV2 {
+                amount
+                currencyCode
+              }
+              title
+              image {
+                altText
+                originalSrc
+                transformedSrc(maxWidth: 200, crop: CENTER)
+                id
+              }
+              compareAtPriceV2 {
+                amount
+                currencyCode
+              }
+              weight
+              weightUnit
+              availableForSale
+              sku
+              requiresShipping
+            }
+          }
+        }
+      }
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
+      lineItemsSubtotalPrice {
+        amount
+        currencyCode
+      }
+      taxesIncluded
+      totalTaxV2 {
+        amount
+        currencyCode
+      }
+      totalPriceV2 {
+        amount
+        currencyCode
+      }
+      subtotalPriceV2 {
+        amount
+        currencyCode
+      }
     }
     checkoutUserErrors {
       code
diff --git a/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart b/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
index 43a5c6fd..0afdd62b 100644
--- a/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
+++ b/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
@@ -46,38 +46,7 @@ query($id: ID!){
         provinceCode
         zip
       }
-      lineItems(first: 10) {
-        edges {
-          node {
-            id
-            quantity
-            title
-            variant {
-              id
-              priceV2 {
-                amount
-                currencyCode
-              }
-              title
-              image {
-                altText
-                originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
-                id
-              }
-              compareAtPriceV2 {
-                amount
-                currencyCode
-              }
-              weight
-              weightUnit
-              availableForSale
-              sku
-              requiresShipping
-            }
-          }
-        }
-      }
+      
       discountApplications(first: 10) {
         edges {
           node {
diff --git a/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart b/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
index 81ba5f95..7dc37c62 100644
--- a/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
+++ b/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
@@ -64,7 +64,7 @@ query($id: ID!){
       completedAt
       createdAt
       currencyCode
-      lineItems(first: 10) {
+      lineItems(first: 250) {
         edges {
           node {
             id
diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index 200f22c7..fda5796c 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -90,7 +90,7 @@ class Checkout {
         completedAt: json['completedAt'],
         createdAt: json['createdAt'],
         currencyCode: json['currencyCode'],
-        lineItems: LineItems.fromJson(json['lineItems']),
+        lineItems: json['lineItems'] != null ? LineItems.fromJson(json['lineItems']) : LineItems(lineItemList:[]),
         note: json['note'],
         webUrl: json['webUrl'],
         updatedAt: json['updatedAt'],
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index e75205f7..3ae90907 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -30,24 +30,38 @@ class ShopifyCheckout with ShopifyError {
 
   GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient;
 
-  /// Returns the Checkout Id.
+  /// Returns the Checkout.
   ///
   /// Creates a new [Checkout].
-  Future<String> createCheckout(
-      {String note, bool deleteThisPartOfCache = false}) async {
-    final MutationOptions _options =
-        MutationOptions(documentNode: gql(createCheckoutMutation), variables: {
+  Future<Checkout> createCheckout(List<String> variantIdList,
+      {Map<String, String> shippingAddress, String email,
+      String note,
+      bool deleteThisPartOfCache = false}) async {
+    var lineItems = transformVariantIdListIntoListOfMaps(variantIdList);
+    dynamic variables = {
       "input": {
-        'note': note
+        "lineItems": lineItems,
+        "note": note
       }
-    });
+    };
+    if(shippingAddress!=null){
+      variables["input"]["shippingAddress"] = shippingAddress;
+    }
+    if(email!=null){
+      variables["input"]["email"] = email;
+    }
+    final MutationOptions _options =
+        MutationOptions(documentNode: gql(createCheckoutMutation), variables: variables);
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
-    return ((result?.data['checkoutCreate'] ?? const {})['checkout'] ??
-        const {})['id'];
+    // return ((result?.data['checkoutCreate'] ?? const {})['checkout'] ??
+    //     const {});
+    final checkout = Checkout.fromJson(
+        (result?.data['checkoutCreate'] ?? const {})['checkout']);
+    return checkout;
   }
 
   /// Replaces the [LineItems] in the [Checkout] associated to the [checkoutId].
@@ -266,7 +280,7 @@ class ShopifyCheckout with ShopifyError {
         result?.data['checkoutShippingLineUpdate']?.data['checkout']);
   }
 
-  Future<void> emailUpdate(String checkoutId, String email,
+  Future<Checkout> emailUpdate(String checkoutId, String email,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(checkoutEmailUpdateMutation),
@@ -277,6 +291,8 @@ class ShopifyCheckout with ShopifyError {
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
+    return Checkout.fromJson(
+        result?.data['checkoutEmailUpdateV2']?.data['checkout']);
   }
 
   // bool _requiresShipping(QueryResult result) {
@@ -336,7 +352,7 @@ class ShopifyCheckout with ShopifyError {
   }
 
   Future<List<Product>> getRecentlyOrderedProducts(
-      String customerAccessToken, int limit, 
+      String customerAccessToken, int limit,
       {SortKeyOrder sortKey = SortKeyOrder.ID,
       bool reverse = true,
       bool deleteThisPartOfCache = false}) async {
@@ -360,8 +376,8 @@ class ShopifyCheckout with ShopifyError {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
     List<Product> pList = [];
-    orders.orderList.forEach((order) { 
-      order.lineItems.lineItemOrderList.forEach((lineItem) { 
+    orders.orderList.forEach((order) {
+      order.lineItems.lineItemOrderList.forEach((lineItem) {
         pList.add(lineItem.variant.product);
       });
     });
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index c410a98f..49e958c8 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -23,7 +23,6 @@ import 'package:flutter_simple_shopify/models/src/product.dart';
 import 'package:flutter_simple_shopify/enums/src/sort_key_product.dart';
 import 'package:flutter_simple_shopify/models/src/shop.dart';
 import 'package:graphql/client.dart';
-import '../../graphql_operations/queries/get_featured_collections.dart';
 import '../../graphql_operations/queries/get_n_products.dart';
 import '../../graphql_operations/queries/get_products.dart';
 import '../../models/src/collection.dart';
@@ -245,7 +244,6 @@ class ShopifyStore with ShopifyError {
   Future<Collection> getCollectionByHandle(String handle,
       {bool deleteThisPartOfCache = false, productsCount}) async {
     try {
-      final a = getCollectionByHandleWithProductsQuery(productsCount);
       final WatchQueryOptions _options = WatchQueryOptions(
           documentNode: productsCount != null
               ? gql(getCollectionByHandleWithProductsQuery(productsCount))

From 8bb8bbe76cf9077313d982e1f13bf470bcb79867 Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Fri, 21 May 2021 19:47:55 +0530
Subject: [PATCH 56/80] currency format

---
 .../checkout_discount_code_remove.dart        | 70 +++++++++++++++++++
 lib/models/src/product.dart                   | 43 ++++++++----
 lib/shopify/src/shopify_checkout.dart         |  5 +-
 pubspec.lock                                  |  7 ++
 pubspec.yaml                                  |  1 +
 5 files changed, 113 insertions(+), 13 deletions(-)

diff --git a/lib/graphql_operations/mutations/checkout_discount_code_remove.dart b/lib/graphql_operations/mutations/checkout_discount_code_remove.dart
index a95ce956..ccd31310 100644
--- a/lib/graphql_operations/mutations/checkout_discount_code_remove.dart
+++ b/lib/graphql_operations/mutations/checkout_discount_code_remove.dart
@@ -1,6 +1,76 @@
 const String checkoutDiscountCodeRemoveMutation = r'''
 mutation checkoutDiscountCodeRemove($checkoutId : ID!) {
   checkoutDiscountCodeRemove(checkoutId: $checkoutId) {
+    checkout {
+      id
+      email
+      requiresShipping
+      currencyCode
+      webUrl
+      orderStatusUrl
+      shippingLine {
+        handle
+        title
+        priceV2 {
+          amount
+          currencyCode
+        }
+      }
+      shippingAddress {
+        address1
+        address2
+        city
+        company
+        country
+        countryCodeV2
+        firstName
+        formattedArea
+        id
+        lastName
+        latitude
+        longitude
+        name
+        phone
+        province
+        provinceCode
+        zip
+      }
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
+      lineItemsSubtotalPrice {
+        amount
+        currencyCode
+      }
+      taxesIncluded
+      totalTaxV2 {
+        amount
+        currencyCode
+      }
+      totalPriceV2 {
+        amount
+        currencyCode
+      }
+      subtotalPriceV2 {
+        amount
+        currencyCode
+      }
+    }
     checkoutUserErrors {
       code
       field
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 2deb1d73..9c007082 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -1,4 +1,5 @@
 import 'package:collection/collection.dart';
+import 'package:intl/intl.dart';
 
 class Products {
   final List<Product> productList;
@@ -395,57 +396,75 @@ class PriceV2 {
   final String currencyCode;
   final String currencySymbol;
   final String formattedPrice;
+  final String numberFormattedPrice;
 
   const PriceV2(
       {this.formattedPrice,
       this.currencySymbol,
       this.amount,
-      this.currencyCode});
+      this.currencyCode, 
+      this.numberFormattedPrice});
 
   static PriceV2 fromJson(Map<String, dynamic> json) {
+    // var format = NumberFormat.currency(locale: 'HI');
+    // String amount = json['amount'] != null
+    //     ? double.parse(json['amount']).toStringAsFixed(2)
+    //     : '';
     return PriceV2(
         amount: json['amount'] != null ? double.parse(json['amount']) : null,
         currencyCode: json['currencyCode'],
         currencySymbol: _simpleCurrencySymbols[json['currencyCode']],
-        formattedPrice: _chooseRightOrderOnCurrencySymbol(json));
+        formattedPrice: _chooseRightOrderOnCurrencySymbol(json['amount'], json['currencyCode']),
+        numberFormattedPrice: _chooseRightOrderOnCurrencySymbol(json['amount'], json['currencyCode'], numberFormat: true)
+        );
   }
 
-  static String _chooseRightOrderOnCurrencySymbol(Map<String, dynamic> json) {
+  static String _chooseRightOrderOnCurrencySymbol(String amount, String currencyCode, {bool numberFormat = false}) {
     String currencyString;
-    String amount = json['amount'] != null
-        ? double.parse(json['amount']).toStringAsFixed(2)
-        : '';
-    switch (json['currencyCode']) {
+    String formattedAmount = '';
+
+    if(amount != null){
+      if(numberFormat){
+        var format = NumberFormat.currency(locale: 'HI', symbol: '');
+        formattedAmount = format.format(double.parse(amount));
+      }else{
+        formattedAmount = double.parse(amount).toStringAsFixed(2);
+      }
+    }else{
+      // formattedAmount = '';
+      return '';
+    }
+    switch (currencyCode) {
       case "INR":
         {
           currencyString =
-              '${_simpleCurrencySymbols[json['currencyCode']]}$amount';
+              '${_simpleCurrencySymbols[currencyCode]}$formattedAmount';
         }
         break;
 
       case "EUR":
         {
           currencyString =
-              '$amount${_simpleCurrencySymbols[json['currencyCode']]}';
+              '$formattedAmount${_simpleCurrencySymbols[currencyCode]}';
         }
         break;
       case "USD":
         {
           currencyString =
-              '${_simpleCurrencySymbols[json['currencyCode']]}$amount';
+              '${_simpleCurrencySymbols[currencyCode]}$formattedAmount';
         }
         break;
       case "AED":
         {
           currencyString =
-              '${_simpleCurrencySymbols[json['currencyCode']]}$amount';
+              '${_simpleCurrencySymbols[currencyCode]}$formattedAmount';
         }
         break;
 
       default:
         {
           currencyString =
-              '$amount${_simpleCurrencySymbols[json['currencyCode']]}';
+              '$formattedAmount${_simpleCurrencySymbols[currencyCode]}';
         }
         break;
     }
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index 3ae90907..e151639c 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -204,7 +204,7 @@ class ShopifyCheckout with ShopifyError {
   }
 
   /// Removes the applied discount from the [Checkout] that [checkoutId] belongs to.
-  Future<void> checkoutDiscountCodeRemove(String checkoutId,
+  Future<Checkout> checkoutDiscountCodeRemove(String checkoutId,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         documentNode: gql(checkoutDiscountCodeRemoveMutation),
@@ -214,6 +214,9 @@ class ShopifyCheckout with ShopifyError {
     if (deleteThisPartOfCache) {
       _graphQLClient.cache.write(_options.toKey(), null);
     }
+
+    return Checkout.fromJson(
+        result?.data['checkoutDiscountCodeRemove']?.data['checkout']);
   }
 
   /// Appends the [giftCardCodes] to the [Checkout] that [checkoutId] belongs to.
diff --git a/pubspec.lock b/pubspec.lock
index 70580ec8..ceb94277 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -114,6 +114,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.4"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.16.1"
   matcher:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 8bbb7973..a2b7cb51 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,6 +12,7 @@ dependencies:
   graphql: ^3.1.0
   shared_preferences: ^0.5.7
   enum_to_string: ^1.0.14
+  intl: ^0.16.1
 
 
 dev_dependencies:

From e865ca780de33dd690647cc6a66f73c3b27c645d Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Mon, 24 May 2021 17:31:15 +0530
Subject: [PATCH 57/80] removed deleted products from recently ordered products
 list

---
 lib/shopify/src/shopify_checkout.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index e151639c..f9dc6a46 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -381,7 +381,8 @@ class ShopifyCheckout with ShopifyError {
     List<Product> pList = [];
     orders.orderList.forEach((order) {
       order.lineItems.lineItemOrderList.forEach((lineItem) {
-        pList.add(lineItem.variant.product);
+        if(lineItem.variant.product !=null)
+          pList.add(lineItem.variant.product);
       });
     });
     return pList;

From e0c0b681bf9a03e1f923ab532f1a4985b925f16a Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Mon, 24 May 2021 19:18:20 +0530
Subject: [PATCH 58/80] removed duplicate products from recently ordered
 products list

---
 lib/shopify/src/shopify_checkout.dart | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index f9dc6a46..f156522c 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -34,24 +34,22 @@ class ShopifyCheckout with ShopifyError {
   ///
   /// Creates a new [Checkout].
   Future<Checkout> createCheckout(List<String> variantIdList,
-      {Map<String, String> shippingAddress, String email,
+      {Map<String, String> shippingAddress,
+      String email,
       String note,
       bool deleteThisPartOfCache = false}) async {
     var lineItems = transformVariantIdListIntoListOfMaps(variantIdList);
     dynamic variables = {
-      "input": {
-        "lineItems": lineItems,
-        "note": note
-      }
+      "input": {"lineItems": lineItems, "note": note}
     };
-    if(shippingAddress!=null){
+    if (shippingAddress != null) {
       variables["input"]["shippingAddress"] = shippingAddress;
     }
-    if(email!=null){
+    if (email != null) {
       variables["input"]["email"] = email;
     }
-    final MutationOptions _options =
-        MutationOptions(documentNode: gql(createCheckoutMutation), variables: variables);
+    final MutationOptions _options = MutationOptions(
+        documentNode: gql(createCheckoutMutation), variables: variables);
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
@@ -381,8 +379,14 @@ class ShopifyCheckout with ShopifyError {
     List<Product> pList = [];
     orders.orderList.forEach((order) {
       order.lineItems.lineItemOrderList.forEach((lineItem) {
-        if(lineItem.variant.product !=null)
-          pList.add(lineItem.variant.product);
+        if (lineItem.variant.product != null) {
+          Product hasProduct = pList.firstWhere(
+              (product) => product.id == lineItem.variant.product.id,
+              orElse: () => null);
+          if (hasProduct == null) {
+            pList.add(lineItem.variant.product);
+          }
+        }
       });
     });
     return pList;

From 0f426312911c9cc6bc558e4aba3667815e48c14d Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Tue, 25 May 2021 19:35:12 +0530
Subject: [PATCH 59/80] product type

---
 .../queries/get_n_products.dart               | 70 ++++++-------------
 .../queries/get_product_by_handle.dart        |  1 +
 2 files changed, 24 insertions(+), 47 deletions(-)

diff --git a/lib/graphql_operations/queries/get_n_products.dart b/lib/graphql_operations/queries/get_n_products.dart
index 363fbbb3..262dd258 100644
--- a/lib/graphql_operations/queries/get_n_products.dart
+++ b/lib/graphql_operations/queries/get_n_products.dart
@@ -7,22 +7,32 @@ query($n : Int, $sortKey : ProductSortKeys, $reverse: Boolean){
     edges {
       cursor
       node {
-      options(first: 50) {
-            id
-            name
-            values
-            } 
-        variants(first: 250) {
+        id
+        handle
+        title
+        availableForSale
+        tags
+        rating: metafield(namespace: "rview", key: "rating") {
+          key 
+          namespace 
+          value 
+          valueType 
+        }
+        review_count: metafield(namespace: "rview", key: "review-count") {
+          key 
+          namespace 
+          value 
+          valueType 
+        }
+        variants(first: 1) {
           edges {
             node {
               id
               title
-              image {
-                altText
-                id
-                originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
-              }
+              availableForSale
+              sku
+              requiresShipping
+              quantityAvailable
               priceV2 {
                 amount
                 currencyCode
@@ -31,44 +41,10 @@ query($n : Int, $sortKey : ProductSortKeys, $reverse: Boolean){
                 amount
                 currencyCode
               }
-              weight
-              weightUnit
-              availableForSale
-              sku
-              requiresShipping
-              quantityAvailable
-            }
-          }
-          pageInfo {
-            hasNextPage
-          }
-        }
-        availableForSale
-        collections(first: 250) {
-          edges {
-            node {
-              description
-              descriptionHtml
-              id
-              handle
-              updatedAt
-              title
             }
           }
         }
-        createdAt
-        description
-        descriptionHtml
-        handle
-        id
-        onlineStoreUrl
-        productType
-        publishedAt
-        tags
-        title
-        updatedAt
-        vendor
-        images(first: 250) {
+        images(first: 1) {
           edges {
             node {
               altText
diff --git a/lib/graphql_operations/queries/get_product_by_handle.dart b/lib/graphql_operations/queries/get_product_by_handle.dart
index 4680bad7..fa427006 100644
--- a/lib/graphql_operations/queries/get_product_by_handle.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle.dart
@@ -7,6 +7,7 @@ query($handle: String!) {
     availableForSale
     tags
     onlineStoreUrl
+    productType 
     options(first: 50) {
       id
       name

From a8dff00067880763a599e516b7561972a36a0f6d Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Thu, 27 May 2021 19:01:13 +0530
Subject: [PATCH 60/80] product vendor

---
 .../get_collection_by_handle_with_products.dart        |  1 +
 lib/graphql_operations/queries/get_n_products.dart     |  1 +
 .../queries/get_product_by_handle.dart                 |  4 +++-
 .../queries/get_product_by_handle_minimum_data.dart    |  1 +
 .../queries/get_product_recommendations.dart           |  1 +
 .../queries/get_products_by_handle.dart                |  1 +
 .../queries/get_products_by_ids.dart                   | 10 +---------
 .../queries/get_products_by_ids_minimum_data.dart      |  1 +
 .../queries/get_recently_ordered_products.dart         |  1 +
 .../queries/get_x_articles_after_cursor.dart           |  4 +++-
 .../queries/get_x_products_after_cursor.dart           |  1 +
 ...t_x_products_after_cursor_by_collection_handle.dart |  1 +
 .../queries/get_x_products_on_query_after_cursor.dart  |  1 +
 lib/models/src/product.dart                            |  2 +-
 14 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
index 55e308e8..c1a56a0b 100644
--- a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
+++ b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
@@ -19,6 +19,7 @@ query(\$handle: String!) {
           title
           availableForSale
           tags
+          vendor
           rating: metafield(namespace: "rview", key: "rating") {
             key 
             namespace 
diff --git a/lib/graphql_operations/queries/get_n_products.dart b/lib/graphql_operations/queries/get_n_products.dart
index 262dd258..63339dfa 100644
--- a/lib/graphql_operations/queries/get_n_products.dart
+++ b/lib/graphql_operations/queries/get_n_products.dart
@@ -12,6 +12,7 @@ query($n : Int, $sortKey : ProductSortKeys, $reverse: Boolean){
         title
         availableForSale
         tags
+        vendor
         rating: metafield(namespace: "rview", key: "rating") {
           key 
           namespace 
diff --git a/lib/graphql_operations/queries/get_product_by_handle.dart b/lib/graphql_operations/queries/get_product_by_handle.dart
index fa427006..30796b9c 100644
--- a/lib/graphql_operations/queries/get_product_by_handle.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle.dart
@@ -7,12 +7,14 @@ query($handle: String!) {
     availableForSale
     tags
     onlineStoreUrl
-    productType 
+    productType
+    vendor 
     options(first: 50) {
       id
       name
       values
     }
+    vendor
     rating: metafield(namespace: "rview", key: "rating") {
       key 
       namespace 
diff --git a/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart b/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
index 14a5ad30..8eb304b7 100644
--- a/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
@@ -6,6 +6,7 @@ query($handle: String!) {
     title
     availableForSale
     tags
+    vendor
     rating: metafield(namespace: "rview", key: "rating") {
       key 
       namespace 
diff --git a/lib/graphql_operations/queries/get_product_recommendations.dart b/lib/graphql_operations/queries/get_product_recommendations.dart
index c3c70cc2..6bec23de 100644
--- a/lib/graphql_operations/queries/get_product_recommendations.dart
+++ b/lib/graphql_operations/queries/get_product_recommendations.dart
@@ -6,6 +6,7 @@ query getProductRecommentationsQuery($id: ID!){
     title
     availableForSale
     tags
+    vendor
     rating: metafield(namespace: "rview", key: "rating") {
       key 
       namespace 
diff --git a/lib/graphql_operations/queries/get_products_by_handle.dart b/lib/graphql_operations/queries/get_products_by_handle.dart
index 0935f221..006b88c5 100644
--- a/lib/graphql_operations/queries/get_products_by_handle.dart
+++ b/lib/graphql_operations/queries/get_products_by_handle.dart
@@ -8,6 +8,7 @@ query getProductByHandle($handle: String!) {
     descriptionHtml
     productType
     tags
+    vendor
     rating: metafield(namespace: "rview", key: "rating") {
       key 
       namespace 
diff --git a/lib/graphql_operations/queries/get_products_by_ids.dart b/lib/graphql_operations/queries/get_products_by_ids.dart
index 0fade5af..2563f82d 100644
--- a/lib/graphql_operations/queries/get_products_by_ids.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids.dart
@@ -10,6 +10,7 @@ query($ids: [ID!]!) {
       productType
       tags
       onlineStoreUrl
+      vendor
       rating: metafield(namespace: "rview", key: "rating") {
         key 
         namespace 
@@ -67,15 +68,6 @@ query($ids: [ID!]!) {
           }
         }
       }
-      collections(first: 250) {
-        edges {
-          node {
-            id
-            handle
-            title
-          }
-        }
-      }
     }
   }
 }
diff --git a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
index 2ac2c5fe..b8057389 100644
--- a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
@@ -8,6 +8,7 @@ query($ids: [ID!]!) {
       availableForSale
       descriptionHtml
       productType
+      vendor
       rating: metafield(namespace: "rview", key: "rating") {
         key 
         namespace 
diff --git a/lib/graphql_operations/queries/get_recently_ordered_products.dart b/lib/graphql_operations/queries/get_recently_ordered_products.dart
index 73786844..0c342931 100644
--- a/lib/graphql_operations/queries/get_recently_ordered_products.dart
+++ b/lib/graphql_operations/queries/get_recently_ordered_products.dart
@@ -30,6 +30,7 @@ query getOrders(
                     title
                     handle
                     availableForSale
+                    vendor
                     rating: metafield(namespace: "rview", key: "rating") {
                       key 
                       namespace 
diff --git a/lib/graphql_operations/queries/get_x_articles_after_cursor.dart b/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
index d2c0f654..1cc909cb 100644
--- a/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
@@ -12,6 +12,9 @@ query($cursor: String, $x: Int, $reverse: Boolean, $sortKey: ArticleSortKeys) {
         title
         publishedAt
         url
+        excerpt
+        excerptHtml
+        contentHtml
         authorV2 {
           bio
           email
@@ -19,7 +22,6 @@ query($cursor: String, $x: Int, $reverse: Boolean, $sortKey: ArticleSortKeys) {
           lastName
           name
         }
-        contentHtml
         image {
           altText
           id
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
index 4af4c53e..ac3cdd94 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
@@ -12,6 +12,7 @@ query($cursor: String, $x: Int, $reverse: Boolean, $sortKey: ProductSortKeys) {
         title
         availableForSale
         tags
+        vendor
         rating: metafield(namespace: "rview", key: "rating") {
           key 
           namespace 
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
index 701d84ec..a43d6394 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
@@ -29,6 +29,7 @@ query(
           availableForSale
           title
           tags
+          vendor
           rating: metafield(namespace: "rview", key: "rating") {
             key 
             namespace 
diff --git a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
index 6122b01e..71fbb4db 100644
--- a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
@@ -10,6 +10,7 @@ query( $cursor: String, $limit : Int, $sortKey : ProductSortKeys, $query: String
         onlineStoreUrl
         productType
         tags
+        vendor
         rating: metafield(namespace: "rview", key: "rating") {
           key 
           namespace 
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 9c007082..57079e38 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -457,7 +457,7 @@ class PriceV2 {
       case "AED":
         {
           currencyString =
-              '${_simpleCurrencySymbols[currencyCode]}$formattedAmount';
+              '${_simpleCurrencySymbols[currencyCode]} $formattedAmount';
         }
         break;
 

From 05d4be42d8f4aea8323b690354ba9ae19140844a Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Fri, 28 May 2021 14:25:49 +0530
Subject: [PATCH 61/80] migrated

---
 lib/enums/src/sort_key_product.dart   |   2 +-
 lib/mixins/src/shopfiy_error.dart     |  57 +++----
 lib/models/src/article.dart           | 116 +++++++------
 lib/models/src/blog.dart              |  14 +-
 lib/models/src/checkout.dart          | 166 +++++++++----------
 lib/models/src/collection.dart        |  22 +--
 lib/models/src/order.dart             | 121 +++++++-------
 lib/models/src/product.dart           | 146 ++++++++--------
 lib/models/src/shop.dart              |  58 +++----
 lib/models/src/shopify_user.dart      |  82 ++++-----
 lib/shopify/src/shopify_auth.dart     | 107 ++++++------
 lib/shopify/src/shopify_blog.dart     |  37 ++---
 lib/shopify/src/shopify_checkout.dart | 177 ++++++++++++--------
 lib/shopify/src/shopify_customer.dart | 104 +++++++-----
 lib/shopify/src/shopify_store.dart    | 168 +++++++++----------
 lib/shopify_config.dart               |  51 ++++--
 pubspec.lock                          | 230 ++++++++++++++++++++------
 pubspec.yaml                          |  12 +-
 18 files changed, 937 insertions(+), 733 deletions(-)

diff --git a/lib/enums/src/sort_key_product.dart b/lib/enums/src/sort_key_product.dart
index 349a19d1..eb3dee63 100644
--- a/lib/enums/src/sort_key_product.dart
+++ b/lib/enums/src/sort_key_product.dart
@@ -10,7 +10,7 @@ enum SortKeyProduct {
   RELEVANCE,
 }
 
-extension ParseToStringProduct on SortKeyProduct{
+extension ParseToStringProduct on SortKeyProduct?{
   String parseToString(){
     return this.toString().split('.')[1];
   }
diff --git a/lib/mixins/src/shopfiy_error.dart b/lib/mixins/src/shopfiy_error.dart
index 84b7a4c9..3774c393 100644
--- a/lib/mixins/src/shopfiy_error.dart
+++ b/lib/mixins/src/shopfiy_error.dart
@@ -1,46 +1,41 @@
 import 'package:graphql/client.dart';
 
 mixin ShopifyError {
-  void checkForError(QueryResult queryResult, {String key, String errorKey}) {
-    
-    if (key != null && errorKey != null) {
-      Map<String, Object> data = (queryResult?.data as LazyCacheMap)?.data;
-      Map<String, Object> content = data[key];
-      List errors = content[errorKey];
-      if (errors.length != 0) {
-        throw Exception(errors);
-      }
-    }
+  /// throws a [OperationException] if the operation was wrong
+  /// throws a [ShopifyException] if shopify reports an error
+  void checkForError(QueryResult queryResult, {String? key, String? errorKey}) {
     if (queryResult.hasException)
-      throw Exception(queryResult.exception.toString());
-  }
-
-  /// Checks and throws an [CheckoutCompleteException] when
-  /// the [QueryResult] contains checkout errors
-  /// also run [checkForError] for normal error handling
-  void checkForCheckoutError(QueryResult queryResult) {
-    checkForError(queryResult);
-
-    final checkoutCompleteFreeData = queryResult.data['checkoutCompleteFree'];
-    if (checkoutCompleteFreeData != null) {
-      if (checkoutCompleteFreeData['checkoutUserErrors']?.isNotEmpty) {
-        checkoutCompleteFreeData['checkoutUserErrors'].forEach((error)=>print(error.data));
-        throw CheckoutCompleteException('Error on checkoutCompleteFree', errors: checkoutCompleteFreeData['checkoutUserErrors']);
+      throw queryResult.exception!;
+    if (key != null && errorKey != null) {
+      Map<String, Object>? data = queryResult.data! as Map<String, Object>;
+      Map<String, Object>? content = data[key] as Map<String, Object>?;
+      if (content == null) return;
+      List? errors = content[errorKey] as List<dynamic>?;
+      if (errors != null && errors.isNotEmpty) {
+        errors.forEach((error) => print(error));
+        throw ShopifyException(key, errorKey, errors: errors);
       }
     }
   }
 }
 
 
-/// Exception thrown when a checkout fails
+/// Exception thrown when an api call fails
 /// like when some items are out of stock
-class CheckoutCompleteException implements Exception {
-  /// A message describing the issue
-  final String message;
+class ShopifyException implements Exception {
+  /// The shopify operation in which the error occurred
+  final String key;
+  /// The type of the error
+  final String errorKey;
 
   /// The list of errors, might contains items out of stock or other item-related
   /// errors
-  final List<dynamic> errors;
+  final List<dynamic>? errors;
 
-  const CheckoutCompleteException(this.message, {this.errors});
-}
+  const ShopifyException(this.key, this.errorKey, {this.errors});
+
+  @override
+  String toString() {
+    return "$errorKey during $key: $errors";
+  }
+}
\ No newline at end of file
diff --git a/lib/models/src/article.dart b/lib/models/src/article.dart
index 03740670..991d957b 100644
--- a/lib/models/src/article.dart
+++ b/lib/models/src/article.dart
@@ -4,69 +4,87 @@ class Articles {
   final List<Article> articleList;
   final bool hasNextPage;
 
-  Articles({this.articleList, this.hasNextPage});
+  Articles({required this.articleList, required this.hasNextPage});
 
-  static Articles fromJson(Map<String, dynamic> json){
+  static Articles fromJson(Map<String, dynamic> json) {
     return Articles(
-        articleList: _getArticleList(json ?? const {}),
-        hasNextPage: (json['pageInfo'] ?? const {})['hasNextPage']
-    );
+        articleList: _getArticleList(json),
+        hasNextPage: (json['pageInfo'] ?? const {})['hasNextPage']);
   }
 
   static _getArticleList(Map<String, dynamic> json) {
     List<Article> articleList = [];
-    json['edges']?.forEach((article) => articleList.add(Article.fromJson(article ?? const {})) );
+    json['edges']?.forEach(
+        (article) => articleList.add(Article.fromJson(article ?? const {})));
     return articleList;
   }
 }
 
 class Article {
-  final String cursor;
-  final AuthorV2 author;
-  final List<Comment> commentList;
-  final String content;
-  final String contentHtml;
-  final String excerpt;
-  final String excerptHtml;
-  final String handle;
-  final String id;
-  final ShopifyImage image;
-  final DateTime publishedAt;
-  final List<String> tags;
-  final String title;
-  final String url;
-
-  Article({this.cursor, this.author, this.commentList, this.content, this.contentHtml, this.excerpt, this.excerptHtml, this.handle, this.id, this.image, this.publishedAt, this.tags, this.title, this.url});
-
-  static Article fromJson(Map<String, dynamic> json){
-    DateTime publishedAt = (json['node'] ?? const {})['publishedAt'] != null
+  final String? cursor;
+  final AuthorV2? author;
+  final List<Comment>? commentList;
+  final String? content;
+  final String? contentHtml;
+  final String? excerpt;
+  final String? excerptHtml;
+  final String? handle;
+  final String? id;
+  final ShopifyImage? image;
+  final DateTime? publishedAt;
+  final List<String>? tags;
+  final String? title;
+  final String? url;
+
+  Article(
+      {this.cursor,
+      this.author,
+      this.commentList,
+      this.content,
+      this.contentHtml,
+      this.excerpt,
+      this.excerptHtml,
+      this.handle,
+      this.id,
+      this.image,
+      this.publishedAt,
+      this.tags,
+      this.title,
+      this.url});
+
+  static Article fromJson(Map<String, dynamic> json) {
+    DateTime? publishedAt = (json['node'] ?? const {})['publishedAt'] != null
         ? DateTime.parse((json['node'] ?? const {})['publishedAt'])
         : null;
     return Article(
       cursor: json['cursor'],
-      author: AuthorV2.fromJson(((json['node'] ?? const {})['authorV2']) ?? const {}),
-      commentList: _getCommentList((json['node'] ?? const {})['comments'] ?? const {}),
+      author: AuthorV2.fromJson(
+          ((json['node'] ?? const {})['authorV2']) ?? const {}),
+      commentList:
+          _getCommentList((json['node'] ?? const {})['comments'] ?? const {}),
       content: (json['node'] ?? const {})['content'],
       contentHtml: (json['node'] ?? const {})['contentHtml'],
       excerpt: (json['node'] ?? const {})['excerpt'],
       excerptHtml: (json['node'] ?? const {})['excerptHtml'],
       handle: (json['node'] ?? const {})['handle'],
       id: (json['node'] ?? const {})['id'],
-      image: ShopifyImage.fromJson((json['node'] ?? const {})['image'] ?? const {}),
+      image: ShopifyImage.fromJson(
+          (json['node'] ?? const {})['image'] ?? const {}),
       publishedAt: publishedAt,
-      tags: _getTagsList(json ?? const {}),
+      tags: _getTagsList(json),
       title: (json['node'] ?? const {})['title'],
       url: (json['node'] ?? const {})['url'],
     );
   }
 
-  static _getCommentList(Map<String, dynamic> json){
+  static _getCommentList(Map<String, dynamic> json) {
     List<Comment> commentList = [];
-    json['edges']?.forEach((comment) => commentList.add(Comment.fromJson(comment ?? const {})));
+    json['edges']?.forEach(
+        (comment) => commentList.add(Comment.fromJson(comment ?? const {})));
     return commentList;
   }
 
-  static _getTagsList(Map<String, dynamic> json){
+  static _getTagsList(Map<String, dynamic> json) {
     List<String> tagsList = [];
     (json['node'] ?? const {})['tags']?.forEach((tag) => tagsList.add(tag));
     return tagsList;
@@ -74,43 +92,39 @@ class Article {
 }
 
 class Comment {
-  final String email;
-  final String name;
-  final String content;
-  final String contentHtml;
-  final String id;
+  final String? email;
+  final String? name;
+  final String? content;
+  final String? contentHtml;
+  final String? id;
 
   Comment({this.email, this.name, this.content, this.contentHtml, this.id});
 
-  static Comment fromJson(Map<String, dynamic> json){
+  static Comment fromJson(Map<String, dynamic> json) {
     return Comment(
         email: ((json['node'] ?? const {})['author'] ?? const {})['email'],
         name: ((json['node'] ?? const {})['author'] ?? const {})['name'],
         content: (json['node'] ?? const {})['content'],
         contentHtml: (json['node'] ?? const {})['contentHtml'],
-        id: (json['node'] ?? const {})['id']
-    );
+        id: (json['node'] ?? const {})['id']);
   }
 }
 
 class AuthorV2 {
-  final String bio;
-  final String email;
-  final String firstName;
-  final String lastName;
-  final String name;
+  final String? bio;
+  final String? email;
+  final String? firstName;
+  final String? lastName;
+  final String? name;
 
   AuthorV2({this.bio, this.email, this.firstName, this.lastName, this.name});
 
-  static AuthorV2 fromJson(Map<String, dynamic> json){
+  static AuthorV2 fromJson(Map<String, dynamic> json) {
     return AuthorV2(
         bio: json['bio'],
         email: json['email'],
         firstName: json['firstName'],
         lastName: json['lastName'],
-        name: json['name']
-    );
+        name: json['name']);
   }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/models/src/blog.dart b/lib/models/src/blog.dart
index 3009626e..893d3f1a 100644
--- a/lib/models/src/blog.dart
+++ b/lib/models/src/blog.dart
@@ -3,13 +3,13 @@ import 'package:flutter_simple_shopify/models/src/article.dart';
 
 class Blogs {
 
-  Blogs({this.blogList});
+  Blogs({required this.blogList});
 
   final List<Blog> blogList;
 
   static Blogs fromJson(Map<String, dynamic> json){
     return Blogs(
-        blogList: _getBlogList(json ?? const {})
+        blogList: _getBlogList(json)
     );
   }
 
@@ -22,11 +22,11 @@ class Blogs {
 
 class Blog {
 
-  final String id;
-  final String handle;
-  final String title;
-  final String url;
-  final Articles articles;
+  final String? id;
+  final String? handle;
+  final String? title;
+  final String? url;
+  final Articles? articles;
 
   Blog({this.id, this.handle, this.title, this.url, this.articles});
 
diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index fda5796c..478b1bde 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -4,74 +4,74 @@ import 'package:flutter_simple_shopify/models/src/product.dart';
 import '../../flutter_simple_shopify.dart';
 
 class Checkout {
-  final String id;
-  final String email;
+  final String? id;
+  final String? email;
   final DiscountApplications discountApplications;
   final List<AppliedGiftCards> appliedGiftcards;
-  final AvailableShippingRates availableShippingrates;
+  final AvailableShippingRates? availableShippingrates;
   final ShippingRate shippingLine;
   final MailingAddress shippingAddress;
-  final String completedAt;
-  final String createdAt;
-  final String currencyCode;
+  final String? completedAt;
+  final String? createdAt;
+  final String? currencyCode;
   final LineItems lineItems;
-  final String note;
-  final String webUrl;
-  final String updatedAt;
+  final String? note;
+  final String? webUrl;
+  final String? updatedAt;
   final PriceV2 lineItemsSubtotalPrice;
   final PriceV2 discountAmount;
   final PriceV2 totalTaxV2;
   final PriceV2 totalPriceV2;
-  final bool taxesIncluded;
-  final bool taxExempt;
+  final bool? taxesIncluded;
+  final bool? taxExempt;
   final PriceV2 subtotalPriceV2;
-  final String orderStatusUrl;
-  final Order order;
-  final bool requiresShipping;
+  final String? orderStatusUrl;
+  final Order? order;
+  final bool? requiresShipping;
 
   Checkout(
       {this.id,
       this.email,
-      this.discountApplications,
-      this.appliedGiftcards,
+      required this.discountApplications,
+      required this.appliedGiftcards,
       this.availableShippingrates,
-      this.shippingLine,
-      this.shippingAddress,
+      required this.shippingLine,
+      required this.shippingAddress,
       this.completedAt,
       this.createdAt,
       this.currencyCode,
-      this.lineItems,
+      required this.lineItems,
       this.note,
       this.webUrl,
       this.updatedAt,
-      this.totalTaxV2,
-      this.totalPriceV2,
-      this.lineItemsSubtotalPrice,
-      this.discountAmount,
+      required this.totalTaxV2,
+      required this.totalPriceV2,
+      required this.lineItemsSubtotalPrice,
+      required this.discountAmount,
       this.taxesIncluded,
       this.taxExempt,
-      this.subtotalPriceV2,
+      required this.subtotalPriceV2,
       this.orderStatusUrl,
       this.order,
       this.requiresShipping});
 
   static Checkout fromJson(Map<String, dynamic> json) {
-    bool taxesIncluded = json['taxesIncluded'];
+    bool? taxesIncluded = json['taxesIncluded'];
     PriceV2 totalTaxV2 = PriceV2.fromJson(json['totalTaxV2'] ?? const {});
     PriceV2 lineItemsSubtotalPrice =
         PriceV2.fromJson(json['lineItemsSubtotalPrice'] ?? const {});
     PriceV2 totalPriceV2 = PriceV2.fromJson(json['totalPriceV2'] ?? const {});
     ShippingRate shippingLine =
         ShippingRate.fromJson(json['shippingLine'] ?? const {});
-    String amount;
-    String currencyCode;
+    String? amount;
+    String? currencyCode;
     if (lineItemsSubtotalPrice.amount != null && totalPriceV2.amount != null) {
-      double amt = (totalPriceV2.amount - lineItemsSubtotalPrice.amount);
-      if (totalTaxV2.amount != null && !taxesIncluded) {
-        amt -= totalTaxV2.amount;
+      double amt = (totalPriceV2.amount! - lineItemsSubtotalPrice.amount!);
+      if (totalTaxV2.amount != null && !taxesIncluded!) {
+        amt -= totalTaxV2.amount!;
       }
-      if (shippingLine.priceV2?.amount != null) {
-        amt -= shippingLine.priceV2.amount;
+      if (shippingLine.priceV2.amount != null) {
+        amt -= shippingLine.priceV2.amount!;
       }
       amount = amt.abs().toStringAsFixed(2);
       currencyCode = totalPriceV2.currencyCode;
@@ -81,7 +81,7 @@ class Checkout {
         email: json['email'],
         discountApplications:
             DiscountApplications.fromJson(json['discountApplications']),
-        appliedGiftcards: _getAppliedGiftCards(json ?? const {}),
+        appliedGiftcards: _getAppliedGiftCards(json),
         availableShippingrates: AvailableShippingRates.fromJson(
             json['availableShippingRates'] ?? const {}),
         shippingLine: shippingLine,
@@ -96,7 +96,7 @@ class Checkout {
         updatedAt: json['updatedAt'],
         lineItemsSubtotalPrice: lineItemsSubtotalPrice,
         discountAmount: PriceV2.fromJson(
-            {'amount': amount, 'currencyCode': currencyCode} ?? const {}),
+            {'amount': amount, 'currencyCode': currencyCode}),
         totalTaxV2: totalTaxV2,
         totalPriceV2: totalPriceV2,
         taxesIncluded: taxesIncluded,
@@ -117,15 +117,15 @@ class Checkout {
 }
 
 class AvailableShippingRates {
-  final bool ready;
+  final bool? ready;
   final List<ShippingRate> shippingRates;
 
-  const AvailableShippingRates({this.ready, this.shippingRates});
+  const AvailableShippingRates({this.ready, required this.shippingRates});
 
   static AvailableShippingRates fromJson(Map<String, dynamic> json) {
     return AvailableShippingRates(
       ready: json['ready'],
-      shippingRates: _getShippingRates(json ?? const {}),
+      shippingRates: _getShippingRates(json),
     );
   }
 
@@ -138,11 +138,11 @@ class AvailableShippingRates {
 }
 
 class ShippingRate {
-  final String handle;
-  final String title;
+  final String? handle;
+  final String? title;
   final PriceV2 priceV2;
 
-  ShippingRate({this.handle, this.title, this.priceV2});
+  ShippingRate({this.handle, this.title, required this.priceV2});
 
   static ShippingRate fromJson(Map<String, dynamic> json) {
     return ShippingRate(
@@ -153,23 +153,23 @@ class ShippingRate {
 }
 
 class MailingAddress {
-  final String address1;
-  final String address2;
-  final String city;
-  final String company;
-  final String country;
-  final String countryCodeV2;
-  final String firstName;
-  final String formattedArea;
-  final String id;
-  final String lastName;
-  final double latitude;
-  final double longitude;
-  final String name;
-  final String phone;
-  final String province;
-  final String provinceCode;
-  final String zip;
+  final String? address1;
+  final String? address2;
+  final String? city;
+  final String? company;
+  final String? country;
+  final String? countryCodeV2;
+  final String? firstName;
+  final String? formattedArea;
+  final String? id;
+  final String? lastName;
+  final double? latitude;
+  final double? longitude;
+  final String? name;
+  final String? phone;
+  final String? province;
+  final String? provinceCode;
+  final String? zip;
 
   MailingAddress(
       {this.address1,
@@ -216,7 +216,7 @@ class MailingAddress {
 class LineItems {
   final List<LineItem> lineItemList;
 
-  LineItems({this.lineItemList});
+  LineItems({required this.lineItemList});
 
   static LineItems fromJson(Map<String, dynamic> json) {
     return LineItems(lineItemList: _getLineItemList(json));
@@ -231,10 +231,10 @@ class LineItems {
 }
 
 class LineItem {
-  final String id;
-  final int quantity;
-  final String title;
-  final ProductVariantCheckout variant;
+  final String? id;
+  final int? quantity;
+  final String? title;
+  final ProductVariantCheckout? variant;
 
   LineItem({this.id, this.quantity, this.variant, this.title});
 
@@ -252,17 +252,17 @@ class LineItem {
 class DiscountApplications {
   final List<DiscountApplication> discountApplicationList;
 
-  DiscountApplications({this.discountApplicationList});
+  DiscountApplications({required this.discountApplicationList});
 
   get length => discountApplicationList.length;
 
-  static DiscountApplications fromJson(Map<String, dynamic> json) {
+  static DiscountApplications fromJson(Map<String, dynamic>? json) {
     return DiscountApplications(
         discountApplicationList: _getDiscountApplicationList(json));
   }
 
   static List<DiscountApplication> _getDiscountApplicationList(
-      Map<String, dynamic> json) {
+      Map<String, dynamic>? json) {
     List<DiscountApplication> discountApplicationList = [];
     if (json != null)
       json['edges']?.forEach((discountApplication) => discountApplicationList
@@ -272,10 +272,10 @@ class DiscountApplications {
 }
 
 class DiscountApplication {
-  final String allocationMethod;
-  final String targetSelection;
-  final String targetType;
-  final double percentage;
+  final String? allocationMethod;
+  final String? targetSelection;
+  final String? targetType;
+  final double? percentage;
   final PriceV2 price;
 
   DiscountApplication(
@@ -283,7 +283,7 @@ class DiscountApplication {
       this.targetSelection,
       this.targetType,
       this.percentage,
-      this.price});
+      required this.price});
 
   static DiscountApplication fromJson(Map<String, dynamic> json) {
     // print(json);
@@ -302,22 +302,22 @@ class DiscountApplication {
 
 class ProductVariantCheckout {
   final PriceV2 price;
-  final String title;
+  final String? title;
   final ShopifyImage image;
   final PriceV2 compareAtPrice;
-  final double weight;
-  final String weightUnit;
-  final bool availableForSale;
-  final String sku;
-  final bool requiresShipping;
-  final String id;
-  final Product product;
+  final double? weight;
+  final String? weightUnit;
+  final bool? availableForSale;
+  final String? sku;
+  final bool? requiresShipping;
+  final String? id;
+  final Product? product;
 
   const ProductVariantCheckout(
-      {this.price,
+      {required this.price,
       this.title,
-      this.image,
-      this.compareAtPrice,
+      required this.image,
+      required this.compareAtPrice,
       this.weight,
       this.weightUnit,
       this.availableForSale,
@@ -346,9 +346,9 @@ class ProductVariantCheckout {
 class AppliedGiftCards {
   final PriceV2 amountUsedV2;
   final PriceV2 balanceV2;
-  final String id;
+  final String? id;
 
-  AppliedGiftCards({this.amountUsedV2, this.balanceV2, this.id});
+  AppliedGiftCards({required this.amountUsedV2, required this.balanceV2, this.id});
 
   static AppliedGiftCards fromJson(Map<String, dynamic> json) {
     return AppliedGiftCards(
diff --git a/lib/models/src/collection.dart b/lib/models/src/collection.dart
index 6376ea75..9b356412 100644
--- a/lib/models/src/collection.dart
+++ b/lib/models/src/collection.dart
@@ -4,11 +4,11 @@ class Collections {
   final List<Collection> collectionList;
   final bool hasNextPage;
 
-  Collections({this.collectionList, this.hasNextPage});
+  Collections({required this.collectionList, required this.hasNextPage});
 
   static Collections fromJson(Map<String, dynamic> json) {
     return Collections(
-        collectionList: _getCollectionList(json ?? const {}),
+        collectionList: _getCollectionList(json),
         hasNextPage: (json['pageInfo'] ?? const {})['hasNextPage']);
   }
 
@@ -21,15 +21,15 @@ class Collections {
 }
 
 class Collection {
-  final String title;
-  final String description;
-  final String descriptionHtml;
-  final String handle;
-  final String id;
-  final String updatedAt;
-  final ShopifyImage image;
-  final Products products;
-  final String cursor;
+  final String? title;
+  final String? description;
+  final String? descriptionHtml;
+  final String? handle;
+  final String? id;
+  final String? updatedAt;
+  final ShopifyImage? image;
+  final Products? products;
+  final String? cursor;
 
   Collection(
       {this.title,
diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index 7110465c..b43f5ad6 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -9,44 +9,45 @@ class Orders {
   final List<Order> orderList;
   final bool hasNextPage;
 
-  Orders({this.orderList, this.hasNextPage});
+  Orders({required this.orderList, required this.hasNextPage});
 
   static Orders fromJson(Map<String, dynamic> json) {
     return Orders(
-        orderList: _getOrderList(json ?? const {}),
+        orderList: _getOrderList(json),
         hasNextPage: (json['pageInfo'] ?? const {})['hasNextPage']);
   }
 
   static List<Order> _getOrderList(Map<String, dynamic> json) {
     List<Order> orderList = [];
-    json['edges']?.forEach((e) => orderList.add(Order.fromJson(e['node'] ?? const {})));
+    json['edges']
+        ?.forEach((e) => orderList.add(Order.fromJson(e['node'] ?? const {})));
     return orderList;
   }
 }
 
 class Order {
-  final String id;
-  final String email;
-  final String currencyCode;
-  final String customerUrl;
-  final LineItemsOrder lineItems;
-  final String name;
-  final int orderNumber;
-  final String phone;
-  final DateTime processedAt;
-  final DateTime canceledAt;
-  final OrderCancelReason cancelReason;
-  final OrderFinancialStatus financialStatus;
-  final OrderFulfillmentStatus fulfillmentStatus;
-  final MailingAddress shippingAddress;
-  final String statusUrl;
-  final DiscountApplications discountApplications;
-  final PriceV2 subtotalPriceV2;
-  final PriceV2 totalPriceV2;
-  final PriceV2 totalRefundedV2;
-  final PriceV2 totalShippingPriceV2;
-  final PriceV2 totalTaxV2;
-  final String cursor;
+  final String? id;
+  final String? email;
+  final String? currencyCode;
+  final String? customerUrl;
+  final LineItemsOrder? lineItems;
+  final String? name;
+  final int? orderNumber;
+  final String? phone;
+  final DateTime? processedAt;
+  final DateTime? canceledAt;
+  final OrderCancelReason? cancelReason;
+  final OrderFinancialStatus? financialStatus;
+  final OrderFulfillmentStatus? fulfillmentStatus;
+  final MailingAddress? shippingAddress;
+  final String? statusUrl;
+  final DiscountApplications? discountApplications;
+  final PriceV2? subtotalPriceV2;
+  final PriceV2? totalPriceV2;
+  final PriceV2? totalRefundedV2;
+  final PriceV2? totalShippingPriceV2;
+  final PriceV2? totalTaxV2;
+  final String? cursor;
 
   Order(
       {this.id,
@@ -64,7 +65,7 @@ class Order {
       this.fulfillmentStatus,
       this.shippingAddress,
       this.statusUrl,
-      this.discountApplications,     
+      this.discountApplications,
       this.subtotalPriceV2,
       this.totalPriceV2,
       this.totalRefundedV2,
@@ -72,19 +73,16 @@ class Order {
       this.totalTaxV2,
       this.cursor});
 
-  static Order fromJson(Map<String, dynamic> json) {
-    DateTime processedAt =
-        DateTime.parse((json ?? const {})['processedAt']);
-    DateTime canceledAt = (json ?? const {})['canceledAt'] != null
+  static Order fromJson(Map<String, dynamic>? json) {
+    DateTime processedAt = DateTime.parse((json ?? const {})['processedAt']);
+    DateTime? canceledAt = (json ?? const {})['canceledAt'] != null
         ? DateTime.parse((json ?? const {})['canceledAt'])
         : null;
-    OrderFinancialStatus financialStatus = EnumToString.fromString(
-        OrderFinancialStatus.values,
-        (json ?? const {})['financialStatus']);
-    OrderFulfillmentStatus fulfillmentStatus = EnumToString.fromString(
-        OrderFulfillmentStatus.values,
-        (json ?? const {})['fulfillmentStatus']);
-    OrderCancelReason cancelReason = EnumToString.fromString(
+    OrderFinancialStatus? financialStatus = EnumToString.fromString(
+        OrderFinancialStatus.values, (json ?? const {})['financialStatus']);
+    OrderFulfillmentStatus? fulfillmentStatus = EnumToString.fromString(
+        OrderFulfillmentStatus.values, (json ?? const {})['fulfillmentStatus']);
+    OrderCancelReason? cancelReason = EnumToString.fromString(
         OrderCancelReason.values, (json ?? const {})['cancelReason']);
 
     return Order(
@@ -92,8 +90,7 @@ class Order {
         email: (json ?? const {})['email'],
         currencyCode: (json ?? const {})['currencyCode'],
         customerUrl: (json ?? const {})['customerUrl'],
-        lineItems:
-            LineItemsOrder.fromJson((json ?? const {})['lineItems']),
+        lineItems: LineItemsOrder.fromJson((json ?? const {})['lineItems']),
         name: (json ?? const {})['name'],
         orderNumber: (json ?? const {})['orderNumber'],
         phone: (json ?? const {})['phone'],
@@ -106,23 +103,23 @@ class Order {
             (json ?? const {})['shippingAddress'] ?? const {}),
         statusUrl: (json ?? const {})['statusUrl'],
         discountApplications: DiscountApplications.fromJson(
-          (json ?? const {})['discountApplications']),
-        subtotalPriceV2: PriceV2.fromJson(
-            (json ?? const {})['subtotalPriceV2'] ?? const {}),
-        totalPriceV2: PriceV2.fromJson(
-            (json ?? const {})['totalPriceV2'] ?? const {}),
-        totalRefundedV2: PriceV2.fromJson(
-            (json ?? const {})['totalRefundedV2'] ?? const {}),
+            (json ?? const {})['discountApplications']),
+        subtotalPriceV2:
+            PriceV2.fromJson((json ?? const {})['subtotalPriceV2'] ?? const {}),
+        totalPriceV2:
+            PriceV2.fromJson((json ?? const {})['totalPriceV2'] ?? const {}),
+        totalRefundedV2:
+            PriceV2.fromJson((json ?? const {})['totalRefundedV2'] ?? const {}),
         totalShippingPriceV2: PriceV2.fromJson(
             (json ?? const {})['totalShippingPriceV2'] ?? const {}),
-        totalTaxV2: PriceV2.fromJson(
-            (json ?? const {})['totalTaxV2'] ?? const {}),
-        cursor: json['cursor']);
+        totalTaxV2:
+            PriceV2.fromJson((json ?? const {})['totalTaxV2'] ?? const {}),
+        cursor: json?['cursor']);
   }
 }
 
 class LineItemsOrder {
-  final List<LineItemOrder> lineItemOrderList;
+  final List<LineItemOrder>? lineItemOrderList;
 
   LineItemsOrder({this.lineItemOrderList});
 
@@ -139,22 +136,22 @@ class LineItemsOrder {
 }
 
 class LineItemOrder {
-  final int currentQuantity;
+  final int? currentQuantity;
   final List<DiscountAllocations> discountAllocations;
   final PriceV2 discountedTotalPrice;
   final PriceV2 originalTotalPrice;
-  final int quantity;
-  final String title;
+  final int? quantity;
+  final String? title;
   final ProductVariantCheckout variant;
 
   LineItemOrder(
       {this.currentQuantity,
-      this.discountAllocations,
-      this.discountedTotalPrice,
-      this.originalTotalPrice,
+      required this.discountAllocations,
+      required this.discountedTotalPrice,
+      required this.originalTotalPrice,
       this.quantity,
       this.title,
-      this.variant});
+      required this.variant});
 
   static LineItemOrder fromJson(Map<String, dynamic> json) {
     return LineItemOrder(
@@ -162,8 +159,8 @@ class LineItemOrder {
         discountAllocations: _getDiscountAllocationsList(json),
         discountedTotalPrice: PriceV2.fromJson(
             (json['node'] ?? const {})['discountedTotalPrice'] ?? const {}),
-        originalTotalPrice:
-            PriceV2.fromJson((json['node'] ?? const {})['originalTotalPrice'] ?? const {}),
+        originalTotalPrice: PriceV2.fromJson(
+            (json['node'] ?? const {})['originalTotalPrice'] ?? const {}),
         quantity: (json['node'] ?? const {})['quantity'],
         title: (json['node'] ?? const {})['title'],
         variant: ProductVariantCheckout.fromJson(
@@ -172,8 +169,8 @@ class LineItemOrder {
 
   static _getDiscountAllocationsList(Map<String, dynamic> json) {
     List<DiscountAllocations> discountList = [];
-    (json['node'] ?? const {})['discountAllocations']?.forEach(
-        (discount) => discountList.add(DiscountAllocations.fromJson(discount ?? const {})));
+    (json['node'] ?? const {})['discountAllocations']?.forEach((discount) =>
+        discountList.add(DiscountAllocations.fromJson(discount ?? const {})));
     return discountList;
   }
 }
@@ -181,7 +178,7 @@ class LineItemOrder {
 class DiscountAllocations {
   final PriceV2 allocatedAmount;
 
-  DiscountAllocations({this.allocatedAmount});
+  DiscountAllocations({required this.allocatedAmount});
 
   static DiscountAllocations fromJson(Map<String, dynamic> json) {
     return DiscountAllocations(
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 57079e38..c6183899 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -5,11 +5,11 @@ class Products {
   final List<Product> productList;
   final bool hasNextPage;
 
-  Products({this.productList, this.hasNextPage});
+  Products({required this.productList, required this.hasNextPage});
 
   static Products fromJson(Map<String, dynamic> json) {
     return Products(
-        productList: _getProductList(json ?? const {}),
+        productList: _getProductList(json),
         hasNextPage: (json['pageInfo'] ?? const {})['hasNextPage']);
   }
 
@@ -23,35 +23,35 @@ class Products {
 
 class Product {
   final List<AssociatedCollections> collectionList;
-  final String title;
-  final String id;
-  final bool availableForSale;
-  final String createdAt;
-  final String description;
+  final String? title;
+  final String? id;
+  final bool? availableForSale;
+  final String? createdAt;
+  final String? description;
   final List<ProductVariant> productVariants;
-  final String descriptionHtml;
-  final String handle;
-  final String onlineStoreUrl;
-  final String productType;
-  final String publishedAt;
-  final List<String> tags;
-  final String updatedAt;
-  final String cursor;
+  final String? descriptionHtml;
+  final String? handle;
+  final String? onlineStoreUrl;
+  final String? productType;
+  final String? publishedAt;
+  final List<String>? tags;
+  final String? updatedAt;
+  final String? cursor;
   final List<ShopifyImage> images;
   final List<Option> options;
-  final String vendor;
+  final String? vendor;
   final List<Metafield> metafields;
-  final double rating;
-  final int reviewCount;
+  final double? rating;
+  final int? reviewCount;
 
   const Product(
-      {this.collectionList,
+      {required this.collectionList,
       this.title,
       this.id,
       this.availableForSale,
       this.createdAt,
       this.description,
-      this.productVariants,
+      required this.productVariants,
       this.descriptionHtml,
       this.handle,
       this.onlineStoreUrl,
@@ -60,10 +60,10 @@ class Product {
       this.tags,
       this.updatedAt,
       this.cursor,
-      this.images,
-      this.options,
+      required this.images,
+      required this.options,
       this.vendor,
-      this.metafields,
+      required this.metafields,
       this.rating,
       this.reviewCount});
 
@@ -97,13 +97,13 @@ class Product {
 
   static Product fromProductHandleJson(Map<String, dynamic> json) {
     return Product(
-        collectionList: _getCollectionList(json ?? const {}),
+        collectionList: _getCollectionList(json),
         id: json['id'],
         title: json['title'],
         availableForSale: json['availableForSale'],
         createdAt: json['createdAt'],
         description: json['description'],
-        productVariants: _getProductVariants(json ?? const {}),
+        productVariants: _getProductVariants(json),
         descriptionHtml: json['descriptionHtml'],
         handle: json['handle'],
         onlineStoreUrl: json['onlineStoreUrl'],
@@ -147,7 +147,7 @@ class Product {
       List<SelectedOption> filters) {
     Function unOrdDeepEq = const DeepCollectionEquality.unordered().equals;
 
-    List<Map<String, String>> filterList = [];
+    List<Map<String?, String?>> filterList = [];
     filters.forEach((SelectedOption selectedOption) {
       filterList.add({selectedOption.name: selectedOption.value});
     });
@@ -155,7 +155,7 @@ class Product {
     final productVariant =
         this.productVariants.firstWhere((ProductVariant productVariant) {
       bool found = false;
-      List<Map<String, String>> selectedOptionList = [];
+      List<Map<String?, String?>> selectedOptionList = [];
 
       productVariant.selectedOptions.forEach((SelectedOption selectedOption) {
         selectedOptionList.add({selectedOption.name: selectedOption.value});
@@ -178,7 +178,7 @@ class Product {
     return optionList;
   }
 
-  static List<String> _getTags(List<dynamic> list) {
+  static List<String> _getTags(List<dynamic>? list) {
     List<String> tags = [];
     list?.forEach((e) => tags.add(e ?? const {}));
     return tags;
@@ -196,7 +196,7 @@ class Product {
 
   static _getImageList(Map<String, dynamic> json) {
     List<ShopifyImage> imageList = [];
-    if (json != null && json['edges'] != null)
+    if (json['edges'] != null)
       json['edges'].forEach((image) =>
           imageList.add(ShopifyImage.fromJson(image['node'] ?? const {})));
     return imageList;
@@ -211,12 +211,12 @@ class Product {
 }
 
 class AssociatedCollections {
-  final String description;
-  final String descriptionHtml;
-  final String id;
-  final String handle;
-  final String updatedAt;
-  final String title;
+  final String? description;
+  final String? descriptionHtml;
+  final String? id;
+  final String? handle;
+  final String? updatedAt;
+  final String? title;
 
   AssociatedCollections(
       {this.description,
@@ -238,10 +238,10 @@ class AssociatedCollections {
 }
 
 class ShopifyImage {
-  final String altText;
-  final String originalSource;
-  final String transformedSrc;
-  final String id;
+  final String? altText;
+  final String? originalSource;
+  final String? transformedSrc;
+  final String? id;
 
   const ShopifyImage(
       {this.altText, this.originalSource, this.transformedSrc, this.id});
@@ -264,23 +264,23 @@ class ShopifyImage {
 
 class ProductVariant {
   final PriceV2 price;
-  final String title;
+  final String? title;
   final ShopifyImage image;
   final PriceV2 compareAtPrice;
-  final double weight;
-  final String weightUnit;
-  final bool availableForSale;
-  final String sku;
-  final bool requiresShipping;
-  final String id;
-  final int quantityAvailable;
+  final double? weight;
+  final String? weightUnit;
+  final bool? availableForSale;
+  final String? sku;
+  final bool? requiresShipping;
+  final String? id;
+  final int? quantityAvailable;
   final List<SelectedOption> selectedOptions;
 
   const ProductVariant(
-      {this.price,
+      {required this.price,
       this.title,
-      this.image,
-      this.compareAtPrice,
+      required this.image,
+      required this.compareAtPrice,
       this.weight,
       this.weightUnit,
       this.availableForSale,
@@ -288,7 +288,7 @@ class ProductVariant {
       this.requiresShipping,
       this.id,
       this.quantityAvailable,
-      this.selectedOptions});
+      required this.selectedOptions});
 
   static ProductVariant fromJson(Map<String, dynamic> json) {
     return ProductVariant(
@@ -329,12 +329,12 @@ class ProductVariant {
 }
 
 class Metafield {
-  final String id;
-  final String namespace;
-  final String key;
-  final String value;
-  final String valueType;
-  final String description;
+  final String? id;
+  final String? namespace;
+  final String? key;
+  final String? value;
+  final String? valueType;
+  final String? description;
 
   const Metafield(
       {this.id,
@@ -356,11 +356,11 @@ class Metafield {
 }
 
 class Option {
-  final String id;
-  final String name;
+  final String? id;
+  final String? name;
   final List<String> values;
 
-  Option({this.id, this.name, this.values});
+  Option({this.id, this.name, required this.values});
 
   static Option fromJson(Map<String, dynamic> json) {
     return Option(
@@ -377,8 +377,8 @@ class Option {
 }
 
 class SelectedOption {
-  final String name;
-  final String value;
+  final String? name;
+  final String? value;
 
   SelectedOption({this.name, this.value});
 
@@ -392,11 +392,11 @@ class SelectedOption {
 }
 
 class PriceV2 {
-  final double amount;
-  final String currencyCode;
-  final String currencySymbol;
-  final String formattedPrice;
-  final String numberFormattedPrice;
+  final double? amount;
+  final String? currencyCode;
+  final String? currencySymbol;
+  final String? formattedPrice;
+  final String? numberFormattedPrice;
 
   const PriceV2(
       {this.formattedPrice,
@@ -419,7 +419,7 @@ class PriceV2 {
         );
   }
 
-  static String _chooseRightOrderOnCurrencySymbol(String amount, String currencyCode, {bool numberFormat = false}) {
+  static String _chooseRightOrderOnCurrencySymbol(String? amount, String? currencyCode, {bool numberFormat = false}) {
     String currencyString;
     String formattedAmount = '';
 
@@ -438,33 +438,33 @@ class PriceV2 {
       case "INR":
         {
           currencyString =
-              '${_simpleCurrencySymbols[currencyCode]}$formattedAmount';
+              '${_simpleCurrencySymbols[currencyCode!]}$formattedAmount';
         }
         break;
 
       case "EUR":
         {
           currencyString =
-              '$formattedAmount${_simpleCurrencySymbols[currencyCode]}';
+              '$formattedAmount${_simpleCurrencySymbols[currencyCode!]}';
         }
         break;
       case "USD":
         {
           currencyString =
-              '${_simpleCurrencySymbols[currencyCode]}$formattedAmount';
+              '${_simpleCurrencySymbols[currencyCode!]}$formattedAmount';
         }
         break;
       case "AED":
         {
           currencyString =
-              '${_simpleCurrencySymbols[currencyCode]} $formattedAmount';
+              '${_simpleCurrencySymbols[currencyCode!]} $formattedAmount';
         }
         break;
 
       default:
         {
           currencyString =
-              '$formattedAmount${_simpleCurrencySymbols[currencyCode]}';
+              '$formattedAmount${_simpleCurrencySymbols[currencyCode!]}';
         }
         break;
     }
diff --git a/lib/models/src/shop.dart b/lib/models/src/shop.dart
index 1da86fe5..340bb60f 100644
--- a/lib/models/src/shop.dart
+++ b/lib/models/src/shop.dart
@@ -1,7 +1,7 @@
 class Shop {
-  final String description;
-  final String moneyFormat;
-  final String name;
+  final String? description;
+  final String? moneyFormat;
+  final String? name;
   final PaymentSettings paymentSettings;
   final PrimaryDomain primaryDomain;
   final PrivacyPolicy privacyPolicy;
@@ -9,7 +9,7 @@ class Shop {
   final List<String> shipsToCountries;
   final TermsOfService termsOfService;
 
-  Shop({this.description, this.moneyFormat, this.name, this.paymentSettings, this.primaryDomain, this.privacyPolicy, this.refundPolicy, this.shipsToCountries, this.termsOfService});
+  Shop({this.description, this.moneyFormat, this.name, required this.paymentSettings, required this.primaryDomain, required this.privacyPolicy, required this.refundPolicy, required this.shipsToCountries, required this.termsOfService});
 
   static Shop fromJson(Map<String, dynamic> json){
     return Shop(
@@ -33,16 +33,16 @@ class Shop {
 }
 
 class PaymentSettings {
-  final List<String> acceptedCardBrands;
-  final String cardVaultUrl;
-  final String countryCode;
-  final String currencyCode;
-  final List<String> enabledPresentmentCurrencies;
-  final String shopifyPaymentAccountId;
+  final List<String>? acceptedCardBrands;
+  final String? cardVaultUrl;
+  final String? countryCode;
+  final String? currencyCode;
+  final List<String>? enabledPresentmentCurrencies;
+  final String? shopifyPaymentAccountId;
   final List<String> supportedDigitalWallets;
 
   PaymentSettings(
-      {this.acceptedCardBrands, this.cardVaultUrl, this.countryCode, this.currencyCode, this.enabledPresentmentCurrencies, this.shopifyPaymentAccountId, this.supportedDigitalWallets});
+      {this.acceptedCardBrands, this.cardVaultUrl, this.countryCode, this.currencyCode, this.enabledPresentmentCurrencies, this.shopifyPaymentAccountId, required this.supportedDigitalWallets});
 
   static PaymentSettings fromJson(Map<String, dynamic> json) {
     return PaymentSettings(
@@ -76,9 +76,9 @@ class PaymentSettings {
 }
 
 class PrimaryDomain {
-  final String host;
-  final bool sslEnabled;
-  final String url;
+  final String? host;
+  final bool? sslEnabled;
+  final String? url;
 
   PrimaryDomain({this.host, this.sslEnabled, this.url});
 
@@ -92,11 +92,11 @@ class PrimaryDomain {
 }
 
 class PrivacyPolicy {
-  final String body;
-  final String handle;
-  final String id;
-  final String title;
-  final String url;
+  final String? body;
+  final String? handle;
+  final String? id;
+  final String? title;
+  final String? url;
 
   PrivacyPolicy({this.body, this.handle, this.id, this.title, this.url});
 
@@ -112,11 +112,11 @@ class PrivacyPolicy {
 }
 
 class RefundPolicy {
-  final String body;
-  final String handle;
-  final String id;
-  final String title;
-  final String url;
+  final String? body;
+  final String? handle;
+  final String? id;
+  final String? title;
+  final String? url;
 
   RefundPolicy({this.body, this.handle, this.id, this.title, this.url});
 
@@ -132,11 +132,11 @@ class RefundPolicy {
 }
 
 class TermsOfService {
-  final String body;
-  final String handle;
-  final String id;
-  final String title;
-  final String url;
+  final String? body;
+  final String? handle;
+  final String? id;
+  final String? title;
+  final String? url;
 
   TermsOfService({this.body, this.handle, this.id, this.title, this.url});
 
diff --git a/lib/models/src/shopify_user.dart b/lib/models/src/shopify_user.dart
index 01ba135b..70d0588f 100644
--- a/lib/models/src/shopify_user.dart
+++ b/lib/models/src/shopify_user.dart
@@ -3,18 +3,18 @@ import 'package:flutter_simple_shopify/models/src/product.dart';
 
 class ShopifyUser {
   final Addresses address;
-  final String createdAt;
-  final String displayName;
-  final String email;
-  final String firstName;
-  final String id;
-  final String lastName;
-  final String phone;
+  final String? createdAt;
+  final String? displayName;
+  final String? email;
+  final String? firstName;
+  final String? id;
+  final String? lastName;
+  final String? phone;
   final List<String> tags;
   final LastIncompleteCheckout lastIncompleteCheckout;
 
   ShopifyUser(
-      {this.address,
+      {required this.address,
       this.createdAt,
       this.displayName,
       this.email,
@@ -22,8 +22,8 @@ class ShopifyUser {
       this.id,
       this.lastName,
       this.phone,
-      this.tags,
-      this.lastIncompleteCheckout});
+      required this.tags,
+      required this.lastIncompleteCheckout});
 
   static ShopifyUser fromJson(Map<String, dynamic> json) {
     return ShopifyUser(
@@ -35,7 +35,7 @@ class ShopifyUser {
       id: json['id'],
       lastName: json['lastName'],
       phone: json['phone'],
-      tags: _getTagList(json ?? const []),
+      tags: _getTagList((json)),
       lastIncompleteCheckout: LastIncompleteCheckout.fromJson(
           json['lastIncompleteCheckout'] ?? const {}),
     );
@@ -51,7 +51,7 @@ class ShopifyUser {
 class Addresses {
   final List<Address> addressList;
 
-  Addresses({this.addressList});
+  Addresses({required this.addressList});
 
   static Addresses fromJson(Map<String, dynamic> json) {
     return Addresses(addressList: _getAddressList(json));
@@ -66,23 +66,23 @@ class Addresses {
 }
 
 class Address {
-  final String id;
-  final String address1;
-  final String address2;
-  final String city;
-  final String company;
-  final String country;
-  final String countryCode;
-  final String firstName;
-  final String lastName;
-  final String formattedArea;
-  final String latitude;
-  final String longitude;
-  final String name;
-  final String phone;
-  final String province;
-  final String provinceCode;
-  final String zip;
+  final String? id;
+  final String? address1;
+  final String? address2;
+  final String? city;
+  final String? company;
+  final String? country;
+  final String? countryCode;
+  final String? firstName;
+  final String? lastName;
+  final String? formattedArea;
+  final String? latitude;
+  final String? longitude;
+  final String? name;
+  final String? phone;
+  final String? province;
+  final String? provinceCode;
+  final String? zip;
 
   Address(
       {this.id,
@@ -126,12 +126,12 @@ class Address {
 }
 
 class LastIncompleteCheckout {
-  final String completedAt;
-  final String createdAt;
-  final String email;
-  final String id;
-  final String currencyCode;
-  final String webUrl;
+  final String? completedAt;
+  final String? createdAt;
+  final String? email;
+  final String? id;
+  final String? currencyCode;
+  final String? webUrl;
   final PriceV2 totalPriceV2;
   final PriceV2 lineItemsSubtotalPrice;
   final LineItems lineItems;
@@ -143,9 +143,9 @@ class LastIncompleteCheckout {
       this.id,
       this.currencyCode,
       this.webUrl,
-      this.totalPriceV2,
-      this.lineItemsSubtotalPrice,
-      this.lineItems});
+      required this.totalPriceV2,
+      required this.lineItemsSubtotalPrice,
+      required this.lineItems});
 
   static LastIncompleteCheckout fromJson(Map<String, dynamic> json) {
     return LastIncompleteCheckout(
@@ -163,15 +163,15 @@ class LastIncompleteCheckout {
 }
 
 class CustomerAccessToken {
-  final String accessToken;
+  final String? accessToken;
   final DateTime expiresAt;
 
   CustomerAccessToken(this.accessToken, this.expiresAt);
 
-  static CustomerAccessToken fromJson(Map<String, dynamic> json) {
+  static CustomerAccessToken fromJson(Map<String, dynamic>? json) {
     json = ((json ?? const {})['customerAccessToken'] ?? const {});
     return CustomerAccessToken(
-        json['accessToken'], DateTime.parse(json['expiresAt']));
+        json!['accessToken'], DateTime.parse(json['expiresAt']));
   }
 
   Map toJson() => {
diff --git a/lib/shopify/src/shopify_auth.dart b/lib/shopify/src/shopify_auth.dart
index 98d8a2d5..c45da80f 100644
--- a/lib/shopify/src/shopify_auth.dart
+++ b/lib/shopify/src/shopify_auth.dart
@@ -1,6 +1,4 @@
 import 'dart:convert';
-
-import 'package:flutter/material.dart';
 import 'package:flutter_simple_shopify/graphql_operations/mutations/customer_access_token_renew.dart';
 import 'package:flutter_simple_shopify/mixins/src/shopfiy_error.dart';
 import 'package:graphql/client.dart';
@@ -16,19 +14,19 @@ import '../../shopify_config.dart';
 /// ShopifyAuth class handles the authentication.
 class ShopifyAuth with ShopifyError {
   ShopifyAuth._();
-  final GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient;
+  final GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient!;
 
   static final ShopifyAuth instance = ShopifyAuth._();
 
-  static ShopifyUser _shopifyUser;
+  static ShopifyUser? _shopifyUser;
 
   static const String _shopifyKey = 'FLUTTER_SIMPLE_SHOPIFY_ACCESS_TOKEN';
 
-  static Future<String> get currentCustomerAccessToken async =>
-      (await currentCustomer).accessToken;
+  static Future<String?> get currentCustomerAccessToken async =>
+      (await currentCustomer)!.accessToken;
 
-  static Future<CustomerAccessToken> get currentCustomer async {
-    String string =
+  static Future<CustomerAccessToken?> get currentCustomer async {
+    String? string =
         (await SharedPreferences.getInstance()).getString(_shopifyKey);
     if (string != null) {
       Map<String, dynamic> json = jsonDecode(string);
@@ -41,17 +39,13 @@ class ShopifyAuth with ShopifyError {
 
   /// Tries to create a new user account with the given email address and password.
   Future<ShopifyUser> createUser(
-      {@required String firstName,
-      @required String lastName,
-      @required String email,
-      @required String password,
+      {required String firstName,
+      required String lastName,
+      required String email,
+      required String password,
       bool deleteThisPartOfCache = false}) async {
-    assert(firstName != null);
-    assert(lastName != null);
-    assert(email != null);
-    assert(password != null);
     final MutationOptions _options =
-        MutationOptions(documentNode: gql(customerCreateMutation), variables: {
+        MutationOptions(document: gql(customerCreateMutation), variables: {
       'firstName': firstName,
       'lastName': lastName,
       'email': email,
@@ -59,15 +53,18 @@ class ShopifyAuth with ShopifyError {
     });
     final QueryResult result = await _graphQLClient.mutate(_options);
 
-    checkForError(result,
-        key: 'customerCreate', errorKey: 'customerUserErrors');
+    checkForError(
+      result,
+      key: 'customerCreate',
+      errorKey: 'customerUserErrors',
+    );
     final shopifyUser = ShopifyUser.fromJson(
-        (result?.data['customerCreate'] ?? const {})['customer']);
+        (result.data!['customerCreate'] ?? const {})['customer']);
     final CustomerAccessToken customerAccessToken =
         await _createAccessToken(email, password);
     await _setShopifyUser(customerAccessToken);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return shopifyUser;
   }
@@ -76,37 +73,36 @@ class ShopifyAuth with ShopifyError {
   /// email to the given email address, which must correspond to an existing
   /// user of your app.
   Future<void> sendPasswordResetEmail(
-      {@required String email, bool deleteThisPartOfCache = false}) async {
-    assert(email != null);
+      {required String email, bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(customerRecoverMutation),
-        variables: {'email': email});
+        document: gql(customerRecoverMutation), variables: {'email': email});
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result,
-        key: 'customerRecover', errorKey: 'customerUserErrors');
+    checkForError(
+      result,
+      key: 'customerRecover',
+      errorKey: 'customerUserErrors',
+    );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
   /// Tries to sign in a user with the given email address and password.
   Future<ShopifyUser> signInWithEmailAndPassword(
-      {@required String email,
-      @required String password,
+      {required String email,
+      required String password,
       bool deleteThisPartOfCache = false}) async {
-    assert(email != null);
-    assert(password != null);
     final CustomerAccessToken customerAccessToken =
         await _createAccessToken(email, password);
     final WatchQueryOptions _getCustomer = WatchQueryOptions(
-        documentNode: gql(getCustomerQuery),
+        document: gql(getCustomerQuery),
         variables: {'customerAccessToken': customerAccessToken.accessToken});
     final QueryResult result = await _graphQLClient.query(_getCustomer);
     checkForError(result);
-    final shopifyUser = ShopifyUser.fromJson(result?.data['customer']);
+    final shopifyUser = ShopifyUser.fromJson(result.data!['customer']);
     await _setShopifyUser(customerAccessToken);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_getCustomer.toKey(), null);
+      _graphQLClient.cache.writeQuery(_getCustomer.asRequest, data: {});
     }
     return shopifyUser;
   }
@@ -115,75 +111,78 @@ class ShopifyAuth with ShopifyError {
   Future<CustomerAccessToken> _createAccessToken(String email, String password,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(customerAccessTokenCreate),
+        document: gql(customerAccessTokenCreate),
         variables: {'email': email, 'password': password});
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result,
         key: 'customerAccessTokenCreate', errorKey: 'customerUserErrors');
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return CustomerAccessToken.fromJson(
-        result?.data['customerAccessTokenCreate']);
+        result.data!['customerAccessTokenCreate']);
   }
 
   /// Signs out the current user and clears it from the disk cache.
   Future<void> signOutCurrentUser({bool deleteThisPartOfCache = false}) async {
-    String cat = await currentCustomerAccessToken;
+    String? cat = await currentCustomerAccessToken;
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(accessTokenDeleteMutation),
+        document: gql(accessTokenDeleteMutation),
         variables: {'customerAccessToken': cat});
     await _setShopifyUser(null);
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
+    checkForError(
+      result,
+      key: 'customerAccessTokenDelete',
+      errorKey: 'userErrors',
+    );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
-    return result;
+    // return result;
   }
 
   Future<CustomerAccessToken> renewCurrentUser(
       {bool deleteThisPartOfCache = false}) async {
-    String cat = await currentCustomerAccessToken;
+    String? cat = await currentCustomerAccessToken;
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(customerAccessTokenRenewMutation),
+        document: gql(customerAccessTokenRenewMutation),
         variables: {'customerAccessToken': cat});
     final QueryResult result = await _graphQLClient.mutate(_options);
     CustomerAccessToken customerAccessToken =
-        CustomerAccessToken.fromJson(result?.data['customerAccessTokenRenew']);
+        CustomerAccessToken.fromJson(result.data!['customerAccessTokenRenew']);
     await _setShopifyUser(customerAccessToken);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return customerAccessToken;
   }
 
   /// Returns the currently signed-in [ShopifyUser] or [null] if there is none.
-  Future<ShopifyUser> currentUser({bool deleteThisPartOfCache = false}) async {
+  Future<ShopifyUser?> currentUser({bool deleteThisPartOfCache = false}) async {
     SharedPreferences _prefs = await SharedPreferences.getInstance();
-    String cat = await currentCustomerAccessToken;
+    String? cat = await currentCustomerAccessToken;
     final WatchQueryOptions _getCustomer = WatchQueryOptions(
-        documentNode: gql(getCustomerQuery),
+        document: gql(getCustomerQuery),
         variables: {'customerAccessToken': cat});
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_getCustomer.toKey(), null);
+      _graphQLClient.cache.writeQuery(_getCustomer.asRequest, data: {});
     }
     if (_shopifyUser != null) {
       return _shopifyUser;
-      //TODO look into shared prefs (@adam)
     } else if (_prefs.getString(_shopifyKey) != null) {
       final QueryResult result = (await _graphQLClient.query(_getCustomer));
       checkForError(result);
       ShopifyUser user = ShopifyUser.fromJson(
-          (result?.data ?? const {})['customer'] ?? const {});
+          (result.data ?? const {})['customer'] ?? const {});
       return user;
     } else {
       return null;
     }
   }
 
-  Future<void> _setShopifyUser(CustomerAccessToken customerAccessToken) async {
+  Future<void> _setShopifyUser(CustomerAccessToken? customerAccessToken) async {
     SharedPreferences _prefs = await SharedPreferences.getInstance();
     if (customerAccessToken != null) {
       String jsonString = jsonEncode(customerAccessToken);
diff --git a/lib/shopify/src/shopify_blog.dart b/lib/shopify/src/shopify_blog.dart
index 4c341732..0cf1fd5f 100644
--- a/lib/shopify/src/shopify_blog.dart
+++ b/lib/shopify/src/shopify_blog.dart
@@ -15,7 +15,7 @@ import '../../shopify_config.dart';
 class ShopifyBlog with ShopifyError {
   ShopifyBlog._();
 
-  final GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient;
+  final GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient!;
   static final ShopifyBlog instance = ShopifyBlog._();
 
   /// Returns a List of [Blog].
@@ -27,7 +27,7 @@ class ShopifyBlog with ShopifyError {
       bool reverseBlogs = false,
       bool reverseArticles = false}) async {
     final WatchQueryOptions _options =
-        WatchQueryOptions(documentNode: gql(getAllBlogsQuery), variables: {
+        WatchQueryOptions(document: gql(getAllBlogsQuery), variables: {
       'reverseBlogs': reverseBlogs,
       'reverseArticles': reverseArticles,
       'sortKey': sortKeyBlog.parseToString(),
@@ -35,9 +35,9 @@ class ShopifyBlog with ShopifyError {
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
-    return (Blogs.fromJson((result?.data ?? const {})["blogs"] ?? const {}))
+    return (Blogs.fromJson((result.data ?? const {})["blogs"] ?? const {}))
         .blogList;
   }
 
@@ -50,17 +50,17 @@ class ShopifyBlog with ShopifyError {
       bool deleteThisPartOfCache = false,
       bool reverse = false}) async {
     final QueryOptions _options =
-        WatchQueryOptions(documentNode: gql(getBlogByHandleQuery), variables: {
+        WatchQueryOptions(document: gql(getBlogByHandleQuery), variables: {
       'handle': handle,
       'sortKey': sortKeyArticle.parseToString(),
       'reverseArticles': reverse
     });
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
-    var response = (result?.data['blogByHandle'] as LazyCacheMap)?.data;
+    var response = result.data!['blogByHandle'];
     var newResponse = {'node': response};
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return Blog.fromJson(newResponse);
   }
@@ -71,19 +71,18 @@ class ShopifyBlog with ShopifyError {
   Future<List<Article>> getXArticlesSorted(int articleAmount,
       {SortKeyArticle sortKeyArticle = SortKeyArticle.RELEVANCE,
       bool deleteThisPartOfCache = false}) async {
-    final QueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getNArticlesSortedQuery),
-        variables: {
-          'x': articleAmount,
-          'sortKey': sortKeyArticle.parseToString(),
-        });
+    final QueryOptions _options =
+        WatchQueryOptions(document: gql(getNArticlesSortedQuery), variables: {
+      'x': articleAmount,
+      'sortKey': sortKeyArticle.parseToString(),
+    });
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return (Articles.fromJson(
-            ((result?.data ?? const {}))['articles'] ?? const {}))
+            (result.data ?? const {})['articles'] ?? const {}))
         .articleList;
   }
 
@@ -93,9 +92,9 @@ class ShopifyBlog with ShopifyError {
       SortKeyArticle sortKey = SortKeyArticle.TITLE}) async {
     String cursor = startCursor;
     final WatchQueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getXArticlesAfterCursorQuery),
+        document: gql(getXArticlesAfterCursorQuery),
         variables: {
-          'x': limit ?? 50,
+          'x': limit,
           'cursor': cursor,
           'reverse': reverse,
           'sortKey': sortKey.parseToString()
@@ -104,10 +103,10 @@ class ShopifyBlog with ShopifyError {
     checkForError(result);
 
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     Articles articles =
-        (Articles.fromJson((result?.data ?? const {})["articles"] ?? {}));
+        (Articles.fromJson((result.data ?? const {})["articles"] ?? {}));
     return articles;
   }
 }
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index f156522c..c768437f 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -28,15 +28,15 @@ class ShopifyCheckout with ShopifyError {
   ShopifyCheckout._();
   static final ShopifyCheckout instance = ShopifyCheckout._();
 
-  GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient;
+  GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient!;
 
   /// Returns the Checkout.
   ///
   /// Creates a new [Checkout].
   Future<Checkout> createCheckout(List<String> variantIdList,
-      {Map<String, String> shippingAddress,
-      String email,
-      String note,
+      {Map<String, String>? shippingAddress,
+      String? email,
+      String? note,
       bool deleteThisPartOfCache = false}) async {
     var lineItems = transformVariantIdListIntoListOfMaps(variantIdList);
     dynamic variables = {
@@ -49,16 +49,16 @@ class ShopifyCheckout with ShopifyError {
       variables["input"]["email"] = email;
     }
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(createCheckoutMutation), variables: variables);
+        document: gql(createCheckoutMutation), variables: variables);
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     // return ((result?.data['checkoutCreate'] ?? const {})['checkout'] ??
     //     const {});
     final checkout = Checkout.fromJson(
-        (result?.data['checkoutCreate'] ?? const {})['checkout']);
+        (result.data!['checkoutCreate'] ?? const {})['checkout']);
     return checkout;
   }
 
@@ -70,14 +70,18 @@ class ShopifyCheckout with ShopifyError {
       {bool deleteThisPartOfCache = false}) async {
     var checkoutLineItems = transformVariantIdListIntoListOfMaps(variantIdList);
     final MutationOptions _options =
-        MutationOptions(documentNode: gql(replaceCheckoutItems), variables: {
+        MutationOptions(document: gql(replaceCheckoutItems), variables: {
       'checkoutId': checkoutId,
       'checkoutLineItems': checkoutLineItems,
     });
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
+    checkForError(
+      result,
+      key: 'checkoutLineItemsReplace',
+      errorKey: 'userErrors',
+    );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -87,15 +91,15 @@ class ShopifyCheckout with ShopifyError {
   Future<Checkout> getCheckoutInfoQuery(String checkoutId,
       {bool deleteThisPartOfCache = false}) async {
     final WatchQueryOptions _options =
-        WatchQueryOptions(documentNode: gql(getCheckoutInfo), variables: {
+        WatchQueryOptions(document: gql(getCheckoutInfo), variables: {
       'id': checkoutId,
     });
     final QueryResult _queryResult = (await _graphQLClient.query(_options));
     checkForError(_queryResult);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
-    return Checkout.fromJson(_queryResult?.data['node']);
+    return Checkout.fromJson(_queryResult.data!['node']);
   }
 
   /// Updates the shipping address on given [checkoutId]
@@ -113,7 +117,7 @@ class ShopifyCheckout with ShopifyError {
       String zip,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(checkoutShippingAddressUpdateMutation),
+        document: gql(checkoutShippingAddressUpdateMutation),
         variables: {
           'checkoutId': checkoutId,
           'address1': address1,
@@ -128,29 +132,32 @@ class ShopifyCheckout with ShopifyError {
           'zip': zip
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result,
-        key: 'checkoutShippingAddressUpdateV2', errorKey: 'checkoutUserErrors');
+    checkForError(
+      result,
+      key: 'checkoutShippingAddressUpdateV2',
+      errorKey: 'checkoutUserErrors',
+    );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return Checkout.fromJson(
-        result?.data['checkoutShippingAddressUpdateV2']?.data['checkout']);
+        result.data!['checkoutShippingAddressUpdateV2']?.data['checkout']);
   }
 
   Future<Checkout> getCheckoutInfoWithAvailableShippingRatesQuery(
       String checkoutId,
       {bool deleteThisPartOfCache = false}) async {
     final WatchQueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getCheckoutInfoWithShippingRate),
+        document: gql(getCheckoutInfoWithShippingRate),
         variables: {
           'id': checkoutId,
         });
     final QueryResult _queryResult = (await _graphQLClient.query(_options));
     checkForError(_queryResult);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
-    return Checkout.fromJson(_queryResult?.data['node']);
+    return Checkout.fromJson(_queryResult.data!['node']);
   }
 
   /// Associates the [Customer] that [customerAccessToken] belongs to, to the [Checkout] that [checkoutId] belongs to.
@@ -158,15 +165,19 @@ class ShopifyCheckout with ShopifyError {
       String checkoutId, String customerAccessToken,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(associateCustomer),
+        document: gql(associateCustomer),
         variables: {
           'checkoutId': checkoutId,
           'customerAccessToken': customerAccessToken
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
+    checkForError(
+      result,
+      key: 'checkoutCustomerAssociateV2',
+      errorKey: 'checkoutUserErrors',
+    );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -174,12 +185,16 @@ class ShopifyCheckout with ShopifyError {
   Future<void> checkoutCustomerDisassociate(String checkoutId,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(checkoutCustomerDisassociateMutation),
+        document: gql(checkoutCustomerDisassociateMutation),
         variables: {'id': checkoutId});
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
+    checkForError(
+      result,
+      key: 'checkoutCustomerDisassociateV2',
+      errorKey: 'checkoutUserErrors',
+    );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -188,33 +203,41 @@ class ShopifyCheckout with ShopifyError {
       String checkoutId, String discountCode,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(checkoutDiscountCodeApplyMutation),
+        document: gql(checkoutDiscountCodeApplyMutation),
         variables: {'checkoutId': checkoutId, 'discountCode': discountCode});
     final QueryResult result = await _graphQLClient.mutate(_options);
 
-    checkForError(result);
+    checkForError(
+      result,
+      key: 'checkoutDiscountCodeApplyV2',
+      errorKey: 'checkoutUserErrors',
+    );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
 
     return Checkout.fromJson(
-        result?.data['checkoutDiscountCodeApplyV2']?.data['checkout']);
+        result.data!['checkoutDiscountCodeApplyV2']?.data['checkout']);
   }
 
   /// Removes the applied discount from the [Checkout] that [checkoutId] belongs to.
   Future<Checkout> checkoutDiscountCodeRemove(String checkoutId,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(checkoutDiscountCodeRemoveMutation),
+        document: gql(checkoutDiscountCodeRemoveMutation),
         variables: {'checkoutId': checkoutId});
     QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
+    checkForError(
+      result,
+      key: 'checkoutDiscountCodeRemove',
+      errorKey: 'checkoutUserErrors',
+    );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
 
     return Checkout.fromJson(
-        result?.data['checkoutDiscountCodeRemove']?.data['checkout']);
+        result.data!['checkoutDiscountCodeRemove']?.data['checkout']);
   }
 
   /// Appends the [giftCardCodes] to the [Checkout] that [checkoutId] belongs to.
@@ -222,12 +245,16 @@ class ShopifyCheckout with ShopifyError {
       String checkoutId, List<String> giftCardCodes,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(checkoutGiftCardsAppendMutation),
+        document: gql(checkoutGiftCardsAppendMutation),
         variables: {'checkoutId': checkoutId, 'giftCardCodes': giftCardCodes});
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
+    checkForError(
+      result,
+      key: 'checkoutGiftCardsAppend',
+      errorKey: 'checkoutUserErrors',
+    );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -236,15 +263,19 @@ class ShopifyCheckout with ShopifyError {
       String appliedGiftCardId, String checkoutId,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(checkoutGiftCardRemoveMutation),
+        document: gql(checkoutGiftCardRemoveMutation),
         variables: {
           'appliedGiftCards': appliedGiftCardId,
           'checkoutId': checkoutId
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
+    checkForError(
+      result,
+      key: 'checkoutGiftCardRemoveV2',
+      errorKey: 'checkoutUserErrors',
+    );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -253,13 +284,17 @@ class ShopifyCheckout with ShopifyError {
   Future<void> checkoutCompleteFree(String checkoutId,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(checkoutCompleteFreeMutation),
+        document: gql(checkoutCompleteFreeMutation),
         variables: {'checkoutId': checkoutId});
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForCheckoutError(result);
+    checkForError(
+      result,
+      key: 'checkoutCompleteFree',
+      errorKey: 'checkoutUserErrors',
+    );
 
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -267,33 +302,37 @@ class ShopifyCheckout with ShopifyError {
       String checkoutId, String shippingRateHandle,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(checkoutShippingLineUpdateMutation),
+        document: gql(checkoutShippingLineUpdateMutation),
         variables: {
           'checkoutId': checkoutId,
           'shippingRateHandle': shippingRateHandle
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
+    checkForError(
+      result,
+      key: 'checkoutShippingLineUpdate',
+      errorKey: 'checkoutUserErrors',
+    );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return Checkout.fromJson(
-        result?.data['checkoutShippingLineUpdate']?.data['checkout']);
+        result.data!['checkoutShippingLineUpdate']?.data['checkout']);
   }
 
   Future<Checkout> emailUpdate(String checkoutId, String email,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(checkoutEmailUpdateMutation),
+        document: gql(checkoutEmailUpdateMutation),
         variables: {'checkoutId': checkoutId, 'email': email});
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result,
         key: 'checkoutEmailUpdateV2', errorKey: 'checkoutUserErrors');
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return Checkout.fromJson(
-        result?.data['checkoutEmailUpdateV2']?.data['checkout']);
+        result.data!['checkoutEmailUpdateV2']?.data['checkout']);
   }
 
   // bool _requiresShipping(QueryResult result) {
@@ -308,19 +347,19 @@ class ShopifyCheckout with ShopifyError {
       bool reverse = true,
       bool deleteThisPartOfCache = false}) async {
     final QueryOptions _options =
-        WatchQueryOptions(documentNode: gql(getAllOrdersQuery), variables: {
+        WatchQueryOptions(document: gql(getAllOrdersQuery), variables: {
       'accessToken': customerAccessToken,
       'sortKey': sortKey.parseToString(),
       'reverse': reverse
     });
     final QueryResult result =
-        await ShopifyConfig.graphQLClient.query(_options);
+        await ShopifyConfig.graphQLClient!.query(_options);
     checkForError(result);
     Orders orders = Orders.fromJson(
-        ((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ??
+        (((result.data ?? const {})['customer'] ?? const {})['orders'] ??
             const {}));
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return orders.orderList;
   }
@@ -332,7 +371,7 @@ class ShopifyCheckout with ShopifyError {
       bool deleteThisPartOfCache = false}) async {
     String cursor = startCursor;
     final QueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getXOrdersAfterCursorQuery),
+        document: gql(getXOrdersAfterCursorQuery),
         variables: {
           'accessToken': customerAccessToken,
           'sortKey': sortKey.parseToString(),
@@ -341,25 +380,25 @@ class ShopifyCheckout with ShopifyError {
           'x': limit
         });
     final QueryResult result =
-        await ShopifyConfig.graphQLClient.query(_options);
+        await ShopifyConfig.graphQLClient!.query(_options);
     checkForError(result);
     Orders orders = Orders.fromJson(
-        ((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ??
+        (((result.data ?? const {})['customer'] ?? const {})['orders'] ??
             const {}));
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return orders;
   }
 
-  Future<List<Product>> getRecentlyOrderedProducts(
+  Future<List<Product?>> getRecentlyOrderedProducts(
       String customerAccessToken, int limit,
       {SortKeyOrder sortKey = SortKeyOrder.ID,
       bool reverse = true,
       bool deleteThisPartOfCache = false}) async {
-    String cursor;
+    String? cursor;
     final QueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getRecentlyOrderedProductsQuery),
+        document: gql(getRecentlyOrderedProductsQuery),
         variables: {
           'accessToken': customerAccessToken,
           'sortKey': sortKey.parseToString(),
@@ -368,20 +407,20 @@ class ShopifyCheckout with ShopifyError {
           'x': limit
         });
     final QueryResult result =
-        await ShopifyConfig.graphQLClient.query(_options);
+        await ShopifyConfig.graphQLClient!.query(_options);
     checkForError(result);
     Orders orders = Orders.fromJson(
-        ((((result?.data ?? const {}))['customer'] ?? const {})['orders'] ??
+        (((result.data ?? const {})['customer'] ?? const {})['orders'] ??
             const {}));
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
-    List<Product> pList = [];
+    List<Product?> pList = [];
     orders.orderList.forEach((order) {
-      order.lineItems.lineItemOrderList.forEach((lineItem) {
+      order.lineItems!.lineItemOrderList!.forEach((lineItem) {
         if (lineItem.variant.product != null) {
-          Product hasProduct = pList.firstWhere(
-              (product) => product.id == lineItem.variant.product.id,
+          Product? hasProduct = pList.firstWhere(
+              (product) => product!.id == lineItem.variant.product!.id,
               orElse: () => null);
           if (hasProduct == null) {
             pList.add(lineItem.variant.product);
diff --git a/lib/shopify/src/shopify_customer.dart b/lib/shopify/src/shopify_customer.dart
index b4875aee..4efd20e4 100644
--- a/lib/shopify/src/shopify_customer.dart
+++ b/lib/shopify/src/shopify_customer.dart
@@ -8,12 +8,12 @@ import 'package:graphql/client.dart';
 import '../../shopify_config.dart';
 
 /// ShopifyCustomer class provides various methods for working with a user/customer.
-class ShopifyCustomer with ShopifyError{
+class ShopifyCustomer with ShopifyError {
   ShopifyCustomer._();
 
   static final ShopifyCustomer instance = ShopifyCustomer._();
 
-  GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient;
+  GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient!;
 
   /// Updated the Address of a Customer, please input only the fields that you wish to update.
   Future<void> customerAddressUpdate(
@@ -28,9 +28,10 @@ class ShopifyCustomer with ShopifyError{
       String province,
       String zip,
       String customerAccessToken,
-      id, {bool deleteThisPartOfCache = false}) async {
+      id,
+      {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(customerAddressUpdateMutation),
+        document: gql(customerAddressUpdateMutation),
         variables: {
           'address1': address1,
           'address2': address2,
@@ -46,22 +47,26 @@ class ShopifyCustomer with ShopifyError{
           'id': id
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
-    if(deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+    checkForError(
+      result,
+      key: 'customerAddressUpdate',
+      errorKey: 'customerUserErrors',
+    );
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
   /// Updates the customer to which [customerAccessToken] belongs to.
   Future<void> customerUpdate(
-      {String email,
-        String firstName,
-        String lastName,
-        String password,
-        String phoneNumber,
-        String customerAccessToken,
-        bool acceptsMarketing,
-        bool deleteThisPartOfCache = false}) async {
+      {String? email,
+      String? firstName,
+      String? lastName,
+      String? password,
+      String? phoneNumber,
+      String? customerAccessToken,
+      bool? acceptsMarketing,
+      bool deleteThisPartOfCache = false}) async {
     Map<String, dynamic> variableMap = {};
     ({
       'email': email,
@@ -71,33 +76,38 @@ class ShopifyCustomer with ShopifyError{
       'phone': phoneNumber,
       'acceptsMarketing': acceptsMarketing,
       'customerAccessToken': customerAccessToken
-    }).forEach((k,v) => v != null ? variableMap[k] = v:null);
+    }).forEach((k, v) => v != null ? variableMap[k] = v : null);
     // print(variableMap);
-    final MutationOptions _options =
-    MutationOptions(documentNode: gql(createValidMutationString(variableMap)), variables: variableMap);
+    final MutationOptions _options = MutationOptions(
+        document: gql(createValidMutationString(variableMap)),
+        variables: variableMap);
     QueryResult result = await _graphQLClient.mutate(_options);
-    // checkForError(result);
-    if(deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+    checkForError(
+      result,
+      key: 'customerUpdate',
+      errorKey: 'customerUserErrors',
+    );
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
   /// Creates a address for the customer to which [customerAccessToken] belongs to.
   Future<void> customerAddressCreate(
-      {String address1,
-        String address2,
-        String company,
-        String city,
-        String country,
-        String firstName,
-        String lastName,
-        String phone,
-        String province,
-        String zip,
-        String customerAccessToken,
-  bool deleteThisPartOfCache = false}) async {
+      {String? address1,
+      String? address2,
+      String? company,
+      String? city,
+      String? country,
+      String? firstName,
+      String? lastName,
+      String? phone,
+      String? province,
+      String? zip,
+      String? customerAccessToken,
+      bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(customerAddressCreateMutation),
+        document: gql(customerAddressCreateMutation),
         variables: {
           'address1': address1,
           'address2': address2,
@@ -112,9 +122,13 @@ class ShopifyCustomer with ShopifyError{
           'customerAccessToken': customerAccessToken,
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
-    if(deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+    checkForError(
+      result,
+      key: 'customerAddressCreate',
+      errorKey: 'customerUserErrors',
+    );
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -122,17 +136,23 @@ class ShopifyCustomer with ShopifyError{
   ///
   /// A Customer may have more than 1 address, so the addresses have Id's.
   Future<void> customerAddressDelete(
-      {String customerAccessToken, String addressId, bool deleteThisPartOfCache = false}) async {
+      {String? customerAccessToken,
+      String? addressId,
+      bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
-        documentNode: gql(customerAddressDeleteMutation),
+        document: gql(customerAddressDeleteMutation),
         variables: {
           'customerAccessToken': customerAccessToken,
           'id': addressId
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
-    checkForError(result);
-    if(deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+    checkForError(
+      result,
+      key: 'customerAddressDelete',
+      errorKey: 'customerUserErrors',
+    );
+    if (deleteThisPartOfCache) {
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 }
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index 49e958c8..949cc35c 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -34,20 +34,19 @@ class ShopifyStore with ShopifyError {
 
   static final ShopifyStore instance = ShopifyStore._();
 
-  GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient;
+  GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient!;
 
   /// Returns a List of [Product].
   ///
   /// Simply returns all Products from your Store.
   Future<List<Product>> getAllProducts(
-      {String metafieldsNamespace, bool deleteThisPartOfCache = false}) async {
+      {String? metafieldsNamespace, bool deleteThisPartOfCache = false}) async {
     List<Product> productList = [];
     Products tempProduct;
-    String cursor;
+    String? cursor;
     WatchQueryOptions _options;
     do {
-      _options =
-          WatchQueryOptions(documentNode: gql(getProductsQuery), variables: {
+      _options = WatchQueryOptions(document: gql(getProductsQuery), variables: {
         'cursor': cursor,
         'shouldFetchMetafields': metafieldsNamespace != null,
         'metafieldsNamespace': metafieldsNamespace
@@ -55,13 +54,13 @@ class ShopifyStore with ShopifyError {
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
       tempProduct =
-          (Products.fromJson((result?.data ?? const {})["products"] ?? {}));
+          (Products.fromJson((result.data ?? const {})["products"] ?? {}));
 
-      productList += tempProduct?.productList ?? const [];
+      productList += tempProduct.productList;
       cursor = productList.isNotEmpty ? productList.last.cursor : null;
-    } while ((tempProduct?.hasNextPage == true));
+    } while ((tempProduct.hasNextPage == true));
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return productList;
   }
@@ -70,18 +69,18 @@ class ShopifyStore with ShopifyError {
       {bool deleteThisPartOfCache = false, minimumData = true}) async {
     try {
       final WatchQueryOptions _options = WatchQueryOptions(
-          documentNode: minimumData
+          document: minimumData
               ? gql(getProductByHandleMinimumDataQuery)
               : gql(getProductByHandleQuery),
           variables: {'handle': handle});
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
       if (deleteThisPartOfCache) {
-        _graphQLClient.cache.write(_options.toKey(), null);
+        _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
       }
       // Map<String, dynamic> a = (result?.data ?? const {})['productByHandle'] ?? {};
       return Product.fromProductHandleJson(
-          (result?.data ?? const {})['productByHandle'] ?? {});
+          (result.data ?? const {})['productByHandle'] ?? {});
     } catch (e) {
       print(e);
     }
@@ -98,9 +97,9 @@ class ShopifyStore with ShopifyError {
       SortKeyProduct sortKeyProduct = SortKeyProduct.TITLE}) async {
     String cursor = startCursor;
     final WatchQueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getXProductsAfterCursorQuery),
+        document: gql(getXProductsAfterCursorQuery),
         variables: {
-          'x': limit ?? 50,
+          'x': limit,
           'cursor': cursor,
           'reverse': reverse,
           'sortKey': sortKeyProduct.parseToString()
@@ -109,9 +108,9 @@ class ShopifyStore with ShopifyError {
     checkForError(result);
 
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
-    return (Products.fromJson((result?.data ?? const {})["products"] ?? {}));
+    return (Products.fromJson((result.data ?? const {})["products"] ?? {}));
   }
 
   /// Returns a List of [Product].
@@ -121,20 +120,20 @@ class ShopifyStore with ShopifyError {
       {bool deleteThisPartOfCache = false, minimumData = true}) async {
     List<Product> productList = [];
     final QueryOptions _options = WatchQueryOptions(
-        documentNode: minimumData
+        document: minimumData
             ? gql(getProductsByIdsMinimumDataQuery)
             : gql(getProductsByIdsQuery),
         variables: {'ids': idList});
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
-    var response = result?.data;
+    var response = result.data!;
     var newResponse = {
       'edges': List.generate(response['nodes'].length,
           (index) => {'node': response['nodes'][index]})
     };
     productList = Products.fromJson(newResponse).productList;
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return productList;
   }
@@ -156,13 +155,11 @@ class ShopifyStore with ShopifyError {
   ///  SortKey.RELEVANCE,
   Future<List<Product>> getNProducts(int n,
       {bool deleteThisPartOfCache = false,
-      bool reverse,
+      bool? reverse,
       SortKeyProduct sortKey = SortKeyProduct.PRODUCT_TYPE}) async {
-    assert(n != null);
-    assert(sortKey != null);
     List<Product> productList = [];
     final WatchQueryOptions _options =
-        WatchQueryOptions(documentNode: gql(getNProductsQuery), variables: {
+        WatchQueryOptions(document: gql(getNProductsQuery), variables: {
       'n': n,
       'sortKey': sortKey.parseToString(),
       'reverse': reverse,
@@ -170,10 +167,10 @@ class ShopifyStore with ShopifyError {
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
     productList =
-        (Products.fromJson((result?.data ?? const {})["products"] ?? {}))
+        (Products.fromJson((result.data ?? const {})["products"] ?? {}))
             .productList;
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return productList;
   }
@@ -183,21 +180,21 @@ class ShopifyStore with ShopifyError {
       {bool deleteThisPartOfCache = false}) async {
     try {
       final WatchQueryOptions _options = WatchQueryOptions(
-          documentNode: gql(getProductRecommendationsQuery),
+          document: gql(getProductRecommendationsQuery),
           variables: {'id': productId});
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
       if (deleteThisPartOfCache) {
-        _graphQLClient.cache.write(_options.toKey(), null);
+        _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
       }
       var newResponse = List.generate(
-          result?.data['productRecommendations']?.length ?? 0,
+          result.data!['productRecommendations']?.length ?? 0,
           (index) => {
                 "node":
-                    (result?.data['productRecommendations'] ?? const {})[index]
+                    (result.data!['productRecommendations'] ?? const {})[index]
               });
       var tempProducts = {"edges": newResponse};
-      return Products.fromJson(tempProducts)?.productList;
+      return Products.fromJson(tempProducts).productList;
     } catch (e) {
       print(e);
     }
@@ -209,18 +206,17 @@ class ShopifyStore with ShopifyError {
       {bool deleteThisPartOfCache = false}) async {
     try {
       final WatchQueryOptions _options = WatchQueryOptions(
-          documentNode: gql(getCollectionsByIdsQuery),
-          variables: {'ids': idList});
+          document: gql(getCollectionsByIdsQuery), variables: {'ids': idList});
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
       if (deleteThisPartOfCache) {
-        _graphQLClient.cache.write(_options.toKey(), null);
+        _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
       }
 
-      var newResponse = List.generate(result?.data['nodes']?.length ?? 0,
-          (index) => {"node": (result?.data['nodes'] ?? const {})[index]});
+      var newResponse = List.generate(result.data!['nodes']?.length ?? 0,
+          (index) => {"node": (result.data!['nodes'] ?? const {})[index]});
       var tempCollection = {"edges": newResponse};
-      return Collections.fromJson(tempCollection ?? const {})?.collectionList;
+      return Collections.fromJson(tempCollection).collectionList;
     } catch (e) {
       print(e);
     }
@@ -230,36 +226,37 @@ class ShopifyStore with ShopifyError {
   /// Returns the Shop.
   Future<Shop> getShop({bool deleteThisPartOfCache = false}) async {
     final WatchQueryOptions _options = WatchQueryOptions(
-      documentNode: gql(getShopQuery),
+      document: gql(getShopQuery),
     );
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
-    return Shop.fromJson(result?.data);
+    return Shop.fromJson(result.data!);
   }
 
   /// Returns a collection by handle.
   Future<Collection> getCollectionByHandle(String handle,
       {bool deleteThisPartOfCache = false, productsCount}) async {
+    Collection collection = Collection.fromJson({});
     try {
       final WatchQueryOptions _options = WatchQueryOptions(
-          documentNode: productsCount != null
+          document: productsCount != null
               ? gql(getCollectionByHandleWithProductsQuery(productsCount))
               : gql(getCollectionByHandleQuery),
           variables: {'handle': handle});
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
       if (deleteThisPartOfCache) {
-        _graphQLClient.cache.write(_options.toKey(), null);
+        _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
       }
-      return Collection.fromCollectionHandleJson(
-          (result?.data ?? const {})['collectionByHandle'] ?? {});
+      collection = Collection.fromCollectionHandleJson(
+          (result.data ?? const {})['collectionByHandle'] ?? {});
     } catch (e) {
       print(e);
     }
-    return Collection.fromJson({});
+    return collection;
   }
 
   Future<Collection> getXProductsAfterCursorByCollectionHandle(
@@ -271,10 +268,10 @@ class ShopifyStore with ShopifyError {
     String cursor = startCursor;
     try {
       final WatchQueryOptions _options = WatchQueryOptions(
-          documentNode: gql(getXProductAfterCursorByCollectionHandleQuery),
+          document: gql(getXProductAfterCursorByCollectionHandleQuery),
           variables: {
             'handle': handle,
-            'x': limit ?? 50,
+            'x': limit,
             'cursor': cursor,
             'reverse': reverse,
             'sortKey': sortKeyProductCollection.parseToString()
@@ -282,10 +279,10 @@ class ShopifyStore with ShopifyError {
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
       if (deleteThisPartOfCache) {
-        _graphQLClient.cache.write(_options.toKey(), null);
+        _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
       }
       return Collection.fromCollectionHandleJson(
-          (result?.data ?? const {})['collectionByHandle'] ?? {});
+          (result.data ?? const {})['collectionByHandle'] ?? {});
     } catch (e) {
       print(e);
     }
@@ -301,11 +298,11 @@ class ShopifyStore with ShopifyError {
       bool reverse = false}) async {
     List<Collection> collectionList = [];
     Collections tempCollection;
-    String cursor;
+    String? cursor;
     WatchQueryOptions _options;
     do {
       _options = WatchQueryOptions(
-          documentNode: gql(getAllCollectionsOptimizedQuery),
+          document: gql(getAllCollectionsOptimizedQuery),
           variables: {
             'cursor': cursor,
             'sortKey': sortKeyCollection.parseToString(),
@@ -314,12 +311,12 @@ class ShopifyStore with ShopifyError {
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
       tempCollection = (Collections.fromJson(
-          (result?.data ?? const {})['collections'] ?? {}));
+          (result.data ?? const {})['collections'] ?? {}));
       collectionList = tempCollection.collectionList + collectionList;
       cursor = collectionList.isNotEmpty ? collectionList.last.cursor : null;
-    } while ((tempCollection?.hasNextPage == true));
+    } while ((tempCollection.hasNextPage == true));
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return collectionList;
   }
@@ -337,10 +334,10 @@ class ShopifyStore with ShopifyError {
     bool reverse = false,
   }) async {
     List<Collection> collectionList;
-    String cursor;
+    String? cursor;
     WatchQueryOptions _options;
     _options = WatchQueryOptions(
-        documentNode: gql(getXCollectionsAndNProductsSortedQuery),
+        document: gql(getXCollectionsAndNProductsSortedQuery),
         variables: {
           'cursor': cursor,
           'sortKey': sortKeyCollection.parseToString(),
@@ -352,10 +349,10 @@ class ShopifyStore with ShopifyError {
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
     collectionList =
-        (Collections.fromJson((result?.data ?? const {})['collections'] ?? {}))
+        (Collections.fromJson((result.data ?? const {})['collections'] ?? {}))
             .collectionList;
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return collectionList;
   }
@@ -367,13 +364,13 @@ class ShopifyStore with ShopifyError {
       {bool deleteThisPartOfCache = false,
       SortKeyProductCollection sortKeyProductCollection =
           SortKeyProductCollection.CREATED}) async {
-    String cursor;
+    String? cursor;
     List<Product> productList = [];
     Collection collection;
     QueryOptions _options;
     do {
       _options = WatchQueryOptions(
-          documentNode: gql(getCollectionByIdQuery),
+          document: gql(getCollectionByIdQuery),
           variables: {
             'id': id,
             'cursor': cursor,
@@ -382,12 +379,12 @@ class ShopifyStore with ShopifyError {
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
       productList
-          .addAll((Collection.fromJson(result?.data).products).productList);
-      collection = (Collection.fromJson(result?.data));
+          .addAll(Collection.fromJson(result.data!).products!.productList);
+      collection = (Collection.fromJson(result.data!));
       cursor = productList.isNotEmpty ? productList.last.cursor : null;
-    } while (collection?.products?.hasNextPage == true);
+    } while (collection.products?.hasNextPage == true);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return productList;
   }
@@ -396,14 +393,14 @@ class ShopifyStore with ShopifyError {
   ///
   /// Returns the first [limit] Products after the given [startCursor].
   /// [limit] has to be in the range of 0 and 250.
-  Future<Products> getXProductsAfterCursorWithinCollection(
+  Future<Products?> getXProductsAfterCursorWithinCollection(
       String id, int limit, String startCursor,
       {SortKeyProductCollection sortKey = SortKeyProductCollection.BEST_SELLING,
       bool deleteThisPartOfCache = false,
       bool reverse = false}) async {
     String cursor = startCursor;
     final WatchQueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getXProductsAfterCursorWithinCollectionQuery),
+        document: gql(getXProductsAfterCursorWithinCollectionQuery),
         variables: {
           'id': id,
           'cursor': cursor,
@@ -414,25 +411,25 @@ class ShopifyStore with ShopifyError {
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
-    return (Collection.fromJson(result?.data)).products;
+    return (Collection.fromJson(result.data!)).products;
   }
 
   /// Returns a List of [Product].
   ///
   /// Gets all [Product] from a [query] search sorted by [sortKey].
   Future<List<Product>> getAllProductsOnQuery(String cursor, String query,
-      {SortKeyProduct sortKey,
+      {SortKeyProduct? sortKey,
       bool deleteThisPartOfCache = false,
       bool reverse = false}) async {
-    String cursor;
+    String? cursor;
     List<Product> productList = [];
     Products products;
     WatchQueryOptions _options;
     do {
       _options = WatchQueryOptions(
-          documentNode: gql(getAllProductsOnQueryQuery),
+          document: gql(getAllProductsOnQueryQuery),
           variables: {
             'cursor': cursor,
             'sortKey': sortKey.parseToString(),
@@ -442,13 +439,13 @@ class ShopifyStore with ShopifyError {
       final QueryResult result = await _graphQLClient.query(_options);
       checkForError(result);
       productList.addAll(
-          (Products.fromJson((result?.data ?? const {})['products']))
-              ?.productList);
-      products = (Products.fromJson((result?.data ?? const {})['products']));
+          (Products.fromJson((result.data ?? const {})['products']))
+              .productList);
+      products = (Products.fromJson((result.data ?? const {})['products']));
       cursor = productList.isNotEmpty ? productList.last.cursor : null;
-    } while (products?.hasNextPage == true);
+    } while (products.hasNextPage == true);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return productList;
   }
@@ -458,11 +455,11 @@ class ShopifyStore with ShopifyError {
   /// Gets [limit] amount of [Product] from the [query] search, sorted by [sortKey].
   Future<Products> getXProductsOnQueryAfterCursor(
       String query, int limit, String cursor,
-      {SortKeyProduct sortKey,
+      {SortKeyProduct? sortKey,
       bool deleteThisPartOfCache = false,
       bool reverse = false}) async {
     final WatchQueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getXProductsOnQueryAfterCursorQuery),
+        document: gql(getXProductsOnQueryAfterCursorQuery),
         variables: {
           'cursor': cursor,
           'limit': limit,
@@ -471,13 +468,13 @@ class ShopifyStore with ShopifyError {
           'reverse': reverse
         });
     final QueryResult result =
-        await ShopifyConfig.graphQLClient.query(_options);
+        await ShopifyConfig.graphQLClient!.query(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
 
-    return Products.fromJson((result?.data ?? const {})['products']);
+    return Products.fromJson((result.data ?? const {})['products']);
   }
 
   /// Returns a List of [Metafield].
@@ -487,18 +484,17 @@ class ShopifyStore with ShopifyError {
       String productHandle, String namespace,
       {bool deleteThisPartOfCache = false}) async {
     final WatchQueryOptions _options = WatchQueryOptions(
-        documentNode: gql(getMetafieldsFromProductQuery),
+        document: gql(getMetafieldsFromProductQuery),
         variables: {'handle': productHandle, 'namespace': namespace});
     final QueryResult result =
-        await ShopifyConfig.graphQLClient.query(_options);
+        await ShopifyConfig.graphQLClient!.query(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.write(_options.toKey(), null);
+      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
-    return ((((result.data as LazyCacheMap)['productByHandle']
-                as LazyCacheMap)['metafields'] as LazyCacheMap)['edges']
+    return (result.data!['productByHandle']['metafields']['edges']
             as List<Object>)
-        .map((e) => Metafield.fromJson(e))
+        .map((e) => Metafield.fromJson(e as Map<String, dynamic>))
         .toList();
   }
 }
diff --git a/lib/shopify_config.dart b/lib/shopify_config.dart
index c0b86fe6..e10dd6da 100644
--- a/lib/shopify_config.dart
+++ b/lib/shopify_config.dart
@@ -1,37 +1,56 @@
 import 'package:graphql/client.dart';
 
 class ShopifyConfig {
-
   /// Your own unique access key found on your Shopify dashboard under apps -> manage private apps -> your-app-name .
-  static String _storefrontAccessToken;
+  static String? _storefrontAccessToken;
 
   /// Your store url.
   ///
   /// eg: "shopname.myshopify.com"
-  static String _storeUrl;
+  static String? _storeUrl;
+
+  static String? get storeUrl => _storeUrl;
 
   /// The version of the Storefront API.
   ///
   /// Default is set to 2020-04.
   static String _storefrontApiVersion = '2020-04';
 
+  /// Where to store the cache.
+  ///
+  /// Default is [InMemoryStore] which does _not_ persist to disk
+  static Store? _cacheStore;
+
+  static Store? get cacheStore => _cacheStore;
+
   /// Sets the config.
   ///
   /// IMPORTANT: preferably call this inside the main function or at least before instantiating other Shopify classes.
-  static void setConfig(String storefrontAccessToken, String storeUrl, String storefrontApiVersion){
-    _storefrontAccessToken ??= storefrontAccessToken;
-    _storeUrl ??= storeUrl;
-    _storefrontApiVersion = storefrontApiVersion != null ? storefrontApiVersion : _storefrontApiVersion;
+  static void setConfig(
+    String storefrontAccessToken,
+    String storeUrl,
+    String? storefrontApiVersion, {
+    Store? cacheStore,
+  }) {
+    _storefrontAccessToken = storefrontAccessToken;
+    _storeUrl = storeUrl;
+    _storefrontApiVersion = storefrontApiVersion ?? _storefrontApiVersion;
+    _cacheStore = cacheStore;
+    _graphQLClient = GraphQLClient(
+      link: HttpLink(
+        'https://$_storeUrl/api/$_storefrontApiVersion/graphql.json',
+        defaultHeaders: {
+          'X-Shopify-Storefront-Access-Token': _storefrontAccessToken!,
+        },
+      ),
+      cache: GraphQLCache(
+        store: _cacheStore,
+      ),
+    );
   }
 
+  static GraphQLClient? _graphQLClient;
+
   /// The GraphQlClient used for communication with the Storefront API.
-  static final GraphQLClient graphQLClient = GraphQLClient(
-    link: HttpLink(
-        headers: {'X-Shopify-Storefront-Access-Token':'$_storefrontAccessToken'},
-        uri: 'https://$_storeUrl/api/$_storefrontApiVersion/graphql.json'
-    ),
-    cache: NormalizedInMemoryCache(
-      dataIdFromObject: typenameDataIdFromObject,
-    ),
-  );
+  static GraphQLClient? get graphQLClient => _graphQLClient;
 }
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index ceb94277..eb170842 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,70 +7,77 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.1"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.3"
-  convert:
-    dependency: transitive
-    description:
-      name: convert
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.1"
+    version: "1.15.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "3.0.1"
   enum_to_string:
     dependency: "direct main"
     description:
       name: enum_to_string
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.14"
+    version: "2.0.1"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.1"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -92,112 +99,217 @@ packages:
       name: gql
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.2"
+    version: "0.13.0"
+  gql_dedupe_link:
+    dependency: transitive
+    description:
+      name: gql_dedupe_link
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  gql_error_link:
+    dependency: transitive
+    description:
+      name: gql_error_link
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0"
+  gql_exec:
+    dependency: transitive
+    description:
+      name: gql_exec
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.0"
+  gql_http_link:
+    dependency: transitive
+    description:
+      name: gql_http_link
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.0"
+  gql_link:
+    dependency: transitive
+    description:
+      name: gql_link
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.0"
+  gql_transform_link:
+    dependency: transitive
+    description:
+      name: gql_transform_link
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0"
   graphql:
     dependency: "direct main"
     description:
       name: graphql
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.0"
+    version: "5.0.0-nullsafety.5"
+  hive:
+    dependency: transitive
+    description:
+      name: hive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.4"
   http:
     dependency: transitive
     description:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.1"
+    version: "0.13.3"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.4"
+    version: "4.0.0"
   intl:
     dependency: "direct main"
     description:
       name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.1"
+    version: "0.17.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.3"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.1"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
-  mime:
+    version: "1.3.0"
+  normalize:
     dependency: transitive
     description:
-      name: mime
+      name: normalize
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.6+3"
+    version: "0.5.2"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.1"
+    version: "1.8.0"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0+1"
-  quiver:
+    version: "1.11.0"
+  platform:
     dependency: transitive
     description:
-      name: quiver
+      name: platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "3.0.0"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.2.1"
   rxdart:
     dependency: transitive
     description:
       name: rxdart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.24.1"
+    version: "0.26.0"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.7+3"
+    version: "2.0.6"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.1+10"
+    version: "2.0.0"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2+7"
+    version: "2.0.0"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -209,70 +321,84 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.2"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.2"
+    version: "0.3.0"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
-  uuid_enhanced:
+    version: "1.3.0"
+  uuid:
     dependency: transitive
     description:
-      name: uuid_enhanced
+      name: uuid
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.4"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
-  websocket:
+    version: "2.1.0"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  xdg_directories:
     dependency: transitive
     description:
-      name: websocket
+      name: xdg_directories
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.5"
+    version: "0.2.0"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
-  flutter: ">=1.12.13+hotfix.5 <2.0.0"
+  dart: ">=2.13.0 <3.0.0"
+  flutter: ">=1.20.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index a2b7cb51..3db3fe07 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,18 +1,18 @@
 name: flutter_simple_shopify
 description: A new Flutter package which provides help in creating a mobile app of a shopify store.
-version: 0.0.25-alpha
+version: 0.0.30-null-safety
 homepage: https://github.com/ThinkSimple/flutter_simple_shopify
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   flutter:
     sdk: flutter
-  graphql: ^3.1.0
-  shared_preferences: ^0.5.7
-  enum_to_string: ^1.0.14
-  intl: ^0.16.1
+  graphql: ^5.0.0-nullsafety.5
+  shared_preferences: ^2.0.6
+  enum_to_string: ^2.0.1
+  intl: ^0.17.0
 
 
 dev_dependencies:

From ad9dd0ab938ca3bfc33590afa08339859d414140 Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Mon, 31 May 2021 17:16:43 +0530
Subject: [PATCH 62/80] null safety fixed

---
 lib/models/src/order.dart             | 23 +++++---
 lib/models/src/product.dart           | 55 +++++++++----------
 lib/shopify/src/shopify_auth.dart     | 14 ++---
 lib/shopify/src/shopify_blog.dart     |  8 +--
 lib/shopify/src/shopify_checkout.dart | 36 ++++++-------
 lib/shopify/src/shopify_customer.dart |  8 +--
 lib/shopify/src/shopify_store.dart    | 78 ++++++++++++++-------------
 7 files changed, 114 insertions(+), 108 deletions(-)

diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index b43f5ad6..0437ea31 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -78,12 +78,20 @@ class Order {
     DateTime? canceledAt = (json ?? const {})['canceledAt'] != null
         ? DateTime.parse((json ?? const {})['canceledAt'])
         : null;
-    OrderFinancialStatus? financialStatus = EnumToString.fromString(
-        OrderFinancialStatus.values, (json ?? const {})['financialStatus']);
-    OrderFulfillmentStatus? fulfillmentStatus = EnumToString.fromString(
-        OrderFulfillmentStatus.values, (json ?? const {})['fulfillmentStatus']);
-    OrderCancelReason? cancelReason = EnumToString.fromString(
-        OrderCancelReason.values, (json ?? const {})['cancelReason']);
+    OrderFinancialStatus? financialStatus =
+        (json ?? const {})['financialStatus'] != null
+            ? EnumToString.fromString(OrderFinancialStatus.values,
+                (json ?? const {})['financialStatus'])
+            : null;
+    OrderFulfillmentStatus? fulfillmentStatus =
+        (json ?? const {})['fulfillmentStatus'] != null
+            ? EnumToString.fromString(OrderFulfillmentStatus.values,
+                (json ?? const {})['fulfillmentStatus'])
+            : null;
+    OrderCancelReason? cancelReason = (json ?? const {})['cancelReason'] != null
+        ? EnumToString.fromString(
+            OrderCancelReason.values, (json ?? const {})['cancelReason'])
+        : null;
 
     return Order(
         id: (json ?? const {})['id'],
@@ -163,8 +171,7 @@ class LineItemOrder {
             (json['node'] ?? const {})['originalTotalPrice'] ?? const {}),
         quantity: (json['node'] ?? const {})['quantity'],
         title: (json['node'] ?? const {})['title'],
-        variant: ProductVariantCheckout.fromJson(
-            (json['node'] ?? const {})['variant'] ?? const {}));
+        variant: ProductVariantCheckout.fromJson((json['node'] ?? const {})['variant'] ?? {}));
   }
 
   static _getDiscountAllocationsList(Map<String, dynamic> json) {
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index c6183899..b6fcd08a 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -22,13 +22,13 @@ class Products {
 }
 
 class Product {
-  final List<AssociatedCollections> collectionList;
+  final List<AssociatedCollections>? collectionList;
   final String? title;
   final String? id;
   final bool? availableForSale;
   final String? createdAt;
   final String? description;
-  final List<ProductVariant> productVariants;
+  final List<ProductVariant>? productVariants;
   final String? descriptionHtml;
   final String? handle;
   final String? onlineStoreUrl;
@@ -37,21 +37,21 @@ class Product {
   final List<String>? tags;
   final String? updatedAt;
   final String? cursor;
-  final List<ShopifyImage> images;
-  final List<Option> options;
+  final List<ShopifyImage>? images;
+  final List<Option>? options;
   final String? vendor;
-  final List<Metafield> metafields;
+  final List<Metafield>? metafields;
   final double? rating;
   final int? reviewCount;
 
   const Product(
-      {required this.collectionList,
+      {this.collectionList,
       this.title,
       this.id,
       this.availableForSale,
       this.createdAt,
       this.description,
-      required this.productVariants,
+      this.productVariants,
       this.descriptionHtml,
       this.handle,
       this.onlineStoreUrl,
@@ -60,10 +60,10 @@ class Product {
       this.tags,
       this.updatedAt,
       this.cursor,
-      required this.images,
-      required this.options,
+      this.images,
+      this.options,
       this.vendor,
-      required this.metafields,
+      this.metafields,
       this.rating,
       this.reviewCount});
 
@@ -135,15 +135,12 @@ class Product {
   }
 
   static List<ProductVariant> _getProductVariants(Map<String, dynamic> json) {
-    List<ProductVariant> productVariants = [];
-    ((json['variants'] ?? const {})['edges'] ?? const [])?.forEach((v) {
-      if (v?.data != null)
-        productVariants.add(ProductVariant.fromJson(v?.data ?? const {}));
-    });
-    return productVariants;
+    return ((json['variants'] ?? const {})['edges'] as List<dynamic>)
+            .map((v) => ProductVariant.fromJson(v ?? const {}))
+            .toList() ;
   }
 
-  ProductVariant getProductVariantBySelectedOption(
+  ProductVariant? getProductVariantBySelectedOption(
       List<SelectedOption> filters) {
     Function unOrdDeepEq = const DeepCollectionEquality.unordered().equals;
 
@@ -153,11 +150,11 @@ class Product {
     });
 
     final productVariant =
-        this.productVariants.firstWhere((ProductVariant productVariant) {
+        this.productVariants?.firstWhere((ProductVariant productVariant) {
       bool found = false;
       List<Map<String?, String?>> selectedOptionList = [];
-
-      productVariant.selectedOptions.forEach((SelectedOption selectedOption) {
+  
+      productVariant.selectedOptions?.forEach((SelectedOption selectedOption) {
         selectedOptionList.add({selectedOption.name: selectedOption.value});
       });
 
@@ -263,10 +260,10 @@ class ShopifyImage {
 }
 
 class ProductVariant {
-  final PriceV2 price;
+  final PriceV2? price;
   final String? title;
-  final ShopifyImage image;
-  final PriceV2 compareAtPrice;
+  final ShopifyImage? image;
+  final PriceV2? compareAtPrice;
   final double? weight;
   final String? weightUnit;
   final bool? availableForSale;
@@ -274,13 +271,13 @@ class ProductVariant {
   final bool? requiresShipping;
   final String? id;
   final int? quantityAvailable;
-  final List<SelectedOption> selectedOptions;
+  final List<SelectedOption>? selectedOptions;
 
   const ProductVariant(
-      {required this.price,
+      {this.price,
       this.title,
-      required this.image,
-      required this.compareAtPrice,
+      this.image,
+      this.compareAtPrice,
       this.weight,
       this.weightUnit,
       this.availableForSale,
@@ -288,7 +285,7 @@ class ProductVariant {
       this.requiresShipping,
       this.id,
       this.quantityAvailable,
-      required this.selectedOptions});
+      this.selectedOptions});
 
   static ProductVariant fromJson(Map<String, dynamic> json) {
     return ProductVariant(
@@ -313,7 +310,7 @@ class ProductVariant {
   Map toJson() => {
         'id': id,
         'title': title,
-        'image': image.toJson()
+        'image': image?.toJson()
         // 'weight': weight,
       };
 
diff --git a/lib/shopify/src/shopify_auth.dart b/lib/shopify/src/shopify_auth.dart
index c45da80f..3786b688 100644
--- a/lib/shopify/src/shopify_auth.dart
+++ b/lib/shopify/src/shopify_auth.dart
@@ -64,7 +64,7 @@ class ShopifyAuth with ShopifyError {
         await _createAccessToken(email, password);
     await _setShopifyUser(customerAccessToken);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return shopifyUser;
   }
@@ -83,7 +83,7 @@ class ShopifyAuth with ShopifyError {
       errorKey: 'customerUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -102,7 +102,7 @@ class ShopifyAuth with ShopifyError {
     final shopifyUser = ShopifyUser.fromJson(result.data!['customer']);
     await _setShopifyUser(customerAccessToken);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_getCustomer.asRequest, data: {});
+      // _graphQLClient.cache.writeQuery(_getCustomer.asRequest, data: {});
     }
     return shopifyUser;
   }
@@ -117,7 +117,7 @@ class ShopifyAuth with ShopifyError {
     checkForError(result,
         key: 'customerAccessTokenCreate', errorKey: 'customerUserErrors');
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return CustomerAccessToken.fromJson(
         result.data!['customerAccessTokenCreate']);
@@ -137,7 +137,7 @@ class ShopifyAuth with ShopifyError {
       errorKey: 'userErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     // return result;
   }
@@ -154,7 +154,7 @@ class ShopifyAuth with ShopifyError {
     await _setShopifyUser(customerAccessToken);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return customerAccessToken;
   }
@@ -167,7 +167,7 @@ class ShopifyAuth with ShopifyError {
         document: gql(getCustomerQuery),
         variables: {'customerAccessToken': cat});
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_getCustomer.asRequest, data: {});
+      // _graphQLClient.cache.writeQuery(_getCustomer.asRequest, data: {});
     }
     if (_shopifyUser != null) {
       return _shopifyUser;
diff --git a/lib/shopify/src/shopify_blog.dart b/lib/shopify/src/shopify_blog.dart
index 0cf1fd5f..70247ff1 100644
--- a/lib/shopify/src/shopify_blog.dart
+++ b/lib/shopify/src/shopify_blog.dart
@@ -35,7 +35,7 @@ class ShopifyBlog with ShopifyError {
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return (Blogs.fromJson((result.data ?? const {})["blogs"] ?? const {}))
         .blogList;
@@ -60,7 +60,7 @@ class ShopifyBlog with ShopifyError {
     var response = result.data!['blogByHandle'];
     var newResponse = {'node': response};
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return Blog.fromJson(newResponse);
   }
@@ -79,7 +79,7 @@ class ShopifyBlog with ShopifyError {
     final QueryResult result = await _graphQLClient.query(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return (Articles.fromJson(
             (result.data ?? const {})['articles'] ?? const {}))
@@ -103,7 +103,7 @@ class ShopifyBlog with ShopifyError {
     checkForError(result);
 
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     Articles articles =
         (Articles.fromJson((result.data ?? const {})["articles"] ?? {}));
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index c768437f..ca25578f 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -53,7 +53,7 @@ class ShopifyCheckout with ShopifyError {
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     // return ((result?.data['checkoutCreate'] ?? const {})['checkout'] ??
     //     const {});
@@ -81,7 +81,7 @@ class ShopifyCheckout with ShopifyError {
       errorKey: 'userErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -97,7 +97,7 @@ class ShopifyCheckout with ShopifyError {
     final QueryResult _queryResult = (await _graphQLClient.query(_options));
     checkForError(_queryResult);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return Checkout.fromJson(_queryResult.data!['node']);
   }
@@ -138,7 +138,7 @@ class ShopifyCheckout with ShopifyError {
       errorKey: 'checkoutUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return Checkout.fromJson(
         result.data!['checkoutShippingAddressUpdateV2']?.data['checkout']);
@@ -155,7 +155,7 @@ class ShopifyCheckout with ShopifyError {
     final QueryResult _queryResult = (await _graphQLClient.query(_options));
     checkForError(_queryResult);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return Checkout.fromJson(_queryResult.data!['node']);
   }
@@ -177,7 +177,7 @@ class ShopifyCheckout with ShopifyError {
       errorKey: 'checkoutUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -194,7 +194,7 @@ class ShopifyCheckout with ShopifyError {
       errorKey: 'checkoutUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -213,7 +213,7 @@ class ShopifyCheckout with ShopifyError {
       errorKey: 'checkoutUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
 
     return Checkout.fromJson(
@@ -233,7 +233,7 @@ class ShopifyCheckout with ShopifyError {
       errorKey: 'checkoutUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
 
     return Checkout.fromJson(
@@ -254,7 +254,7 @@ class ShopifyCheckout with ShopifyError {
       errorKey: 'checkoutUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -275,7 +275,7 @@ class ShopifyCheckout with ShopifyError {
       errorKey: 'checkoutUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -294,7 +294,7 @@ class ShopifyCheckout with ShopifyError {
     );
 
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -314,7 +314,7 @@ class ShopifyCheckout with ShopifyError {
       errorKey: 'checkoutUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return Checkout.fromJson(
         result.data!['checkoutShippingLineUpdate']?.data['checkout']);
@@ -329,7 +329,7 @@ class ShopifyCheckout with ShopifyError {
     checkForError(result,
         key: 'checkoutEmailUpdateV2', errorKey: 'checkoutUserErrors');
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return Checkout.fromJson(
         result.data!['checkoutEmailUpdateV2']?.data['checkout']);
@@ -359,7 +359,7 @@ class ShopifyCheckout with ShopifyError {
         (((result.data ?? const {})['customer'] ?? const {})['orders'] ??
             const {}));
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return orders.orderList;
   }
@@ -386,7 +386,7 @@ class ShopifyCheckout with ShopifyError {
         (((result.data ?? const {})['customer'] ?? const {})['orders'] ??
             const {}));
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return orders;
   }
@@ -413,11 +413,11 @@ class ShopifyCheckout with ShopifyError {
         (((result.data ?? const {})['customer'] ?? const {})['orders'] ??
             const {}));
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     List<Product?> pList = [];
     orders.orderList.forEach((order) {
-      order.lineItems!.lineItemOrderList!.forEach((lineItem) {
+      order.lineItems?.lineItemOrderList?.forEach((lineItem) {
         if (lineItem.variant.product != null) {
           Product? hasProduct = pList.firstWhere(
               (product) => product!.id == lineItem.variant.product!.id,
diff --git a/lib/shopify/src/shopify_customer.dart b/lib/shopify/src/shopify_customer.dart
index 4efd20e4..3660b653 100644
--- a/lib/shopify/src/shopify_customer.dart
+++ b/lib/shopify/src/shopify_customer.dart
@@ -53,7 +53,7 @@ class ShopifyCustomer with ShopifyError {
       errorKey: 'customerUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -88,7 +88,7 @@ class ShopifyCustomer with ShopifyError {
       errorKey: 'customerUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -128,7 +128,7 @@ class ShopifyCustomer with ShopifyError {
       errorKey: 'customerUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 
@@ -152,7 +152,7 @@ class ShopifyCustomer with ShopifyError {
       errorKey: 'customerUserErrors',
     );
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
   }
 }
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index 949cc35c..bcde86cc 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -34,7 +34,7 @@ class ShopifyStore with ShopifyError {
 
   static final ShopifyStore instance = ShopifyStore._();
 
-  GraphQLClient _graphQLClient = ShopifyConfig.graphQLClient!;
+  GraphQLClient? get _graphQLClient => ShopifyConfig.graphQLClient;
 
   /// Returns a List of [Product].
   ///
@@ -51,7 +51,7 @@ class ShopifyStore with ShopifyError {
         'shouldFetchMetafields': metafieldsNamespace != null,
         'metafieldsNamespace': metafieldsNamespace
       });
-      final QueryResult result = await _graphQLClient.query(_options);
+      final QueryResult result = await _graphQLClient!.query(_options);
       checkForError(result);
       tempProduct =
           (Products.fromJson((result.data ?? const {})["products"] ?? {}));
@@ -60,7 +60,7 @@ class ShopifyStore with ShopifyError {
       cursor = productList.isNotEmpty ? productList.last.cursor : null;
     } while ((tempProduct.hasNextPage == true));
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
     }
     return productList;
   }
@@ -73,10 +73,10 @@ class ShopifyStore with ShopifyError {
               ? gql(getProductByHandleMinimumDataQuery)
               : gql(getProductByHandleQuery),
           variables: {'handle': handle});
-      final QueryResult result = await _graphQLClient.query(_options);
+      final QueryResult result = await _graphQLClient!.query(_options);
       checkForError(result);
       if (deleteThisPartOfCache) {
-        _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+        //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
       }
       // Map<String, dynamic> a = (result?.data ?? const {})['productByHandle'] ?? {};
       return Product.fromProductHandleJson(
@@ -104,11 +104,11 @@ class ShopifyStore with ShopifyError {
           'reverse': reverse,
           'sortKey': sortKeyProduct.parseToString()
         });
-    final QueryResult result = await _graphQLClient.query(_options);
+    final QueryResult result = await _graphQLClient!.query(_options);
     checkForError(result);
 
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
     }
     return (Products.fromJson((result.data ?? const {})["products"] ?? {}));
   }
@@ -124,7 +124,7 @@ class ShopifyStore with ShopifyError {
             ? gql(getProductsByIdsMinimumDataQuery)
             : gql(getProductsByIdsQuery),
         variables: {'ids': idList});
-    final QueryResult result = await _graphQLClient.query(_options);
+    final QueryResult result = await _graphQLClient!.query(_options);
     checkForError(result);
     var response = result.data!;
     var newResponse = {
@@ -133,7 +133,7 @@ class ShopifyStore with ShopifyError {
     };
     productList = Products.fromJson(newResponse).productList;
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
     }
     return productList;
   }
@@ -159,18 +159,20 @@ class ShopifyStore with ShopifyError {
       SortKeyProduct sortKey = SortKeyProduct.PRODUCT_TYPE}) async {
     List<Product> productList = [];
     final WatchQueryOptions _options =
-        WatchQueryOptions(document: gql(getNProductsQuery), variables: {
-      'n': n,
-      'sortKey': sortKey.parseToString(),
-      'reverse': reverse,
-    });
-    final QueryResult result = await _graphQLClient.query(_options);
+        WatchQueryOptions(
+          document: gql(getNProductsQuery), 
+          variables: {
+          'n': n,
+          'sortKey': sortKey.parseToString(),
+          'reverse': reverse,
+        });
+    final QueryResult result = await _graphQLClient!.query(_options);
     checkForError(result);
     productList =
         (Products.fromJson((result.data ?? const {})["products"] ?? {}))
             .productList;
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
     }
     return productList;
   }
@@ -182,10 +184,10 @@ class ShopifyStore with ShopifyError {
       final WatchQueryOptions _options = WatchQueryOptions(
           document: gql(getProductRecommendationsQuery),
           variables: {'id': productId});
-      final QueryResult result = await _graphQLClient.query(_options);
+      final QueryResult result = await _graphQLClient!.query(_options);
       checkForError(result);
       if (deleteThisPartOfCache) {
-        _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+        //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
       }
       var newResponse = List.generate(
           result.data!['productRecommendations']?.length ?? 0,
@@ -207,10 +209,10 @@ class ShopifyStore with ShopifyError {
     try {
       final WatchQueryOptions _options = WatchQueryOptions(
           document: gql(getCollectionsByIdsQuery), variables: {'ids': idList});
-      final QueryResult result = await _graphQLClient.query(_options);
+      final QueryResult result = await _graphQLClient!.query(_options);
       checkForError(result);
       if (deleteThisPartOfCache) {
-        _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+        //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
       }
 
       var newResponse = List.generate(result.data!['nodes']?.length ?? 0,
@@ -228,10 +230,10 @@ class ShopifyStore with ShopifyError {
     final WatchQueryOptions _options = WatchQueryOptions(
       document: gql(getShopQuery),
     );
-    final QueryResult result = await _graphQLClient.query(_options);
+    final QueryResult result = await _graphQLClient!.query(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
     }
     return Shop.fromJson(result.data!);
   }
@@ -246,10 +248,10 @@ class ShopifyStore with ShopifyError {
               ? gql(getCollectionByHandleWithProductsQuery(productsCount))
               : gql(getCollectionByHandleQuery),
           variables: {'handle': handle});
-      final QueryResult result = await _graphQLClient.query(_options);
+      final QueryResult result = await _graphQLClient!.query(_options);
       checkForError(result);
       if (deleteThisPartOfCache) {
-        _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+        //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
       }
       collection = Collection.fromCollectionHandleJson(
           (result.data ?? const {})['collectionByHandle'] ?? {});
@@ -276,10 +278,10 @@ class ShopifyStore with ShopifyError {
             'reverse': reverse,
             'sortKey': sortKeyProductCollection.parseToString()
           });
-      final QueryResult result = await _graphQLClient.query(_options);
+      final QueryResult result = await _graphQLClient!.query(_options);
       checkForError(result);
       if (deleteThisPartOfCache) {
-        _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+        //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
       }
       return Collection.fromCollectionHandleJson(
           (result.data ?? const {})['collectionByHandle'] ?? {});
@@ -308,7 +310,7 @@ class ShopifyStore with ShopifyError {
             'sortKey': sortKeyCollection.parseToString(),
             'reverse': reverse
           });
-      final QueryResult result = await _graphQLClient.query(_options);
+      final QueryResult result = await _graphQLClient!.query(_options);
       checkForError(result);
       tempCollection = (Collections.fromJson(
           (result.data ?? const {})['collections'] ?? {}));
@@ -316,7 +318,7 @@ class ShopifyStore with ShopifyError {
       cursor = collectionList.isNotEmpty ? collectionList.last.cursor : null;
     } while ((tempCollection.hasNextPage == true));
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
     }
     return collectionList;
   }
@@ -346,13 +348,13 @@ class ShopifyStore with ShopifyError {
           'x': x,
           'n': n
         });
-    final QueryResult result = await _graphQLClient.query(_options);
+    final QueryResult result = await _graphQLClient!.query(_options);
     checkForError(result);
     collectionList =
         (Collections.fromJson((result.data ?? const {})['collections'] ?? {}))
             .collectionList;
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
     }
     return collectionList;
   }
@@ -376,7 +378,7 @@ class ShopifyStore with ShopifyError {
             'cursor': cursor,
             'sortKey': sortKeyProductCollection.parseToString()
           });
-      final QueryResult result = await _graphQLClient.query(_options);
+      final QueryResult result = await _graphQLClient!.query(_options);
       checkForError(result);
       productList
           .addAll(Collection.fromJson(result.data!).products!.productList);
@@ -384,7 +386,7 @@ class ShopifyStore with ShopifyError {
       cursor = productList.isNotEmpty ? productList.last.cursor : null;
     } while (collection.products?.hasNextPage == true);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
     }
     return productList;
   }
@@ -408,10 +410,10 @@ class ShopifyStore with ShopifyError {
           'sortKey': sortKey.parseToString(),
           'reverse': reverse,
         });
-    final QueryResult result = await _graphQLClient.query(_options);
+    final QueryResult result = await _graphQLClient!.query(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
     }
     return (Collection.fromJson(result.data!)).products;
   }
@@ -436,7 +438,7 @@ class ShopifyStore with ShopifyError {
             'query': query,
             'reverse': reverse
           });
-      final QueryResult result = await _graphQLClient.query(_options);
+      final QueryResult result = await _graphQLClient!.query(_options);
       checkForError(result);
       productList.addAll(
           (Products.fromJson((result.data ?? const {})['products']))
@@ -445,7 +447,7 @@ class ShopifyStore with ShopifyError {
       cursor = productList.isNotEmpty ? productList.last.cursor : null;
     } while (products.hasNextPage == true);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
     }
     return productList;
   }
@@ -471,7 +473,7 @@ class ShopifyStore with ShopifyError {
         await ShopifyConfig.graphQLClient!.query(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
     }
 
     return Products.fromJson((result.data ?? const {})['products']);
@@ -490,7 +492,7 @@ class ShopifyStore with ShopifyError {
         await ShopifyConfig.graphQLClient!.query(_options);
     checkForError(result);
     if (deleteThisPartOfCache) {
-      _graphQLClient.cache.writeQuery(_options.asRequest, data: {});
+      //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
     }
     return (result.data!['productByHandle']['metafields']['edges']
             as List<Object>)

From 08741e3ee708db058d506f43474d577c97951545 Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Tue, 1 Jun 2021 13:26:10 +0530
Subject: [PATCH 63/80] null safety fixed

---
 lib/mixins/src/shopfiy_error.dart     | 9 ++++-----
 lib/models/src/article.dart           | 2 +-
 lib/models/src/collection.dart        | 2 +-
 lib/models/src/order.dart             | 2 +-
 lib/models/src/product.dart           | 2 +-
 lib/shopify/src/shopify_auth.dart     | 5 ++++-
 lib/shopify/src/shopify_checkout.dart | 4 ++--
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/mixins/src/shopfiy_error.dart b/lib/mixins/src/shopfiy_error.dart
index 3774c393..6c65813d 100644
--- a/lib/mixins/src/shopfiy_error.dart
+++ b/lib/mixins/src/shopfiy_error.dart
@@ -4,11 +4,10 @@ mixin ShopifyError {
   /// throws a [OperationException] if the operation was wrong
   /// throws a [ShopifyException] if shopify reports an error
   void checkForError(QueryResult queryResult, {String? key, String? errorKey}) {
-    if (queryResult.hasException)
-      throw queryResult.exception!;
+    if (queryResult.hasException) throw queryResult.exception!;
     if (key != null && errorKey != null) {
-      Map<String, Object>? data = queryResult.data! as Map<String, Object>;
-      Map<String, Object>? content = data[key] as Map<String, Object>?;
+      Map<String, Object?> data = queryResult.data as Map<String, Object?>;
+      final content = data[key] as dynamic;
       if (content == null) return;
       List? errors = content[errorKey] as List<dynamic>?;
       if (errors != null && errors.isNotEmpty) {
@@ -19,12 +18,12 @@ mixin ShopifyError {
   }
 }
 
-
 /// Exception thrown when an api call fails
 /// like when some items are out of stock
 class ShopifyException implements Exception {
   /// The shopify operation in which the error occurred
   final String key;
+
   /// The type of the error
   final String errorKey;
 
diff --git a/lib/models/src/article.dart b/lib/models/src/article.dart
index 991d957b..235026b3 100644
--- a/lib/models/src/article.dart
+++ b/lib/models/src/article.dart
@@ -2,7 +2,7 @@ import 'package:flutter_simple_shopify/models/src/product.dart';
 
 class Articles {
   final List<Article> articleList;
-  final bool hasNextPage;
+  final bool? hasNextPage;
 
   Articles({required this.articleList, required this.hasNextPage});
 
diff --git a/lib/models/src/collection.dart b/lib/models/src/collection.dart
index 9b356412..e8f32fff 100644
--- a/lib/models/src/collection.dart
+++ b/lib/models/src/collection.dart
@@ -2,7 +2,7 @@ import 'package:flutter_simple_shopify/models/src/product.dart';
 
 class Collections {
   final List<Collection> collectionList;
-  final bool hasNextPage;
+  final bool? hasNextPage;
 
   Collections({required this.collectionList, required this.hasNextPage});
 
diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index 0437ea31..c33c8a81 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -7,7 +7,7 @@ import 'checkout.dart';
 
 class Orders {
   final List<Order> orderList;
-  final bool hasNextPage;
+  final bool? hasNextPage;
 
   Orders({required this.orderList, required this.hasNextPage});
 
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index b6fcd08a..0622cacf 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -3,7 +3,7 @@ import 'package:intl/intl.dart';
 
 class Products {
   final List<Product> productList;
-  final bool hasNextPage;
+  final bool? hasNextPage;
 
   Products({required this.productList, required this.hasNextPage});
 
diff --git a/lib/shopify/src/shopify_auth.dart b/lib/shopify/src/shopify_auth.dart
index 3786b688..b6bcdc3d 100644
--- a/lib/shopify/src/shopify_auth.dart
+++ b/lib/shopify/src/shopify_auth.dart
@@ -116,11 +116,14 @@ class ShopifyAuth with ShopifyError {
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(result,
         key: 'customerAccessTokenCreate', errorKey: 'customerUserErrors');
+        print('object');
     if (deleteThisPartOfCache) {
       //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
+    var a = (result.data ?? const {})['customerAccessTokenCreate'] ?? {};
+    print('object');
     return CustomerAccessToken.fromJson(
-        result.data!['customerAccessTokenCreate']);
+        (result.data ?? const {})['customerAccessTokenCreate'] ?? {});
   }
 
   /// Signs out the current user and clears it from the disk cache.
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index ca25578f..5304f60b 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -365,11 +365,11 @@ class ShopifyCheckout with ShopifyError {
   }
 
   Future<Orders> getXOrdersAfterCursor(
-      String customerAccessToken, int limit, String startCursor,
+      String customerAccessToken, int limit, String? startCursor,
       {SortKeyOrder sortKey = SortKeyOrder.ID,
       bool reverse = true,
       bool deleteThisPartOfCache = false}) async {
-    String cursor = startCursor;
+    String? cursor = startCursor;
     final QueryOptions _options = WatchQueryOptions(
         document: gql(getXOrdersAfterCursorQuery),
         variables: {

From 6741348e72c30dd096964c3742c747e5a344cc6e Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Tue, 1 Jun 2021 19:20:30 +0530
Subject: [PATCH 64/80] checkout info query

---
 .../queries/get_checkout_information.dart     | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/lib/graphql_operations/queries/get_checkout_information.dart b/lib/graphql_operations/queries/get_checkout_information.dart
index 996e186c..df172ccb 100644
--- a/lib/graphql_operations/queries/get_checkout_information.dart
+++ b/lib/graphql_operations/queries/get_checkout_information.dart
@@ -24,28 +24,6 @@ query(\$id: ID!) {
           financialStatus
           fulfillmentStatus
           statusUrl
-          lineItems(first: 250) {
-            edges {
-              node {
-                title
-                variant {
-                  id
-                  title
-                  availableForSale
-                  priceV2 {
-                    amount
-                    currencyCode
-                  }
-                  image {
-                    altText
-                    id
-                    originalSrc
-                    transformedSrc(maxWidth: 200, crop: CENTER)
-                  }
-                }
-              }
-            }
-          }
           shippingAddress {
             address1
             address2
@@ -113,7 +91,7 @@ query(\$id: ID!) {
         provinceCode
         zip
       }
-      lineItems(first: 10) {
+      lineItems(first: 250) {
         edges {
           node {
             id

From 2afe4b2eabd9ea5d206f6300ca6202f302fb4592 Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Wed, 2 Jun 2021 13:29:29 +0530
Subject: [PATCH 65/80] articles

---
 lib/shopify/src/shopify_blog.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/shopify/src/shopify_blog.dart b/lib/shopify/src/shopify_blog.dart
index 70247ff1..599af78d 100644
--- a/lib/shopify/src/shopify_blog.dart
+++ b/lib/shopify/src/shopify_blog.dart
@@ -86,11 +86,11 @@ class ShopifyBlog with ShopifyError {
         .articleList;
   }
 
-  Future<Articles> getXArticlesAfterCursor(int limit, String startCursor,
+  Future<Articles> getXArticlesAfterCursor(int limit, String? startCursor,
       {bool deleteThisPartOfCache = false,
       bool reverse = false,
       SortKeyArticle sortKey = SortKeyArticle.TITLE}) async {
-    String cursor = startCursor;
+    String? cursor = startCursor;
     final WatchQueryOptions _options = WatchQueryOptions(
         document: gql(getXArticlesAfterCursorQuery),
         variables: {

From 49902f501830cb59cb2f0e745583ab21932a232d Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Tue, 8 Jun 2021 10:25:29 +0530
Subject: [PATCH 66/80] Merge branch 'dev' of
 github.com:forked-prs/flutter_simple_shopify

---
 README.md                                     |  1 +
 .../checkout_shipping_address_update.dart     |  2 +-
 .../checkout_shipping_line_update.dart        |  2 +-
 .../mutations/create_checkout.dart            |  2 +-
 .../queries/get_all_blogs.dart                |  2 +-
 .../queries/get_all_orders.dart               |  2 +-
 ...et_all_products_from_collection_by_id.dart |  6 ++--
 .../queries/get_all_products_on_query.dart    |  4 +--
 .../queries/get_blog_by_handle.dart           | 10 +++---
 .../queries/get_checkout_information.dart     |  2 +-
 .../get_checkout_without_shipping_rates.dart  |  2 +-
 .../queries/get_collection_by_handle.dart     |  2 +-
 ...et_collection_by_handle_with_products.dart |  6 ++--
 .../queries/get_collections.dart              |  6 ++--
 .../queries/get_collections_by_ids.dart       |  2 +-
 .../queries/get_featured_collections.dart     |  6 ++--
 .../queries/get_n_articles_sorted.dart        |  2 +-
 .../queries/get_n_products.dart               |  2 +-
 .../queries/get_page_by_handle.dart           | 11 ++++++
 .../queries/get_product_by_handle.dart        |  4 +--
 .../get_product_by_handle_minimum_data.dart   |  2 +-
 .../queries/get_product_recommendations.dart  |  2 +-
 .../queries/get_products.dart                 |  4 +--
 .../queries/get_products_by_handle.dart       |  4 +--
 .../queries/get_products_by_ids.dart          |  4 +--
 .../get_products_by_ids_minimum_data.dart     |  2 +-
 .../get_recently_ordered_products.dart        |  2 +-
 .../queries/get_x_articles_after_cursor.dart  |  2 +-
 ...t_x_collections_and_n_products_sorted.dart |  6 ++--
 .../queries/get_x_orders_after_cursor.dart    |  2 +-
 .../queries/get_x_products_after_cursor.dart  |  4 +--
 ...cts_after_cursor_by_collection_handle.dart |  4 +--
 ...oducts_after_cursor_within_collection.dart |  4 +--
 .../get_x_products_on_query_after_cursor.dart |  4 +--
 lib/models/models.dart                        |  3 +-
 lib/models/src/page.dart                      | 23 ++++++++++++
 lib/shopify/src/shopify_auth.dart             |  4 +--
 lib/shopify/src/shopify_store.dart            | 35 +++++++++++++++----
 38 files changed, 122 insertions(+), 65 deletions(-)
 create mode 100644 lib/graphql_operations/queries/get_page_by_handle.dart
 create mode 100644 lib/models/src/page.dart

diff --git a/README.md b/README.md
index 03641f37..4d9ab326 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,7 @@ The goal is to make creating an mobile app from your Shopify website easier.
      Future<List<Product>> getAllProductsOnQuery(String cursor, SortKeyProduct sortKey, String query)
      Future<Products> getXProductsOnQueryAfterCursor(String cursor, int limit, SortKeyProduct sortKey, String query)
      Future<List<Metafield>> getMetafieldsFromProduct(String productHandle, {String namespace})
+     Future<ShopifyPage> getPageByHandle(String handle)
 ```
 ```dart
   ShopifyCheckout shopifyCheckout = ShopifyCheckout.instance;
diff --git a/lib/graphql_operations/mutations/checkout_shipping_address_update.dart b/lib/graphql_operations/mutations/checkout_shipping_address_update.dart
index 61de142a..c6f7aa14 100644
--- a/lib/graphql_operations/mutations/checkout_shipping_address_update.dart
+++ b/lib/graphql_operations/mutations/checkout_shipping_address_update.dart
@@ -88,7 +88,7 @@ mutation checkoutShippingAddressUpdateV2(
               image {
                 altText
                 originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
+                transformedSrc(maxWidth: 400, crop: CENTER)
                 id
               }
               compareAtPriceV2 {
diff --git a/lib/graphql_operations/mutations/checkout_shipping_line_update.dart b/lib/graphql_operations/mutations/checkout_shipping_line_update.dart
index 595af906..b44dc3a3 100644
--- a/lib/graphql_operations/mutations/checkout_shipping_line_update.dart
+++ b/lib/graphql_operations/mutations/checkout_shipping_line_update.dart
@@ -68,7 +68,7 @@ mutation checkoutShippingLineUpdate(
               image {
                 altText
                 originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
+                transformedSrc(maxWidth: 400, crop: CENTER)
                 id
               }
               compareAtPriceV2 {
diff --git a/lib/graphql_operations/mutations/create_checkout.dart b/lib/graphql_operations/mutations/create_checkout.dart
index 70a1f38a..1de6a46f 100644
--- a/lib/graphql_operations/mutations/create_checkout.dart
+++ b/lib/graphql_operations/mutations/create_checkout.dart
@@ -52,7 +52,7 @@ mutation checkoutCreate($input: CheckoutCreateInput!) {
               image {
                 altText
                 originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
+                transformedSrc(maxWidth: 400, crop: CENTER)
                 id
               }
               compareAtPriceV2 {
diff --git a/lib/graphql_operations/queries/get_all_blogs.dart b/lib/graphql_operations/queries/get_all_blogs.dart
index 772b687c..b6f8c2a2 100644
--- a/lib/graphql_operations/queries/get_all_blogs.dart
+++ b/lib/graphql_operations/queries/get_all_blogs.dart
@@ -40,7 +40,7 @@ query getBlogs($reverseBlogs: Boolean, $reverseArticles: Boolean, $sortKey: Blog
                 altText
                 id
                 originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
+                transformedSrc(maxWidth: 400, crop: CENTER)
               }
               publishedAt
               tags
diff --git a/lib/graphql_operations/queries/get_all_orders.dart b/lib/graphql_operations/queries/get_all_orders.dart
index a5dbf9a0..57a5b50c 100644
--- a/lib/graphql_operations/queries/get_all_orders.dart
+++ b/lib/graphql_operations/queries/get_all_orders.dart
@@ -38,7 +38,7 @@ customer(customerAccessToken: $accessToken) {
                     altText
                     id
                     originalSrc
-                    transformedSrc(maxWidth: 200, crop: CENTER)
+                    transformedSrc(maxWidth: 400, crop: CENTER)
                   }
                   compareAtPriceV2 {
                     amount
diff --git a/lib/graphql_operations/queries/get_all_products_from_collection_by_id.dart b/lib/graphql_operations/queries/get_all_products_from_collection_by_id.dart
index fb648a5d..6be9e2a3 100644
--- a/lib/graphql_operations/queries/get_all_products_from_collection_by_id.dart
+++ b/lib/graphql_operations/queries/get_all_products_from_collection_by_id.dart
@@ -12,7 +12,7 @@ query($id : ID!, $cursor : String, $sortKey: ProductCollectionSortKeys){
         altText
         id
         originalSrc
-        transformedSrc(maxWidth: 200, crop: CENTER)
+        transformedSrc(maxWidth: 400, crop: CENTER)
       }
       products(first: 10, sortKey: $sortKey, after: $cursor) {
         edges {
@@ -47,7 +47,7 @@ query($id : ID!, $cursor : String, $sortKey: ProductCollectionSortKeys){
                   altText
                   id
                   originalSrc
-                  transformedSrc(maxWidth: 200, crop: CENTER)
+                  transformedSrc(maxWidth: 400, crop: CENTER)
                 }
               }
             }
@@ -66,7 +66,7 @@ query($id : ID!, $cursor : String, $sortKey: ProductCollectionSortKeys){
                     altText
                     id
                     originalSrc
-                    transformedSrc(maxWidth: 200, crop: CENTER)
+                    transformedSrc(maxWidth: 400, crop: CENTER)
                   }
                   priceV2 {
                     amount
diff --git a/lib/graphql_operations/queries/get_all_products_on_query.dart b/lib/graphql_operations/queries/get_all_products_on_query.dart
index dab783a5..fe6bb396 100644
--- a/lib/graphql_operations/queries/get_all_products_on_query.dart
+++ b/lib/graphql_operations/queries/get_all_products_on_query.dart
@@ -27,7 +27,7 @@ query( $cursor: String, $sortKey : ProductSortKeys, $query: String, $reverse: Bo
               altText
               id
               originalSrc
-              transformedSrc(maxWidth: 200, crop: CENTER)
+              transformedSrc(maxWidth: 400, crop: CENTER)
             }
           }
         }
@@ -39,7 +39,7 @@ query( $cursor: String, $sortKey : ProductSortKeys, $query: String, $reverse: Bo
                 altText
                 id
                 originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
+                transformedSrc(maxWidth: 400, crop: CENTER)
               }
               priceV2 {
                 amount
diff --git a/lib/graphql_operations/queries/get_blog_by_handle.dart b/lib/graphql_operations/queries/get_blog_by_handle.dart
index 18e97655..6d2755b3 100644
--- a/lib/graphql_operations/queries/get_blog_by_handle.dart
+++ b/lib/graphql_operations/queries/get_blog_by_handle.dart
@@ -14,13 +14,13 @@ query($handle : String!, $sortKey: ArticleSortKeys, $reverseArticles: Boolean){
           comments(first: 250) {
             edges {
               node {
-                content
-                contentHtml
-                id
                 author {
                   email
                   name
                 }
+                content
+                contentHtml
+                id
               }
             }
           }
@@ -28,13 +28,13 @@ query($handle : String!, $sortKey: ArticleSortKeys, $reverseArticles: Boolean){
           contentHtml
           excerpt
           excerptHtml
-          id
           handle
+          id
           image {
             altText
             id
             originalSrc
-            transformedSrc(maxWidth: 200, crop: CENTER)
+            transformedSrc(maxWidth: 400, crop: CENTER)
           }
           publishedAt
           tags
diff --git a/lib/graphql_operations/queries/get_checkout_information.dart b/lib/graphql_operations/queries/get_checkout_information.dart
index df172ccb..435d89f3 100644
--- a/lib/graphql_operations/queries/get_checkout_information.dart
+++ b/lib/graphql_operations/queries/get_checkout_information.dart
@@ -107,7 +107,7 @@ query(\$id: ID!) {
               image {
                 altText
                 originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
+                transformedSrc(maxWidth: 400, crop: CENTER)
                 id
               }
               compareAtPriceV2 {
diff --git a/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart b/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
index 7dc37c62..8143ee0b 100644
--- a/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
+++ b/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
@@ -80,7 +80,7 @@ query($id: ID!){
               image {
                 altText
                 originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
+                transformedSrc(maxWidth: 400, crop: CENTER)
                 id
               }
               compareAtPriceV2 {
diff --git a/lib/graphql_operations/queries/get_collection_by_handle.dart b/lib/graphql_operations/queries/get_collection_by_handle.dart
index f561458b..97565ff8 100644
--- a/lib/graphql_operations/queries/get_collection_by_handle.dart
+++ b/lib/graphql_operations/queries/get_collection_by_handle.dart
@@ -8,7 +8,7 @@ query($handle: String!) {
             altText
             id
             originalSrc
-            transformedSrc(maxWidth: 200, crop: CENTER)
+            transformedSrc(maxWidth: 400, crop: CENTER)
         }
     }
 }
diff --git a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
index c1a56a0b..8547fb0f 100644
--- a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
+++ b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
@@ -9,7 +9,7 @@ query(\$handle: String!) {
       altText
       id
       originalSrc
-      transformedSrc(maxWidth: 200, crop: CENTER)
+      transformedSrc(maxWidth: 400, crop: CENTER)
     }
     products(first: $productsCount) {
       edges {
@@ -44,7 +44,7 @@ query(\$handle: String!) {
                   altText
                   id
                   originalSrc
-                  transformedSrc(maxWidth: 200, crop: CENTER)
+                  transformedSrc(maxWidth: 400, crop: CENTER)
                 }
                 priceV2 {
                   amount
@@ -63,7 +63,7 @@ query(\$handle: String!) {
                 altText
                 id
                 originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
+                transformedSrc(maxWidth: 400, crop: CENTER)
               }
             }
           }
diff --git a/lib/graphql_operations/queries/get_collections.dart b/lib/graphql_operations/queries/get_collections.dart
index 6468f45d..a2d1d217 100644
--- a/lib/graphql_operations/queries/get_collections.dart
+++ b/lib/graphql_operations/queries/get_collections.dart
@@ -17,7 +17,7 @@ query($cursor: String, $sortKey: CollectionSortKeys, $reverse: Boolean){
           altText
           id
           originalSrc
-          transformedSrc(maxWidth: 200, crop: CENTER)
+          transformedSrc(maxWidth: 400, crop: CENTER)
         }
         products(first: 250) {
           edges {
@@ -30,7 +30,7 @@ query($cursor: String, $sortKey: CollectionSortKeys, $reverse: Boolean){
                       altText
                       id
                       originalSrc
-                      transformedSrc(maxWidth: 200, crop: CENTER)
+                      transformedSrc(maxWidth: 400, crop: CENTER)
                     }
                     priceV2 {
                       amount
@@ -73,7 +73,7 @@ query($cursor: String, $sortKey: CollectionSortKeys, $reverse: Boolean){
                     altText
                     id
                     originalSrc
-                    transformedSrc(maxWidth: 200, crop: CENTER)
+                    transformedSrc(maxWidth: 400, crop: CENTER)
                   }
                 }
               }
diff --git a/lib/graphql_operations/queries/get_collections_by_ids.dart b/lib/graphql_operations/queries/get_collections_by_ids.dart
index fa7e4a22..7d918561 100644
--- a/lib/graphql_operations/queries/get_collections_by_ids.dart
+++ b/lib/graphql_operations/queries/get_collections_by_ids.dart
@@ -8,7 +8,7 @@ query getCollectionsByIds($ids: [ID!]!){
       image {
         src
         originalSrc
-        transformedSrc(maxWidth: 200, crop: CENTER)
+        transformedSrc(maxWidth: 400, crop: CENTER)
         id
         altText
       }
diff --git a/lib/graphql_operations/queries/get_featured_collections.dart b/lib/graphql_operations/queries/get_featured_collections.dart
index b8668fb0..eb230caf 100644
--- a/lib/graphql_operations/queries/get_featured_collections.dart
+++ b/lib/graphql_operations/queries/get_featured_collections.dart
@@ -13,7 +13,7 @@ query getFeaturedCollectionQuery($query: String!){
           altText
           id
           originalSrc
-          transformedSrc(maxWidth: 200, crop: CENTER)
+          transformedSrc(maxWidth: 400, crop: CENTER)
         }
         products(first: 20) {
           edges {
@@ -26,7 +26,7 @@ query getFeaturedCollectionQuery($query: String!){
                       altText
                       id
                       originalSrc
-                      transformedSrc(maxWidth: 200, crop: CENTER)
+                      transformedSrc(maxWidth: 400, crop: CENTER)
                     }
                     priceV2 {
                       amount
@@ -69,7 +69,7 @@ query getFeaturedCollectionQuery($query: String!){
                     altText
                     id
                     originalSrc
-                    transformedSrc(maxWidth: 200, crop: CENTER)
+                    transformedSrc(maxWidth: 400, crop: CENTER)
                   }
                 }
               }
diff --git a/lib/graphql_operations/queries/get_n_articles_sorted.dart b/lib/graphql_operations/queries/get_n_articles_sorted.dart
index 8bbf910d..e99cfd6d 100644
--- a/lib/graphql_operations/queries/get_n_articles_sorted.dart
+++ b/lib/graphql_operations/queries/get_n_articles_sorted.dart
@@ -33,7 +33,7 @@ query($x : Int, $sortKey : ArticleSortKeys, $reverse: Boolean){
           altText
           id
           originalSrc
-          transformedSrc(maxWidth: 200, crop: CENTER)
+          transformedSrc(maxWidth: 400, crop: CENTER)
         }
         publishedAt
         tags
diff --git a/lib/graphql_operations/queries/get_n_products.dart b/lib/graphql_operations/queries/get_n_products.dart
index 63339dfa..7914e89d 100644
--- a/lib/graphql_operations/queries/get_n_products.dart
+++ b/lib/graphql_operations/queries/get_n_products.dart
@@ -51,7 +51,7 @@ query($n : Int, $sortKey : ProductSortKeys, $reverse: Boolean){
               altText
               id
               originalSrc
-              transformedSrc(maxWidth: 200, crop: CENTER)
+              transformedSrc(maxWidth: 400, crop: CENTER)
             }
           }
         }
diff --git a/lib/graphql_operations/queries/get_page_by_handle.dart b/lib/graphql_operations/queries/get_page_by_handle.dart
new file mode 100644
index 00000000..741e2b45
--- /dev/null
+++ b/lib/graphql_operations/queries/get_page_by_handle.dart
@@ -0,0 +1,11 @@
+const String getPageByHandleQuery = r'''
+query($handle : String!){
+  pageByHandle(handle: $handle) {
+        id
+        handle
+        title 
+        body
+        url
+    }
+}
+''';
\ No newline at end of file
diff --git a/lib/graphql_operations/queries/get_product_by_handle.dart b/lib/graphql_operations/queries/get_product_by_handle.dart
index 30796b9c..92af2d51 100644
--- a/lib/graphql_operations/queries/get_product_by_handle.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle.dart
@@ -52,7 +52,7 @@ query($handle: String!) {
             altText
             id
             originalSrc
-            transformedSrc(maxWidth: 200, crop: CENTER)
+            transformedSrc(maxWidth: 400, crop: CENTER)
           }
         }
       }
@@ -63,7 +63,7 @@ query($handle: String!) {
           altText
           id
           originalSrc
-          transformedSrc(maxWidth: 200, crop: CENTER)
+          transformedSrc(maxWidth: 400, crop: CENTER)
         }
       }
     }
diff --git a/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart b/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
index 8eb304b7..6c0842f8 100644
--- a/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
@@ -45,7 +45,7 @@ query($handle: String!) {
           altText
           id
           originalSrc
-          transformedSrc(maxWidth: 200, crop: CENTER)
+          transformedSrc(maxWidth: 400, crop: CENTER)
         }
       }
     }
diff --git a/lib/graphql_operations/queries/get_product_recommendations.dart b/lib/graphql_operations/queries/get_product_recommendations.dart
index 6bec23de..b7390821 100644
--- a/lib/graphql_operations/queries/get_product_recommendations.dart
+++ b/lib/graphql_operations/queries/get_product_recommendations.dart
@@ -25,7 +25,7 @@ query getProductRecommentationsQuery($id: ID!){
           altText
           id
           originalSrc
-          transformedSrc(maxWidth: 200, crop: CENTER)
+          transformedSrc(maxWidth: 400, crop: CENTER)
         }
       }
     }
diff --git a/lib/graphql_operations/queries/get_products.dart b/lib/graphql_operations/queries/get_products.dart
index 96f672d2..f38ae412 100644
--- a/lib/graphql_operations/queries/get_products.dart
+++ b/lib/graphql_operations/queries/get_products.dart
@@ -33,7 +33,7 @@ query($cursor : String,  $shouldFetchMetafields : Boolean = false, $metafieldsNa
                 altText
                 id
                 originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
+                transformedSrc(maxWidth: 400, crop: CENTER)
               }
               priceV2 {
                 amount
@@ -86,7 +86,7 @@ query($cursor : String,  $shouldFetchMetafields : Boolean = false, $metafieldsNa
               altText
               id
               originalSrc
-              transformedSrc(maxWidth: 200, crop: CENTER)
+              transformedSrc(maxWidth: 400, crop: CENTER)
             }
           }
         }
diff --git a/lib/graphql_operations/queries/get_products_by_handle.dart b/lib/graphql_operations/queries/get_products_by_handle.dart
index 006b88c5..3dfcf338 100644
--- a/lib/graphql_operations/queries/get_products_by_handle.dart
+++ b/lib/graphql_operations/queries/get_products_by_handle.dart
@@ -32,7 +32,7 @@ query getProductByHandle($handle: String!) {
           altText
           id
           originalSrc
-          transformedSrc(maxWidth: 200, crop: CENTER)
+          transformedSrc(maxWidth: 400, crop: CENTER)
         }
       }
     }
@@ -61,7 +61,7 @@ query getProductByHandle($handle: String!) {
             altText
             id
             originalSrc
-            transformedSrc(maxWidth: 200, crop: CENTER)
+            transformedSrc(maxWidth: 400, crop: CENTER)
           }
         }
       }
diff --git a/lib/graphql_operations/queries/get_products_by_ids.dart b/lib/graphql_operations/queries/get_products_by_ids.dart
index 2563f82d..514477f8 100644
--- a/lib/graphql_operations/queries/get_products_by_ids.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids.dart
@@ -34,7 +34,7 @@ query($ids: [ID!]!) {
             altText
             id
             originalSrc
-            transformedSrc(maxWidth: 200, crop: CENTER)
+            transformedSrc(maxWidth: 400, crop: CENTER)
           }
         }
       }
@@ -63,7 +63,7 @@ query($ids: [ID!]!) {
               altText
               id
               originalSrc
-              transformedSrc(maxWidth: 200, crop: CENTER)
+              transformedSrc(maxWidth: 400, crop: CENTER)
             }
           }
         }
diff --git a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
index b8057389..6185699b 100644
--- a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
@@ -27,7 +27,7 @@ query($ids: [ID!]!) {
             altText
             id
             originalSrc
-            transformedSrc(maxWidth: 200, crop: CENTER)
+            transformedSrc(maxWidth: 400, crop: CENTER)
           }
         }
       }
diff --git a/lib/graphql_operations/queries/get_recently_ordered_products.dart b/lib/graphql_operations/queries/get_recently_ordered_products.dart
index 0c342931..ce681b9b 100644
--- a/lib/graphql_operations/queries/get_recently_ordered_products.dart
+++ b/lib/graphql_operations/queries/get_recently_ordered_products.dart
@@ -49,7 +49,7 @@ query getOrders(
                           altText
                           id
                           originalSrc
-                          transformedSrc(maxWidth: 200, crop: CENTER)
+                          transformedSrc(maxWidth: 400, crop: CENTER)
                         }
                       }
                     }
diff --git a/lib/graphql_operations/queries/get_x_articles_after_cursor.dart b/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
index 1cc909cb..6f38a2c0 100644
--- a/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
@@ -26,7 +26,7 @@ query($cursor: String, $x: Int, $reverse: Boolean, $sortKey: ArticleSortKeys) {
           altText
           id
           originalSrc
-          transformedSrc(maxWidth: 200, crop: CENTER)
+          transformedSrc(maxWidth: 400, crop: CENTER)
         }
       }
     }
diff --git a/lib/graphql_operations/queries/get_x_collections_and_n_products_sorted.dart b/lib/graphql_operations/queries/get_x_collections_and_n_products_sorted.dart
index e0ae585d..f6f728fe 100644
--- a/lib/graphql_operations/queries/get_x_collections_and_n_products_sorted.dart
+++ b/lib/graphql_operations/queries/get_x_collections_and_n_products_sorted.dart
@@ -17,7 +17,7 @@ query($cursor: String, $sortKey: CollectionSortKeys, $sortKeyProduct: ProductCol
           altText
           id
           originalSrc
-          transformedSrc(maxWidth: 200, crop: CENTER)
+          transformedSrc(maxWidth: 400, crop: CENTER)
         }
         products(first: $n, sortKey: $sortKeyProduct) {
           edges {
@@ -30,7 +30,7 @@ query($cursor: String, $sortKey: CollectionSortKeys, $sortKeyProduct: ProductCol
                       altText
                       id
                       originalSrc
-                      transformedSrc(maxWidth: 200, crop: CENTER)
+                      transformedSrc(maxWidth: 400, crop: CENTER)
                     }
                     priceV2 {
                       amount
@@ -61,7 +61,7 @@ query($cursor: String, $sortKey: CollectionSortKeys, $sortKeyProduct: ProductCol
                     altText
                     id
                     originalSrc
-                    transformedSrc(maxWidth: 200, crop: CENTER)
+                    transformedSrc(maxWidth: 400, crop: CENTER)
                   }
                 }
               }
diff --git a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
index d01206b6..f23196f5 100644
--- a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
@@ -43,7 +43,7 @@ query getOrders(
                     altText
                     id
                     originalSrc
-                    transformedSrc(maxWidth: 200, crop: CENTER)
+                    transformedSrc(maxWidth: 400, crop: CENTER)
                   }
                 }
               }
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
index ac3cdd94..e0f1bfad 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
@@ -31,7 +31,7 @@ query($cursor: String, $x: Int, $reverse: Boolean, $sortKey: ProductSortKeys) {
               altText
               id
               originalSrc
-              transformedSrc(maxWidth: 200, crop: CENTER)
+              transformedSrc(maxWidth: 400, crop: CENTER)
             }
           }
         }
@@ -48,7 +48,7 @@ query($cursor: String, $x: Int, $reverse: Boolean, $sortKey: ProductSortKeys) {
                 altText
                 id
                 originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
+                transformedSrc(maxWidth: 400, crop: CENTER)
               }
               priceV2 {
                 amount
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
index a43d6394..3a2ce520 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
@@ -15,7 +15,7 @@ query(
       altText
       id
       originalSrc
-      transformedSrc(maxWidth: 200, crop: CENTER)
+      transformedSrc(maxWidth: 400, crop: CENTER)
     }
     products(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
       pageInfo {
@@ -48,7 +48,7 @@ query(
                 altText
                 id
                 originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
+                transformedSrc(maxWidth: 400, crop: CENTER)
               }
             }
           }
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart b/lib/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart
index 973a2d3f..3197808a 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor_within_collection.dart
@@ -15,7 +15,7 @@ query(
         altText
         id
         originalSrc
-        transformedSrc(maxWidth: 200, crop: CENTER)
+        transformedSrc(maxWidth: 400, crop: CENTER)
       }
       products(
         first: $limit
@@ -36,7 +36,7 @@ query(
                   altText
                   id
                   originalSrc
-                  transformedSrc(maxWidth: 200, crop: CENTER)
+                  transformedSrc(maxWidth: 400, crop: CENTER)
                 }
               }
             }
diff --git a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
index 71fbb4db..80493304 100644
--- a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
@@ -29,7 +29,7 @@ query( $cursor: String, $limit : Int, $sortKey : ProductSortKeys, $query: String
               altText
               id
               originalSrc
-              transformedSrc(maxWidth: 200, crop: CENTER)
+              transformedSrc(maxWidth: 400, crop: CENTER)
             }
           }
         }
@@ -45,7 +45,7 @@ query( $cursor: String, $limit : Int, $sortKey : ProductSortKeys, $query: String
                 altText
                 id
                 originalSrc
-                transformedSrc(maxWidth: 200, crop: CENTER)
+                transformedSrc(maxWidth: 400, crop: CENTER)
               }
               priceV2 {
                 amount
diff --git a/lib/models/models.dart b/lib/models/models.dart
index 405d3080..a472ef52 100644
--- a/lib/models/models.dart
+++ b/lib/models/models.dart
@@ -5,4 +5,5 @@ export 'src/product.dart';
 export 'src/shopify_user.dart';
 export 'src/article.dart';
 export 'src/blog.dart';
-export 'src/shop.dart';
\ No newline at end of file
+export 'src/shop.dart';
+export 'src/page.dart';
\ No newline at end of file
diff --git a/lib/models/src/page.dart b/lib/models/src/page.dart
new file mode 100644
index 00000000..0fe5834c
--- /dev/null
+++ b/lib/models/src/page.dart
@@ -0,0 +1,23 @@
+
+
+class ShopifyPage {
+
+  final String? id;
+  final String? handle;
+  final String? title;
+  final String? body;
+  final String? url;
+
+  ShopifyPage({this.id, this.handle, this.title, this.body, this.url});
+
+  static ShopifyPage fromJson(Map<String, dynamic> json){
+    return ShopifyPage(
+        id: json['id'],
+        handle: json['handle'],
+        title: json['title'],
+        body: json['body'],
+        url: json['url'],
+    );
+  }
+
+}
\ No newline at end of file
diff --git a/lib/shopify/src/shopify_auth.dart b/lib/shopify/src/shopify_auth.dart
index b6bcdc3d..aeb70c02 100644
--- a/lib/shopify/src/shopify_auth.dart
+++ b/lib/shopify/src/shopify_auth.dart
@@ -120,8 +120,8 @@ class ShopifyAuth with ShopifyError {
     if (deleteThisPartOfCache) {
       //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
-    var a = (result.data ?? const {})['customerAccessTokenCreate'] ?? {};
-    print('object');
+    // var a = (result.data ?? const {})['customerAccessTokenCreate'] ?? {};
+    // print('object');
     return CustomerAccessToken.fromJson(
         (result.data ?? const {})['customerAccessTokenCreate'] ?? {});
   }
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index bcde86cc..29da6e17 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -1,11 +1,13 @@
 import 'package:flutter_simple_shopify/enums/enums.dart';
 import 'package:flutter_simple_shopify/enums/src/sort_key_collection.dart';
+import 'package:flutter_simple_shopify/flutter_simple_shopify.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_all_collections_optimized.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_all_products_from_collection_by_id.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_all_products_on_query.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_collection_by_handle.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_collection_by_handle_with_products.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_collections_by_ids.dart';
+import 'package:flutter_simple_shopify/graphql_operations/queries/get_page_by_handle.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_product_by_handle.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_product_by_handle_minimum_data.dart';
 import 'package:flutter_simple_shopify/graphql_operations/queries/get_product_recommendations.dart';
@@ -159,13 +161,11 @@ class ShopifyStore with ShopifyError {
       SortKeyProduct sortKey = SortKeyProduct.PRODUCT_TYPE}) async {
     List<Product> productList = [];
     final WatchQueryOptions _options =
-        WatchQueryOptions(
-          document: gql(getNProductsQuery), 
-          variables: {
-          'n': n,
-          'sortKey': sortKey.parseToString(),
-          'reverse': reverse,
-        });
+        WatchQueryOptions(document: gql(getNProductsQuery), variables: {
+      'n': n,
+      'sortKey': sortKey.parseToString(),
+      'reverse': reverse,
+    });
     final QueryResult result = await _graphQLClient!.query(_options);
     checkForError(result);
     productList =
@@ -499,4 +499,25 @@ class ShopifyStore with ShopifyError {
         .map((e) => Metafield.fromJson(e as Map<String, dynamic>))
         .toList();
   }
+
+  /// Returns a [ShopifyPage].
+  ///
+  /// Returns the [ShopifyPage] that is associated to the [handle].
+  Future<ShopifyPage> getPageByHandle(String handle,
+      {bool deleteThisPartOfCache = false}) async {
+    final QueryOptions _options =
+        WatchQueryOptions(document: gql(getPageByHandleQuery), variables: {
+      'handle': handle,
+    });
+    // final QueryResult result = await _graphQLClient.query(_options);
+    final QueryResult result =
+        await ShopifyConfig.graphQLClient!.query(_options);
+    checkForError(result);
+    var response = (result.data!['pageByHandle'])?.data;
+    // var newResponse = {'node': response};
+    if (deleteThisPartOfCache) {
+      // _graphQLClient.cache.write(_options.toKey(), null);
+    }
+    return ShopifyPage.fromJson(response);
+  }
 }

From 4d90bec59e0aeaa5fb2f66e388262906bf5b9d96 Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Wed, 9 Jun 2021 19:52:03 +0530
Subject: [PATCH 67/80] null safety

---
 lib/models/src/order.dart             |  2 +-
 lib/models/src/product.dart           |  2 +-
 lib/shopify/src/shopify_checkout.dart | 12 ++++++------
 lib/shopify/src/shopify_store.dart    |  2 +-
 pubspec.lock                          |  8 ++++----
 pubspec.yaml                          |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/models/src/order.dart b/lib/models/src/order.dart
index c33c8a81..ee17dc52 100644
--- a/lib/models/src/order.dart
+++ b/lib/models/src/order.dart
@@ -98,7 +98,7 @@ class Order {
         email: (json ?? const {})['email'],
         currencyCode: (json ?? const {})['currencyCode'],
         customerUrl: (json ?? const {})['customerUrl'],
-        lineItems: LineItemsOrder.fromJson((json ?? const {})['lineItems']),
+        lineItems: LineItemsOrder.fromJson((json ?? const {})['lineItems'] ?? {}),
         name: (json ?? const {})['name'],
         orderNumber: (json ?? const {})['orderNumber'],
         phone: (json ?? const {})['phone'],
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 0622cacf..24f7c9ec 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -135,7 +135,7 @@ class Product {
   }
 
   static List<ProductVariant> _getProductVariants(Map<String, dynamic> json) {
-    return ((json['variants'] ?? const {})['edges'] as List<dynamic>)
+    return (((json['variants'] ?? const {})['edges'] ?? []) as List<dynamic>)
             .map((v) => ProductVariant.fromJson(v ?? const {}))
             .toList() ;
   }
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index 5304f60b..38bb0c93 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -141,7 +141,7 @@ class ShopifyCheckout with ShopifyError {
       //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return Checkout.fromJson(
-        result.data!['checkoutShippingAddressUpdateV2']?.data['checkout']);
+        result.data!['checkoutShippingAddressUpdateV2']['checkout'] ?? {});
   }
 
   Future<Checkout> getCheckoutInfoWithAvailableShippingRatesQuery(
@@ -217,7 +217,7 @@ class ShopifyCheckout with ShopifyError {
     }
 
     return Checkout.fromJson(
-        result.data!['checkoutDiscountCodeApplyV2']?.data['checkout']);
+        result.data!['checkoutDiscountCodeApplyV2']['checkout'] ?? {});
   }
 
   /// Removes the applied discount from the [Checkout] that [checkoutId] belongs to.
@@ -237,7 +237,7 @@ class ShopifyCheckout with ShopifyError {
     }
 
     return Checkout.fromJson(
-        result.data!['checkoutDiscountCodeRemove']?.data['checkout']);
+        result.data!['checkoutDiscountCodeRemove']['checkout'] ?? {});
   }
 
   /// Appends the [giftCardCodes] to the [Checkout] that [checkoutId] belongs to.
@@ -317,7 +317,7 @@ class ShopifyCheckout with ShopifyError {
       //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
     return Checkout.fromJson(
-        result.data!['checkoutShippingLineUpdate']?.data['checkout']);
+        result.data!['checkoutShippingLineUpdate']['checkout'] ?? {});
   }
 
   Future<Checkout> emailUpdate(String checkoutId, String email,
@@ -331,8 +331,8 @@ class ShopifyCheckout with ShopifyError {
     if (deleteThisPartOfCache) {
       //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
-    return Checkout.fromJson(
-        result.data!['checkoutEmailUpdateV2']?.data['checkout']);
+
+    return Checkout.fromJson(result.data!['checkoutEmailUpdateV2']['checkout'] ?? {});
   }
 
   // bool _requiresShipping(QueryResult result) {
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index 29da6e17..f4222011 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -513,7 +513,7 @@ class ShopifyStore with ShopifyError {
     final QueryResult result =
         await ShopifyConfig.graphQLClient!.query(_options);
     checkForError(result);
-    var response = (result.data!['pageByHandle'])?.data;
+    var response = (result.data!['pageByHandle']);
     // var newResponse = {'node': response};
     if (deleteThisPartOfCache) {
       // _graphQLClient.cache.write(_options.toKey(), null);
diff --git a/pubspec.lock b/pubspec.lock
index eb170842..0b3fcec5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -70,7 +70,7 @@ packages:
       name: ffi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   file:
     dependency: transitive
     description:
@@ -148,7 +148,7 @@ packages:
       name: graphql
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.0-nullsafety.5"
+    version: "5.0.0"
   hive:
     dependency: transitive
     description:
@@ -204,7 +204,7 @@ packages:
       name: normalize
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.2"
+    version: "0.5.3"
   path:
     dependency: transitive
     description:
@@ -391,7 +391,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 3db3fe07..9437980d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  graphql: ^5.0.0-nullsafety.5
+  graphql: ^5.0.0
   shared_preferences: ^2.0.6
   enum_to_string: ^2.0.1
   intl: ^0.17.0

From 076f132443e2db4d22fbb833b79d84b100a7333e Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Fri, 11 Jun 2021 12:46:10 +0530
Subject: [PATCH 68/80] caching removed

---
 lib/shopify_config.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/shopify_config.dart b/lib/shopify_config.dart
index e10dd6da..c0c0929b 100644
--- a/lib/shopify_config.dart
+++ b/lib/shopify_config.dart
@@ -44,7 +44,7 @@ class ShopifyConfig {
         },
       ),
       cache: GraphQLCache(
-        store: _cacheStore,
+        // store: _cacheStore,
       ),
     );
   }

From af520c55c933ccaef363a98add7d058da7d2901f Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Wed, 16 Jun 2021 13:42:08 +0530
Subject: [PATCH 69/80] cache policy to noCache

---
 lib/shopify_config.dart | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/lib/shopify_config.dart b/lib/shopify_config.dart
index c0c0929b..70a55cdf 100644
--- a/lib/shopify_config.dart
+++ b/lib/shopify_config.dart
@@ -36,21 +36,28 @@ class ShopifyConfig {
     _storeUrl = storeUrl;
     _storefrontApiVersion = storefrontApiVersion ?? _storefrontApiVersion;
     _cacheStore = cacheStore;
-    _graphQLClient = GraphQLClient(
-      link: HttpLink(
-        'https://$_storeUrl/api/$_storefrontApiVersion/graphql.json',
-        defaultHeaders: {
-          'X-Shopify-Storefront-Access-Token': _storefrontAccessToken!,
-        },
-      ),
-      cache: GraphQLCache(
-        // store: _cacheStore,
-      ),
+    final policies = Policies(
+      fetch: FetchPolicy.noCache,
     );
+    _graphQLClient = GraphQLClient(
+        link: HttpLink(
+          'https://$_storeUrl/api/$_storefrontApiVersion/graphql.json',
+          defaultHeaders: {
+            'X-Shopify-Storefront-Access-Token': _storefrontAccessToken!,
+          },
+        ),
+        cache: GraphQLCache(
+            // store: _cacheStore,
+            ),
+        defaultPolicies: DefaultPolicies(
+          watchQuery: policies,
+          query: policies,
+          mutate: policies,
+        ));
   }
 
   static GraphQLClient? _graphQLClient;
 
   /// The GraphQlClient used for communication with the Storefront API.
   static GraphQLClient? get graphQLClient => _graphQLClient;
-}
\ No newline at end of file
+}

From efe28e97b0b9c4208451848c9ce8fa061f6611ad Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Fri, 24 Sep 2021 17:19:21 +0530
Subject: [PATCH 70/80] currency conversion

---
 lib/models/src/product.dart | 138 ++++++++++++++++++++++++++++--------
 lib/shopify_config.dart     |  13 ++++
 2 files changed, 122 insertions(+), 29 deletions(-)

diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 24f7c9ec..5d9f61f5 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -1,4 +1,5 @@
 import 'package:collection/collection.dart';
+import 'package:flutter_simple_shopify/flutter_simple_shopify.dart';
 import 'package:intl/intl.dart';
 
 class Products {
@@ -136,8 +137,8 @@ class Product {
 
   static List<ProductVariant> _getProductVariants(Map<String, dynamic> json) {
     return (((json['variants'] ?? const {})['edges'] ?? []) as List<dynamic>)
-            .map((v) => ProductVariant.fromJson(v ?? const {}))
-            .toList() ;
+        .map((v) => ProductVariant.fromJson(v ?? const {}))
+        .toList();
   }
 
   ProductVariant? getProductVariantBySelectedOption(
@@ -153,7 +154,7 @@ class Product {
         this.productVariants?.firstWhere((ProductVariant productVariant) {
       bool found = false;
       List<Map<String?, String?>> selectedOptionList = [];
-  
+
       productVariant.selectedOptions?.forEach((SelectedOption selectedOption) {
         selectedOptionList.add({selectedOption.name: selectedOption.value});
       });
@@ -388,6 +389,54 @@ class SelectedOption {
   }
 }
 
+class Currency {
+  final String shopCurrency;
+  final String moneyFormat;
+  final String moneyWithCurrencyFormat;
+  final bool currencyConversionEnabled;
+  final String currencyConversionMoneyFormat;
+  final List<String> currencySupported;
+  final List<String> countrySupported;
+  final bool currencyConversionRoundAmounts;
+  final Map<String, dynamic> rates;
+
+  Currency(
+      this.shopCurrency,
+      this.moneyFormat,
+      this.moneyWithCurrencyFormat,
+      this.currencyConversionEnabled,
+      this.currencyConversionMoneyFormat,
+      this.currencySupported,
+      this.countrySupported,
+      this.currencyConversionRoundAmounts,
+      this.rates);
+
+  static Currency fromJson(Map<String, dynamic> json) {
+    return Currency(
+        json['shop_currency'],
+        json['money_format'],
+        json['money_with_currency_format'],
+        json['currency_conversion_enabled'],
+        json['currency_conversion_money_format'],
+        List.from(json['currency_supported']),
+        List.from(json['country_supported']),
+        json['currency_conversion_round_amounts'],
+        Map.from(json['rates']));
+  }
+
+  Map toJson() => {
+        'shopCurrency': shopCurrency,
+        'moneyFormat': moneyFormat,
+        'moneyWithCurrencyFormat': moneyWithCurrencyFormat,
+        'currencyConversionEnabled': currencyConversionEnabled,
+        'currencyConversionMoneyFormat': currencyConversionMoneyFormat,
+        'currencySupported': currencySupported,
+        'countrySupported': countrySupported,
+        'currencyConversionRoundAmounts': currencyConversionRoundAmounts,
+        'rates': rates,
+      };
+}
+
 class PriceV2 {
   final double? amount;
   final String? currencyCode;
@@ -399,46 +448,71 @@ class PriceV2 {
       {this.formattedPrice,
       this.currencySymbol,
       this.amount,
-      this.currencyCode, 
+      this.currencyCode,
       this.numberFormattedPrice});
 
   static PriceV2 fromJson(Map<String, dynamic> json) {
-    // var format = NumberFormat.currency(locale: 'HI');
-    // String amount = json['amount'] != null
-    //     ? double.parse(json['amount']).toStringAsFixed(2)
-    //     : '';
-    return PriceV2(
+    PriceV2 price = PriceV2(
         amount: json['amount'] != null ? double.parse(json['amount']) : null,
         currencyCode: json['currencyCode'],
         currencySymbol: _simpleCurrencySymbols[json['currencyCode']],
-        formattedPrice: _chooseRightOrderOnCurrencySymbol(json['amount'], json['currencyCode']),
-        numberFormattedPrice: _chooseRightOrderOnCurrencySymbol(json['amount'], json['currencyCode'], numberFormat: true)
-        );
+        formattedPrice: _chooseRightOrderOnCurrencySymbol(
+            json['amount'], json['currencyCode']),
+        numberFormattedPrice: _chooseRightOrderOnCurrencySymbol(
+            json['amount'], json['currencyCode'],
+            numberFormat: true));
+    Currency? currency = ShopifyConfig.currency;
+    String? activeCurrency = ShopifyConfig.activeCurrency;
+    if (currency != null && price.amount != null && activeCurrency != null) {
+      if (currency.currencyConversionEnabled) {
+        double amt = convert(price.amount!, currency.rates[price.currencyCode],
+            currency.rates[activeCurrency], currency.currencyConversionRoundAmounts);
+        price = PriceV2(
+            amount: amt,
+            currencyCode: activeCurrency,
+            currencySymbol: _simpleCurrencySymbols[activeCurrency],
+            formattedPrice:
+                _chooseRightOrderOnCurrencySymbol(amt.toString(), activeCurrency),
+            numberFormattedPrice: _chooseRightOrderOnCurrencySymbol(
+                amt.toString(), activeCurrency,
+                numberFormat: true));
+      }
+    }
+    // print("object");
+    return price;
+  }
+
+  static double convert(
+      double amount, double from, double to, bool shouldRound) {
+    double amt = (amount * from) / to;
+    
+    if (shouldRound) {
+      amt = double.parse(amt.toStringAsFixed(0));
+    } else {
+      amt = double.parse(amt.toStringAsFixed(2));
+    }
+    // print('amt $amt');
+    return amt;
   }
 
-  static String _chooseRightOrderOnCurrencySymbol(String? amount, String? currencyCode, {bool numberFormat = false}) {
+  static String _chooseRightOrderOnCurrencySymbol(
+      String? amount, String? currencyCode,
+      {bool numberFormat = false}) {
     String currencyString;
     String formattedAmount = '';
 
-    if(amount != null){
-      if(numberFormat){
+    if (amount != null) {
+      if (numberFormat) {
         var format = NumberFormat.currency(locale: 'HI', symbol: '');
         formattedAmount = format.format(double.parse(amount));
-      }else{
+      } else {
         formattedAmount = double.parse(amount).toStringAsFixed(2);
       }
-    }else{
+    } else {
       // formattedAmount = '';
       return '';
     }
     switch (currencyCode) {
-      case "INR":
-        {
-          currencyString =
-              '${_simpleCurrencySymbols[currencyCode!]}$formattedAmount';
-        }
-        break;
-
       case "EUR":
         {
           currencyString =
@@ -451,7 +525,13 @@ class PriceV2 {
               '${_simpleCurrencySymbols[currencyCode!]}$formattedAmount';
         }
         break;
+      case "INR":
+      case "QAR":
+      case "OMR":
+      case "BHD":
+      case "KWD":
       case "AED":
+      case "SAR":
         {
           currencyString =
               '${_simpleCurrencySymbols[currencyCode!]} $formattedAmount';
@@ -482,11 +562,11 @@ class PriceV2 {
     'NIO': r'C$',
     'GMD': 'GMD',
     'MKD': 'din',
-    'BHD': 'din',
+    'BHD': 'BHD',
     'DZD': 'din',
     'IQD': 'din',
     'JOD': 'din',
-    'KWD': 'din',
+    'KWD': 'KWD',
     'LYD': 'din',
     'RSD': 'din',
     'TND': 'din',
@@ -589,13 +669,13 @@ class PriceV2 {
     'GTQ': 'Q',
     'ZAR': 'R',
     'BRL': r'R$',
-    'OMR': 'Rial',
-    'QAR': 'Rial',
+    'OMR': 'OMR',
+    'QAR': 'QAR',
     'YER': 'Rial',
     'IRR': 'Rial',
     'KHR': 'Riel',
     'MYR': 'RM',
-    'SAR': 'Riyal',
+    'SAR': 'SAR',
     'BYR': 'BYR',
     'RUB': 'руб.',
     'MUR': 'Rs',
diff --git a/lib/shopify_config.dart b/lib/shopify_config.dart
index 70a55cdf..f349cb97 100644
--- a/lib/shopify_config.dart
+++ b/lib/shopify_config.dart
@@ -1,3 +1,4 @@
+import 'package:flutter_simple_shopify/flutter_simple_shopify.dart';
 import 'package:graphql/client.dart';
 
 class ShopifyConfig {
@@ -22,6 +23,14 @@ class ShopifyConfig {
   static Store? _cacheStore;
 
   static Store? get cacheStore => _cacheStore;
+  
+  static Currency? _currency;
+
+  static Currency? get currency => _currency;
+  
+  static String? _activeCurrency;
+
+  static String? get activeCurrency => _activeCurrency;
 
   /// Sets the config.
   ///
@@ -31,11 +40,15 @@ class ShopifyConfig {
     String storeUrl,
     String? storefrontApiVersion, {
     Store? cacheStore,
+    Currency? currency,
+    String? activeCurrency
   }) {
     _storefrontAccessToken = storefrontAccessToken;
     _storeUrl = storeUrl;
     _storefrontApiVersion = storefrontApiVersion ?? _storefrontApiVersion;
     _cacheStore = cacheStore;
+    _currency = currency;
+    _activeCurrency = activeCurrency;
     final policies = Policies(
       fetch: FetchPolicy.noCache,
     );

From 3a372102ce9751f0eb47af589b6044230d6266f3 Mon Sep 17 00:00:00 2001
From: rupam <rupamjbordoloi@gmail.com>
Date: Tue, 12 Oct 2021 16:54:42 +0530
Subject: [PATCH 71/80] product by id minimum data with tags

---
 .../get_products_by_ids_minimum_data.dart     | 117 +++++++++---------
 1 file changed, 59 insertions(+), 58 deletions(-)

diff --git a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
index 6185699b..003cdfbf 100644
--- a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
@@ -1,58 +1,59 @@
-const String getProductsByIdsMinimumDataQuery = r'''
-query($ids: [ID!]!) {
-  nodes(ids: $ids) {
-    ... on Product {
-      id
-      handle
-      title
-      availableForSale
-      descriptionHtml
-      productType
-      vendor
-      rating: metafield(namespace: "rview", key: "rating") {
-        key 
-        namespace 
-        value 
-        valueType 
-      }
-      review_count: metafield(namespace: "rview", key: "review-count") {
-        key 
-        namespace 
-        value 
-        valueType 
-      }
-      images(first: 1) {
-        edges {
-          node {
-            altText
-            id
-            originalSrc
-            transformedSrc(maxWidth: 400, crop: CENTER)
-          }
-        }
-      }
-      variants(first: 1) {
-        edges {
-          node {
-            id
-            title
-            availableForSale
-            quantityAvailable
-            requiresShipping
-            sku
-            priceV2 {
-              amount
-              currencyCode
-            }
-            compareAtPriceV2 {
-              amount
-              currencyCode
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-''';
+const String getProductsByIdsMinimumDataQuery = r'''
+query($ids: [ID!]!) {
+  nodes(ids: $ids) {
+    ... on Product {
+      id
+      handle
+      title
+      tags
+      availableForSale
+      descriptionHtml
+      productType
+      vendor
+      rating: metafield(namespace: "rview", key: "rating") {
+        key 
+        namespace 
+        value 
+        valueType 
+      }
+      review_count: metafield(namespace: "rview", key: "review-count") {
+        key 
+        namespace 
+        value 
+        valueType 
+      }
+      images(first: 1) {
+        edges {
+          node {
+            altText
+            id
+            originalSrc
+            transformedSrc(maxWidth: 400, crop: CENTER)
+          }
+        }
+      }
+      variants(first: 1) {
+        edges {
+          node {
+            id
+            title
+            availableForSale
+            quantityAvailable
+            requiresShipping
+            sku
+            priceV2 {
+              amount
+              currencyCode
+            }
+            compareAtPriceV2 {
+              amount
+              currencyCode
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+''';

From 4ca810cfbea9e238f42c593ef942e5190a8867f9 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Wed, 19 Jan 2022 16:33:19 +0530
Subject: [PATCH 72/80] dynamic product variants count

---
 ...et_collection_by_handle_with_products.dart |  8 +++--
 .../queries/get_product_recommendations.dart  | 14 ++++++---
 .../get_products_by_ids_minimum_data.dart     | 14 ++++++---
 .../get_recently_ordered_products.dart        | 28 ++++++++++-------
 lib/models/src/product.dart                   | 30 +++++++++++++------
 lib/shopify/src/shopify_checkout.dart         |  3 +-
 lib/shopify/src/shopify_store.dart            | 13 ++++----
 7 files changed, 73 insertions(+), 37 deletions(-)

diff --git a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
index 8547fb0f..854d7bef 100644
--- a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
+++ b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
@@ -1,4 +1,4 @@
-String getCollectionByHandleWithProductsQuery(int productsCount) {
+String getCollectionByHandleWithProductsQuery(int productsCount, int variantsCount) {
   return '''
 query(\$handle: String!) {
   collectionByHandle(handle: \$handle) {
@@ -32,7 +32,7 @@ query(\$handle: String!) {
             value 
             valueType 
           }
-          variants(first: 1) {
+          variants(first: $variantsCount) {
             edges {
               node {
                 id
@@ -54,6 +54,10 @@ query(\$handle: String!) {
                   amount
                   currencyCode
                 }
+                selectedOptions {
+                  name
+                  value
+                }
               }
             }
           }
diff --git a/lib/graphql_operations/queries/get_product_recommendations.dart b/lib/graphql_operations/queries/get_product_recommendations.dart
index b7390821..11d17eff 100644
--- a/lib/graphql_operations/queries/get_product_recommendations.dart
+++ b/lib/graphql_operations/queries/get_product_recommendations.dart
@@ -1,6 +1,7 @@
-const String getProductRecommendationsQuery = r'''
-query getProductRecommentationsQuery($id: ID!){
-  productRecommendations(productId: $id) {
+String getProductRecommendationsQuery(int variantsCount) {
+  return '''
+query getProductRecommentationsQuery(\$id: ID!){
+  productRecommendations(productId: \$id) {
     id
     handle
     title
@@ -29,7 +30,7 @@ query getProductRecommentationsQuery($id: ID!){
         }
       }
     }
-    variants(first: 1) {
+    variants(first: $variantsCount) {
       edges {
         node {
           id
@@ -46,9 +47,14 @@ query getProductRecommentationsQuery($id: ID!){
             amount
             currencyCode
           }
+          selectedOptions {
+            name
+            value
+          }
         }
       }
     }
   }
 }
 ''';
+}
\ No newline at end of file
diff --git a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
index 003cdfbf..87fbc3a8 100644
--- a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
@@ -1,6 +1,7 @@
-const String getProductsByIdsMinimumDataQuery = r'''
-query($ids: [ID!]!) {
-  nodes(ids: $ids) {
+String getProductsByIdsMinimumDataQuery(int variantsCount) {
+  return '''
+query(\$ids: [ID!]!) {
+  nodes(ids: \$ids) {
     ... on Product {
       id
       handle
@@ -32,7 +33,7 @@ query($ids: [ID!]!) {
           }
         }
       }
-      variants(first: 1) {
+      variants(first: $variantsCount) {
         edges {
           node {
             id
@@ -49,6 +50,10 @@ query($ids: [ID!]!) {
               amount
               currencyCode
             }
+            selectedOptions {
+              name
+              value
+            }
           }
         }
       }
@@ -57,3 +62,4 @@ query($ids: [ID!]!) {
 }
 
 ''';
+}
\ No newline at end of file
diff --git a/lib/graphql_operations/queries/get_recently_ordered_products.dart b/lib/graphql_operations/queries/get_recently_ordered_products.dart
index ce681b9b..cf172693 100644
--- a/lib/graphql_operations/queries/get_recently_ordered_products.dart
+++ b/lib/graphql_operations/queries/get_recently_ordered_products.dart
@@ -1,14 +1,15 @@
-const String getRecentlyOrderedProductsQuery = r'''
+String getRecentlyOrderedProductsQuery(int variantsCount) {
+  return '''
 query getOrders(
-  $cursor: String
-  $x: Int
-  $sortKey: OrderSortKeys
-  $accessToken: String!
-  $reverse: Boolean
+  \$cursor: String
+  \$x: Int
+  \$sortKey: OrderSortKeys
+  \$accessToken: String!
+  \$reverse: Boolean
 ) {
-  customer(customerAccessToken: $accessToken) {
+  customer(customerAccessToken: \$accessToken) {
     id
-    orders(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
+    orders(first: \$x, after: \$cursor, sortKey: \$sortKey, reverse: \$reverse) {
       pageInfo {
         hasNextPage
       }
@@ -20,7 +21,7 @@ query getOrders(
           cancelReason
           financialStatus
           fulfillmentStatus
-          lineItems(first: 250) {
+          lineItems(first: 10) {
             edges {
               node {
                 title
@@ -53,7 +54,7 @@ query getOrders(
                         }
                       }
                     }
-                    variants(first: 1) {
+                    variants(first: $variantsCount) {
                       edges {
                         node {
                           id
@@ -70,6 +71,10 @@ query getOrders(
                             amount
                             currencyCode
                           }
+                          selectedOptions {
+                            name
+                            value
+                          }
                         }
                       }
                     }
@@ -85,4 +90,5 @@ query getOrders(
     }
   }
 }
-''';
\ No newline at end of file
+''';
+}
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 5d9f61f5..26817a56 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -154,11 +154,11 @@ class Product {
         this.productVariants?.firstWhere((ProductVariant productVariant) {
       bool found = false;
       List<Map<String?, String?>> selectedOptionList = [];
-
+      
       productVariant.selectedOptions?.forEach((SelectedOption selectedOption) {
         selectedOptionList.add({selectedOption.name: selectedOption.value});
       });
-
+      
       if (unOrdDeepEq(selectedOptionList, filterList) == true) {
         found = true;
       }
@@ -452,17 +452,24 @@ class PriceV2 {
       this.numberFormattedPrice});
 
   static PriceV2 fromJson(Map<String, dynamic> json) {
+    Currency? currency = ShopifyConfig.currency;
+    String? activeCurrency = ShopifyConfig.activeCurrency;
+
+    double? amount;
+    if(json['amount'] != null) {
+      amount = double.parse(json['amount']);
+    }
+
     PriceV2 price = PriceV2(
-        amount: json['amount'] != null ? double.parse(json['amount']) : null,
+        amount: amount,
         currencyCode: json['currencyCode'],
         currencySymbol: _simpleCurrencySymbols[json['currencyCode']],
         formattedPrice: _chooseRightOrderOnCurrencySymbol(
-            json['amount'], json['currencyCode']),
+            amount?.toString(), json['currencyCode']),
         numberFormattedPrice: _chooseRightOrderOnCurrencySymbol(
-            json['amount'], json['currencyCode'],
+            amount?.toString(), json['currencyCode'],
             numberFormat: true));
-    Currency? currency = ShopifyConfig.currency;
-    String? activeCurrency = ShopifyConfig.activeCurrency;
+    
     if (currency != null && price.amount != null && activeCurrency != null) {
       if (currency.currencyConversionEnabled) {
         double amt = convert(price.amount!, currency.rates[price.currencyCode],
@@ -487,7 +494,7 @@ class PriceV2 {
     double amt = (amount * from) / to;
     
     if (shouldRound) {
-      amt = double.parse(amt.toStringAsFixed(0));
+      amt = double.parse(amt.ceil().toString());
     } else {
       amt = double.parse(amt.toStringAsFixed(2));
     }
@@ -530,8 +537,13 @@ class PriceV2 {
       case "OMR":
       case "BHD":
       case "KWD":
-      case "AED":
       case "SAR":
+        {
+          currencyString =
+              '$formattedAmount ${_simpleCurrencySymbols[currencyCode!]}';
+        }
+        break;
+      case "AED":
         {
           currencyString =
               '${_simpleCurrencySymbols[currencyCode!]} $formattedAmount';
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index 38bb0c93..c3af6fff 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -395,10 +395,11 @@ class ShopifyCheckout with ShopifyError {
       String customerAccessToken, int limit,
       {SortKeyOrder sortKey = SortKeyOrder.ID,
       bool reverse = true,
+      int variantsCount = 1,
       bool deleteThisPartOfCache = false}) async {
     String? cursor;
     final QueryOptions _options = WatchQueryOptions(
-        document: gql(getRecentlyOrderedProductsQuery),
+        document: gql(getRecentlyOrderedProductsQuery(variantsCount)),
         variables: {
           'accessToken': customerAccessToken,
           'sortKey': sortKey.parseToString(),
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index f4222011..f65150ad 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -26,6 +26,7 @@ import 'package:flutter_simple_shopify/enums/src/sort_key_product.dart';
 import 'package:flutter_simple_shopify/models/src/shop.dart';
 import 'package:graphql/client.dart';
 import '../../graphql_operations/queries/get_n_products.dart';
+import '../../graphql_operations/queries/get_product_recommendations.dart';
 import '../../graphql_operations/queries/get_products.dart';
 import '../../models/src/collection.dart';
 import '../../shopify_config.dart';
@@ -119,11 +120,11 @@ class ShopifyStore with ShopifyError {
   ///
   /// Returns the Products associated to the given id's in [idList]
   Future<List<Product>> getProductsByIds(List<String> idList,
-      {bool deleteThisPartOfCache = false, minimumData = true}) async {
+      {bool deleteThisPartOfCache = false, minimumData = true, int variantsCount = 1}) async {
     List<Product> productList = [];
     final QueryOptions _options = WatchQueryOptions(
         document: minimumData
-            ? gql(getProductsByIdsMinimumDataQuery)
+            ? gql(getProductsByIdsMinimumDataQuery(variantsCount))
             : gql(getProductsByIdsQuery),
         variables: {'ids': idList});
     final QueryResult result = await _graphQLClient!.query(_options);
@@ -179,10 +180,10 @@ class ShopifyStore with ShopifyError {
 
   /// Returns a list of recommended [Product] by given id.
   Future<List<Product>> getProductRecommendations(String productId,
-      {bool deleteThisPartOfCache = false}) async {
+      {bool deleteThisPartOfCache = false, int variantsCount = 1}) async {
     try {
       final WatchQueryOptions _options = WatchQueryOptions(
-          document: gql(getProductRecommendationsQuery),
+          document: gql(getProductRecommendationsQuery(variantsCount)),
           variables: {'id': productId});
       final QueryResult result = await _graphQLClient!.query(_options);
       checkForError(result);
@@ -240,12 +241,12 @@ class ShopifyStore with ShopifyError {
 
   /// Returns a collection by handle.
   Future<Collection> getCollectionByHandle(String handle,
-      {bool deleteThisPartOfCache = false, productsCount}) async {
+      {bool deleteThisPartOfCache = false, int? productsCount, int variantsCount = 1}) async {
     Collection collection = Collection.fromJson({});
     try {
       final WatchQueryOptions _options = WatchQueryOptions(
           document: productsCount != null
-              ? gql(getCollectionByHandleWithProductsQuery(productsCount))
+              ? gql(getCollectionByHandleWithProductsQuery(productsCount, variantsCount))
               : gql(getCollectionByHandleQuery),
           variables: {'handle': handle});
       final QueryResult result = await _graphQLClient!.query(_options);

From bc3192434a7b545a936a13dee31ea12d747edbeb Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 25 Feb 2022 14:06:55 +0530
Subject: [PATCH 73/80] converted price with origal prices

---
 lib/models/src/product.dart | 49 +++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 26817a56..a1ea3100 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -154,11 +154,11 @@ class Product {
         this.productVariants?.firstWhere((ProductVariant productVariant) {
       bool found = false;
       List<Map<String?, String?>> selectedOptionList = [];
-      
+
       productVariant.selectedOptions?.forEach((SelectedOption selectedOption) {
         selectedOptionList.add({selectedOption.name: selectedOption.value});
       });
-      
+
       if (unOrdDeepEq(selectedOptionList, filterList) == true) {
         found = true;
       }
@@ -439,50 +439,73 @@ class Currency {
 
 class PriceV2 {
   final double? amount;
+  final double? originalAmount;
   final String? currencyCode;
   final String? currencySymbol;
   final String? formattedPrice;
+  final String? originalFormattedPrice;
   final String? numberFormattedPrice;
+  final String? originalNumberFormattedPrice;
+  final bool? isConverted;
 
   const PriceV2(
       {this.formattedPrice,
+      this.originalFormattedPrice,
       this.currencySymbol,
       this.amount,
+      this.originalAmount,
       this.currencyCode,
-      this.numberFormattedPrice});
+      this.numberFormattedPrice,
+      this.originalNumberFormattedPrice,
+      this.isConverted});
 
   static PriceV2 fromJson(Map<String, dynamic> json) {
     Currency? currency = ShopifyConfig.currency;
     String? activeCurrency = ShopifyConfig.activeCurrency;
 
     double? amount;
-    if(json['amount'] != null) {
+    if (json['amount'] != null) {
       amount = double.parse(json['amount']);
     }
 
     PriceV2 price = PriceV2(
         amount: amount,
+        originalAmount: amount,
         currencyCode: json['currencyCode'],
         currencySymbol: _simpleCurrencySymbols[json['currencyCode']],
         formattedPrice: _chooseRightOrderOnCurrencySymbol(
             amount?.toString(), json['currencyCode']),
+        originalFormattedPrice: _chooseRightOrderOnCurrencySymbol(
+            amount?.toString(), json['currencyCode']),
         numberFormattedPrice: _chooseRightOrderOnCurrencySymbol(
+            amount?.toString(), json['currencyCode'], numberFormat: true),
+        originalNumberFormattedPrice: _chooseRightOrderOnCurrencySymbol(
             amount?.toString(), json['currencyCode'],
-            numberFormat: true));
-    
+            numberFormat: true),
+        isConverted: false);
+
     if (currency != null && price.amount != null && activeCurrency != null) {
       if (currency.currencyConversionEnabled) {
-        double amt = convert(price.amount!, currency.rates[price.currencyCode],
-            currency.rates[activeCurrency], currency.currencyConversionRoundAmounts);
+        double amt = convert(
+            price.amount!,
+            currency.rates[price.currencyCode],
+            currency.rates[activeCurrency],
+            currency.currencyConversionRoundAmounts);
         price = PriceV2(
             amount: amt,
+            originalAmount: price.amount,
             currencyCode: activeCurrency,
             currencySymbol: _simpleCurrencySymbols[activeCurrency],
-            formattedPrice:
-                _chooseRightOrderOnCurrencySymbol(amt.toString(), activeCurrency),
+            formattedPrice: _chooseRightOrderOnCurrencySymbol(
+                amt.toString(), activeCurrency),
+            originalFormattedPrice: _chooseRightOrderOnCurrencySymbol(
+                price.amount.toString(), json['currencyCode']),
             numberFormattedPrice: _chooseRightOrderOnCurrencySymbol(
-                amt.toString(), activeCurrency,
-                numberFormat: true));
+                amt.toString(), activeCurrency, numberFormat: true),
+            originalNumberFormattedPrice: _chooseRightOrderOnCurrencySymbol(
+                price.amount.toString(), json['currencyCode'],
+                numberFormat: true),
+            isConverted: true);
       }
     }
     // print("object");
@@ -492,7 +515,7 @@ class PriceV2 {
   static double convert(
       double amount, double from, double to, bool shouldRound) {
     double amt = (amount * from) / to;
-    
+
     if (shouldRound) {
       amt = double.parse(amt.ceil().toString());
     } else {

From 5130c8e4cabe7c15b5f7c9b16bce47e0d8af5963 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Thu, 16 Jun 2022 21:26:28 +0530
Subject: [PATCH 74/80] getXProductsAfterCursorByCollectionHandle nullable
 cursor

---
 README.md                          | 2 +-
 lib/models/src/product.dart        | 2 +-
 lib/shopify/src/shopify_store.dart | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 4d9ab326..23b1ee36 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ The goal is to make creating an mobile app from your Shopify website easier.
       {bool deleteThisPartOfCache = false})
      Future<Products> getXProductsAfterCursorWithinCollection(String id, int limit, String startCursor, SortKeyProduct sortKey)
      Future<Collection> getXProductsAfterCursorByCollectionHandle(
-      String handle, int limit, String startCursor,
+      String handle, int limit, String? startCursor,
       {bool deleteThisPartOfCache = false,
       bool reverse = false,
       SortKeyProductCollection sortKeyProductCollection = SortKeyProductCollection.RELEVANCE})
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index a1ea3100..32ff5b24 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -550,12 +550,12 @@ class PriceV2 {
         }
         break;
       case "USD":
+      case "INR":
         {
           currencyString =
               '${_simpleCurrencySymbols[currencyCode!]}$formattedAmount';
         }
         break;
-      case "INR":
       case "QAR":
       case "OMR":
       case "BHD":
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index f65150ad..77e029a6 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -263,12 +263,12 @@ class ShopifyStore with ShopifyError {
   }
 
   Future<Collection> getXProductsAfterCursorByCollectionHandle(
-      String handle, int limit, String startCursor,
+      String handle, int limit, String? startCursor,
       {bool deleteThisPartOfCache = false,
       bool reverse = false,
       SortKeyProductCollection sortKeyProductCollection =
           SortKeyProductCollection.RELEVANCE}) async {
-    String cursor = startCursor;
+    String? cursor = startCursor;
     try {
       final WatchQueryOptions _options = WatchQueryOptions(
           document: gql(getXProductAfterCursorByCollectionHandleQuery),

From 899d535916f95d3e28d926790d4fb0f79840d08e Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Wed, 29 Jun 2022 20:12:53 +0530
Subject: [PATCH 75/80] chore: shopify api version-2022-04

---
 .../queries/get_collection_by_handle_with_products.dart   | 4 ++--
 .../queries/get_metafileds_from_product.dart              | 2 +-
 lib/graphql_operations/queries/get_n_products.dart        | 4 ++--
 lib/graphql_operations/queries/get_page_by_handle.dart    | 2 +-
 lib/graphql_operations/queries/get_product_by_handle.dart | 7 ++++---
 .../queries/get_product_by_handle_minimum_data.dart       | 4 ++--
 .../queries/get_product_recommendations.dart              | 4 ++--
 lib/graphql_operations/queries/get_products.dart          | 2 +-
 .../queries/get_products_by_handle.dart                   | 4 ++--
 lib/graphql_operations/queries/get_products_by_ids.dart   | 4 ++--
 .../queries/get_products_by_ids_minimum_data.dart         | 4 ++--
 .../queries/get_recently_ordered_products.dart            | 4 ++--
 .../queries/get_x_products_after_cursor.dart              | 4 ++--
 .../get_x_products_after_cursor_by_collection_handle.dart | 4 ++--
 .../queries/get_x_products_on_query_after_cursor.dart     | 4 ++--
 lib/models/src/page.dart                                  | 2 +-
 lib/models/src/product.dart                               | 8 ++++----
 lib/shopify/src/shopify_store.dart                        | 2 ++
 18 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
index 854d7bef..0b33c910 100644
--- a/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
+++ b/lib/graphql_operations/queries/get_collection_by_handle_with_products.dart
@@ -24,13 +24,13 @@ query(\$handle: String!) {
             key 
             namespace 
             value 
-            valueType 
+            type 
           }
           review_count: metafield(namespace: "rview", key: "review-count") {
             key 
             namespace 
             value 
-            valueType 
+            type 
           }
           variants(first: $variantsCount) {
             edges {
diff --git a/lib/graphql_operations/queries/get_metafileds_from_product.dart b/lib/graphql_operations/queries/get_metafileds_from_product.dart
index 3cb75f0c..e0f9fdfe 100644
--- a/lib/graphql_operations/queries/get_metafileds_from_product.dart
+++ b/lib/graphql_operations/queries/get_metafileds_from_product.dart
@@ -8,7 +8,7 @@ query($handle: String!, $namespace: String!) {
           namespace
           key
           value
-          valueType
+          type
           description
         }
       }
diff --git a/lib/graphql_operations/queries/get_n_products.dart b/lib/graphql_operations/queries/get_n_products.dart
index 7914e89d..a8e9ddfb 100644
--- a/lib/graphql_operations/queries/get_n_products.dart
+++ b/lib/graphql_operations/queries/get_n_products.dart
@@ -17,13 +17,13 @@ query($n : Int, $sortKey : ProductSortKeys, $reverse: Boolean){
           key 
           namespace 
           value 
-          valueType 
+          type 
         }
         review_count: metafield(namespace: "rview", key: "review-count") {
           key 
           namespace 
           value 
-          valueType 
+          type 
         }
         variants(first: 1) {
           edges {
diff --git a/lib/graphql_operations/queries/get_page_by_handle.dart b/lib/graphql_operations/queries/get_page_by_handle.dart
index 741e2b45..a82488d9 100644
--- a/lib/graphql_operations/queries/get_page_by_handle.dart
+++ b/lib/graphql_operations/queries/get_page_by_handle.dart
@@ -5,7 +5,7 @@ query($handle : String!){
         handle
         title 
         body
-        url
+        onlineStoreUrl
     }
 }
 ''';
\ No newline at end of file
diff --git a/lib/graphql_operations/queries/get_product_by_handle.dart b/lib/graphql_operations/queries/get_product_by_handle.dart
index 92af2d51..81d50b9c 100644
--- a/lib/graphql_operations/queries/get_product_by_handle.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle.dart
@@ -8,7 +8,8 @@ query($handle: String!) {
     tags
     onlineStoreUrl
     productType
-    vendor 
+    vendor
+    descriptionHtml 
     options(first: 50) {
       id
       name
@@ -19,13 +20,13 @@ query($handle: String!) {
       key 
       namespace 
       value 
-      valueType 
+      type 
     }
     review_count: metafield(namespace: "rview", key: "review-count") {
       key 
       namespace 
       value 
-      valueType 
+      type 
     }
     variants(first: 250) {
       edges {
diff --git a/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart b/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
index 6c0842f8..b9549c7a 100644
--- a/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
+++ b/lib/graphql_operations/queries/get_product_by_handle_minimum_data.dart
@@ -11,13 +11,13 @@ query($handle: String!) {
       key 
       namespace 
       value 
-      valueType 
+      type 
     }
     review_count: metafield(namespace: "rview", key: "review-count") {
       key 
       namespace 
       value 
-      valueType 
+      type 
     }
     variants(first: 1) {
       edges {
diff --git a/lib/graphql_operations/queries/get_product_recommendations.dart b/lib/graphql_operations/queries/get_product_recommendations.dart
index 11d17eff..b21f6630 100644
--- a/lib/graphql_operations/queries/get_product_recommendations.dart
+++ b/lib/graphql_operations/queries/get_product_recommendations.dart
@@ -12,13 +12,13 @@ query getProductRecommentationsQuery(\$id: ID!){
       key 
       namespace 
       value 
-      valueType 
+      type 
     }
     review_count: metafield(namespace: "rview", key: "review-count") {
       key 
       namespace 
       value 
-      valueType 
+      type 
     }
     images(first: 1) {
       edges {
diff --git a/lib/graphql_operations/queries/get_products.dart b/lib/graphql_operations/queries/get_products.dart
index f38ae412..3e2c8b26 100644
--- a/lib/graphql_operations/queries/get_products.dart
+++ b/lib/graphql_operations/queries/get_products.dart
@@ -19,7 +19,7 @@ query($cursor : String,  $shouldFetchMetafields : Boolean = false, $metafieldsNa
               namespace
               key
               value
-              valueType
+              type
               description
             }
           }
diff --git a/lib/graphql_operations/queries/get_products_by_handle.dart b/lib/graphql_operations/queries/get_products_by_handle.dart
index 3dfcf338..77a03c2f 100644
--- a/lib/graphql_operations/queries/get_products_by_handle.dart
+++ b/lib/graphql_operations/queries/get_products_by_handle.dart
@@ -13,13 +13,13 @@ query getProductByHandle($handle: String!) {
       key 
       namespace 
       value 
-      valueType 
+      type 
     }
     review_count: metafield(namespace: "rview", key: "review-count") {
       key 
       namespace 
       value 
-      valueType 
+      type 
     }
     options(first: 50) {
       id
diff --git a/lib/graphql_operations/queries/get_products_by_ids.dart b/lib/graphql_operations/queries/get_products_by_ids.dart
index 514477f8..05c793e4 100644
--- a/lib/graphql_operations/queries/get_products_by_ids.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids.dart
@@ -15,13 +15,13 @@ query($ids: [ID!]!) {
         key 
         namespace 
         value 
-        valueType 
+        type 
       }
       review_count: metafield(namespace: "rview", key: "review-count") {
         key 
         namespace 
         value 
-        valueType 
+        type 
       }
       options(first: 50) {
         id
diff --git a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
index 87fbc3a8..e9e36625 100644
--- a/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
+++ b/lib/graphql_operations/queries/get_products_by_ids_minimum_data.dart
@@ -15,13 +15,13 @@ query(\$ids: [ID!]!) {
         key 
         namespace 
         value 
-        valueType 
+        type 
       }
       review_count: metafield(namespace: "rview", key: "review-count") {
         key 
         namespace 
         value 
-        valueType 
+        type 
       }
       images(first: 1) {
         edges {
diff --git a/lib/graphql_operations/queries/get_recently_ordered_products.dart b/lib/graphql_operations/queries/get_recently_ordered_products.dart
index cf172693..fad9adbb 100644
--- a/lib/graphql_operations/queries/get_recently_ordered_products.dart
+++ b/lib/graphql_operations/queries/get_recently_ordered_products.dart
@@ -36,13 +36,13 @@ query getOrders(
                       key 
                       namespace 
                       value 
-                      valueType 
+                      type 
                     }
                     review_count: metafield(namespace: "rview", key: "review-count") {
                       key 
                       namespace 
                       value 
-                      valueType 
+                      type 
                     }
                     images(first: 1) {
                       edges {
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
index e0f1bfad..f38c1f25 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor.dart
@@ -17,13 +17,13 @@ query($cursor: String, $x: Int, $reverse: Boolean, $sortKey: ProductSortKeys) {
           key 
           namespace 
           value 
-          valueType 
+          type 
         }
         review_count: metafield(namespace: "rview", key: "review-count") {
           key 
           namespace 
           value 
-          valueType 
+          type 
         }
         images(first: 1) {
           edges {
diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
index 3a2ce520..e8b1685e 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
@@ -34,13 +34,13 @@ query(
             key 
             namespace 
             value 
-            valueType 
+            type 
           }
           review_count: metafield(namespace: "rview", key: "review-count") {
             key 
             namespace 
             value 
-            valueType 
+            type 
           }
           images(first: 1) {
             edges {
diff --git a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
index 80493304..96b4ef6d 100644
--- a/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_products_on_query_after_cursor.dart
@@ -15,13 +15,13 @@ query( $cursor: String, $limit : Int, $sortKey : ProductSortKeys, $query: String
           key 
           namespace 
           value 
-          valueType 
+          type 
         }
         review_count: metafield(namespace: "rview", key: "review-count") {
           key 
           namespace 
           value 
-          valueType 
+          type 
         }
         images(first: 1) {
           edges {
diff --git a/lib/models/src/page.dart b/lib/models/src/page.dart
index 0fe5834c..75c88740 100644
--- a/lib/models/src/page.dart
+++ b/lib/models/src/page.dart
@@ -16,7 +16,7 @@ class ShopifyPage {
         handle: json['handle'],
         title: json['title'],
         body: json['body'],
-        url: json['url'],
+        url: json['onlineStoreUrl'],
     );
   }
 
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index 32ff5b24..d30145e0 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -331,7 +331,7 @@ class Metafield {
   final String? namespace;
   final String? key;
   final String? value;
-  final String? valueType;
+  final String? type;
   final String? description;
 
   const Metafield(
@@ -339,7 +339,7 @@ class Metafield {
       this.namespace,
       this.key,
       this.value,
-      this.valueType,
+      this.type,
       this.description});
 
   static Metafield fromJson(Map<String, dynamic> json) {
@@ -348,7 +348,7 @@ class Metafield {
         namespace: (json['node'] ?? const {})['namespace'],
         key: (json['node'] ?? const {})['key'],
         value: (json['node'] ?? const {})['value'],
-        valueType: (json['node'] ?? const {})['valueType'],
+        type: (json['node'] ?? const {})['type'],
         description: (json['node'] ?? const {})['description']);
   }
 }
@@ -717,7 +717,7 @@ class PriceV2 {
     'SCR': 'SCR',
     'LKR': 'Rs',
     'NPR': 'Rs',
-    'INR': '\u20b9',
+    'INR': 'Rs.',
     'PKR': 'Rs',
     'IDR': 'Rp',
     'ILS': '\u20aa',
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index 77e029a6..7ad9c9c9 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -81,6 +81,7 @@ class ShopifyStore with ShopifyError {
       if (deleteThisPartOfCache) {
         //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
       }
+      print('object');
       // Map<String, dynamic> a = (result?.data ?? const {})['productByHandle'] ?? {};
       return Product.fromProductHandleJson(
           (result.data ?? const {})['productByHandle'] ?? {});
@@ -134,6 +135,7 @@ class ShopifyStore with ShopifyError {
       'edges': List.generate(response['nodes'].length,
           (index) => {'node': response['nodes'][index]})
     };
+    print('object');
     productList = Products.fromJson(newResponse).productList;
     if (deleteThisPartOfCache) {
       //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});

From 904ff5f0797cbeb431245953dd7e69cfdc695a10 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Thu, 30 Jun 2022 15:43:46 +0530
Subject: [PATCH 76/80] fix: blogs & articles url changed to onlineStoreUrl

---
 lib/graphql_operations/queries/get_all_blogs.dart             | 4 ++--
 lib/graphql_operations/queries/get_blog_by_handle.dart        | 4 ++--
 lib/graphql_operations/queries/get_n_articles_sorted.dart     | 2 +-
 .../queries/get_x_articles_after_cursor.dart                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/graphql_operations/queries/get_all_blogs.dart b/lib/graphql_operations/queries/get_all_blogs.dart
index b6f8c2a2..7104a831 100644
--- a/lib/graphql_operations/queries/get_all_blogs.dart
+++ b/lib/graphql_operations/queries/get_all_blogs.dart
@@ -6,7 +6,7 @@ query getBlogs($reverseBlogs: Boolean, $reverseArticles: Boolean, $sortKey: Blog
         id
         handle
         title
-        url
+        onlineStoreUrl
         articles(first: 250, sortKey: TITLE, reverse: $reverseArticles) {
           edges {
             node {
@@ -45,7 +45,7 @@ query getBlogs($reverseBlogs: Boolean, $reverseArticles: Boolean, $sortKey: Blog
               publishedAt
               tags
               title
-              url
+              onlineStoreUrl
             }
           }
         }
diff --git a/lib/graphql_operations/queries/get_blog_by_handle.dart b/lib/graphql_operations/queries/get_blog_by_handle.dart
index 6d2755b3..59c4f5ea 100644
--- a/lib/graphql_operations/queries/get_blog_by_handle.dart
+++ b/lib/graphql_operations/queries/get_blog_by_handle.dart
@@ -39,14 +39,14 @@ query($handle : String!, $sortKey: ArticleSortKeys, $reverseArticles: Boolean){
           publishedAt
           tags
           title
-          url
+          onlineStoreUrl
         }
       }
     }
     handle
     id
     title
-    url
+    onlineStoreUrl
   }
 }
 ''';
\ No newline at end of file
diff --git a/lib/graphql_operations/queries/get_n_articles_sorted.dart b/lib/graphql_operations/queries/get_n_articles_sorted.dart
index e99cfd6d..e36e7dd7 100644
--- a/lib/graphql_operations/queries/get_n_articles_sorted.dart
+++ b/lib/graphql_operations/queries/get_n_articles_sorted.dart
@@ -38,7 +38,7 @@ query($x : Int, $sortKey : ArticleSortKeys, $reverse: Boolean){
         publishedAt
         tags
         title
-        url
+        onlineStoreUrl
       }
     }
   }
diff --git a/lib/graphql_operations/queries/get_x_articles_after_cursor.dart b/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
index 6f38a2c0..4e906ec7 100644
--- a/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_articles_after_cursor.dart
@@ -11,7 +11,7 @@ query($cursor: String, $x: Int, $reverse: Boolean, $sortKey: ArticleSortKeys) {
         handle
         title
         publishedAt
-        url
+        onlineStoreUrl
         excerpt
         excerptHtml
         contentHtml

From 3048f36a6027448fcd9860244c6fbbb74a1ba691 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Fri, 1 Jul 2022 14:42:46 +0530
Subject: [PATCH 77/80] feat: checkout with gift cards

---
 .../checkout_discount_code_apply.dart         | 16 ++++
 .../checkout_discount_code_remove.dart        | 16 ++++
 .../mutations/checkout_email_update.dart      | 16 ++++
 .../mutations/checkout_giftcard_remove.dart   | 88 ++++++++++++++++++-
 .../mutations/checkout_giftcards_append.dart  | 86 ++++++++++++++++++
 .../checkout_shipping_address_update.dart     | 16 ++++
 .../checkout_shipping_line_update.dart        | 16 ++++
 .../mutations/create_checkout.dart            | 16 ++++
 .../queries/get_checkout_information.dart     | 16 ++++
 ...eckout_information_with_shipping_rate.dart | 17 +++-
 .../get_checkout_without_shipping_rates.dart  |  5 ++
 .../queries/get_x_orders_after_cursor.dart    |  1 +
 lib/models/src/checkout.dart                  |  8 +-
 lib/shopify/src/shopify_checkout.dart         | 13 ++-
 14 files changed, 324 insertions(+), 6 deletions(-)

diff --git a/lib/graphql_operations/mutations/checkout_discount_code_apply.dart b/lib/graphql_operations/mutations/checkout_discount_code_apply.dart
index f2e5d391..95a16fe1 100644
--- a/lib/graphql_operations/mutations/checkout_discount_code_apply.dart
+++ b/lib/graphql_operations/mutations/checkout_discount_code_apply.dart
@@ -38,6 +38,18 @@ mutation checkoutDiscountCodeApplyV2($checkoutId: ID!, $discountCode: String!) {
         provinceCode
         zip
       }
+      appliedGiftCards {
+        amountUsedV2 {
+          amount
+          currencyCode
+        }
+        balanceV2 {
+          amount
+          currencyCode
+        }
+        lastCharacters
+        id
+      }
       discountApplications(first: 10) {
         edges {
           node {
@@ -60,6 +72,10 @@ mutation checkoutDiscountCodeApplyV2($checkoutId: ID!, $discountCode: String!) {
         amount
         currencyCode
       }
+      paymentDueV2 {
+        amount
+        currencyCode
+      }
       taxesIncluded
       totalTaxV2 {
         amount
diff --git a/lib/graphql_operations/mutations/checkout_discount_code_remove.dart b/lib/graphql_operations/mutations/checkout_discount_code_remove.dart
index ccd31310..065331a9 100644
--- a/lib/graphql_operations/mutations/checkout_discount_code_remove.dart
+++ b/lib/graphql_operations/mutations/checkout_discount_code_remove.dart
@@ -35,6 +35,18 @@ mutation checkoutDiscountCodeRemove($checkoutId : ID!) {
         provinceCode
         zip
       }
+      appliedGiftCards {
+        amountUsedV2 {
+          amount
+          currencyCode
+        }
+        balanceV2 {
+          amount
+          currencyCode
+        }
+        lastCharacters
+        id
+      }
       discountApplications(first: 10) {
         edges {
           node {
@@ -57,6 +69,10 @@ mutation checkoutDiscountCodeRemove($checkoutId : ID!) {
         amount
         currencyCode
       }
+      paymentDueV2 {
+        amount
+        currencyCode
+      }
       taxesIncluded
       totalTaxV2 {
         amount
diff --git a/lib/graphql_operations/mutations/checkout_email_update.dart b/lib/graphql_operations/mutations/checkout_email_update.dart
index e1301bd4..d18e2e5c 100644
--- a/lib/graphql_operations/mutations/checkout_email_update.dart
+++ b/lib/graphql_operations/mutations/checkout_email_update.dart
@@ -35,6 +35,18 @@ mutation checkoutEmailUpdate($checkoutId: ID!, $email: String!) {
         provinceCode
         zip
       }
+      appliedGiftCards {
+        amountUsedV2 {
+          amount
+          currencyCode
+        }
+        balanceV2 {
+          amount
+          currencyCode
+        }
+        lastCharacters
+        id
+      }
       discountApplications(first: 10) {
         edges {
           node {
@@ -57,6 +69,10 @@ mutation checkoutEmailUpdate($checkoutId: ID!, $email: String!) {
         amount
         currencyCode
       }
+      paymentDueV2 {
+        amount
+        currencyCode
+      }
       taxesIncluded
       totalTaxV2 {
         amount
diff --git a/lib/graphql_operations/mutations/checkout_giftcard_remove.dart b/lib/graphql_operations/mutations/checkout_giftcard_remove.dart
index 3ba29833..b8977a2b 100644
--- a/lib/graphql_operations/mutations/checkout_giftcard_remove.dart
+++ b/lib/graphql_operations/mutations/checkout_giftcard_remove.dart
@@ -1,6 +1,92 @@
 const String checkoutGiftCardRemoveMutation = r'''
-mutation checkoutGiftCard($appliedGiftCardId : ID!, $checkoutId: ID!) {
+mutation checkoutGiftCardRemoveV2($appliedGiftCardId: ID!, $checkoutId: ID!) {
   checkoutGiftCardRemoveV2(appliedGiftCardId: $appliedGiftCardId, checkoutId: $checkoutId) {
+    checkout {
+      id
+      email
+      requiresShipping
+      currencyCode
+      webUrl
+      orderStatusUrl
+      shippingLine {
+        handle
+        title
+        priceV2 {
+          amount
+          currencyCode
+        }
+      }
+      shippingAddress {
+        address1
+        address2
+        city
+        company
+        country
+        countryCodeV2
+        firstName
+        formattedArea
+        id
+        lastName
+        latitude
+        longitude
+        name
+        phone
+        province
+        provinceCode
+        zip
+      }
+      appliedGiftCards {
+        amountUsedV2 {
+          amount
+          currencyCode
+        }
+        balanceV2 {
+          amount
+          currencyCode
+        }
+        lastCharacters
+        id
+      }
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
+      lineItemsSubtotalPrice {
+        amount
+        currencyCode
+      }
+      paymentDueV2 {
+        amount
+        currencyCode
+      }
+      taxesIncluded
+      totalTaxV2 {
+        amount
+        currencyCode
+      }
+      totalPriceV2 {
+        amount
+        currencyCode
+      }
+      subtotalPriceV2 {
+        amount
+        currencyCode
+      }
+    }
     checkoutUserErrors {
       code
       field
diff --git a/lib/graphql_operations/mutations/checkout_giftcards_append.dart b/lib/graphql_operations/mutations/checkout_giftcards_append.dart
index d3077b9a..adb8a49e 100644
--- a/lib/graphql_operations/mutations/checkout_giftcards_append.dart
+++ b/lib/graphql_operations/mutations/checkout_giftcards_append.dart
@@ -1,6 +1,92 @@
 const String checkoutGiftCardsAppendMutation = r'''
 mutation checkoutGiftCardsAppend($checkoutId : ID!, $giftCardCodes : [String!]!) {
   checkoutGiftCardsAppend(checkoutId: $checkoutId, giftCardCodes: $giftCardCodes) {
+    checkout {
+      id
+      email
+      requiresShipping
+      currencyCode
+      webUrl
+      orderStatusUrl
+      shippingLine {
+        handle
+        title
+        priceV2 {
+          amount
+          currencyCode
+        }
+      }
+      shippingAddress {
+        address1
+        address2
+        city
+        company
+        country
+        countryCodeV2
+        firstName
+        formattedArea
+        id
+        lastName
+        latitude
+        longitude
+        name
+        phone
+        province
+        provinceCode
+        zip
+      }
+      appliedGiftCards {
+        amountUsedV2 {
+          amount
+          currencyCode
+        }
+        balanceV2 {
+          amount
+          currencyCode
+        }
+        lastCharacters
+        id
+      }
+      discountApplications(first: 10) {
+        edges {
+          node {
+            allocationMethod
+            targetSelection
+            targetType
+            value {
+              ... on MoneyV2 {
+                amount
+                currencyCode
+              }
+              ... on PricingPercentageValue {
+                percentage
+              }
+            }
+          }
+        }
+      }
+      lineItemsSubtotalPrice {
+        amount
+        currencyCode
+      }
+      paymentDueV2 {
+        amount
+        currencyCode
+      }
+      taxesIncluded
+      totalTaxV2 {
+        amount
+        currencyCode
+      }
+      totalPriceV2 {
+        amount
+        currencyCode
+      }
+      subtotalPriceV2 {
+        amount
+        currencyCode
+      }
+    }
     checkoutUserErrors {
       code
       field
diff --git a/lib/graphql_operations/mutations/checkout_shipping_address_update.dart b/lib/graphql_operations/mutations/checkout_shipping_address_update.dart
index c6f7aa14..cc684e01 100644
--- a/lib/graphql_operations/mutations/checkout_shipping_address_update.dart
+++ b/lib/graphql_operations/mutations/checkout_shipping_address_update.dart
@@ -104,6 +104,18 @@ mutation checkoutShippingAddressUpdateV2(
           }
         }
       }
+      appliedGiftCards {
+        amountUsedV2 {
+          amount
+          currencyCode
+        }
+        balanceV2 {
+          amount
+          currencyCode
+        }
+        lastCharacters
+        id
+      }
       discountApplications(first: 10) {
         edges {
           node {
@@ -126,6 +138,10 @@ mutation checkoutShippingAddressUpdateV2(
         amount
         currencyCode
       }
+      paymentDueV2 {
+        amount
+        currencyCode
+      }
       taxesIncluded 
       totalTaxV2 {
         amount
diff --git a/lib/graphql_operations/mutations/checkout_shipping_line_update.dart b/lib/graphql_operations/mutations/checkout_shipping_line_update.dart
index b44dc3a3..624eb953 100644
--- a/lib/graphql_operations/mutations/checkout_shipping_line_update.dart
+++ b/lib/graphql_operations/mutations/checkout_shipping_line_update.dart
@@ -84,6 +84,18 @@ mutation checkoutShippingLineUpdate(
           }
         }
       }
+      appliedGiftCards {
+        amountUsedV2 {
+          amount
+          currencyCode
+        }
+        balanceV2 {
+          amount
+          currencyCode
+        }
+        lastCharacters
+        id
+      }
       discountApplications(first: 10) {
         edges {
           node {
@@ -106,6 +118,10 @@ mutation checkoutShippingLineUpdate(
         amount
         currencyCode
       }
+      paymentDueV2 {
+        amount
+        currencyCode
+      }
       taxesIncluded 
       totalTaxV2 {
         amount
diff --git a/lib/graphql_operations/mutations/create_checkout.dart b/lib/graphql_operations/mutations/create_checkout.dart
index 1de6a46f..01c9d541 100644
--- a/lib/graphql_operations/mutations/create_checkout.dart
+++ b/lib/graphql_operations/mutations/create_checkout.dart
@@ -68,6 +68,18 @@ mutation checkoutCreate($input: CheckoutCreateInput!) {
           }
         }
       }
+      appliedGiftCards {
+        amountUsedV2 {
+          amount
+          currencyCode
+        }
+        balanceV2 {
+          amount
+          currencyCode
+        }
+        lastCharacters
+        id
+      }
       discountApplications(first: 10) {
         edges {
           node {
@@ -90,6 +102,10 @@ mutation checkoutCreate($input: CheckoutCreateInput!) {
         amount
         currencyCode
       }
+      paymentDueV2 {
+        amount
+        currencyCode
+      }
       taxesIncluded
       totalTaxV2 {
         amount
diff --git a/lib/graphql_operations/queries/get_checkout_information.dart b/lib/graphql_operations/queries/get_checkout_information.dart
index 435d89f3..8a4523a9 100644
--- a/lib/graphql_operations/queries/get_checkout_information.dart
+++ b/lib/graphql_operations/queries/get_checkout_information.dart
@@ -123,6 +123,18 @@ query(\$id: ID!) {
           }
         }
       }
+      appliedGiftCards {
+        amountUsedV2 {
+          amount
+          currencyCode
+        }
+        balanceV2 {
+          amount
+          currencyCode
+        }
+        lastCharacters
+        id
+      }
       discountApplications(first: 10) {
         edges {
           node {
@@ -145,6 +157,10 @@ query(\$id: ID!) {
         amount
         currencyCode
       }
+      paymentDueV2 {
+        amount
+        currencyCode
+      }
       taxesIncluded
       totalTaxV2 {
         amount
diff --git a/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart b/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
index 0afdd62b..4ab3aff7 100644
--- a/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
+++ b/lib/graphql_operations/queries/get_checkout_information_with_shipping_rate.dart
@@ -46,7 +46,18 @@ query($id: ID!){
         provinceCode
         zip
       }
-      
+      appliedGiftCards {
+        amountUsedV2 {
+          amount
+          currencyCode
+        }
+        balanceV2 {
+          amount
+          currencyCode
+        }
+        lastCharacters
+        id
+      }
       discountApplications(first: 10) {
         edges {
           node {
@@ -69,6 +80,10 @@ query($id: ID!){
         amount
         currencyCode
       }
+      paymentDueV2 {
+        amount
+        currencyCode
+      }
       taxesIncluded
       totalTaxV2 {
         amount
diff --git a/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart b/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
index 8143ee0b..908c3491 100644
--- a/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
+++ b/lib/graphql_operations/queries/get_checkout_without_shipping_rates.dart
@@ -31,6 +31,7 @@ query($id: ID!){
           amount
           currencyCode
         }
+        lastCharacters
         id
       }
       requiresShipping
@@ -103,6 +104,10 @@ query($id: ID!){
         amount
         currencyCode
       }
+      paymentDueV2 {
+        amount
+        currencyCode
+      }
       totalTaxV2 {
         amount
         currencyCode
diff --git a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
index f23196f5..81ea3fb7 100644
--- a/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
+++ b/lib/graphql_operations/queries/get_x_orders_after_cursor.dart
@@ -31,6 +31,7 @@ query getOrders(
             edges {
               node {
                 title
+                quantity
                 variant {
                   id
                   title
diff --git a/lib/models/src/checkout.dart b/lib/models/src/checkout.dart
index 478b1bde..fc8c2211 100644
--- a/lib/models/src/checkout.dart
+++ b/lib/models/src/checkout.dart
@@ -20,6 +20,7 @@ class Checkout {
   final String? updatedAt;
   final PriceV2 lineItemsSubtotalPrice;
   final PriceV2 discountAmount;
+  final PriceV2 paymentDueV2;
   final PriceV2 totalTaxV2;
   final PriceV2 totalPriceV2;
   final bool? taxesIncluded;
@@ -48,6 +49,7 @@ class Checkout {
       required this.totalPriceV2,
       required this.lineItemsSubtotalPrice,
       required this.discountAmount,
+      required this.paymentDueV2,
       this.taxesIncluded,
       this.taxExempt,
       required this.subtotalPriceV2,
@@ -97,6 +99,7 @@ class Checkout {
         lineItemsSubtotalPrice: lineItemsSubtotalPrice,
         discountAmount: PriceV2.fromJson(
             {'amount': amount, 'currencyCode': currencyCode}),
+        paymentDueV2: PriceV2.fromJson(json['paymentDueV2'] ?? const {}),
         totalTaxV2: totalTaxV2,
         totalPriceV2: totalPriceV2,
         taxesIncluded: taxesIncluded,
@@ -327,6 +330,7 @@ class ProductVariantCheckout {
       this.product});
 
   static ProductVariantCheckout fromJson(Map<String, dynamic> json) {
+    print('object');
     return ProductVariantCheckout(
       price: PriceV2.fromJson(json['priceV2'] ?? const {}),
       title: json['title'],
@@ -346,14 +350,16 @@ class ProductVariantCheckout {
 class AppliedGiftCards {
   final PriceV2 amountUsedV2;
   final PriceV2 balanceV2;
+  final String lastCharacters;
   final String? id;
 
-  AppliedGiftCards({required this.amountUsedV2, required this.balanceV2, this.id});
+  AppliedGiftCards({required this.amountUsedV2, required this.balanceV2, required this.lastCharacters, this.id});
 
   static AppliedGiftCards fromJson(Map<String, dynamic> json) {
     return AppliedGiftCards(
         amountUsedV2: PriceV2.fromJson(json['amountUsedV2'] ?? const {}),
         balanceV2: PriceV2.fromJson(json['balanceV2'] ?? const {}),
+        lastCharacters: json['lastCharacters'],
         id: json['id']);
   }
 }
diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index c3af6fff..f9c4bc4f 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -241,7 +241,7 @@ class ShopifyCheckout with ShopifyError {
   }
 
   /// Appends the [giftCardCodes] to the [Checkout] that [checkoutId] belongs to.
-  Future<void> checkoutGiftCardAppend(
+  Future<Checkout> checkoutGiftCardAppend(
       String checkoutId, List<String> giftCardCodes,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
@@ -256,18 +256,22 @@ class ShopifyCheckout with ShopifyError {
     if (deleteThisPartOfCache) {
       //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
+
+    return Checkout.fromJson(
+        result.data!['checkoutGiftCardsAppend']['checkout'] ?? {});
   }
 
   /// Removes the Gift card that [appliedGiftCardId] belongs to, from the [Checkout] that [checkoutId] belongs to.
-  Future<void> checkoutGiftCardRemove(
+  Future<Checkout> checkoutGiftCardRemove(
       String appliedGiftCardId, String checkoutId,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         document: gql(checkoutGiftCardRemoveMutation),
         variables: {
-          'appliedGiftCards': appliedGiftCardId,
+          'appliedGiftCardId': appliedGiftCardId,
           'checkoutId': checkoutId
         });
+    print('object');
     final QueryResult result = await _graphQLClient.mutate(_options);
     checkForError(
       result,
@@ -277,6 +281,9 @@ class ShopifyCheckout with ShopifyError {
     if (deleteThisPartOfCache) {
       //_graphQLClient.cache.writeQuery(_options.asRequest, data: {});
     }
+
+    return Checkout.fromJson(
+        result.data!['checkoutGiftCardRemoveV2']['checkout'] ?? {});
   }
 
   /// Complete [Checkout] without providing payment information.

From 86c1b27e452c17fb5b37c885204652f281766e4b Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Wed, 6 Jul 2022 14:17:46 +0530
Subject: [PATCH 78/80] feat: collection filters for products

---
 ...cts_after_cursor_by_collection_handle.dart | 14 +++-
 lib/models/src/product.dart                   | 83 ++++++++++++++++++-
 lib/shopify/src/shopify_store.dart            | 27 ++++--
 3 files changed, 112 insertions(+), 12 deletions(-)

diff --git a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
index e8b1685e..419a3ec1 100644
--- a/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
+++ b/lib/graphql_operations/queries/get_x_products_after_cursor_by_collection_handle.dart
@@ -5,6 +5,7 @@ query(
   $x: Int
   $reverse: Boolean
   $sortKey: ProductCollectionSortKeys
+  $filters: [ProductFilter!]
 ) {
   collectionByHandle(handle: $handle) {
     id
@@ -17,10 +18,21 @@ query(
       originalSrc
       transformedSrc(maxWidth: 400, crop: CENTER)
     }
-    products(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse) {
+    products(first: $x, after: $cursor, sortKey: $sortKey, reverse: $reverse, filters: $filters) {
       pageInfo {
         hasNextPage
       }
+      filters {
+        id
+        label
+        type
+        values {
+          id
+          label
+          count
+          input
+        }
+      }
       edges {
         cursor
         node {
diff --git a/lib/models/src/product.dart b/lib/models/src/product.dart
index d30145e0..878d1e75 100644
--- a/lib/models/src/product.dart
+++ b/lib/models/src/product.dart
@@ -1,17 +1,96 @@
+import 'dart:convert';
+
 import 'package:collection/collection.dart';
 import 'package:flutter_simple_shopify/flutter_simple_shopify.dart';
 import 'package:intl/intl.dart';
 
+class Filter {
+  final String id;
+  final String label;
+  final String type;
+  final List<FilterValue> values;
+
+  Filter(
+      {required this.id,
+      required this.label,
+      required this.type,
+      required this.values});
+
+  static Filter fromJson(Map<String, dynamic> json) {
+    return Filter(
+      id: json['id'],
+      label: json['label'],
+      type: json['type'],
+      values: FilterValue.getList(json['values']),
+    );
+  }
+
+  static List<Filter> getList(List jsonList) {
+    List<Filter> fList = [];
+    jsonList.forEach((e) => fList.add(Filter.fromJson(e ?? const {})));
+    return fList;
+  }
+}
+
+class FilterValue {
+  final String id;
+  final String label;
+  final int count;
+  final Map input;
+
+  FilterValue(
+      {required this.id,
+      required this.label,
+      required this.count,
+      required this.input});
+
+  static FilterValue fromJson(Map json) {
+    return FilterValue(
+      id: json['id'],
+      label: json['label'],
+      count: json['count'],
+      input: jsonDecode(json['input']),
+    );
+  }
+
+  static List<FilterValue> getList(List jsonList) {
+    List<FilterValue> fvList = [];
+    jsonList.forEach((e) => fvList.add(FilterValue.fromJson(e ?? const {})));
+    return fvList;
+  }
+
+  Map toJson() => {
+        'id': id,
+        'label': label,
+        'count': count,
+        'input': jsonEncode(input),
+      };
+
+  FilterValue copyWith({String? id, String? label, int? count, Map? input}) {
+    return FilterValue(
+      id: id ?? this.id,
+      label: label ?? this.label,
+      count: count ?? this.count,
+      input: input ?? this.input,
+    );
+  }
+}
+
 class Products {
   final List<Product> productList;
   final bool? hasNextPage;
+  final List<Filter>? filters;
 
-  Products({required this.productList, required this.hasNextPage});
+  Products(
+      {required this.productList, required this.hasNextPage, this.filters});
 
   static Products fromJson(Map<String, dynamic> json) {
+    var a = json['filters'];
+    print('object');
     return Products(
         productList: _getProductList(json),
-        hasNextPage: (json['pageInfo'] ?? const {})['hasNextPage']);
+        hasNextPage: (json['pageInfo'] ?? const {})['hasNextPage'],
+        filters: Filter.getList(json['filters'] ?? []));
   }
 
   static List<Product> _getProductList(Map<String, dynamic> json) {
diff --git a/lib/shopify/src/shopify_store.dart b/lib/shopify/src/shopify_store.dart
index 7ad9c9c9..1ae101fe 100644
--- a/lib/shopify/src/shopify_store.dart
+++ b/lib/shopify/src/shopify_store.dart
@@ -81,7 +81,7 @@ class ShopifyStore with ShopifyError {
       if (deleteThisPartOfCache) {
         //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
       }
-      print('object');
+      // print('object');
       // Map<String, dynamic> a = (result?.data ?? const {})['productByHandle'] ?? {};
       return Product.fromProductHandleJson(
           (result.data ?? const {})['productByHandle'] ?? {});
@@ -121,7 +121,9 @@ class ShopifyStore with ShopifyError {
   ///
   /// Returns the Products associated to the given id's in [idList]
   Future<List<Product>> getProductsByIds(List<String> idList,
-      {bool deleteThisPartOfCache = false, minimumData = true, int variantsCount = 1}) async {
+      {bool deleteThisPartOfCache = false,
+      minimumData = true,
+      int variantsCount = 1}) async {
     List<Product> productList = [];
     final QueryOptions _options = WatchQueryOptions(
         document: minimumData
@@ -135,7 +137,7 @@ class ShopifyStore with ShopifyError {
       'edges': List.generate(response['nodes'].length,
           (index) => {'node': response['nodes'][index]})
     };
-    print('object');
+    // print('object');
     productList = Products.fromJson(newResponse).productList;
     if (deleteThisPartOfCache) {
       //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
@@ -243,12 +245,15 @@ class ShopifyStore with ShopifyError {
 
   /// Returns a collection by handle.
   Future<Collection> getCollectionByHandle(String handle,
-      {bool deleteThisPartOfCache = false, int? productsCount, int variantsCount = 1}) async {
+      {bool deleteThisPartOfCache = false,
+      int? productsCount,
+      int variantsCount = 1}) async {
     Collection collection = Collection.fromJson({});
     try {
       final WatchQueryOptions _options = WatchQueryOptions(
           document: productsCount != null
-              ? gql(getCollectionByHandleWithProductsQuery(productsCount, variantsCount))
+              ? gql(getCollectionByHandleWithProductsQuery(
+                  productsCount, variantsCount))
               : gql(getCollectionByHandleQuery),
           variables: {'handle': handle});
       final QueryResult result = await _graphQLClient!.query(_options);
@@ -268,6 +273,7 @@ class ShopifyStore with ShopifyError {
       String handle, int limit, String? startCursor,
       {bool deleteThisPartOfCache = false,
       bool reverse = false,
+      List<dynamic> filters = const [],
       SortKeyProductCollection sortKeyProductCollection =
           SortKeyProductCollection.RELEVANCE}) async {
     String? cursor = startCursor;
@@ -279,9 +285,12 @@ class ShopifyStore with ShopifyError {
             'x': limit,
             'cursor': cursor,
             'reverse': reverse,
-            'sortKey': sortKeyProductCollection.parseToString()
+            'sortKey': sortKeyProductCollection.parseToString(),
+            'filters': filters
           });
       final QueryResult result = await _graphQLClient!.query(_options);
+      // var a = "$result";
+      // print('result $result');
       checkForError(result);
       if (deleteThisPartOfCache) {
         //_graphQLClient!.cache.writeQuery(_options.asRequest, data: {});
@@ -425,7 +434,7 @@ class ShopifyStore with ShopifyError {
   ///
   /// Gets all [Product] from a [query] search sorted by [sortKey].
   Future<List<Product>> getAllProductsOnQuery(String cursor, String query,
-      {SortKeyProduct? sortKey,
+      {SortKeyProduct sortKey = SortKeyProduct.RELEVANCE,
       bool deleteThisPartOfCache = false,
       bool reverse = false}) async {
     String? cursor;
@@ -459,8 +468,8 @@ class ShopifyStore with ShopifyError {
   ///
   /// Gets [limit] amount of [Product] from the [query] search, sorted by [sortKey].
   Future<Products> getXProductsOnQueryAfterCursor(
-      String query, int limit, String cursor,
-      {SortKeyProduct? sortKey,
+      String query, int limit, String? cursor,
+      {SortKeyProduct sortKey = SortKeyProduct.RELEVANCE,
       bool deleteThisPartOfCache = false,
       bool reverse = false}) async {
     final WatchQueryOptions _options = WatchQueryOptions(

From 024e15c88569ca211ef51d921cfe847b82d91e74 Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Thu, 7 Jul 2022 17:46:36 +0530
Subject: [PATCH 79/80] fix: shippingAddressUpdate with nullable fields

---
 lib/shopify/src/shopify_checkout.dart | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index f9c4bc4f..ccd81b8f 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -105,16 +105,16 @@ class ShopifyCheckout with ShopifyError {
   /// Updates the shipping address on given [checkoutId]
   Future<Checkout> shippingAddressUpdate(
       String checkoutId,
-      String address1,
-      String address2,
-      String company,
-      String city,
-      String country,
-      String firstName,
-      String lastName,
-      String phone,
-      String province,
-      String zip,
+      String? address1,
+      String? address2,
+      String? company,
+      String? city,
+      String? country,
+      String? firstName,
+      String? lastName,
+      String? phone,
+      String? province,
+      String? zip,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         document: gql(checkoutShippingAddressUpdateMutation),
@@ -132,6 +132,7 @@ class ShopifyCheckout with ShopifyError {
           'zip': zip
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
+    print("object");
     checkForError(
       result,
       key: 'checkoutShippingAddressUpdateV2',

From 4c6ae8c2551f842ffa53ccecc74b1f4d702c3d6b Mon Sep 17 00:00:00 2001
From: rupam4 <rupam@claritytech.io>
Date: Thu, 7 Jul 2022 17:46:36 +0530
Subject: [PATCH 80/80] fix: shippingAddressUpdate with nullable fields

fix: shippingAddressUpdate with nullable fields
---
 lib/shopify/src/shopify_checkout.dart | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/shopify/src/shopify_checkout.dart b/lib/shopify/src/shopify_checkout.dart
index f9c4bc4f..eff7daf8 100644
--- a/lib/shopify/src/shopify_checkout.dart
+++ b/lib/shopify/src/shopify_checkout.dart
@@ -34,7 +34,7 @@ class ShopifyCheckout with ShopifyError {
   ///
   /// Creates a new [Checkout].
   Future<Checkout> createCheckout(List<String> variantIdList,
-      {Map<String, String>? shippingAddress,
+      {Map<String, String?>? shippingAddress,
       String? email,
       String? note,
       bool deleteThisPartOfCache = false}) async {
@@ -105,16 +105,16 @@ class ShopifyCheckout with ShopifyError {
   /// Updates the shipping address on given [checkoutId]
   Future<Checkout> shippingAddressUpdate(
       String checkoutId,
-      String address1,
-      String address2,
-      String company,
-      String city,
-      String country,
-      String firstName,
-      String lastName,
-      String phone,
-      String province,
-      String zip,
+      String? address1,
+      String? address2,
+      String? company,
+      String? city,
+      String? country,
+      String? firstName,
+      String? lastName,
+      String? phone,
+      String? province,
+      String? zip,
       {bool deleteThisPartOfCache = false}) async {
     final MutationOptions _options = MutationOptions(
         document: gql(checkoutShippingAddressUpdateMutation),
@@ -132,6 +132,7 @@ class ShopifyCheckout with ShopifyError {
           'zip': zip
         });
     final QueryResult result = await _graphQLClient.mutate(_options);
+    print("object");
     checkForError(
       result,
       key: 'checkoutShippingAddressUpdateV2',