Skip to content

Commit

Permalink
Merge pull request #17 from tranzzo/feature/new_version
Browse files Browse the repository at this point in the history 
new version
  • Loading branch information
@mrvitalya
mrvitalya authored Aug 1, 2024
2 parents 9de22e3 + 1253d4f commit 53b2d79
Show file tree
Hide file tree
Showing 87 changed files with 165,388 additions and 73,771 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,14 @@ All notable changes to this project will be documented in this file.
Changed processedAmount type


## [1.5.17] - 01.08.2024

#### Changed
Moved property payment3dsBypass from AdditionalData to PaymentType object
Moved property method from AdditionalData to PaymentType object
#### Added
Added new card scanner
Added lookup payment method
Added arm64 support
#### Fixed
Fixed compilation error
48 changes: 22 additions & 26 deletions Example/TranzzoPaymentSDK-Example.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
3F8644B8E53AF6E540B6B037 /* Pods_TranzzoPaymentSDK_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCE602B34B4CEBD499AFC2EB /* Pods_TranzzoPaymentSDK_Example.framework */; };
1392E8E9350CA657EBD8E2B2 /* Pods_TranzzoPaymentSDK_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F0D8461F7D1D25B48B915C9E /* Pods_TranzzoPaymentSDK_Example.framework */; settings = {ATTRIBUTES = (Required, ); }; };
CE18EA6D280FF00F004558D3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE18EA6C280FF00F004558D3 /* AppDelegate.swift */; };
CE18EA6F280FF00F004558D3 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE18EA6E280FF00F004558D3 /* SceneDelegate.swift */; };
CE18EA71280FF00F004558D3 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE18EA70280FF00F004558D3 /* ViewController.swift */; };
Expand All @@ -17,10 +17,8 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
1C0BEAAC26FA853EDCD0DA37 /* Pods-TranzzoPaymentsSDK-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TranzzoPaymentsSDK-Example.debug.xcconfig"; path = "Target Support Files/Pods-TranzzoPaymentsSDK-Example/Pods-TranzzoPaymentsSDK-Example.debug.xcconfig"; sourceTree = "<group>"; };
3EC55B680B3D561879E0F4D9 /* Pods-TranzzoPaymentsSDK-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TranzzoPaymentsSDK-Example.release.xcconfig"; path = "Target Support Files/Pods-TranzzoPaymentsSDK-Example/Pods-TranzzoPaymentsSDK-Example.release.xcconfig"; sourceTree = "<group>"; };
4FD427E2085061B88BE30AF1 /* Pods-TranzzoPaymentSDK-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TranzzoPaymentSDK-Example.release.xcconfig"; path = "Target Support Files/Pods-TranzzoPaymentSDK-Example/Pods-TranzzoPaymentSDK-Example.release.xcconfig"; sourceTree = "<group>"; };
6E2946FECE286B4AA2052560 /* Pods-TranzzoPaymentSDK-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TranzzoPaymentSDK-Example.debug.xcconfig"; path = "Target Support Files/Pods-TranzzoPaymentSDK-Example/Pods-TranzzoPaymentSDK-Example.debug.xcconfig"; sourceTree = "<group>"; };
1BE30B556D2AC3DF814F5115 /* Pods-TranzzoPaymentSDK-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TranzzoPaymentSDK-Example.release.xcconfig"; path = "Target Support Files/Pods-TranzzoPaymentSDK-Example/Pods-TranzzoPaymentSDK-Example.release.xcconfig"; sourceTree = "<group>"; };
5F0C5F738055A2E6B2246313 /* Pods-TranzzoPaymentSDK-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TranzzoPaymentSDK-Example.debug.xcconfig"; path = "Target Support Files/Pods-TranzzoPaymentSDK-Example/Pods-TranzzoPaymentSDK-Example.debug.xcconfig"; sourceTree = "<group>"; };
CE18EA69280FF00F004558D3 /* TranzzoPaymentSDK-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "TranzzoPaymentSDK-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
CE18EA6C280FF00F004558D3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
CE18EA6E280FF00F004558D3 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -30,28 +28,34 @@
CE18EA78280FF012004558D3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
CE18EA7A280FF012004558D3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
CEE0DFD428206B3000542010 /* TranzzoPaymentSDK-Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "TranzzoPaymentSDK-Example.entitlements"; sourceTree = "<group>"; };
FCE602B34B4CEBD499AFC2EB /* Pods_TranzzoPaymentSDK_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TranzzoPaymentSDK_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F0D8461F7D1D25B48B915C9E /* Pods_TranzzoPaymentSDK_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TranzzoPaymentSDK_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
CE18EA66280FF00F004558D3 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3F8644B8E53AF6E540B6B037 /* Pods_TranzzoPaymentSDK_Example.framework in Frameworks */,
1392E8E9350CA657EBD8E2B2 /* Pods_TranzzoPaymentSDK_Example.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
3A3A626D003AE42A22BA64AC /* Frameworks */ = {
isa = PBXGroup;
children = (
F0D8461F7D1D25B48B915C9E /* Pods_TranzzoPaymentSDK_Example.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
CAD9EAC9E228CB17523B9586 /* Pods */ = {
isa = PBXGroup;
children = (
1C0BEAAC26FA853EDCD0DA37 /* Pods-TranzzoPaymentsSDK-Example.debug.xcconfig */,
3EC55B680B3D561879E0F4D9 /* Pods-TranzzoPaymentsSDK-Example.release.xcconfig */,
6E2946FECE286B4AA2052560 /* Pods-TranzzoPaymentSDK-Example.debug.xcconfig */,
4FD427E2085061B88BE30AF1 /* Pods-TranzzoPaymentSDK-Example.release.xcconfig */,
5F0C5F738055A2E6B2246313 /* Pods-TranzzoPaymentSDK-Example.debug.xcconfig */,
1BE30B556D2AC3DF814F5115 /* Pods-TranzzoPaymentSDK-Example.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
Expand All @@ -62,7 +66,7 @@
CE18EA6B280FF00F004558D3 /* TranzzoPaymentSDK-Example */,
CE18EA6A280FF00F004558D3 /* Products */,
CAD9EAC9E228CB17523B9586 /* Pods */,
E2E47FE1CE2C8AC94A32147C /* Frameworks */,
3A3A626D003AE42A22BA64AC /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -89,26 +93,18 @@
path = "TranzzoPaymentSDK-Example";
sourceTree = "<group>";
};
E2E47FE1CE2C8AC94A32147C /* Frameworks */ = {
isa = PBXGroup;
children = (
FCE602B34B4CEBD499AFC2EB /* Pods_TranzzoPaymentSDK_Example.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
CE18EA68280FF00F004558D3 /* TranzzoPaymentSDK-Example */ = {
isa = PBXNativeTarget;
buildConfigurationList = CE18EA7D280FF012004558D3 /* Build configuration list for PBXNativeTarget "TranzzoPaymentSDK-Example" */;
buildPhases = (
87415E96E38FBC9034FF78AA /* [CP] Check Pods Manifest.lock */,
8549D0959659165A04100E4F /* [CP] Check Pods Manifest.lock */,
CE18EA65280FF00F004558D3 /* Sources */,
CE18EA66280FF00F004558D3 /* Frameworks */,
CE18EA67280FF00F004558D3 /* Resources */,
205BEAB52BF6BF26290D846D /* [CP] Embed Pods Frameworks */,
0533C1C730270D938A82D5BF /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -166,7 +162,7 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
205BEAB52BF6BF26290D846D /* [CP] Embed Pods Frameworks */ = {
0533C1C730270D938A82D5BF /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand All @@ -183,7 +179,7 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TranzzoPaymentSDK-Example/Pods-TranzzoPaymentSDK-Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
87415E96E38FBC9034FF78AA /* [CP] Check Pods Manifest.lock */ = {
8549D0959659165A04100E4F /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand Down Expand Up @@ -356,7 +352,7 @@
};
CE18EA7E280FF012004558D3 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 6E2946FECE286B4AA2052560 /* Pods-TranzzoPaymentSDK-Example.debug.xcconfig */;
baseConfigurationReference = 5F0C5F738055A2E6B2246313 /* Pods-TranzzoPaymentSDK-Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down Expand Up @@ -390,7 +386,7 @@
};
CE18EA7F280FF012004558D3 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 4FD427E2085061B88BE30AF1 /* Pods-TranzzoPaymentSDK-Example.release.xcconfig */;
baseConfigurationReference = 1BE30B556D2AC3DF814F5115 /* Pods-TranzzoPaymentSDK-Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down
21 changes: 15 additions & 6 deletions Example/TranzzoPaymentSDK-Example/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand All @@ -11,30 +12,38 @@
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="TranzzoPaymentsSDK_Example" customModuleProvider="target" sceneMemberID="viewController">
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="TranzzoPaymentSDK_Example" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="76d-Cz-Bvq">
<rect key="frame" x="151.5" y="407" width="111" height="82"/>
<rect key="frame" x="144" y="376.5" width="126.5" height="143.5"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YUa-EO-NVv">
<rect key="frame" x="0.0" y="0.0" width="111" height="31"/>
<rect key="frame" x="0.0" y="0.0" width="126.5" height="34.5"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" title="Fixed amount"/>
<connections>
<action selector="fixexAmountButtonTapped:" destination="BYZ-38-t0r" eventType="touchUpInside" id="VaO-BI-ge2"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ppj-FQ-Qcx">
<rect key="frame" x="0.0" y="51" width="111" height="31"/>
<rect key="frame" x="0.0" y="54.5" width="126.5" height="34.5"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" title="Any amount"/>
<connections>
<action selector="anyAmountButtonTapped:" destination="BYZ-38-t0r" eventType="touchUpInside" id="6FZ-TI-3hw"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="d44-2T-a2P">
<rect key="frame" x="0.0" y="109" width="126.5" height="34.5"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" title="Lookup"/>
<connections>
<action selector="lookupButtonTapped:" destination="BYZ-38-t0r" eventType="touchUpInside" id="rSV-gB-csD"/>
</connections>
</button>
</subviews>
</stackView>
</subviews>
Expand Down
27 changes: 24 additions & 3 deletions Example/TranzzoPaymentSDK-Example/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class ViewController: UIViewController {
tokenCards: tokenCards)

let keyConfig = KeyConfig(sessionToken: sessionToken, apiKey: apiKey, posId: posId)
let additionalData = AdditionalData(method: .purchase, payment3dsBypass: .supported, serverUrl: nil, products: products, merchantMcc: nil, payload: nil)
let additionalData = AdditionalData(serverUrl: nil, products: products, merchantMcc: nil, payload: nil)
let customerData = CustomerData(customerEmail: "test@email.com", customerPhone: "0506426008")

TranzzoPaymentSDK.makePayment(rootController: self,
Expand All @@ -63,12 +63,33 @@ class ViewController: UIViewController {
description: "Test product",
tokenCards: tokenCards)
let keyConfig = KeyConfig(sessionToken: sessionToken, apiKey: apiKey, posId: posId)
let additionalInfo = AdditionalData(method: .purchase, payment3dsBypass: .supported, serverUrl: nil, products: products, merchantMcc: nil, payload: nil)
let additionalData = AdditionalData(serverUrl: nil, products: products, merchantMcc: nil, payload: nil)
let customerData = CustomerData(customerEmail: "test@email.com", customerPhone: "0506426008")

TranzzoPaymentSDK.makePayment(rootController: self, delegate: self, paymentData: PaymentData(type: paymentType, keyConfig: keyConfig, customerData: customerData, additionalData: additionalInfo))
TranzzoPaymentSDK.makePayment(rootController: self, delegate: self, paymentData: PaymentData(type: paymentType, keyConfig: keyConfig, customerData: customerData, additionalData: additionalData))
}

@IBAction private func lookupButtonTapped(_ sender: AnyObject) {
let paymentType = LookupPaymentType(orderId: UUID().uuidString, description: "Test description")

let keyConfig = KeyConfig(sessionToken: sessionToken,
apiKey: apiKey,
posId: posId)

let additionalData = AdditionalData(serverUrl: nil,
products: nil,
merchantMcc: nil,
payload: nil)
let customerData = CustomerData(customerEmail: "tempmail@gmail.com",
customerPhone: "380506541111")

TranzzoPaymentSDK.makePayment(rootController: self,
delegate: self,
paymentData: PaymentData(type: paymentType,
keyConfig: keyConfig,
customerData: customerData,
additionalData: additionalData))
}
}

extension ViewController: TranzzoPaymentDelegate {
Expand Down
Loading

0 comments on commit 53b2d79

Please sign in to comment.