change model field name

GMERemittance/Utility/HotLine/Application Logic/Model/HotLine.swift

@@ -22,23 +22,23 @@ struct HotLineContainer: Mappable {
 }
 
 struct HotLine: Mappable {
-  var country: String?
+  var countryName: String?
   var countryCode: String?
-  var remitPhone: String?
-  var remitFacebook: String?
-  var loanPhone: String?
-  var loanFacebook: String?
+  var remitPhoneNumber: String?
+  var remitFacebookURL: String?
+  var loanPhoneNumber: String?
+  var loanFacebookURL: String?
   
   init?(map: Map) {
     
   }
   
   mutating func mapping(map: Map) {
-    country <- map["country"]
+    countryName <- map["countryName"]
     countryCode <- map["countryCode"]
-    remitPhone <- map["remitPhone"]
-    remitFacebook <- map["remitFacebook"]
-    loanPhone <- map["loanPhone"]
-    loanFacebook <- map["loanFacebook"]
+    remitPhoneNumber <- map["remitPhoneNumber"]
+    remitFacebookURL <- map["remitFacebookURL"]
+    loanPhoneNumber <- map["loanPhoneNumber"]
+    loanFacebookURL <- map["loanFacebookURL"]
   }
 }

GMERemittance/Utility/HotLine/Application Logic/Service/HotLineService.swift

