Skip to content
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

Filter Truemoney Wallet / TrueMoney payment methods #246

Merged
merged 4 commits into from
Dec 6, 2023
Merged

Filter Truemoney Wallet / TrueMoney payment methods #246

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcfcf1c
Add translation to TrueMoney
Dec 4, 2023
05a4c95
Filter Truemove Wallet / Jumpapp output to payment options
Dec 4, 2023
8051fbf
Add unittests
Dec 5, 2023
b1283f8
Refactoring PaymentChooserViewController
Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions OmiseSDK/PaymentChooserViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,9 @@ class PaymentChooserViewController: AdaptableStaticTableViewController<PaymentCh
paymentMethodsToShow.insert(.creditCard, at: 0)
}

if paymentMethodsToShow.contains(.truemoney) && paymentMethodsToShow.contains(.truemoneyJumpApp) {
danfowler marked this conversation as resolved.
Show resolved Hide resolved
paymentMethodsToShow.removeAll { $0 == .truemoney }
}
showingValues = paymentMethodsToShow

os_log("Payment Chooser: Showing options - %{private}@",
Expand Down
18 changes: 9 additions & 9 deletions OmiseSDK/Resources/Base.lproj/OmiseSDK.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@
<edgeInsets key="layoutMargins" top="0.0" left="16" bottom="0.0" right="16"/>
</view>
<view key="tableFooterView" contentMode="scaleToFill" id="g6L-kx-hv0">
<rect key="frame" x="0.0" y="2234" width="375" height="0.0"/>
<rect key="frame" x="0.0" y="2254" width="375" height="0.0"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
Expand Down Expand Up @@ -1549,14 +1549,14 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" text="TrueMoney" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ext-Bd-tya">
<rect key="frame" x="55" y="0.0" width="312" height="64"/>
<rect key="frame" x="67" y="0.0" width="288" height="64"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
<color key="textColor" red="0.23999999999999999" green="0.25" blue="0.29999999999999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" image="TrueMoney" adjustsImageSizeForAccessibilityContentSizeCategory="YES" id="DqM-AD-5EN">
<rect key="frame" x="8" y="16" width="32" height="32"/>
<rect key="frame" x="20" y="16" width="32" height="32"/>
<autoresizingMask key="autoresizingMask"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="Redirect" translatesAutoresizingMaskIntoConstraints="NO" id="XXk-p5-owH">
Expand Down Expand Up @@ -3128,7 +3128,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<view key="tableFooterView" contentMode="scaleToFill" id="rLy-XG-aKO">
<rect key="frame" x="0.0" y="1090" width="375" height="0.0"/>
<rect key="frame" x="0.0" y="1230" width="375" height="0.0"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
Expand Down Expand Up @@ -3695,22 +3695,22 @@
</scenes>
<designables>
<designable name="1JF-Jq-C50">
<size key="intrinsicContentSize" width="5" height="22"/>
<size key="intrinsicContentSize" width="23" height="48"/>
</designable>
<designable name="1dv-2d-6Zi">
<size key="intrinsicContentSize" width="38" height="33"/>
</designable>
<designable name="AJd-kX-GAq">
<size key="intrinsicContentSize" width="5" height="22"/>
<size key="intrinsicContentSize" width="23" height="48"/>
</designable>
<designable name="PBr-uW-pM8">
<size key="intrinsicContentSize" width="5" height="22"/>
<size key="intrinsicContentSize" width="23" height="48"/>
</designable>
<designable name="Par-EA-T3D">
<size key="intrinsicContentSize" width="55.333333333333336" height="22"/>
<size key="intrinsicContentSize" width="73.666666666666671" height="48"/>
</designable>
<designable name="Y1l-QK-aPc">
<size key="intrinsicContentSize" width="5" height="22"/>
<size key="intrinsicContentSize" width="23" height="48"/>
</designable>
<designable name="ZPa-NN-y1M">
<size key="intrinsicContentSize" width="30" height="33"/>
Expand Down
3 changes: 3 additions & 0 deletions OmiseSDK/Resources/en.lproj/OmiseSDK.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@
/* Class = "UILabel"; text = "TrueMoney Wallet"; ObjectID = "ewt-LA-vRb"; */
"ewt-LA-vRb.text" = "TrueMoney Wallet";

/* Class = "UILabel"; text = "TrueMoney"; ObjectID = "ext-Bd-tya"; */
danfowler marked this conversation as resolved.
Show resolved Hide resolved
"ext-Bd-tya.text" = "TrueMoney";

/* Class = "UILabel"; text = "Label"; ObjectID = "hNq-jM-xs4"; */
"hNq-jM-xs4.text" = "Label";

Expand Down
3 changes: 3 additions & 0 deletions OmiseSDK/Resources/ja.lproj/OmiseSDK.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@
/* Class = "UILabel"; text = "TrueMoney Wallet"; ObjectID = "ewt-LA-vRb"; */
"ewt-LA-vRb.text" = "TrueMoneyウォレット";

/* Class = "UILabel"; text = "TrueMoney"; ObjectID = "ext-Bd-tya"; */
"ext-Bd-tya.text" = "TrueMoney";

/* Class = "UILabel"; text = "Pay with Citi Rewards Points"; ObjectID = "zmw-2Y-WAX"; */
"zmw-2Y-WAX.text" = "Citi Rewardsポイント";

Expand Down
3 changes: 3 additions & 0 deletions OmiseSDK/Resources/th.lproj/OmiseSDK.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@
/* Class = "UILabel"; text = "TrueMoney Wallet"; ObjectID = "ewt-LA-vRb"; */
"ewt-LA-vRb.text" = "ทรูมันนี่วอลเล็ท";

/* Class = "UILabel"; text = "TrueMoney"; ObjectID = "ext-Bd-tya"; */
"ext-Bd-tya.text" = "ทรูมันนี่";

/* Class = "UILabel"; text = "Pay with Citi Rewards Points"; ObjectID = "zmw-2Y-WAX"; */
"zmw-2Y-WAX.text" = "ชำระด้วยคะแนนซิตี้รีวอร์ด";

Expand Down
Loading