Merge branch 'master' of https://git.warp.ly/open-source/warply_sdk_framework

@@ -79,13 +79,14 @@ extension OldCouponsView {
     }
     }
     
     
     struct couponItemView: View {
     struct couponItemView: View {
-        var item: NSDictionary
+        var item: swiftApi.CouponItemModel
         var parentView: UIView
         var parentView: UIView
         
         
         var uiscreen = UIScreen.main.bounds
         var uiscreen = UIScreen.main.bounds
         
         
         var body: some View {
         var body: some View {
-            let couponData = item["coupon_data"] as? [String: Any] ?? ["":""]
+//            let couponData = item["coupon_data"] as? [String: Any] ?? ["":""]
+            let couponSetData = item.couponset_data
             
             
             Button {
             Button {
                 // Coupon Action
                 // Coupon Action
@@ -101,7 +102,7 @@ extension OldCouponsView {
                     
                     
                 HStack(alignment: .center) {
                 HStack(alignment: .center) {
                     
                     
-                    ImageView(withURL: item["img_preview"] as? String ?? "", width: self.uiscreen.width * 0.15, isFill: false)
+                    ImageView(withURL: couponSetData?.img_preview ?? "", width: self.uiscreen.width * 0.15, isFill: false)
                     
                     
                     VLine()
                     VLine()
                         .stroke(style: StrokeStyle(lineWidth: 1, dash: [5]))
                         .stroke(style: StrokeStyle(lineWidth: 1, dash: [5]))
@@ -110,7 +111,7 @@ extension OldCouponsView {
                         .padding(.leading, 10)
                         .padding(.leading, 10)
                     
                     
                     VStack(alignment: .leading, spacing: 5.0) {
                     VStack(alignment: .leading, spacing: 5.0) {
-                        Text(item["name"] as? String ?? "")
+                        Text(couponSetData?.name ?? "")
                             .fontWeight(.medium)
                             .fontWeight(.medium)
                             .font(.system(size: 16))
                             .font(.system(size: 16))
                             .foregroundColor(Color(red: 0.22745098039215686, green: 0.3215686274509804, blue: 0.4))
                             .foregroundColor(Color(red: 0.22745098039215686, green: 0.3215686274509804, blue: 0.4))
@@ -118,14 +119,14 @@ extension OldCouponsView {
 //                            .lineLimit(1)
 //                            .lineLimit(1)
                         
                         
                         HStack(alignment: .center) {
                         HStack(alignment: .center) {
-                            Text((couponData["discount"] as? String ?? "")+"€")
+                            Text((item.discount ?? "")+"€")
                                 .fontWeight(.bold)
                                 .fontWeight(.bold)
                                 .font(.system(size: 35))
                                 .font(.system(size: 35))
                                 .foregroundColor(Color(red: 0.22745098039215686, green: 0.3215686274509804, blue: 0.4))
                                 .foregroundColor(Color(red: 0.22745098039215686, green: 0.3215686274509804, blue: 0.4))
                                 .multilineTextAlignment(.leading)
                                 .multilineTextAlignment(.leading)
                                 .lineLimit(1)
                                 .lineLimit(1)
                             
                             
-//                                Text(item["short_description"] as? String ?? "")
+//                                Text(couponSetData?.short_description ?? "")
 //                                .fontWeight(.medium)
 //                                .fontWeight(.medium)
 //                                    .font(.system(size: 11))
 //                                    .font(.system(size: 11))
 //                                    .foregroundColor(Color(red: 0.3803921568627451, green: 0.44313725490196076, blue: 0.5058823529411764))
 //                                    .foregroundColor(Color(red: 0.3803921568627451, green: 0.44313725490196076, blue: 0.5058823529411764))
@@ -133,7 +134,7 @@ extension OldCouponsView {
 //                                    .lineLimit(3)
 //                                    .lineLimit(3)
                         }
                         }
                         
                         
-                        Text("Εξαργυρώθηκε την " + OldCouponsView.couponsContainer.convertDateFormat(inputDate: couponData["expiration"] as? String ?? ""))
+                        Text("Εξαργυρώθηκε την " + (item.expiration ?? ""))
                         .fontWeight(.medium)
                         .fontWeight(.medium)
                             .font(.system(size: 11))
                             .font(.system(size: 11))
                             .foregroundColor(Color(red: 0.3803921568627451, green: 0.44313725490196076, blue: 0.5058823529411764))
                             .foregroundColor(Color(red: 0.3803921568627451, green: 0.44313725490196076, blue: 0.5058823529411764))
@@ -169,22 +170,22 @@ extension OldCouponsView {
     }
     }
 
 
     struct couponsContainer: View {
     struct couponsContainer: View {
-        @State var coupons:Array<NSDictionary> = []
+        @State var coupons:Array<swiftApi.CouponItemModel> = []
         @State var parentView:UIView
         @State var parentView:UIView
         
         
         var uiscreen = UIScreen.main.bounds
         var uiscreen = UIScreen.main.bounds
         
         
-        static func convertDateFormat(inputDate: String) -> String {
-             let dateFormatter = DateFormatter()
-             dateFormatter.dateFormat = "yyyy-MM-dd hh:mm:ss"
-            if let date = dateFormatter.date(from: inputDate) {
-                dateFormatter.dateFormat = "dd/MM/yyyy"
-                let resultString = dateFormatter.string(from: date)
-                return resultString
-             } else {
-                 return ""
-             }
-        }
+//        static func convertDateFormat(inputDate: String) -> String {
+//             let dateFormatter = DateFormatter()
+//             dateFormatter.dateFormat = "yyyy-MM-dd hh:mm:ss"
+//            if let date = dateFormatter.date(from: inputDate) {
+//                dateFormatter.dateFormat = "dd/MM/yyyy"
+//                let resultString = dateFormatter.string(from: date)
+//                return resultString
+//             } else {
+//                 return ""
+//             }
+//        }
         
         
         var body: some View {
         var body: some View {
             VStack(alignment: .center, spacing: self.uiscreen.height * 0.03) {
             VStack(alignment: .center, spacing: self.uiscreen.height * 0.03) {
@@ -206,10 +207,20 @@ extension OldCouponsView {
 struct OldCouponsView: View {
 struct OldCouponsView: View {
     var parentView: UIView
     var parentView: UIView
     
     
-    var coupons:Array<NSDictionary> = DataModel().getOldCoupons
+    var coupons:Array<swiftApi.CouponItemModel> = []
     
     
     var uiscreen = UIScreen.main.bounds
     var uiscreen = UIScreen.main.bounds
     
     
+    
+    init(parentView: UIView) { //initializer method
+
+        let instanceOfMySwiftApi = swiftApi()
+        let couponsData = instanceOfMySwiftApi.getOldCoupons()
+
+        self.coupons = couponsData
+        self.parentView = parentView
+    }
+    
     func goBack(){
     func goBack(){
         for subview in parentView.subviews {
         for subview in parentView.subviews {
             if(subview.tag == 9) {
             if(subview.tag == 9) {

@@ -6,7 +6,6 @@
 //
 //
 
 
 import Foundation
 import Foundation
-import SwiftUI
 
 
 public class swiftApi {
 public class swiftApi {
 
 
@@ -26,22 +25,10 @@ public class swiftApi {
         
         
     }
     }
     
     
-    public func setCCMSLoyaltyCampaigns(campaigns: Array<LoyaltyContextualOfferModel>) {
+    public func setCCMSLoyaltyCampaigns(campaigns: Array<Dictionary<String, String>>) {
         
         
     }
     }
     
     
-    public class LoyaltyContextualOfferModel {
-        var sessionId: String
-        var eligibleAssets: Array<String>
-        var id: String
-        
-        init(sessionId: String, eligibleAssets: Array<String>, id: String) {
-            self.sessionId = sessionId
-            self.eligibleAssets = eligibleAssets
-            self.id = id
-        }
-    }
-    
     public class CouponSetItemModel {
     public class CouponSetItemModel {
         let uuid: String?
         let uuid: String?
         let admin_name: String?
         let admin_name: String?
@@ -271,6 +258,10 @@ public class swiftApi {
         return CouponsDataModel().getData
         return CouponsDataModel().getData
     }
     }
     
     
+    public func getOldCoupons() -> Array<CouponItemModel> {
+        return CouponsDataModel().getOldCoupons
+    }
+    
     public class CampaignItemModel {
     public class CampaignItemModel {
         let index_url: String?
         let index_url: String?
         let logo_url: String?
         let logo_url: String?