Skip to content

K
kt-ios
Commit bb24a1a8 by Olzhas Aldabergenov
Options

payment with guid fixed

parent a85227d2
Showing with 41 additions and 71 deletions
kt.xcworkspace/xcuserdata/neox.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -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"
......
kt/Resources/Base.lproj/Main.storyboard
......@@ -234,7 +234,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ИИН" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g75-AL-BIN" userLabel="iinTitle">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Укажите Ваш ИИН" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g75-AL-BIN" userLabel="iinTitle">
<constraints>
<constraint firstAttribute="height" constant="21" id="6zD-Fy-weB"/>
</constraints>
......@@ -7888,9 +7888,9 @@
</label>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="XqY-6b-Mg3" secondAttribute="trailing" constant="8" id="23T-qO-LQf"/>
<constraint firstItem="XqY-6b-Mg3" firstAttribute="leading" secondItem="aiT-xZ-hx2" secondAttribute="leading" constant="8" id="HHE-MM-bDW"/>
<constraint firstItem="XqY-6b-Mg3" firstAttribute="top" secondItem="aiT-xZ-hx2" secondAttribute="topMargin" constant="8" id="Qad-Xp-FzS"/>
<constraint firstAttribute="trailingMargin" secondItem="XqY-6b-Mg3" secondAttribute="trailing" constant="10" id="bZW-Nm-ZzY"/>
<constraint firstItem="XqY-6b-Mg3" firstAttribute="leading" secondItem="aiT-xZ-hx2" secondAttribute="leadingMargin" constant="10" id="lAl-Y0-00h"/>
<constraint firstItem="XqY-6b-Mg3" firstAttribute="bottom" secondItem="aiT-xZ-hx2" secondAttribute="bottomMargin" constant="5" id="riM-Uf-MS9"/>
</constraints>
</tableViewCellContentView>
......@@ -7905,35 +7905,46 @@
<frame key="frameInset" width="375" height="166"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="СКОРОСТЬ ИНТЕРНЕТА ДО (МБИТ/С)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vpd-Dt-byQ">
<frame key="frameInset" minX="18" minY="11" width="338" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="СКОРОСТЬ ИНТЕРНЕТА ДО (МБИТ/С)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vpd-Dt-byQ">
<frame key="frameInset" minX="8" minY="11" width="359" height="16"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
<color key="textColor" red="0.39157533645629883" green="0.41445443034172058" blue="0.43459904193878174" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="120" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RsC-rA-nkt">
<frame key="frameInset" minX="18" minY="35" width="338" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="120" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RsC-rA-nkt">
<frame key="frameInset" minX="8" minY="35" width="359" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.17968405783176422" green="0.20799672603607178" blue="0.23909254372119904" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="ОПИСАНИЕ" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xFO-tv-Ajb">
<frame key="frameInset" minX="18" minY="67" width="338" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="ОПИСАНИЕ" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xFO-tv-Ajb">
<frame key="frameInset" minX="8" minY="67" width="359" height="16"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
<color key="textColor" red="0.39157533649999998" green="0.41445443030000001" blue="0.43459904189999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="120" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g7U-XB-Ibx">
<frame key="frameInset" minX="18" minY="89" width="338" height="27"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="120" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g7U-XB-Ibx">
<frame key="frameInset" minX="8" minY="89" width="359" height="27"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.17968405779999999" green="0.20799672599999999" blue="0.23909254369999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="vpd-Dt-byQ" firstAttribute="top" secondItem="waO-jG-hbc" secondAttribute="topMargin" constant="3" id="1Jt-5N-gLH"/>
<constraint firstItem="xFO-tv-Ajb" firstAttribute="top" secondItem="RsC-rA-nkt" secondAttribute="bottom" constant="16" id="1h9-mo-R6I"/>
<constraint firstItem="xFO-tv-Ajb" firstAttribute="leading" secondItem="waO-jG-hbc" secondAttribute="leadingMargin" id="74y-QI-c7D"/>
<constraint firstItem="vpd-Dt-byQ" firstAttribute="leading" secondItem="waO-jG-hbc" secondAttribute="leadingMargin" id="Gbp-cv-Bw2"/>
<constraint firstAttribute="bottomMargin" secondItem="g7U-XB-Ibx" secondAttribute="bottom" constant="8" id="ImV-BB-Mhk"/>
<constraint firstItem="g7U-XB-Ibx" firstAttribute="top" secondItem="xFO-tv-Ajb" secondAttribute="bottom" constant="6" id="TV9-Rv-7c5"/>
<constraint firstItem="RsC-rA-nkt" firstAttribute="top" secondItem="vpd-Dt-byQ" secondAttribute="bottom" constant="8" id="YYG-GG-Gp6"/>
<constraint firstItem="RsC-rA-nkt" firstAttribute="trailing" secondItem="waO-jG-hbc" secondAttribute="trailingMargin" id="YvC-YV-r3g"/>
<constraint firstItem="RsC-rA-nkt" firstAttribute="leading" secondItem="waO-jG-hbc" secondAttribute="leadingMargin" id="Z2h-mV-Gnj"/>
<constraint firstItem="g7U-XB-Ibx" firstAttribute="leading" secondItem="waO-jG-hbc" secondAttribute="leadingMargin" id="bBf-02-oVw"/>
<constraint firstItem="vpd-Dt-byQ" firstAttribute="trailing" secondItem="waO-jG-hbc" secondAttribute="trailingMargin" id="k8p-de-Fl9"/>
<constraint firstItem="g7U-XB-Ibx" firstAttribute="trailing" secondItem="waO-jG-hbc" secondAttribute="trailingMargin" id="xXl-s2-EGt"/>
<constraint firstItem="xFO-tv-Ajb" firstAttribute="trailing" secondItem="waO-jG-hbc" secondAttribute="trailingMargin" id="z4C-7T-5Iq"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="tariffDescriptionTitle" destination="xFO-tv-Ajb" id="83j-ph-Q6e"/>
kt/Supporting Files/Info.plist
......@@ -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>
......
kt/ViewControllers/Cabinet/Login/SecondStepOfRegistrationVC.swift
......@@ -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")
}
......
kt/ViewControllers/Service/ServiceTariffController.swift
......@@ -77,7 +77,7 @@ class ServiceTariffController: UIViewController, UITableViewDataSource, UITableV
case 0:
return 44
default:
return 65
return UITableViewAutomaticDimension
}
}
......
kt/Views/Cabinet/CashAndPayment/OnlinePayment/OnlinePaymentButtonFieldCell.swift
......@@ -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)
}
}
}
......
kt/Views/FeedFeedbackCell.swift
......@@ -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")!)
}
......
kt/Views/UIFastPayTableViewCell.swift
......@@ -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