Commit bb24a1a8 by Olzhas Aldabergenov

payment with guid fixed

parent a85227d2
......@@ -118,38 +118,6 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/Categories/UIViewController+AddBackButton.swift"
timestampString = "529824258.801666"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "45"
endingLineNumber = "45"
landmarkName = "backFromModal()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/Categories/UIViewController+AddBackButton.swift"
timestampString = "529824259.667812"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "50"
endingLineNumber = "50"
landmarkName = "back()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
......@@ -201,22 +169,6 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/Facade/Facade+Bot.swift"
timestampString = "531225432.809038"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "13"
endingLineNumber = "13"
landmarkName = "askBot(text:onSuccess:onError:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/Login/LoginViewController.swift"
timestampString = "532607789.350001"
startingColumnNumber = "9223372036854775807"
......
......@@ -19,7 +19,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>58</string>
<string>61</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
......
......@@ -22,10 +22,14 @@ class SecondStepOfRegistrationVC : StepViewController {
override func viewDidLoad() {
super.viewDidLoad()
stepNumber = 2
self.loginTitle.text = LS("registration_placeholder_login")
self.passwordTitle.text = LS("registration_placeholder_password")
}
override func viewDidAppear(animated: Bool) {
super.viewDidAppear(animated)
self.loginField.placeholder = LS("registration_placeholder_login")
self.passwordField.placeholder = LS("registration_placeholder_password")
}
......
......@@ -77,7 +77,7 @@ class ServiceTariffController: UIViewController, UITableViewDataSource, UITableV
case 0:
return 44
default:
return 65
return UITableViewAutomaticDimension
}
}
......
......@@ -84,6 +84,9 @@ class OnlinePaymentButtonFieldCell : UITableViewCell, UITextFieldDelegate {
rightButton.setTitleColor(isLeft ? nil : Color.ButtonGrayColor, forState: .Normal)
leftButton.setTitleColor(isLeft ? Color.ButtonGrayColor : nil, forState: .Normal)
// OnlinePaymentViewController.guidOrPhone = textField.text!
if( vc != nil ) {
textChanged(textField)
}
}
}
......
......@@ -28,7 +28,7 @@ class FeedFeedbackCell: UITableViewCell {
}
func openLink(sender: UIButton) {
UIApplication.sharedApplication().openURL(NSURL(string: "http://telecom.kz")!)
UIApplication.sharedApplication().openURL(NSURL(string: "http://telecom.kz/ios")!)
}
......
......@@ -110,11 +110,11 @@ class UIFastPayTableViewCell : UIBaseTableViewCell {
}
cellData.creditValue = "\(summ) тг."
cellData.summ = "\(summ)"
if balance <= 0 {
self.lblCreditTitle.setTextAndSizeToFit(LS("fastPayCell_credit_title2").uppercaseString)
self.button.enabled = false
self.button.titleLabel?.text = LS("fastPay_positive_balance")
}
// if balance <= 0 {
// self.lblCreditTitle.setTextAndSizeToFit(LS("fastPayCell_credit_title2").uppercaseString)
// self.button.enabled = false
// self.button.titleLabel?.text = LS("fastPay_positive_balance")
// }
loadingIndicator.stopAnimating()
loadingIndicator.removeFromSuperview()
}) { (nsError) in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment