added support for UPI

CoreSDK/Objective-C SampleApp/PayUMoneyExample/APIListVC.m

@@ -39,6 +39,7 @@ - (void)viewDidLoad {
                      @"PayViaStoredCard",
                      @"PayViaWallet",
                      @"PayViaEMI",
+                     @"PayViaUPI",
                      @"NitroFlags",
                      @"VerifyOTP",
                      @"FetchUserDataAPI",
@@ -140,7 +141,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             NSArray *arrSavedCard = [[dict valueForKey:@"result"] valueForKey:@"savedCards"];
             PaymentVC *paymentVC = [self.storyboard instantiateViewControllerWithIdentifier:NSStringFromClass([PaymentVC class])];
             paymentVC.paymentMode = PUMPaymentModeStoredCard;
-            paymentVC.arrStoredCard = arrSavedCard;
+            paymentVC.arrStoredCard = [arrSavedCard isKindOfClass:[NSArray class]] ? arrSavedCard : nil;
             [self.navigationController pushViewController:paymentVC animated:YES];
         }
             break;
@@ -160,6 +161,14 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         }
             break;
         case 11:
+        {
+            PaymentVC *paymentVC = [self.storyboard instantiateViewControllerWithIdentifier:NSStringFromClass([PaymentVC class])];
+            paymentVC.paymentMode = PUMPaymentModeUPI;
+            [self.navigationController pushViewController:paymentVC animated:YES];
+
+        }
+            break;
+        case 12:
         {
             //            @"NitroFlags",
             NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
@@ -174,14 +183,14 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             [Utils showMsgWithTitle:@"NitroFlags" message:[NSString stringWithFormat:@"%@",dict]];
         }
             break;
-        case 12:
+        case 13:
         {
             //            @"VerifyOTP",
             VerifyOTPVC *verifyOTPVC = [self.storyboard instantiateViewControllerWithIdentifier:NSStringFromClass([VerifyOTPVC class])];
             [self.navigationController pushViewController:verifyOTPVC animated:YES];
         }
             break;
