Skip to content

K
kt-ios
Commit 1e8a7608 by Olzhas Aldabergenov
Options

no data label is fast payment added. On password recory email of account holder is displayed

parent a76111df
Showing with 52 additions and 30 deletions
kt.xcodeproj/project.pbxproj
......@@ -91,7 +91,6 @@
3E5CC7A51FA83F7400B55DF0 /* BotManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E5CC7A41FA83F7400B55DF0 /* BotManager.swift */; };
3E5CC7AE1FA84F9F00B55DF0 /* DateUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E5CC7AD1FA84F9F00B55DF0 /* DateUtil.swift */; };
3E6969B31FA2097200032D95 /* ServiceDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E6969B21FA2097200032D95 /* ServiceDetailsViewController.swift */; };
3E8D310D1FB17CBE00A650D2 /* AdditionalStepper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E8D310C1FB17CBE00A650D2 /* AdditionalStepper.swift */; };
3E8D31161FB1AA3500A650D2 /* VIPCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E8D31151FB1AA3500A650D2 /* VIPCell.swift */; };
3EA73F081FAAE6620009731F /* ServiceCalculatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA73F071FAAE6620009731F /* ServiceCalculatorViewController.swift */; };
3EA7F6BA1F00D1A1003F6CBF /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA7F6B91F00D1A1003F6CBF /* MainViewController.swift */; };
......@@ -130,7 +129,6 @@
3EB1085E1F17398C000EAE88 /* BotLeftMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EB1085D1F17398C000EAE88 /* BotLeftMessageCell.swift */; };
3EB108601F173999000EAE88 /* BotRightMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EB1085F1F173999000EAE88 /* BotRightMessageCell.swift */; };
3EC107C51FB019A600EB2188 /* ServiceVIPTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC107C41FB019A600EB2188 /* ServiceVIPTableViewController.swift */; };
3EC107CF1FB0203B00EB2188 /* VIPServiceHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC107CE1FB0203B00EB2188 /* VIPServiceHeader.swift */; };
3EC107D11FB0623E00EB2188 /* VIPCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC107D01FB0623E00EB2188 /* VIPCalculator.swift */; };
3EC107D31FB06E6400EB2188 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC107D21FB06E6400EB2188 /* Colors.swift */; };
3EC107D51FB0703200EB2188 /* VIPTVCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC107D41FB0703200EB2188 /* VIPTVCell.swift */; };
......@@ -647,7 +645,6 @@
3E5CC7A41FA83F7400B55DF0 /* BotManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BotManager.swift; sourceTree = "<group>"; };
3E5CC7AD1FA84F9F00B55DF0 /* DateUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DateUtil.swift; sourceTree = "<group>"; };
3E6969B21FA2097200032D95 /* ServiceDetailsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceDetailsViewController.swift; sourceTree = "<group>"; };
3E8D310C1FB17CBE00A650D2 /* AdditionalStepper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdditionalStepper.swift; sourceTree = "<group>"; };
3E8D31151FB1AA3500A650D2 /* VIPCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VIPCell.swift; sourceTree = "<group>"; };
3EA73F071FAAE6620009731F /* ServiceCalculatorViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceCalculatorViewController.swift; sourceTree = "<group>"; };
3EA7F6B91F00D1A1003F6CBF /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
......@@ -686,7 +683,6 @@
3EB1085D1F17398C000EAE88 /* BotLeftMessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BotLeftMessageCell.swift; sourceTree = "<group>"; };
3EB1085F1F173999000EAE88 /* BotRightMessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BotRightMessageCell.swift; sourceTree = "<group>"; };
3EC107C41FB019A600EB2188 /* ServiceVIPTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceVIPTableViewController.swift; sourceTree = "<group>"; };
3EC107CE1FB0203B00EB2188 /* VIPServiceHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VIPServiceHeader.swift; sourceTree = "<group>"; };
3EC107D01FB0623E00EB2188 /* VIPCalculator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VIPCalculator.swift; sourceTree = "<group>"; };
3EC107D21FB06E6400EB2188 /* Colors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
3EC107D41FB0703200EB2188 /* VIPTVCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VIPTVCell.swift; sourceTree = "<group>"; };
......@@ -1414,7 +1410,6 @@
3EC107CD1FB01F9600EB2188 /* vip */ = {
isa = PBXGroup;
children = (
3EC107CE1FB0203B00EB2188 /* VIPServiceHeader.swift */,
3E8D31151FB1AA3500A650D2 /* VIPCell.swift */,
3EC107D41FB0703200EB2188 /* VIPTVCell.swift */,
3E18DCBD1FB32A7A00025C04 /* VIPMobileCell.swift */,
......@@ -1423,7 +1418,6 @@
3EAC19B61FB4769400C083A1 /* VIPAdditional.swift */,
3EAC19CB1FBAFDB900C083A1 /* VIPAdditionalStepper.swift */,
3E18DCC61FB45BAA00025C04 /* VIPTotal.swift */,
3E8D310C1FB17CBE00A650D2 /* AdditionalStepper.swift */,
);
name = vip;
sourceTree = "<group>";
......@@ -2818,7 +2812,6 @@
0F8DC6001AB04658007C5C13 /* ServiceNavigationController.swift in Sources */,
9891958B1C67AC6E00A4542D /* ButtonWithTopAndBottomBorders.swift in Sources */,
9876E3F71DE973B200355FF3 /* RBCreationViewController.swift in Sources */,
3E8D310D1FB17CBE00A650D2 /* AdditionalStepper.swift in Sources */,
0F8DC5A51AB04608007C5C13 /* City.swift in Sources */,
989501331CFE492400639286 /* OfferCallbackTitleCell.swift in Sources */,
0F8DC5831AB045D2007C5C13 /* BannersManager.swift in Sources */,
......@@ -2981,7 +2974,6 @@
9887290A1DDCE18500CEEBAA /* DamageSource.swift in Sources */,
985A6DC51D05D6FF00961BDF /* TariffPlanChangeHistory.swift in Sources */,
984ED16E1D00652400DD2BB2 /* SelectCityForProviderCell.swift in Sources */,
3EC107CF1FB0203B00EB2188 /* VIPServiceHeader.swift in Sources */,
989501191CFE405500639286 /* OffersCallbackViewController.swift in Sources */,
3E197E781F4D2C87000BC88D /* MainHelpViewController.swift in Sources */,
8445544E1DFC0CAD007D9EE9 /* UITextBoxTableViewCell.swift in Sources */,
......
kt.xcworkspace/xcuserdata/neox.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -58,11 +58,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/Login/LoginViewController.swift"
timestampString = "530792686.165663"
timestampString = "532607789.350001"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "595"
endingLineNumber = "595"
startingLineNumber = "596"
endingLineNumber = "596"
landmarkName = "applicationWillResignActive()"
landmarkType = "7">
</BreakpointContent>
......@@ -74,11 +74,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/Login/LoginViewController.swift"
timestampString = "530792686.165663"
timestampString = "532607789.350001"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "595"
endingLineNumber = "595"
startingLineNumber = "596"
endingLineNumber = "596"
landmarkName = "applicationWillResignActive()"
landmarkType = "7">
</BreakpointContent>
......@@ -90,11 +90,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/Login/LoginViewController.swift"
timestampString = "530792686.165663"
timestampString = "532607789.350001"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "565"
endingLineNumber = "565"
startingLineNumber = "566"
endingLineNumber = "566"
landmarkName = "showHelpAlert()"
landmarkType = "7">
</BreakpointContent>
......@@ -106,11 +106,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/Login/LoginViewController.swift"
timestampString = "530792686.165663"
timestampString = "532607789.350001"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "570"
endingLineNumber = "570"
startingLineNumber = "571"
endingLineNumber = "571"
landmarkName = "showHelpAlert()"
landmarkType = "7">
</BreakpointContent>
......@@ -211,5 +211,21 @@
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"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "291"
endingLineNumber = "291"
landmarkName = "textField(textField:shouldChangeCharactersInRange:replacementString:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
kt/Facade/Facade+Forget.swift
......@@ -8,7 +8,7 @@
import Foundation
extension Facade {
func forgetPassword(params: [String: AnyObject], onError: String -> Void, onSuccess: () -> Void) {
func forgetPassword(params: [String: AnyObject], onError: String -> Void, onSuccess: String -> Void) {
request(Router.Forget(params)).responseSwiftyJSON(completionHandler: { (req, resp, json, error) in
Router.globalLog.debug(req)
Router.globalLog.debug(json)
......@@ -18,7 +18,7 @@ extension Facade {
} else {
Router.globalLog.debug(resp)
if json["error_code"].stringValue == "0" {
onSuccess()
onSuccess(json["email"].stringValue)
} else {
Router.globalLog.error(json["error"].stringValue)
onError(json["error"].stringValue)
......
kt/Resources/en.lproj/Localization.strings
......@@ -437,7 +437,7 @@
"login.text_field.your_password.placeholder" = "Password";
"login.type_login_or_phone" = "Type login or phone number";
"login.type_password" = "Type password";
"login.recovery.successfully_sent" = "На Ваш Email были отправлены данные для восстановления пароля личного кабинета.";
"login.recovery.successfully_sent" = "На Вашу почту %@ были отправлены данные для восстановления пароля личного кабинета.";
"login.button.login" = "Login";
"login.label.or" = "Or";
"login.button.phone_number" = "Phone";
......
kt/Resources/kk.lproj/Localization.strings
......@@ -434,7 +434,7 @@
"login.text_field.your_password.placeholder" = "Құпиясөз";
"login.type_login_or_phone" = "Логин немесе телефонды жазыңыз";
"login.type_password" = "Құпиясөзді жазыңыз";
"login.recovery.successfully_sent" = "На Ваш Email были отправлены данные для восстановления пароля личного кабинета.";
"login.recovery.successfully_sent" = "На Вашу почту %@ были отправлены данные для восстановления пароля личного кабинета.";
"login.button.login" = "Логин";
"login.label.or" = "Немесе";
"login.button.phone_number" = "Телефон";
......
kt/Resources/ru.lproj/Localization.strings
......@@ -439,7 +439,7 @@
"login.text_field.your_password.placeholder" = "Пароль";
"login.type_login_or_phone" = "Введите логин или телефон";
"login.type_password" = "Введите пароль";
"login.recovery.successfully_sent" = "На Ваш Email были отправлены данные для восстановления пароля личного кабинета.";
"login.recovery.successfully_sent" = "На Вашу почту %@ были отправлены данные для восстановления пароля личного кабинета.";
"login.button.login" = "Логин";
"login.label.or" = "Или";
"login.button.phone_number" = "Телефон";
......
kt/ViewControllers/Cabinet/Login/AccessRecoveryViewController.swift
......@@ -44,7 +44,7 @@ class AccessRecoveryViewController : UIViewController, UITableViewDataSource, UI
alert.alpha = 1
alert.show()
PKNotification.loading(false)
}, onSuccess: { () -> Void in
}, onSuccess: { (email) -> Void in
let alert = UIAlertView(title: "Успех", message: nil, delegate: self, cancelButtonTitle: "OK")
alert.tintColor = self.view.tintColor
alert.backgroundColor = UIColor.whiteColor()
......
kt/ViewControllers/Cabinet/Login/LoginViewController.swift
......@@ -200,8 +200,9 @@ class LoginViewController: ScrolledViewController, UIViewControllerTransitioning
Facade.sharedInstance().forgetPassword(params, onError: { error -> Void in
AlertViewUtil.showErrorAlert(message: error)
PKNotification.loading(false)
}, onSuccess: { () -> Void in
AlertViewUtil.showIncorrectAlert(LS("login.recovery.successfully_sent"))
}, onSuccess: { (email) -> Void in
let message = String(format: LS("login.recovery.successfully_sent"), email)
AlertViewUtil.showIncorrectAlert(message)
PKNotification.loading(false)
})
}
......@@ -547,7 +548,7 @@ class LoginViewController: ScrolledViewController, UIViewControllerTransitioning
self.cityButton.addTarget(self, action: #selector(LoginViewController.cityButton_touchUpInside(_:)), forControlEvents: .TouchUpInside)
self.cityButton.sizeToFit()
alertVC.textFields[0].tag = 101
alertVC.textFields[0].tag = 100
customAlertVC.addView(self.cityButton)
customAlertVC.addButtonHandlers({ (button) -> Void in
......
kt/ViewControllers/FastPay/UIFastPayViewController.swift
......@@ -44,7 +44,7 @@ class UIFastPayViewController : ViewControllerWithMenu, UITableViewDelegate {
case "createPayIdentifier":
let vc = segue.destinationViewController as! UICreateFastPayViewController
if (sender != nil) {
if (sender != nil) {
vc.fastPayForEditing = sender as! FastPayItem
}
break
......@@ -96,6 +96,19 @@ class UIFastPayViewController : ViewControllerWithMenu, UITableViewDelegate {
}
cellsData.append(cellData)
}
if ( items.isEmpty ) {
dispatch_async(dispatch_get_main_queue()) {
let noDataLabel = UILabel(frame: CGRect(x: 0, y: 0, width: self.tableView.bounds.size.width, height: self.tableView.bounds.size.height))
noDataLabel.text = LS("no_data")
self.tableView.backgroundView = noDataLabel
noDataLabel.textAlignment = NSTextAlignment.Center
self.tableView.separatorStyle = UITableViewCellSeparatorStyle.None
}
} else {
self.tableView.backgroundView = nil
}
}
private func getFastPayCellData(fastPay: FastPayItem) -> FastPayCellData {
......
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