Merge branch 'trunk' into woomob-1093-woo-poslocal-catalog-save-parsed-full-catalog-into-database

Author: joshheald

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 23.2
+This update smooths your WooCommerce experience with improved cash payments, easier access to POS settings, and accurate HAZMAT details on shipping labels. Plus, we fixed a Blaze flow issue so campaigns behave as expected. Faster, clearer, and more reliable — just how you need it!
+
 ## 23.1
 Managing your store just got smoother with a more reliable shipping label workflow! Jetpack setup has also been improved for a faster, easier connection. Update now and enjoy the improvements!
 

Gemfile

@@ -9,7 +9,7 @@ end
 gem 'danger-dangermattic', '~> 1.2'
 gem 'dotenv'
 # 2.217.0 includes a fix for Xcode 15 test results parsing in CI
-gem 'fastlane', '~> 2.217'
+gem 'fastlane', '~> 2.228'
 gem 'fastlane-plugin-firebase_app_distribution', '~> 0.10'
 gem 'fastlane-plugin-sentry', '~> 1.0'
 # This comment avoids typing to switch to a development version for testing.

Gemfile.lock

@@ -23,24 +23,27 @@ GEM
     artifactory (3.0.17)
     ast (2.4.2)
     atomos (0.1.3)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.1029.0)
-    aws-sdk-core (3.214.1)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1154.0)
+    aws-sdk-core (3.232.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+      logger
+    aws-sdk-kms (1.112.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.176.1)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.198.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.2.0)
+    base64 (0.3.0)
     benchmark (0.4.1)
     bigdecimal (3.2.2)
     buildkit (1.6.1)
@@ -85,7 +88,7 @@ GEM
       rubocop (~> 1.0)
     declarative (0.0.20)
     diffy (3.4.4)
-    digest-crc (0.6.5)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
@@ -108,12 +111,12 @@ GEM
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
+    faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-http-cache (2.5.1)
       faraday (>= 0.8)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.0)
+    faraday-multipart (1.1.1)
       multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
@@ -122,8 +125,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.3.1)
-    fastlane (2.226.0)
+    fastimage (2.4.0)
+    fastlane (2.228.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -163,7 +166,7 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.4.0)
+      xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-firebase_app_distribution (0.10.0)
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
@@ -213,12 +216,12 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.1)
+    google-cloud-core (1.8.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.4.0)
+    google-cloud-errors (1.5.0)
     google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
@@ -236,13 +239,14 @@ GEM
     highline (2.0.3)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httpclient (2.8.3)
+    httpclient (2.9.0)
+      mutex_m
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.9.1)
-    jwt (2.10.1)
+    json (2.13.2)
+    jwt (2.10.2)
       base64
     kramdown (2.5.1)
       rexml (>= 3.3.9)
@@ -254,11 +258,12 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
     minitest (5.25.5)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multipart-post (2.4.1)
+    mutex_m (0.3.0)
     nanaimo (0.4.0)
     nap (1.1.0)
-    naturally (2.2.1)
+    naturally (2.3.0)
     nkf (0.2.0)
     nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
@@ -281,7 +286,7 @@ GEM
       highline (>= 1.6)
       options (~> 2.3.0)
     pstore (0.1.3)
-    public_suffix (4.0.7)
+    public_suffix (6.0.2)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (12.3.3)
@@ -294,7 +299,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.4.0)
+    rexml (3.4.2)
     rmagick (4.3.0)
     rouge (3.28.0)
     rubocop (1.68.0)
@@ -313,16 +318,16 @@ GEM
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     securerandom (0.4.1)
     security (0.1.5)
-    signet (0.19.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     simctl (1.6.10)
       CFPropertyList
@@ -352,7 +357,7 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.4.0)
+    xcpretty (0.4.1)
       rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
@@ -366,7 +371,7 @@ PLATFORMS
 DEPENDENCIES
   danger-dangermattic (~> 1.2)
   dotenv
-  fastlane (~> 2.217)
+  fastlane (~> 2.228)
   fastlane-plugin-firebase_app_distribution (~> 0.10)
   fastlane-plugin-sentry (~> 1.0)
   fastlane-plugin-wpmreleasetoolkit (~> 13.3, >= 13.3.1)

