Skip to content

K
kt-ios
Commit 2548ba7e by Olzhas Aldabergenov
Options

app store version 1.0

parent 3c9e0dd7
Showing with 37 additions and 61 deletions
kt.xcworkspace/xcuserdata/neox.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -131,37 +131,5 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/LKSettingsViewController.swift"
timestampString = "534142482.986384"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "497"
endingLineNumber = "497"
landmarkName = "changeAbonentSettings()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/LKSettingsViewController.swift"
timestampString = "534142482.986384"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "518"
endingLineNumber = "518"
landmarkName = "changeAbonentSettings()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
kt/Models/requestModels/ServiceCallbackRequest.swift
......@@ -22,8 +22,9 @@ class ServiceCallbackRequest {
var validationMessage = ""
var formType: Int?
var userComment: String?
var regionType: String?
init(cityId: String? = nil, serviceId: Int? = nil, fullName: String? = nil, phone: String? = nil, email: String? = nil, type: Int? = nil, formType: Int? = nil, userComment: String? = nil) {
init(cityId: String? = nil, serviceId: Int? = nil, fullName: String? = nil, phone: String? = nil, email: String? = nil, type: Int? = nil, formType: Int? = nil, userComment: String? = nil, regionType: String? = nil) {
self.cityId = cityId
self.serviceId = serviceId
self.fullName = fullName
......@@ -32,6 +33,7 @@ class ServiceCallbackRequest {
self.type = type
self.formType = formType
self.userComment = userComment
self.regionType = regionType
}
func validateFields() -> Bool {
......@@ -54,7 +56,7 @@ class ServiceCallbackRequest {
var params: [String: AnyObject] {
var resultParams: [String: AnyObject] = ["region": cityId!,
"region_type": "city",
"region_type": regionType!,
"service_id": serviceId!,
"name": fullName!,
"phone": phone!,
......
kt/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"idiom" : "iphone",
"filename" : "Icon-41.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"idiom" : "iphone",
"filename" : "Icon-60.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "settings_icon@2x.png",
"filename" : "Icon-58.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "settings_icon@3x.png",
"filename" : "Icon-87.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "spotlight_icon@2x.png",
"filename" : "Icon-80.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "spotlight_icon@3x.png",
"filename" : "Icon-120.png",
"scale" : "3x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "app_icon@2x.png",
"filename" : "Icon-121.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "app_icon@3x.png",
"filename" : "Icon-180.png",
"scale" : "3x"
},
{
......@@ -59,42 +61,43 @@
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "settings_icon.png",
"filename" : "Icon-29.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "settings_icon@2x-1.png",
"filename" : "Icon-59.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "spotlight_icon.png",
"filename" : "Icon-40.png",
"scale" : "1x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "spotlight_icon@2x-1.png",
"filename" : "Icon-81.png",
"scale" : "2x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "app_icon.png",
"filename" : "Icon-76.png",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "app_icon-ipad@2x.png",
"filename" : "Icon-152.png",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"idiom" : "ipad",
"filename" : "Icon-167.png",
"scale" : "2x"
}
],
......
kt/Supporting Files/Info.plist
......@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>71</string>
<string>74</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
......
kt/Utils/ValidationUtil.swift
......@@ -46,7 +46,9 @@ func isValidMacAddress(testStr: String) -> Bool {
}
func isValidPassword(password: String) -> Bool {
let pwdRegEx = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[a-zA-Z\\d]{8,}$"
let pwdRegEx = "^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$"
//let pwdRegEx = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[a-zA-Z\\d]{8,}$"
let pwdTest = NSPredicate(format:"SELF MATCHES %@", pwdRegEx)
let result = pwdTest.evaluateWithObject(password)
return result
......
kt/ViewControllers/Cabinet/cashAndPayments/OnlinePaymentViewController.swift
......@@ -204,6 +204,7 @@ class OnlinePaymentViewController: UIViewController, UITextViewDelegate, UITable
let request = PaymentCreateOrderRequest(payType: OnlinePaymentViewController.currentPayType, email: OnlinePaymentViewController.email, guidOrPhone: OnlinePaymentViewController.guidOrPhone, amount: OnlinePaymentViewController.summ, lang: AppLocalization.language().forTelecom)
guard request.validateFields() else { AlertViewUtil.showAlert(request.validationMessage); return }
self.processRequest(true)
//print(request)
Facade.sharedInstance().createOrder(request.params, onSuccess: { (data) in
self.performSegueWithIdentifier("payment_form", sender: data)
}, onError: { (error) in
......
kt/ViewControllers/Service/CallbackViewController.swift
......@@ -42,8 +42,8 @@ class CallbackViewController: KeyboardedViewController, UIPickerViewDataSource,
self.navigationItem.title = LS("service.callback")//"Обратный звонок"
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(CallbackViewController.keyboardWillShow(_:)), name: UIKeyboardWillShowNotification, object: nil)
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(CallbackViewController.keyboardWillHide(_:)), name: UIKeyboardWillHideNotification, object: nil)
//NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(CallbackViewController.keyboardWillShow(_:)), name: UIKeyboardWillShowNotification, object: nil)
//NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(CallbackViewController.keyboardWillHide(_:)), name: UIKeyboardWillHideNotification, object: nil)
filoField.text = AbonentInfoManager.sharedInstance.abonentInfo?.name
phoneField.text = getFormattedPhone( (AbonentInfoManager.sharedInstance.abonentInfo?.mobilePhone!.stringValue)! )
......@@ -160,9 +160,9 @@ class CallbackViewController: KeyboardedViewController, UIPickerViewDataSource,
@IBAction func sendButtonPressed(sender: AnyObject) {
let request = ServiceCallbackRequest(cityId: self.serverItem.id, serviceId: service_id, fullName: filoField.text, phone: getPhoneDigits(phoneField.text!),
email: emailField.text, type: type, formType: formType, userComment: user_comment)
print(request.params)
//return;
email: emailField.text, type: type, formType: formType, userComment: user_comment,
regionType: self.serverItem!.regionType)
guard request.validateFields() else {
AlertViewUtil.showAlert(request.validationMessage);
return }
......
kt/Views/UIFastPayTableViewCell.swift
......@@ -130,11 +130,11 @@ class UIFastPayTableViewCell : UIBaseTableViewCell {
}
cellData.creditValue = "\(summ) тг."
cellData.summ = "\(summ)"
if Double(balance)! <= 0 {
self.lblCreditTitle.setTextAndSizeToFit(LS("fastPayCell_credit_title2").uppercaseString)
self.button.enabled = false
self.button.titleLabel?.text = LS("fastPay_positive_balance")
}
// if Double(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