open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
0204220d 1 parent 9a08168a

CouponsetViewController fixes

Expand all
Inline Side-by-side
Showing 5 changed files with 5 additions and 3 deletions
...@@ -87,7 +87,8 @@ public class CouponSetItemModel { ...@@ -87,7 +87,8 @@ public class CouponSetItemModel {
87 self.admin_name = dictionary["admin_name"] as? String? ?? "" 87 self.admin_name = dictionary["admin_name"] as? String? ?? ""
88 self.name = dictionary["name"] as? String? ?? "" 88 self.name = dictionary["name"] as? String? ?? ""
89 self.img_preview = dictionary["img_preview"] as? String? ?? "" 89 self.img_preview = dictionary["img_preview"] as? String? ?? ""
90 - self.description = dictionary["description"] as? String? ?? "" 90 + let htmlDescription = dictionary["description"] as? String? ?? ""
91 + self.description = htmlDescription?.htmlToString ?? ""
91 self.short_description = dictionary["short_description"] as? String? ?? "" 92 self.short_description = dictionary["short_description"] as? String? ?? ""
92 self.discount = dictionary["discount"] as? String? ?? "" 93 self.discount = dictionary["discount"] as? String? ?? ""
93 self.sorting = dictionary["sorting"] as? Int? ?? 0 94 self.sorting = dictionary["sorting"] as? Int? ?? 0
...@@ -95,7 +96,8 @@ public class CouponSetItemModel { ...@@ -95,7 +96,8 @@ public class CouponSetItemModel {
95 self.inner_text = htmlText?.htmlToString ?? "" 96 self.inner_text = htmlText?.htmlToString ?? ""
96 self.buyable = dictionary["buyable"] as? Bool? ?? false 97 self.buyable = dictionary["buyable"] as? Bool? ?? false
97 self.visible = dictionary["visible"] as? Bool? ?? false 98 self.visible = dictionary["visible"] as? Bool? ?? false
98 - self.terms = dictionary["terms"] as? String? ?? "" 99 + let htmlTerms = dictionary["terms"] as? String? ?? ""
100 + self.terms = htmlTerms?.htmlToString ?? ""
99 self.merchant_uuid = dictionary["merchant_uuid"] as? String? ?? "" 101 self.merchant_uuid = dictionary["merchant_uuid"] as? String? ?? ""
100 self.discount_type = dictionary["discount_type"] as? String? ?? "" 102 self.discount_type = dictionary["discount_type"] as? String? ?? ""
101 103
......
...@@ -568,7 +568,7 @@ import UIKit ...@@ -568,7 +568,7 @@ import UIKit
568 568
569 private func openCouponsetViewController(with couponSet: CouponSetItemModel) { 569 private func openCouponsetViewController(with couponSet: CouponSetItemModel) {
570 let vc = SwiftWarplyFramework.CouponsetViewController(nibName: "CouponsetViewController", bundle: Bundle.frameworkBundle) 570 let vc = SwiftWarplyFramework.CouponsetViewController(nibName: "CouponsetViewController", bundle: Bundle.frameworkBundle)
571 - vc.couponSet = couponSet 571 + vc.couponset = couponSet
572 572
573 self.navigationController?.pushViewController(vc, animated: true) 573 self.navigationController?.pushViewController(vc, animated: true)
574 } 574 }
......