Modules/Sources/Fakes/NetworkingCore.generated.swift

@@ -270,6 +270,7 @@ extension NetworkingCore.OrderItem {
             totalTax: .fake(),
             attributes: .fake(),
             addOns: .fake(),
+            image: .fake(),
             parent: .fake(),
             bundleConfiguration: .fake()
         )
@@ -455,7 +456,8 @@ extension NetworkingCore.ShippingLabel {
             productNames: .fake(),
             commercialInvoiceURL: .fake(),
             usedDate: .fake(),
-            expiryDate: .fake()
+            expiryDate: .fake(),
+            hazmatCategory: .fake()
         )
     }
 }

Modules/Sources/Networking/Mapper/WooShippingConfigMapper.swift

@@ -48,6 +48,7 @@ extension WooShippingConfigMapper {
         "config.shipments",
         "config.shippingLabelData.currentOrderLabels",
         "config.shippingLabelData.storedData.selected_destination",
-        "config.shippingLabelData.storedData.selected_origin"
+        "config.shippingLabelData.storedData.selected_origin",
+        "config.shippingLabelData.storedData.selected_hazmat"
     ].joined(separator: ", ")
 }

Modules/Sources/Networking/Mapper/WooShippingUpdateShipmentMapper.swift

@@ -7,9 +7,9 @@ struct WooShippingUpdateShipmentMapper: Mapper {
     ///
     func map(response: Data) throws -> WooShippingShipments {
         let decoder = JSONDecoder()
-        if hasDataEnvelope(in: response) {
+        do {
             return try decoder.decode(WooShippingUpdateShipmentResponseEnvelope.self, from: response).data.shipments
-        } else {
+        } catch {
             return try decoder.decode(WooShippingUpdateShipmentResponse.self, from: response).shipments
         }
     }

Modules/Sources/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -5,6 +5,7 @@ import Codegen
 import Foundation
 import WooFoundation
 import struct Alamofire.JSONEncoding
+import struct NetworkingCore.JetpackSite
 
 
 extension Networking.AIProduct {

Modules/Sources/Networking/Model/ShippingLabel/Shipments/WooShippingConfigResponse.swift

@@ -111,11 +111,13 @@ public struct WooShippingLabelData: Decodable, Equatable {
 
         let destinations = storedData?.selectedDestinations
         let origins = storedData?.selectedOrigins
+        let hazmatSelections = storedData?.selectedHazmat
 
         if destinations?.isEmpty == false || origins?.isEmpty == false {
             orderLabels = WooShippingLabelData.mapAddresses(
                 origins: origins,
                 destinations: destinations,
+                hazmatSelections: hazmatSelections,
                 into: decodedOrderLabels
             )
         } else {
@@ -136,14 +138,17 @@ public struct WooShippingLabelData: Decodable, Equatable {
 
 public extension WooShippingLabelData {
     typealias WooShippingLabelAddressMap = [String: WooShippingAddress]
+    typealias WooShippingHazmatMap = [String: HazmatSelection]
 
     struct StoredData: Decodable, Equatable {
         let selectedDestinations: WooShippingLabelAddressMap?
         let selectedOrigins: WooShippingLabelAddressMap?
+        let selectedHazmat: WooShippingHazmatMap?
 
         public enum CodingKeys: String, CodingKey {
             case selectedDestination = "selected_destination"
             case selectedOrigin = "selected_origin"
+            case selectedHazmat = "selected_hazmat"
         }
 
         public init(from decoder: any Decoder) throws {
@@ -156,6 +161,7 @@ public extension WooShippingLabelData {
                 WooShippingLabelAddressMap.self,
                 forKey: CodingKeys.selectedOrigin
             )
+            selectedHazmat = try? container.decodeIfPresent(WooShippingHazmatMap.self, forKey: .selectedHazmat)
         }
     }
 }
@@ -166,3 +172,7 @@ enum WooShippingConfigDecodingError: Error {
     case missingSiteID
     case missingOrderID
 }
+
+public struct HazmatSelection: Decodable, Equatable {
+    public let category: String
+}

Modules/Sources/Networking/Model/ShippingLabel/Shipments/WooShippingLabelData+mapDestinations.swift

@@ -4,6 +4,7 @@ extension WooShippingLabelData {
     static func mapAddresses(
         origins: WooShippingLabelAddressMap?,
         destinations: WooShippingLabelAddressMap?,
+        hazmatSelections: WooShippingHazmatMap?,
         into labels: [ShippingLabel]
     ) -> [ShippingLabel] {
         return labels.map { label in
@@ -14,10 +15,12 @@ extension WooShippingLabelData {
             let formattedID = WooShippingShipmentIDFormatter.formattedShipmentID(shipmentID)
             let originAddress = origins?[formattedID] ?? origins?[shipmentID]
             let destinationAddress = destinations?[formattedID] ?? destinations?[shipmentID]
+            let hazmat = hazmatSelections?[formattedID] ?? hazmatSelections?[shipmentID]
 
             return label.copy(
                 originAddress: originAddress?.toShippingLabelAddress() ?? .copy,
-                destinationAddress: destinationAddress?.toShippingLabelAddress() ?? .copy
+                destinationAddress: destinationAddress?.toShippingLabelAddress() ?? .copy,
+                hazmatCategory: hazmat?.category
             )
         }
     }

Modules/Sources/NetworkingCore/Model/Copiable/Models+Copiable.generated.swift

@@ -444,6 +444,7 @@ extension NetworkingCore.OrderItem {
         totalTax: CopiableProp<String> = .copy,
         attributes: CopiableProp<[OrderItemAttribute]> = .copy,
         addOns: CopiableProp<[OrderItemProductAddOn]> = .copy,
+        image: NullableCopiableProp<OrderItemProductImage> = .copy,
         parent: NullableCopiableProp<Int64> = .copy,
         bundleConfiguration: CopiableProp<[OrderItemBundleItem]> = .copy
     ) -> NetworkingCore.OrderItem {
@@ -462,6 +463,7 @@ extension NetworkingCore.OrderItem {
         let totalTax = totalTax ?? self.totalTax
         let attributes = attributes ?? self.attributes
         let addOns = addOns ?? self.addOns
+        let image = image ?? self.image
         let parent = parent ?? self.parent
         let bundleConfiguration = bundleConfiguration ?? self.bundleConfiguration
 
@@ -481,6 +483,7 @@ extension NetworkingCore.OrderItem {
             totalTax: totalTax,
             attributes: attributes,
             addOns: addOns,
+            image: image,
             parent: parent,
             bundleConfiguration: bundleConfiguration
         )
@@ -713,7 +716,8 @@ extension NetworkingCore.ShippingLabel {
         productNames: CopiableProp<[String]> = .copy,
         commercialInvoiceURL: NullableCopiableProp<String> = .copy,
         usedDate: NullableCopiableProp<Date> = .copy,
-        expiryDate: NullableCopiableProp<Date> = .copy
+        expiryDate: NullableCopiableProp<Date> = .copy,
+        hazmatCategory: NullableCopiableProp<String> = .copy
     ) -> NetworkingCore.ShippingLabel {
         let siteID = siteID ?? self.siteID
         let orderID = orderID ?? self.orderID
@@ -736,6 +740,7 @@ extension NetworkingCore.ShippingLabel {
         let commercialInvoiceURL = commercialInvoiceURL ?? self.commercialInvoiceURL
         let usedDate = usedDate ?? self.usedDate
         let expiryDate = expiryDate ?? self.expiryDate
+        let hazmatCategory = hazmatCategory ?? self.hazmatCategory
 
         return NetworkingCore.ShippingLabel(
             siteID: siteID,
@@ -758,7 +763,8 @@ extension NetworkingCore.ShippingLabel {
             productNames: productNames,
             commercialInvoiceURL: commercialInvoiceURL,
             usedDate: usedDate,
-            expiryDate: expiryDate
+            expiryDate: expiryDate,
+            hazmatCategory: hazmatCategory
         )
     }
 }