Showing
6 changed files
with
12 additions
and
3 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>0</integer> | 10 | + <integer>1</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>1</integer> | 10 | + <integer>0</integer> |
| 11 | </dict> | 11 | </dict> |
| 12 | </dict> | 12 | </dict> |
| 13 | </dict> | 13 | </dict> | ... | ... |
No preview for this file type
| ... | @@ -151,6 +151,8 @@ extension GiftsViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -151,6 +151,8 @@ extension GiftsViewController: UITableViewDelegate, UITableViewDataSource{ |
| 151 | } else if (campaigns[indexPath.row]._campaign_type == "coupon") { | 151 | } else if (campaigns[indexPath.row]._campaign_type == "coupon") { |
| 152 | let couponsetUuid = campaigns[indexPath.row]._couponset | 152 | let couponsetUuid = campaigns[indexPath.row]._couponset |
| 153 | 153 | ||
| 154 | + // TODO: search if loyalty id exists | ||
| 155 | + | ||
| 154 | if (couponsetUuid != "") { | 156 | if (couponsetUuid != "") { |
| 155 | let couponsetsList = swiftApi().getCouponSetList() | 157 | let couponsetsList = swiftApi().getCouponSetList() |
| 156 | 158 | ||
| ... | @@ -160,6 +162,7 @@ extension GiftsViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -160,6 +162,7 @@ extension GiftsViewController: UITableViewDelegate, UITableViewDataSource{ |
| 160 | let vc = storyboard.instantiateViewController(withIdentifier: "CouponViewController") as! SwiftWarplyFramework.CouponViewController | 162 | let vc = storyboard.instantiateViewController(withIdentifier: "CouponViewController") as! SwiftWarplyFramework.CouponViewController |
| 161 | vc.couponset = item | 163 | vc.couponset = item |
| 162 | vc.campaign = campaigns[indexPath.row] | 164 | vc.campaign = campaigns[indexPath.row] |
| 165 | + // TODO: add ccms | ||
| 163 | self.navigationController?.pushViewController(vc, animated: true) | 166 | self.navigationController?.pushViewController(vc, animated: true) |
| 164 | 167 | ||
| 165 | break; | 168 | break; | ... | ... |
| ... | @@ -2,6 +2,8 @@ | ... | @@ -2,6 +2,8 @@ |
| 2 | <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | 2 | <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> |
| 3 | <plist version="1.0"> | 3 | <plist version="1.0"> |
| 4 | <dict> | 4 | <dict> |
| 5 | + <key>NSMotionUsageDescription</key> | ||
| 6 | + <string>We are using motion usage in order to track your step count.</string> | ||
| 5 | <key>UIAppFonts</key> | 7 | <key>UIAppFonts</key> |
| 6 | <array> | 8 | <array> |
| 7 | <string>pf_square_sans_pro_bold_italic.ttf</string> | 9 | <string>pf_square_sans_pro_bold_italic.ttf</string> | ... | ... |
| ... | @@ -69,7 +69,7 @@ import SwiftEventBus | ... | @@ -69,7 +69,7 @@ import SwiftEventBus |
| 69 | profileImage.layer.borderWidth = 1 | 69 | profileImage.layer.borderWidth = 1 |
| 70 | profileImage.layer.borderColor = UIColor(red: 0.13, green: 0.66, blue: 0.71, alpha: 1.00).cgColor | 70 | profileImage.layer.borderColor = UIColor(red: 0.13, green: 0.66, blue: 0.71, alpha: 1.00).cgColor |
| 71 | 71 | ||
| 72 | - if (profile != nil && profile?._image_url != nil && profile?._image_url != "") { | 72 | + if (profile != nil && !(profile?._image_url is NSNull) && profile?._image_url != nil && profile?._image_url != "") { |
| 73 | profileImage.load(link: profile?._image_url ?? "", placeholder: UIImage(), cache: URLCache()) | 73 | profileImage.load(link: profile?._image_url ?? "", placeholder: UIImage(), cache: URLCache()) |
| 74 | } else { | 74 | } else { |
| 75 | profileImage.image = UIImage(named: "default_profile_image", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil) | 75 | profileImage.image = UIImage(named: "default_profile_image", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil) |
| ... | @@ -262,6 +262,8 @@ import SwiftEventBus | ... | @@ -262,6 +262,8 @@ import SwiftEventBus |
| 262 | dfyLogoImageTopSpace.constant = 0 | 262 | dfyLogoImageTopSpace.constant = 0 |
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | + print("======= 1 =======") | ||
| 266 | + | ||
| 265 | myPresentsLabel.text = "Τα δώρα μου" | 267 | myPresentsLabel.text = "Τα δώρα μου" |
| 266 | if (coupons.count > 0) { | 268 | if (coupons.count > 0) { |
| 267 | myPresentsLabel.isHidden = false | 269 | myPresentsLabel.isHidden = false |
| ... | @@ -276,6 +278,8 @@ import SwiftEventBus | ... | @@ -276,6 +278,8 @@ import SwiftEventBus |
| 276 | } else { | 278 | } else { |
| 277 | emptyView.isHidden = true | 279 | emptyView.isHidden = true |
| 278 | } | 280 | } |
| 281 | + | ||
| 282 | + print("======= 2 =======") | ||
| 279 | } | 283 | } |
| 280 | 284 | ||
| 281 | public override func viewWillAppear(_ animated: Bool) { | 285 | public override func viewWillAppear(_ animated: Bool) { | ... | ... |
-
Please register or login to post a comment