Skip to content

K
kt-ios
Commit efbec3b2 by Olzhas Aldabergenov
Options

баги зафиксены

parent a64525dd
Showing with 329 additions and 208 deletions
kt.xcodeproj/project.xcworkspace/xcshareddata/kt.xcscmblueprint
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "EA320F6FA9588ABC7C644742C268D060B5B8C40A",
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "5DF1EA6381DC40CE02B4EA5633CD220EAAC76936",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
"c7b0ae48-b0eb-11de-8bdf-3374eb5c7316" : {
......@@ -13,6 +13,7 @@
"60B8A7321A1344097175D02C5081DD3E085FA24A" : 0,
"79EA0C4F360E98830418AFAE1A03A39D646B0106" : 0,
"98b68a54-b8e4-d874-94f5-50d40778346d" : 0,
"5DF1EA6381DC40CE02B4EA5633CD220EAAC76936" : 9223372036854775807,
"B31A561B4D3E112910A9CF9566C46AB6DDBE8CDC" : 0,
"67620B5EFA902936DF04070AF595B76AB0333747" : 0,
"CD1557C3AE966BEDF3490D85F9712687801B146C" : 0,
......@@ -29,6 +30,7 @@
"60B8A7321A1344097175D02C5081DD3E085FA24A" : "Lottery",
"79EA0C4F360E98830418AFAE1A03A39D646B0106" : "Lottery\/Alamofire-SwiftyJSON",
"98b68a54-b8e4-d874-94f5-50d40778346d" : "idoubs",
"5DF1EA6381DC40CE02B4EA5633CD220EAAC76936" : "kt-ios\/",
"B31A561B4D3E112910A9CF9566C46AB6DDBE8CDC" : "kt",
"67620B5EFA902936DF04070AF595B76AB0333747" : "library\/Alamofire",
"CD1557C3AE966BEDF3490D85F9712687801B146C" : "KT\/XCGLogger\/",
......@@ -59,6 +61,11 @@
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "58B98633C866AD3E226120F73CA1BDB10BF3BB43"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "http:\/\/gitlab.arta.kz\/neox\/kt-ios.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "5DF1EA6381DC40CE02B4EA5633CD220EAAC76936"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "bitbucket.org:metalheadkz\/lottery.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "60B8A7321A1344097175D02C5081DD3E085FA24A"
......
kt.xcworkspace/xcuserdata/neox.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -57,84 +57,6 @@
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/BotLeftMessageCell.swift"
timestampString = "522067560.634483"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "17"
endingLineNumber = "17"
landmarkName = "BotLeftMessageCell"
landmarkType = "3">
<Locations>
<Location
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "telecom.BotLeftMessageCell.(phoneTextField in _63D593197C4535C43D99F9AF6E208A1C).getter : Swift.ImplicitlyUnwrappedOptional&lt;__ObjC.UITextField&gt;"
moduleName = "telecom"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/neox/Documents/%20telecom_old/kt/ViewControllers/BotLeftMessageCell.swift"
timestampString = "522070506.521305"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "17"
endingLineNumber = "17"
offsetFromSymbolStart = "35">
</Location>
<Location
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "telecom.BotLeftMessageCell.(phoneTextField in _63D593197C4535C43D99F9AF6E208A1C).setter : Swift.ImplicitlyUnwrappedOptional&lt;__ObjC.UITextField&gt;"
moduleName = "telecom"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/neox/Documents/%20telecom_old/kt/ViewControllers/BotLeftMessageCell.swift"
timestampString = "522070506.52557"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "17"
endingLineNumber = "17"
offsetFromSymbolStart = "65">
</Location>
<Location
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "telecom.BotLeftMessageCell.init (style : __C.UITableViewCellStyle, reuseIdentifier : Swift.Optional&lt;Swift.String&gt;) -&gt; telecom.BotLeftMessageCell"
moduleName = "telecom"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/neox/Documents/%20telecom_old/kt/ViewControllers/BotLeftMessageCell.swift"
timestampString = "522070506.527788"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "17"
endingLineNumber = "17"
offsetFromSymbolStart = "255">
</Location>
<Location
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "telecom.BotLeftMessageCell.init (coder : __ObjC.NSCoder) -&gt; Swift.Optional&lt;telecom.BotLeftMessageCell&gt;"
moduleName = "telecom"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/neox/Documents/%20telecom_old/kt/ViewControllers/BotLeftMessageCell.swift"
timestampString = "522070506.530012"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "17"
endingLineNumber = "17"
offsetFromSymbolStart = "165">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/MainKnowedgeViewController.swift"
timestampString = "527420051.899478"
startingColumnNumber = "9223372036854775807"
......@@ -225,5 +147,117 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<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 = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Service/CallbackViewController.swift"
timestampString = "529839831.534665"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "166"
endingLineNumber = "166"
landmarkName = "sendButtonPressed(sender:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Service/ServiceTariffController.swift"
timestampString = "529908968.759975"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "92"
endingLineNumber = "92"
landmarkName = "connectButton_TouchUpInside(sender:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Service/ServiceTariffController.swift"
timestampString = "529908968.759975"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "101"
endingLineNumber = "101"
landmarkName = "prepareForSegue(segue:sender:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Service/ServiceItemScrollViewController.swift"
timestampString = "529906649.214457"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "272"
endingLineNumber = "272"
landmarkName = "prepareForSegue(segue:sender:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Service/ServiceItemScrollViewController.swift"
timestampString = "529906650.745449"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "275"
endingLineNumber = "275"
landmarkName = "prepareForSegue(segue:sender:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
kt/Models/reports/Payment.swift
......@@ -43,4 +43,26 @@ class Payment {
// }
}
func yyyyMMdd() -> String? {
guard let systemDate = systemDate else {
return nil
}
let dateFormatterGet = NSDateFormatter()
dateFormatterGet.dateFormat = "yyyy-MM-dd"
return dateFormatterGet.stringFromDate(self.systemDate!)
// let components = systemDate.getComponents()
// let year = components.year
// let month = components.month
// let dateFormatter = NSDateFormatter()
// dateFormatter.locale = AppLocalization.language().locale
// // if #available(iOS 9.0, *) {
// return "\(dateFormatter.standaloneMonthSymbols[month - 1].localizedCapitalizedString) \(year)"
// // } else {
// // Fallback on earlier versions
// // }
}
}
kt/Models/requestModels/ServiceCallbackRequest.swift
......@@ -20,31 +20,35 @@ class ServiceCallbackRequest {
var isPhoneValid = true
var isBlank = false
var validationMessage = ""
var formType: Int?
var userComment: String?
init(cityId: String? = nil, serviceId: Int? = nil, fullName: String? = nil, phone: String? = nil, email: String? = nil, type: Int? = 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) {
self.cityId = cityId
self.serviceId = serviceId
self.fullName = fullName
self.phone = phone
self.email = email
self.type = type
self.formType = formType
self.userComment = userComment
}
func validateFields() -> Bool {
var isValid = true
// if cityId == nil || serviceId == nil || fullName.isNilOrEmpty || phone.isNilOrEmpty || type == nil {
// isValid = false
// validationMessage = LS("error_fill_all_fields")
// } else {
//
// if phone?.characters.count < 10 || phone?.characters.count > 10 {
// isValid = false
// validationMessage = validationMessage == "" ? LS("service_callback.label.incorrect_phone") : "\(validationMessage); \(LS("service_callback.label.incorrect_phone"))"
// }
// if let email = email where isValidEmail(email) {
// validationMessage = validationMessage == "" ? LS("service_callback.label.incorrect_email") : "\(validationMessage); \(LS("service_callback.label.incorrect_email"))"
// }
// }
// if cityId == nil || serviceId == nil || fullName.isNilOrEmpty || phone.isNilOrEmpty || type == nil {
// isValid = false
// validationMessage = LS("error_fill_all_fields")
// } else {
//
// if phone?.characters.count < 10 || phone?.characters.count > 10 {
// isValid = false
// validationMessage = validationMessage == "" ? LS("service_callback.label.incorrect_phone") : "\(validationMessage); \(LS("service_callback.label.incorrect_phone"))"
// }
// if let email = email where isValidEmail(email) {
// validationMessage = validationMessage == "" ? LS("service_callback.label.incorrect_email") : "\(validationMessage); \(LS("service_callback.label.incorrect_email"))"
// }
// }
return isValid
}
......@@ -58,6 +62,12 @@ class ServiceCallbackRequest {
if let email = email {
resultParams["email"] = email
}
if let formType = formType {
resultParams["form_type"] = formType
}
if let userComment = userComment {
resultParams["user_comment"] = userComment
}
return resultParams as! [String : AnyObject]
}
......
kt/Resources/Base.lproj/Main.storyboard
......@@ -20,7 +20,7 @@
<objects>
<navigationController storyboardIdentifier="iPhoneRootViewController" automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="Xud-ew-Pd5" sceneMemberID="viewController">
<nil key="simulatedTopBarMetrics"/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="Vyr-Ht-NYb">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="Vyr-Ht-NYb">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -349,10 +349,10 @@
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" rowHeight="80" id="8gk-Mh-q6D" customClass="AccessRecoveryCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="600" height="80"/>
<rect key="frame" x="0.0" y="28" width="1000" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8gk-Mh-q6D" id="wRv-ae-1bA">
<frame key="frameInset" width="600" height="79"/>
<frame key="frameInset" width="1000" height="79"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dul-TF-41F">
......@@ -1118,7 +1118,7 @@
<scene sceneID="Qvh-7E-G3L">
<objects>
<navigationController storyboardIdentifier="FastPayNavigationController" id="vly-EC-Wf2" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="ZAz-L2-Fwq">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="ZAz-L2-Fwq">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -1146,7 +1146,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="fastPayCellIdentifier" selectionStyle="default" indentationWidth="10" reuseIdentifier="fastPayCellIdentifier" rowHeight="166" id="3ym-kb-mRZ" customClass="UIFastPayTableViewCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="92" width="375" height="166"/>
<rect key="frame" x="0.0" y="92" width="1000" height="166"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3ym-kb-mRZ" id="FGA-mi-AGb">
<frame key="frameInset" width="375" height="165"/>
......@@ -1284,7 +1284,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OZp-jL-1bb" id="L76-f9-HLK">
<frame key="frameInset" width="375" height="59"/>
<frame key="frameInset" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Адрес электронной почты" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OpU-aT-0as">
......@@ -1388,7 +1388,7 @@
<rect key="frame" x="0.0" y="28" width="414" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="SQN-x5-07i" id="zUj-fk-hK8">
<frame key="frameInset" width="414" height="43"/>
<frame key="frameInset" width="414" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qZu-i5-IkV">
......@@ -1434,7 +1434,7 @@
<scene sceneID="7pQ-gJ-z0O">
<objects>
<navigationController storyboardIdentifier="MenuTableController" id="nSs-Zk-1iE" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="ox4-cd-1gm">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="ox4-cd-1gm">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -1504,7 +1504,7 @@
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" rowHeight="60" id="7mz-uf-jNG" customClass="MenuCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="375" height="60"/>
<rect key="frame" x="0.0" y="28" width="1000" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7mz-uf-jNG" id="hSN-mh-1cl">
<frame key="frameInset" width="375" height="60"/>
......@@ -1580,7 +1580,7 @@
<objects>
<navigationController storyboardIdentifier="HomeNavigationController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="7pJ-au-BBN" sceneMemberID="viewController">
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="JqW-o3-79a">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="JqW-o3-79a">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -1786,7 +1786,7 @@
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="100" id="Lxu-88-0ry" customClass="FullDamageModalTableCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="92" width="375" height="100"/>
<rect key="frame" x="0.0" y="92" width="1000" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Lxu-88-0ry" id="Vwr-om-vHl">
<frame key="frameInset" width="375" height="100"/>
......@@ -1912,7 +1912,7 @@
<rect key="frame" x="0.0" y="65" width="375" height="217"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BcJ-QN-cZr" id="2oa-Tb-KB1">
<frame key="frameInset" width="375" height="216"/>
<frame key="frameInset" width="375" height="217"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KRa-O0-3cA">
......@@ -1950,9 +1950,6 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Последний платеж: неизвестно" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xwx-aW-xJH">
<constraints>
<constraint firstAttribute="height" constant="27" id="geA-jT-vZU"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
......@@ -1967,18 +1964,18 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="cp2-Kp-ul5" firstAttribute="top" secondItem="ERY-ZW-orF" secondAttribute="bottom" constant="10" id="0Ub-6U-rDT"/>
<constraint firstItem="Xwx-aW-xJH" firstAttribute="leading" secondItem="DKC-8t-G1M" secondAttribute="leading" constant="16" id="1nE-m2-9d5"/>
<constraint firstAttribute="trailing" secondItem="cp2-Kp-ul5" secondAttribute="trailing" constant="16" id="8Lo-a9-a4a"/>
<constraint firstItem="ERY-ZW-orF" firstAttribute="leading" secondItem="DKC-8t-G1M" secondAttribute="leading" constant="16" id="A62-hV-Pmd"/>
<constraint firstItem="Xwx-aW-xJH" firstAttribute="top" secondItem="DKC-8t-G1M" secondAttribute="top" constant="13" id="FNY-Q6-1qw"/>
<constraint firstAttribute="trailing" secondItem="j4A-Hq-qqB" secondAttribute="trailing" constant="16" id="IXs-tp-dIa"/>
<constraint firstItem="j4A-Hq-qqB" firstAttribute="top" secondItem="DKC-8t-G1M" secondAttribute="top" constant="12" id="U8J-eH-blj"/>
<constraint firstItem="cp2-Kp-ul5" firstAttribute="leading" secondItem="DKC-8t-G1M" secondAttribute="leading" constant="16" id="duZ-Rj-cFB"/>
<constraint firstItem="ERY-ZW-orF" firstAttribute="top" secondItem="Xwx-aW-xJH" secondAttribute="bottom" constant="3" id="eeV-76-A4W"/>
<constraint firstAttribute="bottom" secondItem="cp2-Kp-ul5" secondAttribute="bottom" constant="18" id="gXW-GN-UK9"/>
<constraint firstItem="Xwx-aW-xJH" firstAttribute="leading" secondItem="DKC-8t-G1M" secondAttribute="leading" constant="16" id="gmE-Rk-fJs"/>
<constraint firstItem="Xwx-aW-xJH" firstAttribute="top" secondItem="DKC-8t-G1M" secondAttribute="top" constant="13" id="mVJ-eV-IwP"/>
<constraint firstAttribute="trailing" secondItem="ERY-ZW-orF" secondAttribute="trailing" constant="16" id="nNX-d4-ObI"/>
<constraint firstAttribute="height" constant="141" id="p67-a9-7eg"/>
<constraint firstItem="ERY-ZW-orF" firstAttribute="top" secondItem="Xwx-aW-xJH" secondAttribute="bottom" constant="3" id="pph-JC-xft"/>
<constraint firstAttribute="trailing" secondItem="Xwx-aW-xJH" secondAttribute="trailing" constant="100" id="x7i-9L-I9Z"/>
<constraint firstItem="j4A-Hq-qqB" firstAttribute="leading" secondItem="Xwx-aW-xJH" secondAttribute="trailing" constant="1" id="pEM-IU-UAx"/>
</constraints>
</view>
</subviews>
......@@ -2014,7 +2011,7 @@
<rect key="frame" x="0.0" y="282" width="375" height="359"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ASd-vV-7ps" id="rQ0-MH-iGO">
<frame key="frameInset" width="375" height="358"/>
<frame key="frameInset" width="375" height="359"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Хит продаж" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tHw-4T-nXe">
......@@ -2043,7 +2040,7 @@
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="top" reuseIdentifier="cell" id="52o-7e-ad7" customClass="FeedCollectionViewCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="10" width="300" height="300"/>
<rect key="frame" x="0.0" y="9.5" width="300" height="300"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
......@@ -2137,7 +2134,7 @@
<rect key="frame" x="0.0" y="641" width="375" height="191"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="Xc9-jj-Bd1" id="sZn-nh-awp">
<frame key="frameInset" width="375" height="190"/>
<frame key="frameInset" width="375" height="191"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3YG-o0-ctD">
......@@ -2233,7 +2230,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="pCm-37-On8" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-6071.1999999999998" y="-7763.1184407796109"/>
<point key="canvasLocation" x="-6071.5" y="-7764"/>
</scene>
<!--Казактелеком-->
<scene sceneID="ehZ-11-j95">
......@@ -2291,7 +2288,7 @@
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="uneditableField" rowHeight="100" id="nlE-Nl-vsQ" customClass="RBCreationUneditableFieldTableCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="92" width="375" height="100"/>
<rect key="frame" x="0.0" y="92" width="1000" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nlE-Nl-vsQ" id="gT9-U4-WIA">
<frame key="frameInset" width="342" height="99"/>
......@@ -2324,7 +2321,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fieldCell" rowHeight="100" id="Chb-YR-87M" customClass="RBCreationFieldTableCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="192" width="375" height="100"/>
<rect key="frame" x="0.0" y="192" width="1000" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Chb-YR-87M" id="h7J-gm-bU3">
<frame key="frameInset" width="375" height="99"/>
......@@ -2357,7 +2354,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="buttonCell" rowHeight="100" id="IW2-Os-7eR" customClass="RBCreationButtonTableCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="292" width="375" height="100"/>
<rect key="frame" x="0.0" y="292" width="1000" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="IW2-Os-7eR" id="XaK-1e-1F2">
<frame key="frameInset" width="375" height="99"/>
......@@ -2479,7 +2476,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lkv-ut-or5" id="IV2-pe-FBo">
<frame key="frameInset" width="342" height="99"/>
<frame key="frameInset" width="342" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="ЗАЯВКИ НАЧИНАЯ С ДАТЫ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cw9-bL-EoY">
......@@ -2515,7 +2512,7 @@
<rect key="frame" x="0.0" y="128" width="375" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mgU-8z-mk5" id="7cZ-W8-6Bt">
<frame key="frameInset" width="328" height="89"/>
<frame key="frameInset" width="328" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" ambiguous="YES" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bbS-eM-lUP">
......@@ -2641,7 +2638,7 @@
<rect key="frame" x="0.0" y="28" width="600" height="200"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vmx-Ap-Zh9" id="q1X-yY-KQg">
<frame key="frameInset" width="600" height="199"/>
<frame key="frameInset" width="600" height="200"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7HI-0O-Glg">
......@@ -2846,7 +2843,7 @@
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="130" id="LJW-S3-YEb" customClass="DetalizationCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="375" height="130"/>
<rect key="frame" x="0.0" y="28" width="1000" height="130"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LJW-S3-YEb" id="jCx-Gc-Dvb">
<frame key="frameInset" width="375" height="129"/>
......@@ -3021,7 +3018,7 @@
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="50" id="AP9-BD-JTo" customClass="BillsPositionCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="92" width="375" height="50"/>
<rect key="frame" x="0.0" y="92" width="1000" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AP9-BD-JTo" id="Isd-kD-9HS">
<frame key="frameInset" width="375" height="49"/>
......@@ -3109,7 +3106,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uQQ-J8-UPI" id="d0w-1a-NfH">
<frame key="frameInset" width="375" height="79"/>
<frame key="frameInset" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="R6G-yX-gQ1">
......@@ -3152,7 +3149,7 @@
<rect key="frame" x="0.0" y="108" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lM5-fY-h1s" id="EZR-N0-HGR">
<frame key="frameInset" width="375" height="79"/>
<frame key="frameInset" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Gy-0e-uKm">
......@@ -3408,7 +3405,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Dpj-6y-3dR" id="0Im-f5-utg">
<frame key="frameInset" width="375" height="43"/>
<frame key="frameInset" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H8t-l8-IAE">
......@@ -3506,7 +3503,7 @@
<rect key="frame" x="0.0" y="28" width="359" height="250"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Zoj-Mv-vlU" id="zZi-o0-cLk">
<frame key="frameInset" width="359" height="249"/>
<frame key="frameInset" width="359" height="250"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vbe-am-xpW">
......@@ -3669,7 +3666,7 @@
<rect key="frame" x="0.0" y="278" width="359" height="120"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5nw-DG-5mw" id="KQF-0C-LBJ">
<frame key="frameInset" width="359" height="119"/>
<frame key="frameInset" width="359" height="120"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="duM-2o-GIO">
......@@ -3747,7 +3744,7 @@
<rect key="frame" x="0.0" y="398" width="359" height="80"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="dmh-Hg-JDK" id="OQF-WI-52i">
<frame key="frameInset" width="359" height="79"/>
<frame key="frameInset" width="359" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pqi-tN-QfC">
......@@ -4173,7 +4170,7 @@
<rect key="frame" x="0.0" y="28" width="343" height="120"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="QBg-MG-ZSv" id="k1Z-FH-KYY">
<frame key="frameInset" width="343" height="119"/>
<frame key="frameInset" width="343" height="120"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Gsf-cj-W08">
......@@ -4228,7 +4225,7 @@
<rect key="frame" x="0.0" y="148" width="343" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Y26-HA-gXR" id="0Nu-EG-OVX">
<frame key="frameInset" width="343" height="149"/>
<frame key="frameInset" width="343" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qQr-2d-DLG">
......@@ -4343,7 +4340,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="88"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Dl5-ti-jpt" id="Bfy-f6-tct">
<frame key="frameInset" width="375" height="87"/>
<frame key="frameInset" width="375" height="88"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H0p-eC-Sik">
......@@ -4408,7 +4405,7 @@
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="titleCell" rowHeight="120" id="UyJ-qu-aZy" customClass="OfferFormTitleCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="92" width="375" height="120"/>
<rect key="frame" x="0.0" y="92" width="1000" height="120"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UyJ-qu-aZy" id="4H1-Nt-jPT">
<frame key="frameInset" width="375" height="120"/>
......@@ -4443,7 +4440,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fieldCell" rowHeight="100" id="CzU-vC-LOg" customClass="OfferFormFieldCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="212" width="375" height="100"/>
<rect key="frame" x="0.0" y="212" width="1000" height="100"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="CzU-vC-LOg" id="gv6-tM-INc">
<frame key="frameInset" width="375" height="100"/>
......@@ -4480,7 +4477,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="linkCell" rowHeight="200" id="H5i-KC-G5k" customClass="OfferFormLinkCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="312" width="375" height="200"/>
<rect key="frame" x="0.0" y="312" width="1000" height="200"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="H5i-KC-G5k" id="4Ep-Kf-tPL">
<frame key="frameInset" width="375" height="200"/>
......@@ -4562,7 +4559,7 @@
<scene sceneID="oSb-7D-BYP">
<objects>
<navigationController id="Cz9-Vc-gMK" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="RJG-1E-GIf">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="RJG-1E-GIf">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -4596,7 +4593,7 @@
<rect key="frame" x="0.0" y="92" width="561" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="C3b-7f-Eis" id="1Ya-7Y-Yhe">
<frame key="frameInset" width="561" height="59"/>
<frame key="frameInset" width="561" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UPt-cT-j6J">
......@@ -4875,7 +4872,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="titleValueCellIdentifier" rowHeight="86" id="OPV-kp-TRp" customClass="UITitleValueTableViewCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="375" height="86"/>
<rect key="frame" x="0.0" y="28" width="1000" height="86"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OPV-kp-TRp" id="lZf-5Q-tHg">
<frame key="frameInset" width="342" height="85"/>
......@@ -4970,7 +4967,7 @@
<rect key="frame" x="0.0" y="28" width="600" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LRy-H4-FPr" id="cfQ-IR-xSw">
<frame key="frameInset" width="600" height="149"/>
<frame key="frameInset" width="600" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Label" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RR7-9R-Oij">
......@@ -5042,7 +5039,7 @@
<scene sceneID="VpD-vh-teM">
<objects>
<navigationController id="8tj-Bo-KIz" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="1gB-Km-j1C">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="1gB-Km-j1C">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -5076,7 +5073,7 @@
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" rowHeight="60" id="wCL-Bo-ud3" customClass="TariffPlanChangeHistoryCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="375" height="60"/>
<rect key="frame" x="0.0" y="28" width="1000" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wCL-Bo-ud3" id="V3w-Bg-wQ1">
<frame key="frameInset" width="375" height="59"/>
......@@ -5135,7 +5132,7 @@
<scene sceneID="r4S-OM-LYE">
<objects>
<navigationController id="zsy-Sm-Zcm" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="vL3-3u-NtJ">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="vL3-3u-NtJ">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -5251,7 +5248,7 @@
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" rowHeight="280" id="Rb4-5J-Gyf" customClass="SubscribeHistoryCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="375" height="280"/>
<rect key="frame" x="0.0" y="28" width="1000" height="280"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Rb4-5J-Gyf" id="ZeQ-bB-7Os">
<frame key="frameInset" width="375" height="279"/>
......@@ -5453,7 +5450,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="280"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ThT-7B-kzN" id="pok-ft-BvC">
<frame key="frameInset" width="375" height="279"/>
<frame key="frameInset" width="375" height="280"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oG5-sD-tfJ">
......@@ -5733,7 +5730,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="llT-GK-2t1" id="u5C-DY-lHG">
<frame key="frameInset" width="375" height="54"/>
<frame key="frameInset" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="GFE-wX-oVv">
......@@ -5786,7 +5783,7 @@
<scene sceneID="QTc-tV-iAP">
<objects>
<navigationController id="ITt-FY-3dB" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="NVL-nH-5P9">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="NVL-nH-5P9">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -5948,7 +5945,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zt9-cG-Yl5" id="DrX-x9-F77">
<frame key="frameInset" width="375" height="49"/>
<frame key="frameInset" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="iD TV — Гибкое телевидение для тех, кто не любит себя ограничивать!" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="218-f5-tfr">
......@@ -5972,7 +5969,7 @@
<rect key="frame" x="0.0" y="78" width="375" height="220"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vs5-Ob-TlT" id="9ey-Nw-64d">
<frame key="frameInset" width="375" height="219"/>
<frame key="frameInset" width="375" height="220"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView opaque="NO" userInteractionEnabled="NO" contentMode="scaleAspectFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BwK-LW-CFm">
......@@ -5997,7 +5994,7 @@
<rect key="frame" x="0.0" y="298" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FRY-cY-ADr" id="1KT-MC-Bpm">
<frame key="frameInset" width="375" height="49"/>
<frame key="frameInset" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Тарифы" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MVS-Kx-4bd">
......@@ -6021,7 +6018,7 @@
<rect key="frame" x="0.0" y="348" width="375" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7wd-hi-8fO" id="oU0-Z4-eSi">
<frame key="frameInset" width="375" height="299"/>
<frame key="frameInset" width="375" height="300"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
......@@ -6029,7 +6026,7 @@
<rect key="frame" x="0.0" y="648" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9FQ-n3-0sl" id="PfR-Ku-Vrv">
<frame key="frameInset" width="342" height="49"/>
<frame key="frameInset" width="342" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X7F-0L-o2F">
......@@ -6097,7 +6094,7 @@
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="serviceItemImageCell" rowHeight="280" id="sme-g8-b76" customClass="ServiceItemImageCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="22" width="600" height="280"/>
<rect key="frame" x="0.0" y="22" width="1000" height="280"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sme-g8-b76" id="mkR-0y-Fxz">
<frame key="frameInset" width="600" height="279"/>
......@@ -6130,7 +6127,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="serviceItemWebviewCell" rowHeight="300" id="yAb-Q7-Kgf" customClass="ServiceItemWebviewCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="302" width="600" height="300"/>
<rect key="frame" x="0.0" y="302" width="1000" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yAb-Q7-Kgf" id="TyR-W9-p8U">
<frame key="frameInset" width="600" height="299"/>
......@@ -6157,7 +6154,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="titleServiceItemCell" rowHeight="50" id="BZ8-y6-3dG" customClass="TitleServiceItemCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="602" width="600" height="50"/>
<rect key="frame" x="0.0" y="602" width="1000" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BZ8-y6-3dG" id="qDf-NC-bQj">
<frame key="frameInset" width="600" height="49"/>
......@@ -6181,7 +6178,7 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="tariffCell" rowHeight="50" id="Pl5-ab-ksy" customClass="TariffCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="652" width="600" height="50"/>
<rect key="frame" x="0.0" y="652" width="1000" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pl5-ab-ksy" id="wpC-l4-c5Q">
<frame key="frameInset" width="567" height="49"/>
......@@ -6238,7 +6235,7 @@
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="tariffNameCell" id="fIz-i4-b67" customClass="TariffNameCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="22" width="375" height="44"/>
<rect key="frame" x="0.0" y="22" width="1000" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fIz-i4-b67" id="aiT-xZ-hx2">
<frame key="frameInset" width="375" height="44"/>
......@@ -6262,7 +6259,7 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="tariffDetailCell" rowHeight="166" id="Ho1-34-J2a" customClass="TariffDetailCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="66" width="375" height="166"/>
<rect key="frame" x="0.0" y="66" width="1000" height="166"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ho1-34-J2a" id="waO-jG-hbc">
<frame key="frameInset" width="375" height="166"/>
......@@ -6463,11 +6460,11 @@
<rect key="frame" x="0.0" y="56" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uew-Fr-Rr7" id="O5X-gF-b9W">
<frame key="frameInset" width="375" height="43"/>
<frame key="frameInset" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7xj-02-2Dw">
<frame key="frameInset" minX="15" width="345" height="43"/>
<frame key="frameInset" minX="15" width="345" height="43.5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -6503,7 +6500,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="settingCell" textLabel="7fb-gt-KO6" style="IBUITableViewCellStyleDefault" id="6jH-Cy-sfi">
<rect key="frame" x="0.0" y="92" width="375" height="44"/>
<rect key="frame" x="0.0" y="92" width="1000" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6jH-Cy-sfi" id="x81-dt-Ins">
<frame key="frameInset" width="375" height="43"/>
......@@ -6548,7 +6545,7 @@
<scene sceneID="OJC-o4-vfH">
<objects>
<navigationController storyboardIdentifier="ServicesPaymentNavigationController" id="dOW-6S-UaD" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="r3O-QT-BPT">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="r3O-QT-BPT">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<textAttributes key="titleTextAttributes">
......@@ -6598,7 +6595,7 @@
<rect key="frame" x="0.0" y="28" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RFo-Gl-pY8" id="ySy-UG-sdV">
<frame key="frameInset" width="567" height="43"/>
<frame key="frameInset" width="567" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bRq-oO-kGg">
......@@ -6672,7 +6669,7 @@
<scene sceneID="x7M-Dk-IQa">
<objects>
<navigationController storyboardIdentifier="BlankNavigationController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="1va-3W-hPP" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="mvW-q3-DT7">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="mvW-q3-DT7">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -6707,7 +6704,7 @@
<scene sceneID="6wK-KY-uhM">
<objects>
<navigationController storyboardIdentifier="IDPhoneNavigationController" id="i1Q-6v-bue" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="iqe-bK-qOg">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="iqe-bK-qOg">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -6757,7 +6754,7 @@
<scene sceneID="u9P-40-sbu">
<objects>
<navigationController storyboardIdentifier="WiFiNavigationController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="eov-Ka-DxD" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="PnM-xo-Dsz">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="PnM-xo-Dsz">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -7607,7 +7604,7 @@
<scene sceneID="6dm-G9-aGr">
<objects>
<navigationController storyboardIdentifier="PssNavigationController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="gMl-Ve-FfL" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="fpt-li-IeZ">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="fpt-li-IeZ">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -8200,7 +8197,7 @@
<scene sceneID="V5y-W7-0fu">
<objects>
<navigationController id="bPI-vl-1PM" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="c8x-0H-F14">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="c8x-0H-F14">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -8229,7 +8226,7 @@
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="titleCell" rowHeight="120" id="lB3-M5-2vQ" customClass="OfferCallbackTitleCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="92" width="375" height="120"/>
<rect key="frame" x="0.0" y="92" width="1000" height="120"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lB3-M5-2vQ" id="bBI-LY-VyA">
<frame key="frameInset" width="375" height="120"/>
......@@ -8270,7 +8267,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="gray" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="fieldCell" rowHeight="80" id="zL1-xa-P9U" customClass="OfferCallbackFieldCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="212" width="375" height="80"/>
<rect key="frame" x="0.0" y="212" width="1000" height="80"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zL1-xa-P9U" id="Rjo-5C-gNe">
<frame key="frameInset" width="342" height="80"/>
......@@ -8307,7 +8304,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="linkCell" rowHeight="80" id="nT6-3d-C97" customClass="OfferCallbackLinkCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="292" width="375" height="80"/>
<rect key="frame" x="0.0" y="292" width="1000" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nT6-3d-C97" id="iSI-YG-PTF">
<frame key="frameInset" width="375" height="80"/>
......@@ -8394,7 +8391,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5B6-eK-flM" id="yJk-qe-Kmj">
<frame key="frameInset" width="375" height="59"/>
<frame key="frameInset" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="So8-9t-0MR">
......@@ -9030,7 +9027,7 @@
<scene sceneID="Gnw-8k-SoG">
<objects>
<navigationController id="Enr-dO-guA" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="pXe-Bg-Yia">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="pXe-Bg-Yia">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -9046,7 +9043,7 @@
<scene sceneID="s1b-Jn-sYg">
<objects>
<navigationController id="K6z-EZ-Ihx" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="64V-cw-HI9">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="64V-cw-HI9">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -9210,7 +9207,7 @@
<scene sceneID="qrD-F2-QPd">
<objects>
<navigationController id="0AO-v7-sLv" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="gJG-Cu-DTs">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="gJG-Cu-DTs">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -9243,7 +9240,7 @@
<rect key="frame" x="0.0" y="92" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="P1m-QL-zI0" id="SRv-UP-BuJ">
<frame key="frameInset" width="600" height="59"/>
<frame key="frameInset" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xji-cJ-5wS">
......@@ -9307,7 +9304,7 @@
<rect key="frame" x="0.0" y="92" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yNp-lb-Hs5" id="zHX-IS-W9f">
<frame key="frameInset" width="600" height="59"/>
<frame key="frameInset" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hFm-cX-B99">
......@@ -9371,7 +9368,7 @@
<rect key="frame" x="0.0" y="92" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2XE-UQ-ssK" id="Vja-gC-n47">
<frame key="frameInset" width="600" height="59"/>
<frame key="frameInset" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q3b-6m-kNL">
......@@ -9560,7 +9557,7 @@
<rect key="frame" x="0.0" y="28" width="414" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="I3L-fo-wiq" id="nqP-bD-zze">
<frame key="frameInset" width="414" height="49"/>
<frame key="frameInset" width="414" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="iD TV — Гибкое телевидение для тех, кто не любит себя ограничивать!" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P43-2z-q46">
......@@ -9584,7 +9581,7 @@
<rect key="frame" x="0.0" y="78" width="414" height="220"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="hgB-UO-dTb" id="fDS-Jh-C4K">
<frame key="frameInset" width="414" height="219"/>
<frame key="frameInset" width="414" height="220"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView opaque="NO" userInteractionEnabled="NO" contentMode="scaleAspectFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Me-Gr-PsO">
......@@ -9609,7 +9606,7 @@
<rect key="frame" x="0.0" y="298" width="414" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qMR-Sz-bKt" id="xds-Ec-KOg">
<frame key="frameInset" width="414" height="49"/>
<frame key="frameInset" width="414" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Тарифы" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SGH-Ci-igu">
......@@ -9633,7 +9630,7 @@
<rect key="frame" x="0.0" y="348" width="414" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fLM-2t-NeZ" id="NAb-k8-kqd">
<frame key="frameInset" width="414" height="299"/>
<frame key="frameInset" width="414" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<webView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" allowsInlineMediaPlayback="NO" mediaPlaybackRequiresUserAction="NO" mediaPlaybackAllowsAirPlay="NO" keyboardDisplayRequiresUserAction="NO" translatesAutoresizingMaskIntoConstraints="NO" id="snr-GA-iQi">
......@@ -9661,7 +9658,7 @@
<rect key="frame" x="0.0" y="648" width="414" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="etf-If-U77" id="1fa-q0-1X7">
<frame key="frameInset" width="381" height="49"/>
<frame key="frameInset" width="381" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7OQ-OS-2TQ">
......@@ -9776,7 +9773,7 @@
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zrW-88-8bC" userLabel="contentView">
<rect key="frame" x="0.0" y="0.0" width="600" height="735"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" ambiguous="YES" misplaced="YES" text="Запрос секретного кода" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jnv-vZ-3HX" userLabel="step">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" ambiguous="YES" text="Запрос секретного кода" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jnv-vZ-3HX" userLabel="step">
<frame key="frameInset" minX="15" minY="30" width="570" height="20.666666666666664"/>
<fontDescription key="fontDescription" name="PTSans-Bold" family="PT Sans" pointSize="17"/>
<color key="textColor" red="0.39157533649999998" green="0.41445443030000001" blue="0.43459904189999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -10010,7 +10007,7 @@
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="oAs-yV-YHd" sceneMemberID="viewController">
<tabBarItem key="tabBarItem" title="Главная" image="ic_home_black_24dp" id="bSo-2q-Xq7"/>
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="2Wo-7d-MjO">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="2Wo-7d-MjO">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -10029,7 +10026,7 @@
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="3I7-1n-fhU" sceneMemberID="viewController">
<tabBarItem key="tabBarItem" title="Мои счета" image="ic_credit_card_black_24dp" id="siB-k9-A96"/>
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="cfJ-7V-hJx">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="cfJ-7V-hJx">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -10048,7 +10045,7 @@
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="qvl-gt-70h" sceneMemberID="viewController">
<tabBarItem key="tabBarItem" title="Мои услуги" image="ic_business_center_black_24dp" id="lE0-Ck-MqD"/>
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="953-pC-hI3">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="953-pC-hI3">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -10065,7 +10062,7 @@
<scene sceneID="3Yx-RP-mjI">
<objects>
<navigationController storyboardIdentifier="ServiceMainViewController" id="3lc-Ts-J3w" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="pI0-UP-EUI">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="pI0-UP-EUI">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -10096,7 +10093,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="54"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="CRL-NB-uv2" id="url-DA-apA">
<frame key="frameInset" width="342" height="53"/>
<frame key="frameInset" width="342" height="54"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Pz-e1-Exk">
......@@ -10141,7 +10138,7 @@
<objects>
<navigationController storyboardIdentifier="ClaimPageMenuViewController" automaticallyAdjustsScrollViewInsets="NO" id="UIN-06-h9t" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="Mdb-ew-6D4">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="Mdb-ew-6D4">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -10159,7 +10156,7 @@
<objects>
<navigationController storyboardIdentifier="OfferFormViewController" automaticallyAdjustsScrollViewInsets="NO" id="bre-ds-pa1" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="A61-qk-4Pg">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="A61-qk-4Pg">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -10177,7 +10174,7 @@
<objects>
<navigationController storyboardIdentifier="SoftwareRentViewController" automaticallyAdjustsScrollViewInsets="NO" id="YP4-7x-hZG" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="BPx-Id-tfa">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="BPx-Id-tfa">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -10206,7 +10203,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" rowHeight="80" id="rJb-XU-r8u" customClass="MainKnowedgeTableViewCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="375" height="80"/>
<rect key="frame" x="0.0" y="28" width="1000" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rJb-XU-r8u" id="2La-8x-EIZ">
<frame key="frameInset" width="375" height="79"/>
......@@ -10275,7 +10272,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3Jp-vB-Uxs" id="8qf-ck-wI5">
<frame key="frameInset" width="375" height="99"/>
<frame key="frameInset" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e7b-uq-fJH">
......@@ -10334,7 +10331,7 @@
<objects>
<navigationController storyboardIdentifier="MainHelpViewController" automaticallyAdjustsScrollViewInsets="NO" id="sK8-NS-DjB" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="z78-Ko-sSM">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="z78-Ko-sSM">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -10353,7 +10350,7 @@
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="8nU-JG-qQS" sceneMemberID="viewController">
<tabBarItem key="tabBarItem" title="Профиль" image="ic_credit_card_black_24dp" id="FNJ-jk-XD3"/>
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="nRi-wF-U8e">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="nRi-wF-U8e">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -10371,7 +10368,7 @@
<objects>
<navigationController storyboardIdentifier="BillPositionsModalViewController" automaticallyAdjustsScrollViewInsets="NO" id="xfl-99-OJ9" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="5JY-nF-qJ7">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="5JY-nF-qJ7">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
......@@ -10389,7 +10386,7 @@
<objects>
<navigationController storyboardIdentifier="SettingsViewController" automaticallyAdjustsScrollViewInsets="NO" id="KUo-ks-agG" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="m7o-UL-JDv">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="m7o-UL-JDv">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
kt/Resources/en.lproj/Localization.strings
......@@ -609,3 +609,6 @@
"online_payment.label.incorrect_email" = "Incorrect email";
"online_payment.label.incorrect_guid_or_phone" = "Incorrect guid or phone number";
"online_payment.label.incorrect_payment_summ" = "Incorrect payment summ";
"callback_request" = "Заявка на обратный звонок";
"payment_last_format" = "Последний платеж: ";
kt/Resources/kk.lproj/Localization.strings
......@@ -608,3 +608,6 @@
"online_payment.label.incorrect_email" = "Қате email";
"online_payment.label.incorrect_guid_or_phone" = "Қате жеке шот немесе телефон нөмірі";
"online_payment.label.incorrect_payment_summ" = "Қате төлеу нөмірі";
"callback_request" = "Заявка на обратный звонок";
"payment_last_format" = "Последний платеж: ";
kt/Resources/ru.lproj/Localization.strings
......@@ -451,11 +451,11 @@
"login.passsword_restoration.account" = "По номеру лицевого счета";
"login.passsword_restoration.phone_number" = "По номеру телефона";
"login.alert.email.title" = "По адресу электронной почты";
"login.alert.email.message" = "Введите адрес электронной почты, указанный при регистрации и мы отправим вам данные для пароля";
"login.alert.email.message" = "Введите адрес электронной почты, указанный при регистрации и мы отправим вам данные для восстановления пароля";
"login.alert.account.title" = "По номеру счета";
"login.alert.account.message" = "Введите ваш номер счета и мы отправим вам данные для пароля";
"login.alert.phone_number.title" = "По номеру телефона";
"login.alert.phone_number.message" = "Введите ваш номер телефона и мы отправим вам данные для пароля";
"login.alert.phone_number.message" = "Введите ваш абонентский номер телефона и мы отправим вам данные для восстановления пароля";
"login.alert.send" = "Отправить";
"login.action_sheet.title" = "Выберите способ восстановления доступа";
"login.label.incorrect_data" = "Вы ввели неверные данные";
......@@ -463,7 +463,7 @@
"login.error.incorrect_login_or_password" = "Неверный логин или пароль";
"login.text_field.your_email.placeholder" = "Ваш e-mail";
"login.text_field.your_guid_number.placeholder" = "Номер вашего лицевого счета";
"login.text_field.your_phone_number.placeholder" = "Ваш абонентский номер (без +7)";
"login.text_field.your_phone_number.placeholder" = "без +7";
// Registration
......@@ -611,3 +611,6 @@
"online_payment.label.incorrect_email" = "Некорректный email";
"online_payment.label.incorrect_guid_or_phone" = "Некорректный лицевой счет или номер телефона";
"online_payment.label.incorrect_payment_summ" = "Некорректная сумма оплаты";
"callback_request" = "Заявка на обратный звонок";
"payment_last_format" = "Последний платеж: ";
kt/ViewControllers/Cabinet/FeedViewController.swift
......@@ -31,6 +31,15 @@ class FeedViewController: ViewControllerWithMenu {
func refreshBalance() {
SpinneredAlert.show(self)
AbonentInfoManager.sharedInstance.updateUserInfo()
// Facade.sharedInstance().getPaymentList({ (payments) in
// print(payments)
//
// }, onError: { (error) in
// AlertViewUtil.showIncorrectAlert(error)
// }, onFinish: { () in
// })
}
override func viewWillAppear(animated: Bool) {
......
kt/ViewControllers/Cabinet/MainHelpViewController.swift
......@@ -47,7 +47,9 @@ class MainHelpViewController: ViewControllerWithMenu {
func callbackAction(sender:UITapGestureRecognizer) {
let vc = self.storyboard!.instantiateViewControllerWithIdentifier("CallbackViewController") as! CallbackViewController
vc.service_id = 0
vc.type = 0
vc.type = 1 // COLD
vc.formType = 7 // mobile app
vc.user_comment = LocalizedString("callback_request", description: "Заявка на обратный звонок")
self.navigationController?.pushViewController(vc, animated: true)
}
......
kt/ViewControllers/Service/CallbackViewController.swift
......@@ -10,7 +10,7 @@ import UIKit
class CallbackViewController: KeyboardedViewController, UIPickerViewDataSource, UIPickerViewDelegate {
var type: Int?
var type: Int? // 1 - COLD, 2 - HOT
var region: String?
var phone: String?
var name: String?
......@@ -18,6 +18,7 @@ class CallbackViewController: KeyboardedViewController, UIPickerViewDataSource,
var user_comment: String?
var service_id: Int?
var guid : String?
var formType: Int? // 7 - mobile app
weak var activeField: UITextField?
......@@ -158,7 +159,10 @@ class CallbackViewController: KeyboardedViewController, UIPickerViewDataSource,
}
@IBAction func sendButtonPressed(sender: AnyObject) {
let request = ServiceCallbackRequest(cityId: self.serverItem.id, serviceId: service_id, fullName: filoField.text, phone: phoneField.text, email: emailField.text, type: type)
let request = ServiceCallbackRequest(cityId: self.serverItem.id, serviceId: service_id, fullName: filoField.text, phone: phoneField.text,
email: emailField.text, type: type, formType: formType, userComment: user_comment)
print(request.params)
//return;
guard request.validateFields() else {
AlertViewUtil.showAlert(request.validationMessage);
return }
......
kt/ViewControllers/Service/ServiceItemScrollViewController.swift
......@@ -42,14 +42,14 @@ class ServiceItemScrollViewController: UIViewController, UITableViewDataSource,
@IBAction func connectButton(sender: AnyObject) {
let vc = self.storyboard!.instantiateViewControllerWithIdentifier("CallbackViewController") as! CallbackViewController
vc.service_id = serviceItem?.id
vc.type = 1 // заказ услуги
vc.type = 2 // HOT - заказ услуги
self.navigationController?.pushViewController(vc, animated: true)
}
@IBAction func callBackButton(sender: AnyObject) {
let vc = self.storyboard!.instantiateViewControllerWithIdentifier("CallbackViewController") as! CallbackViewController
vc.service_id = serviceItem?.id
vc.type = 0 // обратный звонок
vc.type = 1 // COLD - обратный звонок
self.navigationController?.pushViewController(vc, animated: true)
}
......@@ -163,7 +163,7 @@ class ServiceItemScrollViewController: UIViewController, UITableViewDataSource,
super.viewDidLoad()
print(self.serviceItemForLoading)
//if (serviceItem != nil) {
//}
......
kt/ViewControllers/Service/ServiceListController.swift
......@@ -84,6 +84,8 @@ class ServiceListController: UIViewController, UITableViewDataSource, UITableVie
}
updateServicesList()
self.servicesTableView.reloadData()
} else {
self.navigationController?.popViewControllerAnimated(true)
}
}
......
kt/ViewControllers/Service/ServiceTariffController.swift
......@@ -86,7 +86,10 @@ class ServiceTariffController: UIViewController, UITableViewDataSource, UITableV
func connectButton_TouchUpInside(sender: AnyObject) {
let vc = self.storyboard!.instantiateViewControllerWithIdentifier("CallbackViewController") as! CallbackViewController
vc.service_id = serviceItem?.id
vc.type = 1
vc.type = 2 // HOT
print(serviceItem?.name)
print(rate?.name)
vc.user_comment = rate?.name// serviceItem?.name
self.navigationController?.pushViewController(vc, animated: true)
}
......
kt/Views/FeedPaymentCell.swift
......@@ -17,6 +17,16 @@ class FeedPaymentCell: UITableViewCell {
var navController : UINavigationController?
var payments: [[AnyObject]] = []
var currentPaymentIndex: Int? {
didSet {
if let currentPaymentIndex = currentPaymentIndex {
let firstPayment = (payments[currentPaymentIndex][1] as! [Payment]).first!
lastPay.text = LocalizedString("payment_last_format", description: "Последний платеж: ") + firstPayment.yyyyMMdd()!
}
}
}
override func awakeFromNib() {
super.awakeFromNib()
......@@ -33,6 +43,17 @@ class FeedPaymentCell: UITableViewCell {
func imageTapped(tapGestureRecognizer: UITapGestureRecognizer) {
SpinneredAlert.show(self.navController!)
AbonentInfoManager.sharedInstance.updateUserInfo()
requestLastPayment()
}
func requestLastPayment() {
Facade.sharedInstance().getPaymentList({ (payments) in
self.payments = payments
self.currentPaymentIndex = payments.count > 0 ? payments.count - 1 : nil
}, onError: { (error) in
AlertViewUtil.showIncorrectAlert(error)
}, onFinish: { () in
})
}
func updateLabels() {
......@@ -40,6 +61,7 @@ class FeedPaymentCell: UITableViewCell {
let currency = "\(abonentInfo.balance ?? 0)".stringByReplacingOccurrencesOfString(".", withString: ",")
balance.text = "\(currency) тг."
}
requestLastPayment()
}
func showError(notification: NSNotification) {
......
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