-        case 13:
+        case 14:
         {
             //            @"FetchUserDataAPI",
             msg = [NSString stringWithFormat:@"%@",self.fetchUserDataAPIResponse];

CoreSDK/Objective-C SampleApp/PayUMoneyExample/PaymentVC.m

@@ -13,6 +13,9 @@
 #import "iOSDefaultActivityIndicator.h"
 #import "EMISelectorViewController.h"
 
+#define kInvaildVPAMessage @"Please enter a valid vpa"
+#define kUnableToValidateVPAMessage @"Unable to validate VPA"
+#define kUPIUnavailable @"UPI option is unavailable"
 
 @interface PaymentVC ()<UITableViewDelegate, UITableViewDataSource, UITextFieldDelegate>
 {
@@ -51,6 +54,9 @@ - (void)viewDidLoad {
     else if (self.paymentMode == PUMPaymentModeStoredCard){
         self.vwStoredCard.hidden = NO;
         self.vwNB.hidden = NO;
+    } else if (self.paymentMode == PUMPaymentModeUPI) {
+        self.vwNB.hidden = NO;
+        self.vwStoredCard.hidden = YES;
     }
     else if (self.paymentMode == PUMPaymentModeNone){
         [self btnTappedPayNow:nil];
@@ -62,7 +68,8 @@ - (void)viewDidLoad {
         UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissKeyboard)];
         [self.view addGestureRecognizer:tapGesture];
     }
-    // Do any additional setup after loading the view.
+
+    [self checkIfUPIOptionAvaliable];
 }
 - (void)dismissKeyboard{
     [self.view endEditing:NO];
@@ -72,6 +79,13 @@ - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
+
+- (void)checkIfUPIOptionAvaliable {
+    if (self.paymentMode == PUMPaymentModeUPI && ![[PayUMoneyCoreSDK sharedInstance] isUPIOptionAvailable]) {
+        [self showAlertWithMessage:kUPIUnavailable];
+    }
+}
+
 - (void)getBinDetails:(NSString *)cardNumber withCompletionBlock:(PUMRawJSONCompletionBlock)completionBlock {
     self.defaultActivityIndicator = [iOSDefaultActivityIndicator new];
     [self.defaultActivityIndicator startAnimatingActivityIndicatorWithSelfView:self.view];
@@ -143,8 +157,9 @@ - (IBAction)btnTappedPayNow:(id)sender {
         paymentParam.paymentMode = PUMPaymentModeStoredCard;
         paymentParam.objSavedCard.cvv = self.tfBankCode.text;
         [self showWebView:paymentParam];
-    }
-    else if (self.paymentMode == PUMPaymentModeNone){
+    } else if (self.paymentMode == PUMPaymentModeUPI) {
+        [self checkForValidVPA];
+    } else if (self.paymentMode == PUMPaymentModeNone){
         paymentParam.paymentMode = PUMPaymentModeNone;
         paymentParam.useWallet = YES;
         [self showWebView:paymentParam];
@@ -172,7 +187,7 @@ - (void)setUpCardParamsForEMI:(PUMPaymentParam *)params {
 
 -(void)openEMITenureScreen:(PUMPaymentParam *)paymentParam {
     NSDictionary *emiDictionary = [self.arrNetBank objectAtIndex:selectedIndex];
-
+    
     EMISelectorViewController *emiSelectorVC = [self.storyboard instantiateViewControllerWithIdentifier:@"EMISelectorViewController"];
     [emiSelectorVC setBankCode:[[emiDictionary allKeys] firstObject]];
     [emiSelectorVC setPaymentParams:paymentParam];
@@ -200,6 +215,51 @@ - (NSArray *)testOrderDetailsArray {
     return @[@{@"From":@"Delhi"}, @{@"To":@"Pune"}];
 }
 
+- (void)showAlertWithMessage:(NSString *)message {
+    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:message preferredStyle:UIAlertControllerStyleAlert];
+
+    UIAlertAction *action = [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleCancel handler:nil];
+    [alertController addAction:action];
+
+    [self presentViewController:alertController animated:YES completion:nil];
+}
+
+- (void)proceedWithVPA:(NSString *)vpa {
+    PUMUPI *upiObject = [PUMUPI new];
+    upiObject.vpa = vpa;
+
+    PUMPaymentParam *paymentParam = [PUMPaymentParam new];
+    paymentParam.objUPI = upiObject;
+    paymentParam.paymentMode = PUMPaymentModeUPI;
+    paymentParam.useWallet = self.switchUseWallet.isOn;
+    [self showWebView:paymentParam];
+}
+
+#pragma mark - API -
+
+- (void)checkForValidVPA {
+    [self.view endEditing:YES];
+    NSString *vpa = [self.tfBankCode.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+
+    __weak PaymentVC *weakSelf = self;
+
+    self.defaultActivityIndicator = [iOSDefaultActivityIndicator new];
+    [self.defaultActivityIndicator startAnimatingActivityIndicatorWithSelfView:self.view];
+
+    [[PayUMoneyCoreSDK sharedInstance] validateVPA:vpa completion:^(BOOL isValidVPA, NSError *error) {
+        [weakSelf.defaultActivityIndicator stopAnimatingActivityIndicator];
+        if (error) {
+            [weakSelf showAlertWithMessage:kUnableToValidateVPAMessage];
+        } else {
+            if (isValidVPA) {
+                [weakSelf proceedWithVPA:vpa];
+            } else {
+                [weakSelf showAlertWithMessage:kInvaildVPAMessage];
+            }
+        }
+    }];
+}
+
 #pragma mark - Table view data source
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
@@ -218,7 +278,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"cell" forIndexPath:indexPath];
-
+    
     if (self.paymentMode != PUMPaymentModeStoredCard ){
         NSDictionary *eachNetBank = [self.arrNetBank objectAtIndex:indexPath.row];
         if (_paymentMode == PUMPaymentModeEMI) {
@@ -239,9 +299,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 }
 
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-//    if (self.paymentMode == PUMPaymentModeNetBanking){
-//        self.tfBankCode.text = [[self tableView:tableView cellForRowAtIndexPath:indexPath].detailTextLabel.text copy];
-//    }
+    //    if (self.paymentMode == PUMPaymentModeNetBanking){
+    //        self.tfBankCode.text = [[self tableView:tableView cellForRowAtIndexPath:indexPath].detailTextLabel.text copy];
+    //    }
     selectedIndex = (int)indexPath.row;
 }
 

CoreSDK/PayUMoneyCoreSDK.framework/Headers/PUMConstants.h

@@ -30,6 +30,7 @@ typedef NS_ENUM(NSInteger, PUMEnvironment) {
 
 #define     EMI_SMALL                                           @"emi"
 #define     EMI                                                 @"EMI"
+#define     UPI                                                 @"UPI"
 #define     CASH_CARD_SMALL                                     @"cashcard"
 #define     CASH_CARD_CAPITAL                                   @"CASHCARD"
 #define     CASH                                                @"CASH"

CoreSDK/PayUMoneyCoreSDK.framework/Headers/PUMHelperClass.h

@@ -34,6 +34,8 @@
 
 + (BOOL)isValidEmail:(NSString *)email;
 
++ (BOOL)isValidVPA:(NSString *)vpa;
+
 + (BOOL)validateRegex:(NSString *) regex onString:(NSString *) str;
 
 + (BOOL)isNitroFlowEnabledForMerchant;

CoreSDK/PayUMoneyCoreSDK.framework/Headers/PUMInternalConstants.h

@@ -64,6 +64,7 @@
 #define Cancel_Transaction_URL                      @"payment/postBackParam.do"
 #define Cancel_Transaction                          @"payment/postBackParamIcp.do"
 #define Post_Payment_URL                            @"payment/app/postPayment"
+#define Validate_VPA                                @"payu/validateVpa"
 
 // ONE_TAP_ENABLE
 #define ENABLE_ONE_TAP                              @"auth/app/setUserPaymentOption"  //params oneClickTxn=-1 OR 0 OR 1 <POST
@@ -230,22 +231,26 @@
 #define ENVIRONMENT_PP22_API_URL                                @"https://pp22.payumoney.com/"
 #define ENVIRONMENT_MOBILE_TEST_API_URL                         @"https://mobiletest.payumoney.com/"
 #define ENVIRONMENT_PP44_API_URL                                @"https://pp44.payumoney.com/"
+#define ENVIRONMENT_PP58_API_URL                                @"https://pp58.payumoney.com/"
 
 //Web URLs
 #define ENVIRONMENT_PRODUCTION_WEB_URL                          @"https://secure.payu.in/_payment"
 #define ENVIRONMENT_TEST_WEB_URL                                @"https://sandboxsecure.payu.in/_payment"
-#define ENVIRONMENT_PP42_WEB_URL                                @"http://pp42.secure.payu.in/_payment"
-#define ENVIRONMENT_PP25_WEB_URL                                @"http://pp25.secure.payu.in/_payment"
-#define ENVIRONMENT_PP41_WEB_URL                                @"http://pp41.secure.payu.in/_payment"
-#define ENVIRONMENT_PP10_WEB_URL                                @"http://pp10.secure.payu.in/_payment"
-#define ENVIRONMENT_PP0_WEB_URL                                 @"http://pp0.secure.payu.in/_payment"
-#define ENVIRONMENT_PP48_WEB_URL                                @"http://pp51.secure.payu.in/_payment"
-#define ENVIRONMENT_PP4_WEB_URL                                 @"http://pp4.secure.payu.in/_payment"
-#define ENVIRONMENT_MOBILE_TEST_WEB_URL                         @"http://mobiletest.payu.in/_payment"
-#define ENVIRONMENT_PP22_WEB_URL                                @"http://pp22.secure.payu.in/_payment"
-#define ENVIRONMENT_PP44_WEB_URL                                @"http://pp44.secure.payu.in/_payment"
-
-
+#define ENVIRONMENT_PP42_WEB_URL                                @"https://pp42secure.payu.in/_payment"
+#define ENVIRONMENT_PP25_WEB_URL                                @"https://pp25secure.payu.in/_payment"
+#define ENVIRONMENT_PP41_WEB_URL                                @"https://pp41secure.payu.in/_payment"
+#define ENVIRONMENT_PP10_WEB_URL                                @"https://pp10secure.payu.in/_payment"
+#define ENVIRONMENT_PP0_WEB_URL                                 @"https://pp0secure.payu.in/_payment"
+#define ENVIRONMENT_PP48_WEB_URL                                @"https://pp51secure.payu.in/_payment"
+#define ENVIRONMENT_PP4_WEB_URL                                 @"https://pp4secure.payu.in/_payment"
+#define ENVIRONMENT_MOBILE_TEST_WEB_URL                         @"https://mobiletest.payu.in/_payment"
+#define ENVIRONMENT_PP22_WEB_URL                                @"https://pp22secure.payu.in/_payment"
+#define ENVIRONMENT_PP44_WEB_URL                                @"https://pp44secure.payu.in/_payment"
+#define ENVIRONMENT_PP58_WEB_URL                                @"https://pp58secure.payu.in/_payment"
+
+//Citrus URLs
+
+#define CITRUS_CHECKOUT_URL                                     @"https://checkout.citruspay.com/"
 
 #define TXNID @"txnid"
 #define MERCHANTID @"merchantId"
@@ -277,13 +282,16 @@
 
 #define     RAW_JSON                                            @"RawJSON"
 #define     PARSED_RESPONSE                                     @"ParsedResponse"
-
+#define     VPA                                                 @"vpa"
+#define     INVALID_RESPONSE                                    @"Invalid Response"
+#define     API_Failure                                         @"API Failed"
 
 
 
 typedef NS_ENUM(NSInteger, PUMBaseURLCategory) {
     PUMBaseURLForAPI,
-    PUMBaseURLForWeb
+    PUMBaseURLForWeb,
+    PUMBaseURLForCitrusCheckout
 };
 
 typedef NS_ENUM(NSInteger, PUMInternalEnvironment) {
@@ -296,7 +304,8 @@ typedef NS_ENUM(NSInteger, PUMInternalEnvironment) {
     PUMEnvironmentPP22,
     PUMEnvironmentPP48,
     PUMEnvironmentPP44,
-    PUMEnvironmentPP25
+    PUMEnvironmentPP25,
+    PUMEnvironmentPP58
 };
 
 
@@ -336,8 +345,8 @@ typedef NS_ENUM(NSInteger,SDK_REQUEST_TYPE ) {
     SDK_ANALYTICS_FETCH_API_TOKEN,
     SDK_ANALYTICS_SEND,
     SDK_FETCH_USER_DATA,
-    SDK_GET_MULTIPLE_BIN_DETAILS
-
+    SDK_GET_MULTIPLE_BIN_DETAILS,
+    SDK_VALIDATE_VPA
 };
 
 static NSString *const kPUMAOTP = @"OTP";

CoreSDK/PayUMoneyCoreSDK.framework/Headers/PUMLogEvents.h

@@ -15,6 +15,7 @@ static NSString *const KPUMAWalletCardValue = @"PUMWallet|Cards";
 static NSString *const KPUMAWalletNetBankValue = @"PUMWallet|Bank";
 static NSString *const KPUMA3PWallet = @"3PWallet";
 static NSString *const KPUMAEMI = @"EMI";
+static NSString *const kPUMAUPI = @"UPI";
 
 static NSString *const kPUMAScreenTypeCheckout = @"Checkout";
 static NSString *const kPUMAScreenTypeAddCard = @"AddCard";
@@ -39,9 +40,11 @@ static NSString *const kPUMAInvalidCVV = @"Invalid CVV";
 
 +(void)paymentAdded;
 
-+(void)paymentSucceededForAmount:(NSString *) amount;
++(void)paymentSucceededForAmount:(NSString *) amount pgType:(NSString *)pgType;
 
-+(void)paymentFailedWithReason:(NSString *) reason andAmount:(NSString *) amount;
++(void)paymentFailedWithReason:(NSString *) reason andAmount:(NSString *) amount pgType:(NSString *)pgType;
+
++(void)verifyAPIFailedWithReason:(NSString *)reason andAmount:(NSString *)amount;
 
 +(void)loginAttempted;
 
@@ -96,7 +99,10 @@ static NSString *const kPUMAInvalidCVV = @"Invalid CVV";
 +(void)more3PWalletsClicked;
 
 +(void)moreEMIBanksClicked:(NSString *)amount;
-//+(void)twoFALoaded;
+
++(void)invalidVPAEntered:(NSString *)vpa;
+
++(void)failedToValidateVPA:(NSString *)vpa errorMessage:(NSString *)errorMessage;
 
 +(void)paymentAbandonedWithReason:(NSString *)reason;
 

CoreSDK/PayUMoneyCoreSDK.framework/Headers/PUMPaymentParam.h

@@ -11,14 +11,16 @@
 #import "PUMNetBankingBO.h"
 #import "PUMCCDC.h"
 #import "PUMEMI.h"
+#import "PUMUPI.h"
 
 typedef NS_ENUM(NSInteger, PUMPaymentMode) {
     PUMPaymentModeNone = 0,
     PUMPaymentModeCCDC,
     PUMPaymentModeNetBanking,
     PUMPaymentModeStoredCard,
     PUMPaymentMode3PWallet,
-    PUMPaymentModeEMI
+    PUMPaymentModeEMI,
+    PUMPaymentModeUPI
 };
 @interface PUMPaymentParam : NSObject
 
@@ -28,6 +30,7 @@ typedef NS_ENUM(NSInteger, PUMPaymentMode) {
 @property (strong, nonatomic) PUMCCDC * objCCDC;
 @property (strong, nonatomic) PUMNetBankingBO * obj3PWallet;
 @property (strong, nonatomic) PUMEMI * objEMI;
+@property (strong, nonatomic) PUMUPI * objUPI;
 
 /**
  Set payment mode

CoreSDK/PayUMoneyCoreSDK.framework/Headers/PUMSDKError.h

@@ -77,7 +77,10 @@ typedef NS_ENUM(NSInteger, PUMSDKErrorCode)
     PUMErrorInternationalCardWithEMI,
     PUMErrorDebitCardWithEMI,
     PUMInvalidReviewOrder,
-    PUMErrorSaveCardUnavailable
+    PUMErrorSaveCardUnavailable,
+    PUMErrorSplitNotAllowedWithUPI,
+    PUMErrorInvalidVPA,
+    PUMErrorUnableToValidateVPA
 };
 
 +(NSError *)toNSError:(int)errorCode

CoreSDK/PayUMoneyCoreSDK.framework/Headers/PUMUPI.h

@@ -0,0 +1,17 @@
+//
+//  PUMUPI.h
+//  PayUMoneyCoreSDK
+//
+//  Created by Rajvinder Singh on 1/10/19.
+//  Copyright © 2019 PayU Payments Private Limited. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@interface PUMUPI : NSObject
+
+@property (strong, nonatomic) NSString *vpa;
+
+@end
+

CoreSDK/PayUMoneyCoreSDK.framework/Headers/PayUMoneyCoreSDK.h

@@ -98,6 +98,14 @@ typedef NSString* (^PUMRightActionCompletionBlock)(BOOL actionOccurred);
 /// This method is used for getting updated emi tenures on the basis of amount provided. Amount should contain convenience fee as well
 - (void)getEMIOptionsForAmount:(NSString *)amount completion:(PUMRawJSONCompletionBlock)completionBlock;
 
+/// Checks if UPI option is available or not.
+- (BOOL)isUPIOptionAvailable;
+
+/** Checks if VPA is valid or not. VPA should be in a format example@@example
+ @param vpa The VPA whose validation needs to be performed
+ */
+- (void)validateVPA:(NSString *)vpa completion:(void(^)(BOOL isValidVPA, NSError *error))completionBlock;
+
 - (void)fetchPaymentUserDataAPIWithCompletionBlock:(PUMRawJSONCompletionBlock)completionBlock;
 
 - (void)getBinDetailsAPI:(NSString *)cardBin