@@ -15,108 +15,108 @@ class HotLineService: HotLineServiceType {
 {
     "Data": [
         {
-            "country": "Nepal",
+            "countryName": "Nepal",
             "countryCode": "np",
-            "remitPhone": "1811-2934",
-            "remitFacebook": "https://www.facebook.com/gmenepal/",
-            "loanPhone": "010-6584-6864",
-            "loanFacebook": "https://www.facebook.com/gmeloannepal/"
+            "remitPhoneNumberNumber": "1811-2934",
+            "remitFacebookURL": "https://www.facebook.com/gmenepal/",
+            "loanPhoneNumber": "010-6584-6864",
+            "loanFacebookURL": "https://www.facebook.com/gmeloannepal/"
         },
         {
-            "country": "Cambodia",
+            "countryName": "Cambodia",
             "countryCode": "kh",
-            "remitPhone": "1811-2941",
-            "remitFacebook": "https://www.facebook.com/gmecambodia/",
-            "loanPhone": "010-3077-6864",
-            "loanFacebook": "https://www.facebook.com/GME-Loan-Cambodia-321683921778208/"
+            "remitPhoneNumber": "1811-2941",
+            "remitFacebookURL": "https://www.facebook.com/gmecambodia/",
+            "loanPhoneNumber": "010-3077-6864",
+            "loanFacebookURL": "https://www.facebook.com/GME-Loan-Cambodia-321683921778208/"
         },
         {
-            "country": "Sri Lanka",
+            "countryName": "Sri Lanka",
             "countryCode": "lk",
-            "remitPhone": "1811-2935​​",
-            "remitFacebook": "https://www.facebook.com/gmeremitsrilanka/",
-            "loanPhone": "010-2965-6864",
-            "loanFacebook": "https://www.facebook.com/gmeloansrilanka"
+            "remitPhoneNumber": "1811-2935​​",
+            "remitFacebookURL": "https://www.facebook.com/gmeremitsrilanka/",
+            "loanPhoneNumber": "010-2965-6864",
+            "loanFacebookURL": "https://www.facebook.com/gmeloansrilanka"
         },
         {
-            "country": "Vietnam",
+            "countryName": "Vietnam",
             "countryCode": "vn",
-            "remitPhone": "1811-2937​​",
-            "remitFacebook": "https://www.facebook.com/gmevietnam/",
-            "loanPhone": "1811-2937",
-            "loanFacebook": "https://www.facebook.com/gmevietnam/"
+            "remitPhoneNumber": "1811-2937​​",
+            "remitFacebookURL": "https://www.facebook.com/gmevietnam/",
+            "loanPhoneNumber": "1811-2937",
+            "loanFacebookURL": "https://www.facebook.com/gmevietnam/"
         },
         {
-            "country": "Philippines",
+            "countryName": "Philippines",
             "countryCode": "ph",
-            "remitPhone": "1811-2936",
-            "remitFacebook": "https://www.facebook.com/gmephilippines/",
-            "loanPhone": "1811-2936",
-            "loanFacebook": "https://www.facebook.com/gmephilippines/"
+            "remitPhoneNumber": "1811-2936",
+            "remitFacebookURL": "https://www.facebook.com/gmephilippines/",
+            "loanPhoneNumber": "1811-2936",
+            "loanFacebookURL": "https://www.facebook.com/gmephilippines/"
         },
         {
-            "country": "Bangladesh",
+            "countryName": "Bangladesh",
             "countryCode": "bd",
-            "remitPhone": "1811-2943",
-            "remitFacebook": "https://www.facebook.com/gmebangladesh/",
-            "loanPhone": "010-9932-6864",
-            "loanFacebook": "https://www.facebook.com/GME-Loan-Bangladesh-260577534842308/"
+            "remitPhoneNumber": "1811-2943",
+            "remitFacebookURL": "https://www.facebook.com/gmebangladesh/",
+            "loanPhoneNumber": "010-9932-6864",
+            "loanFacebookURL": "https://www.facebook.com/GME-Loan-Bangladesh-260577534842308/"
         },
         {
-            "country": "Indonesia",
+            "countryName": "Indonesia",
             "countryCode": "id",
-            "remitPhone": "1811-2945",
-            "remitFacebook": "https://www.facebook.com/gmeindonesia/",
-            "loanPhone": "010-3017-6864",
-            "loanFacebook": "https://www.facebook.com/GME-Loan-Indonesia-1225867314236899/"
+            "remitPhoneNumber": "1811-2945",
+            "remitFacebookURL": "https://www.facebook.com/gmeindonesia/",
+            "loanPhoneNumber": "010-3017-6864",
+            "loanFacebookURL": "https://www.facebook.com/GME-Loan-Indonesia-1225867314236899/"
         },
         {
-            "country": "Thailand",
+            "countryName": "Thailand",
             "countryCode": "th",
-            "remitPhone": "010-9928-6864",
-            "remitFacebook": "https://www.facebook.com/gmethailand/",
-            "loanPhone": "010-9928-68644",
-            "loanFacebook": "https://www.facebook.com/gmethailand/"
+            "remitPhoneNumber": "010-9928-6864",
+            "remitFacebookURL": "https://www.facebook.com/gmethailand/",
+            "loanPhoneNumber": "010-9928-68644",
+            "loanFacebookURL": "https://www.facebook.com/gmethailand/"
         },
         {
-            "country": "Mongolia",
+            "countryName": "Mongolia",
             "countryCode": "mn",
-            "remitPhone": "010-2973-6864",
-            "remitFacebook": "https://www.facebook.com/gmemongolia/",
-            "loanPhone": "010-2973-6864​",
-            "loanFacebook": "https://www.facebook.com/gmemongolia/"
+            "remitPhoneNumber": "010-2973-6864",
+            "remitFacebookURL": "https://www.facebook.com/gmemongolia/",
+            "loanPhoneNumber": "010-2973-6864​",
+            "loanFacebookURL": "https://www.facebook.com/gmemongolia/"
         },
         {
-            "country": "Uzbekistan",
+            "countryName": "Uzbekistan",
             "countryCode": "uz",
-            "remitPhone": "010-3015-6864",
-            "remitFacebook": "https://www.facebook.com/gmeuzbekistan/",
-            "loanPhone": "010-3015-6864",
-            "loanFacebook": "https://www.facebook.com/GME-Loan-Uzbekistan-307204249997604/"
+            "remitPhoneNumber": "010-3015-6864",
+            "remitFacebookURL": "https://www.facebook.com/gmeuzbekistan/",
+            "loanPhoneNumber": "010-3015-6864",
+            "loanFacebookURL": "https://www.facebook.com/GME-Loan-Uzbekistan-307204249997604/"
         },
         {
-            "country": "India",
+            "countryName": "India",
             "countryCode": "in",
-            "remitPhone": "010-2760-6864",
-            "remitFacebook": "https://www.facebook.com/gmeremitindia/",
-            "loanPhone": "010-2760-6864​",
-            "loanFacebook": "https://www.facebook.com/gmeremitindia/"
+            "remitPhoneNumber": "010-2760-6864",
+            "remitFacebookURL": "https://www.facebook.com/gmeremitindia/",
+            "loanPhoneNumber": "010-2760-6864​",
+            "loanFacebookURL": "https://www.facebook.com/gmeremitindia/"
         },
         {
-            "country": "Pakistan",
+            "countryName": "Pakistan",
             "countryCode": "pk",
-            "remitPhone": "010-2760-6864",
-            "remitFacebook": "https://www.facebook.com/gmepakistan/",
-            "loanPhone": "010-2760-6864​",
-            "loanFacebook": "https://www.facebook.com/gmepakistan/"
+            "remitPhoneNumber": "010-2760-6864",
+            "remitFacebookURL": "https://www.facebook.com/gmepakistan/",
+            "loanPhoneNumber": "010-2760-6864​",
+            "loanFacebookURL": "https://www.facebook.com/gmepakistan/"
         },
         {
-            "country": "Myanmar",
+            "countryName": "Myanmar",
             "countryCode": "mm",
-            "remitPhone": "1811-2938",
-            "remitFacebook": "https://www.facebook.com/GME-Remittance-Myanmar-295378281070768/",
-            "loanPhone": "1811-2938",
-            "loanFacebook": "https://www.facebook.com/GME-Loan-Myanmar-1065401266975499/"
+            "remitPhoneNumber": "1811-2938",
+            "remitFacebookURL": "https://www.facebook.com/GME-Remittance-Myanmar-295378281070768/",
+            "loanPhoneNumber": "1811-2938",
+            "loanFacebookURL": "https://www.facebook.com/GME-Loan-Myanmar-1065401266975499/"
         }
     ]
 }

GMERemittance/Utility/HotLine/User Interface/View/Cell/HotLineCell.swift

@@ -66,13 +66,13 @@ class HotLineCell: UITableViewCell {
   }
   
   func setModel(_ model: HotLine?){
-    remitPhoneNunmber = model?.remitPhone
-    remitFacebookURL = model?.remitFacebook
+    remitPhoneNunmber = model?.remitPhoneNumber
+    remitFacebookURL = model?.remitFacebookURL
     
-    loanPhoneNumber = model?.loanPhone
-    loanFacebookUrl = model?.loanFacebook
+    loanPhoneNumber = model?.loanPhoneNumber
+    loanFacebookUrl = model?.loanFacebookURL
     
-    countryName = model?.country
+    countryName = model?.countryName
     coutryFlag = CountryInfo().getFlag(for: model?.countryCode ?? "")
   }