Merge pull request #18 in MTIP/asdk-ios from bugfix/8240 to develop_1.4

* commit '879154c33b68dceecf71f4d5c4704295a278af64':
  create payment info in init for ASDKChargeResponse
  refactor from property to init
  add rebill id into output

ASDKCore/API Objects/Response/Charge/ASDKChargeResponse.h

@@ -22,9 +22,16 @@
 #import "ASDKPaymentInfo.h"
 #import "ASDKThreeDsData.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ASDKChargeResponse : ASDKAcquiringResponse
 
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary
+                          rebillId:(nullable NSNumber *)rebillId;
+
 @property (nonatomic, strong) ASDKPaymentInfo *paymentInfo;
 @property (nonatomic, strong) ASDKThreeDsData *threeDsData;
 
 @end
+
+NS_ASSUME_NONNULL_END

ASDKCore/API Objects/Response/Charge/ASDKChargeResponse.m

@@ -23,6 +23,17 @@
 
 @implementation ASDKChargeResponse
 
+-(instancetype)initWithDictionary:(NSDictionary *)dictionary
+                         rebillId:(NSNumber *)rebillId {
+    self = [super initWithDictionary:dictionary];
+    if (!self) {
+        return nil;
+    }
+    _paymentInfo = [[ASDKPaymentInfo alloc] initWithDictionary:_dictionary];
+    _paymentInfo.rebillId = rebillId;
+    return self;
+}
+
 - (ASDKThreeDsData *)threeDsData
 {
     if (!_threeDsData)

ASDKCore/API Objects/Response/PaymentInfo/ASDKPaymentInfo.h

@@ -27,5 +27,6 @@
 @property (nonatomic, copy) NSString *orderId;
 @property (nonatomic, strong) NSNumber *amount;
 @property (nonatomic, strong) NSString *status;
+@property (nonatomic, strong) NSNumber *rebillId;
 
 @end

ASDKCore/ASDKAcquiringApi.m

@@ -355,7 +355,7 @@ - (void)chargeWithRequest:(ASDKChargeRequest *)request
     [self apiVersion:APIVersion_v2 path:kASDKAPIPathCharge parameters:parameters
        success:^(NSDictionary *responseDictionary, NSURLResponse *response)
      {
-         ASDKChargeResponse *responseObject = [[ASDKChargeResponse alloc] initWithDictionary:responseDictionary];
+         ASDKChargeResponse *responseObject = [[ASDKChargeResponse alloc] initWithDictionary:responseDictionary rebillId:request.rebillId];
          success(responseObject.paymentInfo, responseObject.status);
      }
        failure:^(ASDKAcquringApiError *error)