master merged

pedi-foods/Sources/PediFoods/Services/ApiOrderModels.swift

@@ -152,4 +152,38 @@ struct ValidateDeliveryAddressResult: Decodable {
     let deliveryFee: Double?
     let deliveryTime: String?
     let sameCity: Bool?
+
+    enum CodingKeys: String, CodingKey {
+        case deliveryAllowed
+        case delivery_allowed
+        case reasonCode
+        case reason_code
+        case reasonMessage
+        case reason_message
+        case deliveryMode
+        case delivery_mode
+        case distance
+        case deliveryFee
+        case delivery_fee
+        case fee
+        case taxa
+        case deliveryTime
+        case delivery_time
+        case sameCity
+        case same_city
+    }
+
+    init(from decoder: Decoder) throws {
+        let c = try decoder.container(keyedBy: CodingKeys.self)
+        deliveryAllowed = (try? c.decode(Bool.self, forKey: .deliveryAllowed))
+            ?? (try? c.decode(Bool.self, forKey: .delivery_allowed))
+        reasonCode = ApiService.decodeFlexibleString(from: c, keys: [.reasonCode, .reason_code])
+        reasonMessage = ApiService.decodeFlexibleString(from: c, keys: [.reasonMessage, .reason_message])
+        deliveryMode = ApiService.decodeFlexibleString(from: c, keys: [.deliveryMode, .delivery_mode])
+        distance = ApiService.decodeFlexibleDouble(from: c, keys: [.distance])
+        deliveryFee = ApiService.decodeFlexibleDouble(from: c, keys: [.deliveryFee, .delivery_fee, .fee, .taxa])
+        deliveryTime = ApiService.decodeFlexibleString(from: c, keys: [.deliveryTime, .delivery_time])
+        sameCity = (try? c.decode(Bool.self, forKey: .sameCity))
+            ?? (try? c.decode(Bool.self, forKey: .same_city))
+    }
 }

pedi-foods/Sources/PediFoods/Services/ApiReviewModels.swift

@@ -8,8 +8,6 @@ enum ReviewPlatform: String, Encodable {
     static var current: ReviewPlatform {
         #if os(iOS)
         return .ios
-        #elseif os(Android)
-        return .android
         #else
         return .web
         #endif

pedi-foods/Sources/PediFoods/Services/FeatureControlService.swift

@@ -258,20 +258,16 @@ final class FeatureControlService {
     }
 
     private func featureKeys() -> [String] {
-        let raw = ProcessInfo.processInfo.environment["FEATURE_CONTROL_KEYS"] ?? "fc.checkout_v2,fc.search_ranking_v3"
+        let raw = ProcessInfo.processInfo.environment["FEATURE_CONTROL_KEYS"] ?? "at.city.aguai,at.promo,at.ios.only,at.android.only"
         let items = raw
             .split(separator: ",")
             .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
             .filter { $0.isEmpty == false }
-        return items.isEmpty ? ["fc.checkout_v2"] : items
+        return items.isEmpty ? ["at.ios.only"] : items
     }
 
     private func platformName() -> String {
-        #if os(Android)
-        return "android"
-        #else
         return "ios"
-        #endif
     }
 
     private func appVersion() -> String {