Skip to content

Upgraded the Payment Plugin to the most recent and updated the pod dependencies to support Swift 3 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tobzy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgraded the Payment Plugin to the most recent and updated the pod dependencies to support Swift 3 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
86 changes: 45 additions & 41 deletions config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<widget xmlns="http://www.w3.org/ns/widgets" id="com.interswitch.payment.cordova" version="1.0.0">
<name>PaymentCordova</name>
<description/>
<author/>
<content src="index.html"/>
<allow-navigation href="*"/>
<allow-intent href="itms:*"/>
<allow-intent href="itms-apps:*"/>
<preference name="loglevel" value="DEBUG"/>
<preference name="AndroidLaunchMode" value="singleTop"/>
<preference name="ErrorUrl" value=""/>
<preference name="SplashScreen" value="screen"/>
<preference name="AllowInlineMediaPlayback" value="false"/>
<preference name="AutoHideSplashScreen" value="true"/>
<preference name="BackupWebStorage" value="cloud"/>
<preference name="EnableViewportScale" value="false"/>
<preference name="FadeSplashScreen" value="true"/>
<preference name="FadeSplashScreenDuration" value=".25"/>
<preference name="KeyboardDisplayRequiresUserAction" value="true"/>
<preference name="MediaPlaybackRequiresUserAction" value="false"/>
<preference name="ShowSplashScreenSpinner" value="false"/>
<preference name="SuppressesIncrementalRendering" value="false"/>
<preference name="TopActivityIndicator" value="gray"/>
<preference name="GapBetweenPages" value="0"/>
<preference name="PageLength" value="0"/>
<preference name="PaginationBreakingMode" value="page"/>
<preference name="PaginationMode" value="unpaginated"/>
<feature name="LocalStorage">
<param name="ios-package" value="CDVLocalStorage"/>
</feature>
<preference name="UIWebViewDecelerationSpeed" value="normal"/>
<preference name="monaca:targetFamilyiPhone" value="1"/>
<preference name="monaca:targetFamilyiPad" value="1"/>
<access origin="*"/>
<preference name="KeepRunning" value="true"/>
<preference name="monaca:AndroidIsPackageNameSeparate" value="false"/>
<preference name="DisallowOverscroll" value="true"/>
<preference name="Orientation" value="default"/>
<preference name="SplashScreenDelay" value="1000"/>
<preference name="Fullscreen" value="false"/>
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.interswitch.payment.cordova" version="1.0.0" xmlns="http://www.w3.org/ns/widgets">
<name>PaymentCordova</name>
<description />
<author />
<content src="index.html" />
<allow-navigation href="*" />
<allow-intent href="itms:*" />
<allow-intent href="itms-apps:*" />
<preference name="loglevel" value="DEBUG" />
<preference name="AndroidLaunchMode" value="singleTop" />
<preference name="ErrorUrl" value="" />
<preference name="SplashScreen" value="screen" />
<preference name="AllowInlineMediaPlayback" value="false" />
<preference name="AutoHideSplashScreen" value="true" />
<preference name="BackupWebStorage" value="cloud" />
<preference name="EnableViewportScale" value="false" />
<preference name="FadeSplashScreen" value="true" />
<preference name="FadeSplashScreenDuration" value=".25" />
<preference name="KeyboardDisplayRequiresUserAction" value="true" />
<preference name="MediaPlaybackRequiresUserAction" value="false" />
<preference name="ShowSplashScreenSpinner" value="false" />
<preference name="SuppressesIncrementalRendering" value="false" />
<preference name="TopActivityIndicator" value="gray" />
<preference name="GapBetweenPages" value="0" />
<preference name="PageLength" value="0" />
<preference name="PaginationBreakingMode" value="page" />
<preference name="PaginationMode" value="unpaginated" />
<feature name="LocalStorage">
<param name="ios-package" value="CDVLocalStorage" />
</feature>
<preference name="UIWebViewDecelerationSpeed" value="normal" />
<preference name="monaca:targetFamilyiPhone" value="1" />
<preference name="monaca:targetFamilyiPad" value="1" />
<access origin="*" />
<preference name="KeepRunning" value="true" />
<preference name="monaca:AndroidIsPackageNameSeparate" value="false" />
<preference name="DisallowOverscroll" value="true" />
<preference name="Orientation" value="default" />
<preference name="SplashScreenDelay" value="1000" />
<preference name="Fullscreen" value="false" />
<plugin name="com.interswitchng.sdk.payment" spec="https://github.com/techquest/cordova-payment-plugin.git">
<variable name="CLIENT_ID" value="IKIA7B379B0114CA57FAF8E19F5CC5063ED2220057EF" />
<variable name="CLIENT_SECRET" value="MiunSQ5S/N219UCVP1Lt2raPfwK9lMoiV/PdBX5v/R4=" />
</plugin>
</widget>
2 changes: 2 additions & 0 deletions platforms/android/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<meta-data android:name="clientId" android:value="IKIA7B379B0114CA57FAF8E19F5CC5063ED2220057EF" />
<meta-data android:name="clientSecret" android:value="MiunSQ5S/N219UCVP1Lt2raPfwK9lMoiV/PdBX5v/R4=" />
</application>
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
</manifest>
46 changes: 31 additions & 15 deletions platforms/android/android.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,26 @@
"xml": "<feature name=\"Whitelist\"><param name=\"android-package\" value=\"org.apache.cordova.whitelist.WhitelistPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
"count": 1
},
{
"xml": "<feature name=\"SpinnerDialog\"><param name=\"android-package\" value=\"com.filfatstudios.spinnerdialog.SpinnerDialog\" /></feature>",
"count": 1
},
{
"xml": "<feature name=\"PaymentPlugin\"><param name=\"android-package\" value=\"PaymentPlugin\" /></feature>",
"count": 1
}
]
}
},
"AndroidManifest.xml": {
"parents": {
"/manifest/application": [
{
"xml": "<meta-data android:name=\"clientId\" android:value=\"IKIA7B379B0114CA57FAF8E19F5CC5063ED2220057EF\" />",
"count": 1
},
{
"xml": "<feature name=\"SpinnerDialog\"><param name=\"android-package\" value=\"com.filfatstudios.spinnerdialog.SpinnerDialog\" /></feature>",
"xml": "<meta-data android:name=\"clientSecret\" android:value=\"MiunSQ5S/N219UCVP1Lt2raPfwK9lMoiV/PdBX5v/R4=\" />",
"count": 1
}
]
Expand All @@ -29,37 +43,39 @@
"cordova-plugin-whitelist": {
"PACKAGE_NAME": "io.onsen.quickstart"
},
"cordova-plugin-add-swift-support": {
"com.filfatstudios.spinnerdialog": {
"PACKAGE_NAME": "io.onsen.quickstart"
},
"com.interswitchng.sdk.payment": {
"PACKAGE_NAME": "io.onsen.quickstart"
"cordova-plugin-add-swift-support": {
"PACKAGE_NAME": "com.interswitch.payment.cordova"
},
"com.filfatstudios.spinnerdialog": {
"PACKAGE_NAME": "io.onsen.quickstart"
"com.interswitchng.sdk.payment": {
"CLIENT_ID": "IKIA7B379B0114CA57FAF8E19F5CC5063ED2220057EF",
"CLIENT_SECRET": "MiunSQ5S/N219UCVP1Lt2raPfwK9lMoiV/PdBX5v/R4=",
"PACKAGE_NAME": "com.interswitch.payment.cordova"
}
},
"dependent_plugins": {},
"modules": [
{
"file": "plugins/com.interswitchng.sdk.payment/www/PaymentPlugin.js",
"id": "com.interswitchng.sdk.payment.PaymentPlugin",
"file": "plugins/com.filfatstudios.spinnerdialog/www/SpinnerDialog.js",
"id": "com.filfatstudios.spinnerdialog.SpinnerDialog",
"clobbers": [
"PaymentPlugin"
"SpinnerDialog"
]
},
{
"file": "plugins/com.filfatstudios.spinnerdialog/www/SpinnerDialog.js",
"id": "com.filfatstudios.spinnerdialog.SpinnerDialog",
"file": "plugins/com.interswitchng.sdk.payment/www/PaymentPlugin.js",
"id": "com.interswitchng.sdk.payment.PaymentPlugin",
"clobbers": [
"SpinnerDialog"
"PaymentPlugin"
]
}
],
"plugin_metadata": {
"cordova-plugin-whitelist": "1.2.2",
"cordova-plugin-add-swift-support": "1.0.4",
"com.interswitchng.sdk.payment": "0.0.1",
"com.filfatstudios.spinnerdialog": "1.0.2"
"com.filfatstudios.spinnerdialog": "1.0.2",
"cordova-plugin-add-swift-support": "1.6.2",
"com.interswitchng.sdk.payment": "0.0.1"
}
}
6 changes: 3 additions & 3 deletions platforms/android/assets/www/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
function init() {
var userDetails = {
clientId: "IKIAF8F70479A6902D4BFF4E443EBF15D1D6CB19E232",
clientSecret: "ugsmiXPXOOvks9MR7+IFHSQSdk8ZzvwQMGvd0GJva30=",
// clientId: "IKIAF8F70479A6902D4BFF4E443EBF15D1D6CB19E232",
// clientSecret: "ugsmiXPXOOvks9MR7+IFHSQSdk8ZzvwQMGvd0GJva30=",
paymentApi: "https://qa.interswitchng.com",
passportApi: "https://qa.interswitchng.com/passport"
};
Expand Down Expand Up @@ -331,4 +331,4 @@ function init() {
}

});
})();
})();
18 changes: 9 additions & 9 deletions platforms/android/assets/www/cordova_plugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
cordova.define('cordova/plugin_list', function(require, exports, module) {
module.exports = [
{
"file": "plugins/com.interswitchng.sdk.payment/www/PaymentPlugin.js",
"id": "com.interswitchng.sdk.payment.PaymentPlugin",
"file": "plugins/com.filfatstudios.spinnerdialog/www/SpinnerDialog.js",
"id": "com.filfatstudios.spinnerdialog.SpinnerDialog",
"clobbers": [
"PaymentPlugin"
"SpinnerDialog"
]
},
{
"file": "plugins/com.filfatstudios.spinnerdialog/www/SpinnerDialog.js",
"id": "com.filfatstudios.spinnerdialog.SpinnerDialog",
"file": "plugins/com.interswitchng.sdk.payment/www/PaymentPlugin.js",
"id": "com.interswitchng.sdk.payment.PaymentPlugin",
"clobbers": [
"SpinnerDialog"
"PaymentPlugin"
]
}
];
module.exports.metadata =
// TOP OF METADATA
{
"cordova-plugin-whitelist": "1.2.2",
"cordova-plugin-add-swift-support": "1.0.4",
"com.interswitchng.sdk.payment": "0.0.1",
"com.filfatstudios.spinnerdialog": "1.0.2"
"com.filfatstudios.spinnerdialog": "1.0.2",
"cordova-plugin-add-swift-support": "1.6.2",
"com.interswitchng.sdk.payment": "0.0.1"
};
// BOTTOM OF METADATA
});
5 changes: 4 additions & 1 deletion platforms/android/assets/www/plugins/com.interswitchng.sdk.payment/www/PaymentPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ function paymentAction (action) {
}

