open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
0bc85690 1 parent 0558b476

UnifiedCouponBarcodeVC coupons fixes, Markets Map

Inline Side-by-side
Showing 7 changed files with 129 additions and 23 deletions
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>1</integer> 10 + <integer>0</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -16,7 +16,10 @@ import UIKit ...@@ -16,7 +16,10 @@ import UIKit
16 @IBOutlet weak var dicountLabel: UILabel! 16 @IBOutlet weak var dicountLabel: UILabel!
17 @IBOutlet weak var discriptionLabel: UILabel! 17 @IBOutlet weak var discriptionLabel: UILabel!
18 @IBOutlet weak var expirationLabel: UILabel! 18 @IBOutlet weak var expirationLabel: UILabel!
19 - 19 + @IBOutlet weak var expirationRedView: UIView!
20 + @IBOutlet weak var expirationRedImage: UIImageView!
21 + @IBOutlet weak var expirationRedLabel: UILabel!
22 +
20 var postImageURL: String? { 23 var postImageURL: String? {
21 didSet { 24 didSet {
22 if let url = postImageURL { 25 if let url = postImageURL {
...@@ -96,6 +99,77 @@ import UIKit ...@@ -96,6 +99,77 @@ import UIKit
96 // COUPONSET: desc, img_preview, name, terms, merchant_uuid 99 // COUPONSET: desc, img_preview, name, terms, merchant_uuid
97 // COUPON: coupon, expiration, discount, status 100 // COUPON: coupon, expiration, discount, status
98 // MERCHANT: _img_preview,_admin_name 101 // MERCHANT: _img_preview,_admin_name
102 +
103 + if (coupon.status == 1) {
104 + // Add shadow
105 + self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor
106 + self.layer.shadowOffset = CGSize(width: 0.0, height: 0.0)
107 + self.layer.shadowOpacity = 1.0
108 + self.layer.shadowRadius = 6.0
109 +
110 + couponBgImage.image = UIImage(named: "coupon_bg", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
111 +
112 + expirationLabel.isHidden = false
113 + expirationRedView.isHidden = true
114 + expirationLabel.text = "Ισχύει έως "+(coupon.expiration ?? "")
115 +
116 + let formatter = DateFormatter()
117 + formatter.dateFormat = "dd/MM/yyyy"
118 + let today = Date()
119 +// let firstDate = formatter.date(from: "01/08/2017")
120 +// let secondDate = formatter.date(from: "22/04/2023")
121 + if let couponExpiration = coupon.expiration, let secondDate = formatter.date(from: couponExpiration) {
122 +
123 + let calendar = NSCalendar.current
124 + let date1 = calendar.startOfDay(for: today)
125 + let date2 = calendar.startOfDay(for: secondDate)
126 +
127 + let differenceComponents = calendar.dateComponents([.day], from: date1, to: date2)
128 +
129 + if let daysDifference = differenceComponents.day {
130 + if ((daysDifference >= 0) && (daysDifference <= 15)) {
131 +
132 + expirationLabel.isHidden = true
133 + expirationRedView.isHidden = false
134 + expirationRedView.layer.cornerRadius = 10.0
135 + expirationRedView.backgroundColor = UIColor(red: 0.94, green: 0.90, blue: 0.90, alpha: 1.00)
136 +
137 + expirationRedImage.image = UIImage(named: "ic_time_forward", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
138 +
139 + let normalText1 = "Ισχύει έως "
140 + let redText = (coupon.expiration ?? "")
141 +
142 + let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Medium", size: 12) ?? UIFont.systemFont(ofSize: 11), NSAttributedString.Key.foregroundColor: UIColor(red: 0.38, green: 0.44, blue: 0.51, alpha: 1.00)]
143 + let attrRed = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Medium", size: 12) ?? UIFont.systemFont(ofSize: 11), NSAttributedString.Key.foregroundColor: UIColor(red: 1.00, green: 0.42, blue: 0.42, alpha: 1.00)]
144 +
145 + let attributedString = NSMutableAttributedString(string:normalText1, attributes:attrRegular)
146 + let RedString = NSMutableAttributedString(string: redText, attributes:attrRed)
147 +
148 + attributedString.append(RedString)
149 + expirationRedLabel.attributedText = attributedString
150 +
151 + } else {
152 + expirationLabel.isHidden = false
153 + expirationRedView.isHidden = true
154 + expirationLabel.text = "Ισχύει έως "+(coupon.expiration ?? "")
155 + }
156 + }
157 + }
158 +
159 + } else if (coupon.status == 0) {
160 + couponBgImage.image = UIImage(named: "coupon_bg_grey", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
161 +
162 + expirationLabel.isHidden = false
163 + expirationRedView.isHidden = true
164 + expirationLabel.text = "Το κουπόνι έληξε"
165 +
166 + couponImage.layer.opacity = 0.23
167 + borderView.layer.opacity = 0.15
168 + nameLabel.layer.opacity = 0.15
169 + dicountLabel.layer.opacity = 0.15
170 + discriptionLabel.layer.opacity = 0.15
171 +
172 + }
99 173
100 let merchantList:Array<swiftApi.MerchantModel> = swiftApi().getMerchantList() 174 let merchantList:Array<swiftApi.MerchantModel> = swiftApi().getMerchantList()
101 175
...@@ -120,7 +194,6 @@ import UIKit ...@@ -120,7 +194,6 @@ import UIKit
120 let htmlText = coupon.inner_text ?? "" 194 let htmlText = coupon.inner_text ?? ""
121 discriptionLabel.text = htmlText.htmlToString 195 discriptionLabel.text = htmlText.htmlToString
122 // discriptionLabel.text = coupon.inner_text ?? "" 196 // discriptionLabel.text = coupon.inner_text ?? ""
123 - expirationLabel.text = "Ισχύει έως "+(coupon.expiration ?? "")
124 197
125 } 198 }
126 199
......
...@@ -2611,24 +2611,24 @@ ...@@ -2611,24 +2611,24 @@
2611 </connections> 2611 </connections>
2612 </tableViewCell> 2612 </tableViewCell>
2613 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CouponsTableViewCellId" id="TAK-Ug-AzU" customClass="CouponsTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target"> 2613 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CouponsTableViewCellId" id="TAK-Ug-AzU" customClass="CouponsTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target">
2614 - <rect key="frame" x="0.0" y="897.5" width="414" height="110"/> 2614 + <rect key="frame" x="0.0" y="897.5" width="414" height="118"/>
2615 <autoresizingMask key="autoresizingMask"/> 2615 <autoresizingMask key="autoresizingMask"/>
2616 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="TAK-Ug-AzU" id="LFe-Vj-kjJ"> 2616 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="TAK-Ug-AzU" id="LFe-Vj-kjJ">
2617 - <rect key="frame" x="0.0" y="0.0" width="414" height="110"/> 2617 + <rect key="frame" x="0.0" y="0.0" width="414" height="118"/>
2618 <autoresizingMask key="autoresizingMask"/> 2618 <autoresizingMask key="autoresizingMask"/>
2619 <subviews> 2619 <subviews>
2620 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="35i-Iq-TId"> 2620 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="35i-Iq-TId">
2621 - <rect key="frame" x="10" y="5" width="394" height="105"/> 2621 + <rect key="frame" x="10" y="5" width="394" height="113"/>
2622 <subviews> 2622 <subviews>
2623 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="58G-jP-FMr"> 2623 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="58G-jP-FMr">
2624 - <rect key="frame" x="0.0" y="0.0" width="394" height="105"/> 2624 + <rect key="frame" x="0.0" y="0.0" width="394" height="113"/>
2625 </imageView> 2625 </imageView>
2626 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jcR-bh-Fhz"> 2626 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jcR-bh-Fhz">
2627 - <rect key="frame" x="20" y="10" width="79" height="85"/> 2627 + <rect key="frame" x="20" y="10" width="79" height="93"/>
2628 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 2628 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
2629 </imageView> 2629 </imageView>
2630 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZDK-3b-8MQ"> 2630 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZDK-3b-8MQ">
2631 - <rect key="frame" x="104" y="5" width="10" height="95"/> 2631 + <rect key="frame" x="104" y="5" width="10" height="103"/>
2632 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 2632 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
2633 <constraints> 2633 <constraints>
2634 <constraint firstAttribute="width" constant="10" id="sq7-pL-kd5"/> 2634 <constraint firstAttribute="width" constant="10" id="sq7-pL-kd5"/>
...@@ -2641,7 +2641,7 @@ ...@@ -2641,7 +2641,7 @@
2641 <nil key="highlightedColor"/> 2641 <nil key="highlightedColor"/>
2642 </label> 2642 </label>
2643 <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="NmF-B8-BxN"> 2643 <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="NmF-B8-BxN">
2644 - <rect key="frame" x="119" y="37" width="255" height="31"/> 2644 + <rect key="frame" x="119" y="41" width="255" height="31"/>
2645 <subviews> 2645 <subviews>
2646 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9CO-TF-h6H"> 2646 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9CO-TF-h6H">
2647 <rect key="frame" x="0.0" y="0.0" width="127.5" height="31"/> 2647 <rect key="frame" x="0.0" y="0.0" width="127.5" height="31"/>
...@@ -2662,11 +2662,38 @@ ...@@ -2662,11 +2662,38 @@
2662 </constraints> 2662 </constraints>
2663 </stackView> 2663 </stackView>
2664 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u51-sv-YiH"> 2664 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u51-sv-YiH">
2665 - <rect key="frame" x="119" y="78" width="255" height="12"/> 2665 + <rect key="frame" x="119" y="86" width="255" height="12"/>
2666 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/> 2666 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/>
2667 <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/> 2667 <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/>
2668 <nil key="highlightedColor"/> 2668 <nil key="highlightedColor"/>
2669 </label> 2669 </label>
2670 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G6f-Nu-2R5">
2671 + <rect key="frame" x="119" y="77" width="58.5" height="21"/>
2672 + <subviews>
2673 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LGs-y6-UbY">
2674 + <rect key="frame" x="5" y="3" width="15" height="15"/>
2675 + <constraints>
2676 + <constraint firstAttribute="height" constant="15" id="9tK-aY-Rdn"/>
2677 + <constraint firstAttribute="width" constant="15" id="m2Y-SE-d4q"/>
2678 + </constraints>
2679 + </imageView>
2680 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dF5-HE-P9n">
2681 + <rect key="frame" x="25" y="4.5" width="28.5" height="12"/>
2682 + <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/>
2683 + <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/>
2684 + <nil key="highlightedColor"/>
2685 + </label>
2686 + </subviews>
2687 + <color key="backgroundColor" red="0.94117647058823528" green="0.90196078431372551" blue="0.90196078431372551" alpha="1" colorSpace="calibratedRGB"/>
2688 + <constraints>
2689 + <constraint firstItem="dF5-HE-P9n" firstAttribute="centerY" secondItem="G6f-Nu-2R5" secondAttribute="centerY" id="6wF-K3-vDp"/>
2690 + <constraint firstAttribute="bottom" secondItem="LGs-y6-UbY" secondAttribute="bottom" constant="3" id="AZn-5e-SkV"/>
2691 + <constraint firstAttribute="trailing" secondItem="dF5-HE-P9n" secondAttribute="trailing" constant="5" id="Vk4-0L-NMa"/>
2692 + <constraint firstItem="dF5-HE-P9n" firstAttribute="leading" secondItem="LGs-y6-UbY" secondAttribute="trailing" constant="5" id="lg8-t3-laT"/>
2693 + <constraint firstItem="LGs-y6-UbY" firstAttribute="leading" secondItem="G6f-Nu-2R5" secondAttribute="leading" constant="5" id="n88-zW-8hr"/>
2694 + <constraint firstItem="LGs-y6-UbY" firstAttribute="top" secondItem="G6f-Nu-2R5" secondAttribute="top" constant="3" id="yeQ-49-Bc4"/>
2695 + </constraints>
2696 + </view>
2670 </subviews> 2697 </subviews>
2671 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 2698 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
2672 <constraints> 2699 <constraints>
...@@ -2686,12 +2713,16 @@ ...@@ -2686,12 +2713,16 @@
2686 <constraint firstItem="u51-sv-YiH" firstAttribute="top" relation="greaterThanOrEqual" secondItem="NmF-B8-BxN" secondAttribute="bottom" constant="5" id="RUi-pY-M3y"/> 2713 <constraint firstItem="u51-sv-YiH" firstAttribute="top" relation="greaterThanOrEqual" secondItem="NmF-B8-BxN" secondAttribute="bottom" constant="5" id="RUi-pY-M3y"/>
2687 <constraint firstItem="jcR-bh-Fhz" firstAttribute="top" secondItem="35i-Iq-TId" secondAttribute="top" constant="10" id="W7a-RI-eFK"/> 2714 <constraint firstItem="jcR-bh-Fhz" firstAttribute="top" secondItem="35i-Iq-TId" secondAttribute="top" constant="10" id="W7a-RI-eFK"/>
2688 <constraint firstAttribute="trailing" secondItem="NmF-B8-BxN" secondAttribute="trailing" constant="20" id="WXz-rG-ZBX"/> 2715 <constraint firstAttribute="trailing" secondItem="NmF-B8-BxN" secondAttribute="trailing" constant="20" id="WXz-rG-ZBX"/>
2716 + <constraint firstItem="G6f-Nu-2R5" firstAttribute="leading" secondItem="ZDK-3b-8MQ" secondAttribute="trailing" constant="5" id="ZgC-Py-yjC"/>
2717 + <constraint firstItem="G6f-Nu-2R5" firstAttribute="top" relation="greaterThanOrEqual" secondItem="NmF-B8-BxN" secondAttribute="bottom" constant="5" id="b5v-do-Gik"/>
2689 <constraint firstItem="mOO-dc-RyS" firstAttribute="top" secondItem="35i-Iq-TId" secondAttribute="top" constant="15" id="bB4-81-G6R"/> 2718 <constraint firstItem="mOO-dc-RyS" firstAttribute="top" secondItem="35i-Iq-TId" secondAttribute="top" constant="15" id="bB4-81-G6R"/>
2690 <constraint firstItem="mOO-dc-RyS" firstAttribute="leading" secondItem="ZDK-3b-8MQ" secondAttribute="trailing" constant="5" id="dfS-C5-yrS"/> 2719 <constraint firstItem="mOO-dc-RyS" firstAttribute="leading" secondItem="ZDK-3b-8MQ" secondAttribute="trailing" constant="5" id="dfS-C5-yrS"/>
2691 <constraint firstItem="NmF-B8-BxN" firstAttribute="top" relation="greaterThanOrEqual" secondItem="mOO-dc-RyS" secondAttribute="bottom" constant="5" id="hwb-y3-RPk"/> 2720 <constraint firstItem="NmF-B8-BxN" firstAttribute="top" relation="greaterThanOrEqual" secondItem="mOO-dc-RyS" secondAttribute="bottom" constant="5" id="hwb-y3-RPk"/>
2692 <constraint firstAttribute="bottom" secondItem="jcR-bh-Fhz" secondAttribute="bottom" constant="10" id="jGC-H8-LPk"/> 2721 <constraint firstAttribute="bottom" secondItem="jcR-bh-Fhz" secondAttribute="bottom" constant="10" id="jGC-H8-LPk"/>
2722 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="G6f-Nu-2R5" secondAttribute="trailing" constant="20" id="k22-dw-mnk"/>
2693 <constraint firstAttribute="trailing" secondItem="58G-jP-FMr" secondAttribute="trailing" id="ndw-7x-qT3"/> 2723 <constraint firstAttribute="trailing" secondItem="58G-jP-FMr" secondAttribute="trailing" id="ndw-7x-qT3"/>
2694 <constraint firstAttribute="trailing" secondItem="u51-sv-YiH" secondAttribute="trailing" constant="20" id="vZk-48-uaD"/> 2724 <constraint firstAttribute="trailing" secondItem="u51-sv-YiH" secondAttribute="trailing" constant="20" id="vZk-48-uaD"/>
2725 + <constraint firstAttribute="bottom" secondItem="G6f-Nu-2R5" secondAttribute="bottom" constant="15" id="wJc-Mw-Ctl"/>
2695 </constraints> 2726 </constraints>
2696 </view> 2727 </view>
2697 </subviews> 2728 </subviews>
...@@ -2711,11 +2742,14 @@ ...@@ -2711,11 +2742,14 @@
2711 <outlet property="dicountLabel" destination="9CO-TF-h6H" id="n8h-DI-pzv"/> 2742 <outlet property="dicountLabel" destination="9CO-TF-h6H" id="n8h-DI-pzv"/>
2712 <outlet property="discriptionLabel" destination="XTf-q6-vau" id="0th-ti-mlx"/> 2743 <outlet property="discriptionLabel" destination="XTf-q6-vau" id="0th-ti-mlx"/>
2713 <outlet property="expirationLabel" destination="u51-sv-YiH" id="SLL-Xy-SY4"/> 2744 <outlet property="expirationLabel" destination="u51-sv-YiH" id="SLL-Xy-SY4"/>
2745 + <outlet property="expirationRedImage" destination="LGs-y6-UbY" id="thT-fX-W5Q"/>
2746 + <outlet property="expirationRedLabel" destination="dF5-HE-P9n" id="7sq-E0-jcW"/>
2747 + <outlet property="expirationRedView" destination="G6f-Nu-2R5" id="Qyj-fV-S3E"/>
2714 <outlet property="nameLabel" destination="mOO-dc-RyS" id="zZp-my-uZI"/> 2748 <outlet property="nameLabel" destination="mOO-dc-RyS" id="zZp-my-uZI"/>
2715 </connections> 2749 </connections>
2716 </tableViewCell> 2750 </tableViewCell>
2717 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponBCFooterTableViewCell" id="LD5-ES-J67" customClass="UnifiedCouponBCFooterTableViewCell" customModule="SwiftWarplyFramework"> 2751 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponBCFooterTableViewCell" id="LD5-ES-J67" customClass="UnifiedCouponBCFooterTableViewCell" customModule="SwiftWarplyFramework">
2718 - <rect key="frame" x="0.0" y="1007.5" width="414" height="189"/> 2752 + <rect key="frame" x="0.0" y="1015.5" width="414" height="189"/>
2719 <autoresizingMask key="autoresizingMask"/> 2753 <autoresizingMask key="autoresizingMask"/>
2720 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LD5-ES-J67" id="DmN-AA-8n5"> 2754 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LD5-ES-J67" id="DmN-AA-8n5">
2721 <rect key="frame" x="0.0" y="0.0" width="414" height="189"/> 2755 <rect key="frame" x="0.0" y="0.0" width="414" height="189"/>
......
...@@ -123,6 +123,12 @@ import MapKit ...@@ -123,6 +123,12 @@ import MapKit
123 swiftApi().getMultilingualMerchantsAsync([], false, 0.0, [], "", 0, [merchantUuid], getMerchantsCallback) 123 swiftApi().getMultilingualMerchantsAsync([], false, 0.0, [], "", 0, [merchantUuid], getMerchantsCallback)
124 showContent() 124 showContent()
125 } 125 }
126 + } else {
127 + let appUuid = swiftApi().getAppUuid()
128 + let categoryUuids = appUuid == "0086a2088301440792091b9f814c2267" ? [""] : ["adcace6cab6049c7b7271bc85bc2b26d"]
129 +
130 + swiftApi().getMultilingualMerchantsAsync(categoryUuids, false, 0.0, [], "", 0, [], getMerchantsCallback)
131 + showContent()
126 } 132 }
127 133
128 } 134 }
......
...@@ -496,11 +496,11 @@ extension UITableView { ...@@ -496,11 +496,11 @@ extension UITableView {
496 } 496 }
497 497
498 @IBAction func mapButtonAction(_ sender: Any) { 498 @IBAction func mapButtonAction(_ sender: Any) {
499 -// swiftApi().logTrackersEvent("click", "SeeShops") 499 + swiftApi().logTrackersEvent("click", "SeeShops")
500 // 500 //
501 -// let vc = SwiftWarplyFramework.MapsViewController(nibName: "MapsViewController", bundle: Bundle(for: MyEmptyClass.self)) 501 + let vc = SwiftWarplyFramework.MapsViewController(nibName: "MapsViewController", bundle: Bundle(for: MyEmptyClass.self))
502 // vc.couponSet = coupon?.couponset_data 502 // vc.couponSet = coupon?.couponset_data
503 -// self.navigationController?.pushViewController(vc, animated: true) 503 + self.navigationController?.pushViewController(vc, animated: true)
504 504
505 // if (mapBtnVisible == true) { 505 // if (mapBtnVisible == true) {
506 // swiftApi().logTrackersEvent("click", "SeeShops") 506 // swiftApi().logTrackersEvent("click", "SeeShops")
...@@ -583,13 +583,6 @@ extension UnifiedCouponBarcodeViewController: UITableViewDelegate, UITableViewDa ...@@ -583,13 +583,6 @@ extension UnifiedCouponBarcodeViewController: UITableViewDelegate, UITableViewDa
583 583
584 cell.configureCell(coupon: (self.coupon?._coupons[indexPath.row])!, isMarket: true) 584 cell.configureCell(coupon: (self.coupon?._coupons[indexPath.row])!, isMarket: true)
585 585
586 -// cell.couponBgImage.image = UIImage(named: "coupon_bg_shadow", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
587 -
588 - cell.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor
589 - cell.layer.shadowOffset = CGSize(width: 0.0, height: 0.0)
590 - cell.layer.shadowOpacity = 1.0
591 - cell.layer.shadowRadius = 6.0
592 -
593 return cell 586 return cell
594 587
595 } else { 588 } else {
......