-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add sum NumberFormatter for amount fraction digits
- Loading branch information
Budnikov Vyacheslav
committed
Nov 27, 2017
1 parent
dfcd065
commit 57139f0
Showing
17 changed files
with
124 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| // | ||
| // ASDKUtils.h | ||
| // ASDKCore | ||
| // | ||
| // Created by v.budnikov on 27.11.2017. | ||
| // Copyright © 2017 Tinkoff Bank. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| extern NSString *const kSumDecimalSeparator; | ||
|
|
||
| @interface ASDKUtils : NSObject | ||
|
|
||
| + (NSString *)amountWholeDigits:(double)amount; | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // | ||
| // ASDKUtils.m | ||
| // ASDKCore | ||
| // | ||
| // Copyright © 2017 Tinkoff Bank. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #import "ASDKUtils.h" | ||
|
|
||
| NSString *const kSumDecimalSeparator = @","; | ||
|
|
||
| @implementation ASDKUtils | ||
|
|
||
| + (NSNumberFormatter *)sumNumberFormatter | ||
| { | ||
| static NSNumberFormatter *sumNumberFormatter = nil; | ||
|
|
||
| if (sumNumberFormatter == nil) | ||
| { | ||
| sumNumberFormatter = [[NSNumberFormatter alloc] init]; | ||
| [sumNumberFormatter setGroupingSize:0]; | ||
| [sumNumberFormatter setDecimalSeparator:kSumDecimalSeparator]; | ||
| [sumNumberFormatter setNumberStyle:NSNumberFormatterDecimalStyle]; | ||
| [sumNumberFormatter setMaximumFractionDigits:2]; | ||
| [sumNumberFormatter setMinimumFractionDigits:2]; | ||
| } | ||
|
|
||
| return sumNumberFormatter; | ||
| } | ||
|
|
||
| + (NSString *)amountWholeDigits:(double)amount | ||
| { | ||
| NSString *string = [[self sumNumberFormatter] stringFromNumber:[NSNumber numberWithDouble:amount]]; | ||
| NSArray *array = [string componentsSeparatedByString:kSumDecimalSeparator]; | ||
|
|
||
| if ([array count] == 2) | ||
| { | ||
| return [array objectAtIndex:0]; | ||
| } | ||
|
|
||
| return string; | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,7 +33,7 @@ | |
| */ | ||
| - (void)scanCardSuccess:(void (^)(NSString *cardNumber))success | ||
| failure:(void (^)(ASDKAcquringSdkError *error))failure | ||
| cancel:(void (^)())cancel; | ||
| cancel:(void (^)(void))cancel; | ||
|
|
||
| @end | ||
|
|
||
|
|
@@ -71,7 +71,7 @@ | |
| additionalPaymentData:(NSDictionary *)data | ||
| receiptData:(NSDictionary *)receiptData | ||
| success:(void (^)(ASDKPaymentInfo *paymentInfo))onSuccess | ||
| cancelled:(void (^)())onCancelled | ||
| cancelled:(void (^)(void))onCancelled | ||
| error:(void (^)(ASDKAcquringSdkError *error))onError; | ||
|
|
||
| - (void)chargeWithRebillId:(NSNumber *)rebillId | ||
|
|
@@ -140,15 +140,15 @@ | |
| additionalPaymentData:(NSDictionary *)additionalPaymentData //JSON объект содержащий дополнительные параметры, например @{@"Email" : @"[email protected]"} | ||
| receiptData:(NSDictionary *)receiptData // JSON объект с данными чека, обязательно должен быть объект Items в который вложены позиции чека Email и Taxation - Система налогообложения, значения: osn, usn_income, usn_income_outcome, envd, esn, или patent | ||
| success:(void (^)(ASDKPaymentInfo *paymentInfo))onSuccess | ||
| cancelled:(void (^)())onCancelled | ||
| cancelled:(void (^)(void))onCancelled | ||
| error:(void (^)(ASDKAcquringSdkError *error))onError NS_AVAILABLE_IOS(9_0); | ||
|
|
||
| - (void)checkStatusTransaction:(NSString *)paymentId | ||
| success:(void (^)(ASDKPaymentStatus status))onSuccess | ||
| error:(void (^)(ASDKAcquringSdkError *error))onError; | ||
|
|
||
| - (void)refundTransaction:(NSString *)paymentId | ||
| success:(void (^)())onSuccess | ||
| success:(void (^)(void))onSuccess | ||
| error:(void (^)(ASDKAcquringSdkError *error))onError; | ||
|
|
||
| /*! | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters