Merge pull request #13 from sudeepunnikrishnan/master

Updated for Xcode 9 Swift 3.2 , crash reported for emi scenario amount.
Instamojo · Oct 9, 2017 · 7b83f47 · 7b83f47
2 parents 6bd0564 + afde76a
commit 7b83f47
Show file tree

Hide file tree

Showing 51 changed files with 470 additions and 8 deletions.
diff --git a/Framework/Instamojo.framework/Assets.car b/Framework/Instamojo.framework/Assets.car
diff --git a/Framework/Instamojo.framework/Headers/Instamojo-Swift.h b/Framework/Instamojo.framework/Headers/Instamojo-Swift.h
diff --git a/Framework/Instamojo.framework/Instamojo b/Framework/Instamojo.framework/Instamojo
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/Ayd-f7-0GG-view-feG-x4-aZj.nib b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/Ayd-f7-0GG-view-feG-x4-aZj.nib
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/Cc0-EI-h9R-view-eyY-co-RLW.nib b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/Cc0-EI-h9R-view-eyY-co-RLW.nib
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/Info.plist b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/Info.plist
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/PaymentOptions.nib b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/PaymentOptions.nib
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/cUp-xP-ZoS-view-p2R-hZ-ECO.nib b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/cUp-xP-ZoS-view-p2R-hZ-ECO.nib
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/cardFormView.nib b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/cardFormView.nib
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/emiOptions.nib b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/emiOptions.nib
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/iOY-Af-8GG-view-zgG-85-GxC.nib b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/iOY-Af-8GG-view-zgG-85-GxC.nib
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/juspay.nib b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/juspay.nib
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/ljo-45-45L-view-4DD-nw-zQ4.nib b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/ljo-45-45L-view-4DD-nw-zQ4.nib
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/optionsView.nib b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/optionsView.nib
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/puG-9A-NNu-view-hyj-m5-Qmb.nib b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/puG-9A-NNu-view-hyj-m5-Qmb.nib
diff --git a/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/upiPaymentView.nib b/Framework/Instamojo.framework/InstamojoStoryboard.storyboardc/upiPaymentView.nib
diff --git a/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/arm.swiftdoc b/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/arm.swiftdoc
diff --git a/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/arm.swiftmodule b/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/arm.swiftmodule
diff --git a/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/arm64.swiftdoc b/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/arm64.swiftdoc
diff --git a/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/arm64.swiftmodule b/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/arm64.swiftmodule
diff --git a/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/i386.swiftdoc b/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/i386.swiftdoc
diff --git a/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/i386.swiftmodule b/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/i386.swiftmodule
diff --git a/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/x86_64.swiftdoc b/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/x86_64.swiftdoc
diff --git a/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/x86_64.swiftmodule b/Framework/Instamojo.framework/Modules/Instamojo.swiftmodule/x86_64.swiftmodule
diff --git a/Instamojo.framework/Assets.car b/Instamojo.framework/Assets.car
diff --git a/Instamojo.framework/Headers/Instamojo-Swift.h b/Instamojo.framework/Headers/Instamojo-Swift.h
diff --git a/Instamojo.framework/Instamojo b/Instamojo.framework/Instamojo
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/Ayd-f7-0GG-view-feG-x4-aZj.nib b/Instamojo.framework/InstamojoStoryboard.storyboardc/Ayd-f7-0GG-view-feG-x4-aZj.nib
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/Cc0-EI-h9R-view-eyY-co-RLW.nib b/Instamojo.framework/InstamojoStoryboard.storyboardc/Cc0-EI-h9R-view-eyY-co-RLW.nib
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/Info.plist b/Instamojo.framework/InstamojoStoryboard.storyboardc/Info.plist
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/PaymentOptions.nib b/Instamojo.framework/InstamojoStoryboard.storyboardc/PaymentOptions.nib
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/cUp-xP-ZoS-view-p2R-hZ-ECO.nib b/Instamojo.framework/InstamojoStoryboard.storyboardc/cUp-xP-ZoS-view-p2R-hZ-ECO.nib
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/cardFormView.nib b/Instamojo.framework/InstamojoStoryboard.storyboardc/cardFormView.nib
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/emiOptions.nib b/Instamojo.framework/InstamojoStoryboard.storyboardc/emiOptions.nib
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/iOY-Af-8GG-view-zgG-85-GxC.nib b/Instamojo.framework/InstamojoStoryboard.storyboardc/iOY-Af-8GG-view-zgG-85-GxC.nib
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/juspay.nib b/Instamojo.framework/InstamojoStoryboard.storyboardc/juspay.nib
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/ljo-45-45L-view-4DD-nw-zQ4.nib b/Instamojo.framework/InstamojoStoryboard.storyboardc/ljo-45-45L-view-4DD-nw-zQ4.nib
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/optionsView.nib b/Instamojo.framework/InstamojoStoryboard.storyboardc/optionsView.nib
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/puG-9A-NNu-view-hyj-m5-Qmb.nib b/Instamojo.framework/InstamojoStoryboard.storyboardc/puG-9A-NNu-view-hyj-m5-Qmb.nib
diff --git a/Instamojo.framework/InstamojoStoryboard.storyboardc/upiPaymentView.nib b/Instamojo.framework/InstamojoStoryboard.storyboardc/upiPaymentView.nib
diff --git a/Instamojo.framework/Modules/Instamojo.swiftmodule/arm.swiftdoc b/Instamojo.framework/Modules/Instamojo.swiftmodule/arm.swiftdoc
diff --git a/Instamojo.framework/Modules/Instamojo.swiftmodule/arm.swiftmodule b/Instamojo.framework/Modules/Instamojo.swiftmodule/arm.swiftmodule
diff --git a/Instamojo.framework/Modules/Instamojo.swiftmodule/arm64.swiftdoc b/Instamojo.framework/Modules/Instamojo.swiftmodule/arm64.swiftdoc
diff --git a/Instamojo.framework/Modules/Instamojo.swiftmodule/arm64.swiftmodule b/Instamojo.framework/Modules/Instamojo.swiftmodule/arm64.swiftmodule
diff --git a/Instamojo.framework/Modules/Instamojo.swiftmodule/i386.swiftdoc b/Instamojo.framework/Modules/Instamojo.swiftmodule/i386.swiftdoc
diff --git a/Instamojo.framework/Modules/Instamojo.swiftmodule/i386.swiftmodule b/Instamojo.framework/Modules/Instamojo.swiftmodule/i386.swiftmodule
diff --git a/Instamojo.framework/Modules/Instamojo.swiftmodule/x86_64.swiftdoc b/Instamojo.framework/Modules/Instamojo.swiftmodule/x86_64.swiftdoc
diff --git a/Instamojo.framework/Modules/Instamojo.swiftmodule/x86_64.swiftmodule b/Instamojo.framework/Modules/Instamojo.swiftmodule/x86_64.swiftmodule
diff --git a/Instamojo.podspec b/Instamojo.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Instamojo"
-  s.version      = "1.0.9"
+  s.version      = "1.0.10"
   s.summary      = "Instamojo iOS SDK"
   s.homepage     = "https://www.instamojo.com"
   s.license      = "LGPL"

