Merge pull request #105 from chargebee/feat/support-trial

Feat/support trial

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.6
+Chore
+* Support trial subscriptions in retrieveSubscription
+
 ## 0.4.5
 Chore
 * UTF8 support

README.md

@@ -27,7 +27,7 @@ To use Chargebee SDK in your Flutter app, follow these steps:
 
     ``` dart
     dependencies: 
-     chargebee_flutter: ^0.4.5
+     chargebee_flutter: ^0.4.6
     ```
 
 2.  Install dependency.

android/build.gradle

@@ -1,5 +1,5 @@
 group 'com.chargebee.flutter.sdk'
-version '0.4.5'
+version '0.4.6'
 
 buildscript {
     ext.kotlin_version = '1.6.0'

ios/chargebee_flutter.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'chargebee_flutter'
-  s.version          = '0.4.5'
+  s.version          = '0.4.6'
   s.summary          = 'This is the official Software Development Kit (SDK) for Chargebee Flutter.'
   s.description      = <<-DESC
 A new Flutter plugin.

lib/src/models/product.dart

@@ -150,21 +150,21 @@ class Subscripton {
     subscriptionId = json['subscription_id'] as String;
     customerId = json['customer_id'] as String;
     status = json['status'] as String;
-    activatedAt = json['activated_at'] as int;
-    currentTermStart = json['current_term_start'] as int;
-    currentTermEnd = json['current_term_end'] as int;
-    planAmount = json['plan_amount'].toString();
-
+    activatedAt = json.containsKey('activated_at') ? json['activated_at'] as int : null;
+    currentTermStart = json.containsKey('current_term_start') ? json['current_term_start'] as int: null;
+    currentTermEnd = json.containsKey('current_term_end') ? json['current_term_end'] as int: null;
+    planAmount = json.containsKey('plan_amount') ? json['plan_amount'].toString() : null;
+    /// Defaults to null if key not present
     /// Plan amount sometime we are getting double value sometime Int
   }
 
   /// convert json data into Subscripton model for Android
   Subscripton.fromJsonAndroid(Map<String, dynamic> json) {
-    activatedAtString = json['activated_at'].toString();
-    currentTermEndString = json['current_term_end'].toString();
-    currentTermStartString = json['current_term_start'].toString();
+    activatedAtString = json.containsKey('activated_at') ? json['activated_at'].toString(): null;
+    currentTermEndString = json.containsKey('current_term_end') ? json['current_term_end'].toString(): null;
+    currentTermStartString = json.containsKey('current_term_start') ? json['current_term_start'].toString(): null;
     customerId = json['customer_id'] as String;
-    planAmount = json['plan_amount'].toString();
+    planAmount = json.containsKey('plan_amount') ? json['plan_amount'].toString(): null;
     status = json['status'] as String;
     subscriptionId = json['subscription_id'] as String;
   }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: chargebee_flutter
 description: This is the official Software Development Kit (SDK) for Chargebee Flutter.
-version: 0.4.5
+version: 0.4.6
 homepage: 'https://chargebee.com'
 repository: 'https://github.com/chargebee/chargebee-flutter'