var PaymentPlugin = {};
PaymentPlugin.SAFE_TOKEN_RESPONSE_CODE = "T0";
PaymentPlugin.CARDINAL_RESPONSE_CODE = "S0";
PaymentPlugin.init = paymentAction("Init");

// Using Payment SDK UI
Expand All @@ -28,7 +30,8 @@ PaymentPlugin.makePayment = paymentAction("MakePayment");
PaymentPlugin.loadWallet = paymentAction("LoadWallet");
PaymentPlugin.payWithWalletSDK = paymentAction("PayWithWalletSDK");
PaymentPlugin.validateCard = paymentAction("ValidateCard");
PaymentPlugin.authorizeOtp = paymentAction("AuthorizeOTP");
PaymentPlugin.authorizePurchase = paymentAction("AuthorizePurchase");
PaymentPlugin.authorizeCard = paymentAction("AuthorizeCard");
PaymentPlugin.paymentStatus = paymentAction("PaymentStatus");

module.exports = PaymentPlugin;
Expand Down
1 change: 1 addition & 0 deletions platforms/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ ext {

// PLUGIN GRADLE EXTENSIONS START
apply from: "com.interswitchng.sdk.payment/quickstart-build.gradle"
apply from: "com.interswitchng.sdk.payment/cordova-build.gradle"
// PLUGIN GRADLE EXTENSIONS END

def hasBuildExtras = file('build-extras.gradle').exists()
Expand Down
Empty file modified platforms/android/cordova/version
100644 → 100755
View file
Open in desktop
Empty file.
Binary file modified platforms/android/libs/core.jar
View file
Open in desktop
Binary file not shown.
Binary file modified platforms/android/libs/payment-android-release.aar
View file
Open in desktop
Binary file not shown.
Binary file modified platforms/android/libs/payment.jar
View file
Open in desktop
Binary file not shown.
18 changes: 9 additions & 9 deletions platforms/android/platform_www/cordova_plugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
cordova.define('cordova/plugin_list', function(require, exports, module) {
module.exports = [
{
"file": "plugins/com.interswitchng.sdk.payment/www/PaymentPlugin.js",
"id": "com.interswitchng.sdk.payment.PaymentPlugin",
"file": "plugins/com.filfatstudios.spinnerdialog/www/SpinnerDialog.js",
"id": "com.filfatstudios.spinnerdialog.SpinnerDialog",
"clobbers": [
"PaymentPlugin"
"SpinnerDialog"
]
},
{
"file": "plugins/com.filfatstudios.spinnerdialog/www/SpinnerDialog.js",
"id": "com.filfatstudios.spinnerdialog.SpinnerDialog",
"file": "plugins/com.interswitchng.sdk.payment/www/PaymentPlugin.js",
"id": "com.interswitchng.sdk.payment.PaymentPlugin",
"clobbers": [
"SpinnerDialog"
"PaymentPlugin"
]
}
];
module.exports.metadata =
// TOP OF METADATA
{
"cordova-plugin-whitelist": "1.2.2",
"cordova-plugin-add-swift-support": "1.0.4",
"com.interswitchng.sdk.payment": "0.0.1",
"com.filfatstudios.spinnerdialog": "1.0.2"
"com.filfatstudios.spinnerdialog": "1.0.2",
"cordova-plugin-add-swift-support": "1.6.2",
"com.interswitchng.sdk.payment": "0.0.1"
};
// BOTTOM OF METADATA
});
5 changes: 4 additions & 1 deletion platforms/android/platform_www/plugins/com.interswitchng.sdk.payment/www/PaymentPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ function paymentAction (action) {
}

var PaymentPlugin = {};
PaymentPlugin.SAFE_TOKEN_RESPONSE_CODE = "T0";
PaymentPlugin.CARDINAL_RESPONSE_CODE = "S0";
PaymentPlugin.init = paymentAction("Init");

// Using Payment SDK UI
Expand All @@ -28,7 +30,8 @@ PaymentPlugin.makePayment = paymentAction("MakePayment");
PaymentPlugin.loadWallet = paymentAction("LoadWallet");
PaymentPlugin.payWithWalletSDK = paymentAction("PayWithWalletSDK");
PaymentPlugin.validateCard = paymentAction("ValidateCard");
PaymentPlugin.authorizeOtp = paymentAction("AuthorizeOTP");
PaymentPlugin.authorizePurchase = paymentAction("AuthorizePurchase");
PaymentPlugin.authorizeCard = paymentAction("AuthorizeCard");
PaymentPlugin.paymentStatus = paymentAction("PaymentStatus");

module.exports = PaymentPlugin;
Expand Down
3 changes: 2 additions & 1 deletion platforms/android/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# Project target.
target=android-23
android.library.reference.1=CordovaLib
cordova.gradle.include.1=com.interswitchng.sdk.payment/quickstart-build.gradle
cordova.system.library.1=com.android.support:appcompat-v7:23.1.1
cordova.system.library.2=com.android.support:design:23.1.1
cordova.gradle.include.1=com.interswitchng.sdk.payment/quickstart-build.gradle
cordova.gradle.include.2=com.interswitchng.sdk.payment/cordova-build.gradle
6 changes: 3 additions & 3 deletions platforms/android/res/xml/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
<param name="onload" value="true" />
</feature>
<feature name="PaymentPlugin">
<param name="android-package" value="PaymentPlugin" />
</feature>
<feature name="SpinnerDialog">
<param name="android-package" value="com.filfatstudios.spinnerdialog.SpinnerDialog" />
</feature>
<feature name="PaymentPlugin">
<param name="android-package" value="PaymentPlugin" />
</feature>
<name>PaymentCordova</name>
<description />
<author />
Expand Down
Loading