diff --git a/Instamojo.xcodeproj/project.pbxproj b/Instamojo.xcodeproj/project.pbxproj
@@ -650,7 +650,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "Instamojo-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -680,7 +680,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "Instamojo-Bridging-Header.h";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/Instamojo/Request.swift b/Instamojo/Request.swift
@@ -334,7 +334,7 @@ public class Request: NSObject {
 
         var params = ["order_id": self.order!.cardOptions.orderID, "merchant_id": self.order!.cardOptions.merchantID, "payment_method_type": "Card", "card_number": self.card!.cardNumber, "name_on_card": self.card!.cardHolderName, "card_exp_month": self.card!.getExpiryMonth(), "card_exp_year": self.card!.getExpiryYear(), "card_security_code": self.card!.cvv, "save_to_locker": self.card!.savedCard ? "true" : "false", "redirect_after_payment": "true", "format": "json"] as [String : Any]
 
-        if self.order!.emiOptions != nil {
+        if self.order!.emiOptions != nil && self.order!.emiOptions.selectedBankCode != nil {
             params.updateValue("true", forKey: "is_emi")
             params.updateValue(self.order!.emiOptions.selectedBankCode, forKey :"emi_bank")
             params.updateValue(self.order!.emiOptions.selectedTenure, forKey: "emi_tenure")