Merge release/23.3 into trunk (#16189)

Author: staskus

Modules/Sources/NetworkingCore/Model/OrderItem.swift

@@ -127,8 +127,18 @@ public struct OrderItem: Codable, Equatable, Hashable, Sendable, GeneratedFakeab
                                                               forKey: .attributes)
             .first(where: { $0.key == "_pao_ids" })?.value ?? []
 
-        // Order item product image
-        let image = try container.decodeIfPresent(OrderItemProductImage.self, forKey: .image)
+        // Order item product image can be either a string URL or an object with src field
+        // Use failsafeDecodeIfPresent with alternative types to handle both formats gracefully
+        let image: OrderItemProductImage? = {
+            if let imageObject = container.failsafeDecodeIfPresent(OrderItemProductImage.self, forKey: .image) {
+                return imageObject
+            }
+            if let urlString = container.failsafeDecodeIfPresent(stringForKey: .image),
+               !urlString.isEmpty {
+                return OrderItemProductImage(src: urlString)
+            }
+            return nil
+        }()
 
         // Product Bundle extension properties:
         // If the order item is part of a product bundle, `bundledBy` is the parent order item (product bundle).
@@ -240,16 +250,20 @@ private struct OrderItemProductAddOnContainer: Decodable {
 // MARK: - Order Item Product Image
 //
 public struct OrderItemProductImage: Codable, Equatable, Hashable, Sendable {
-    public let src: String?
+    public let src: String
+
+    public init(src: String) {
+        self.src = src
+    }
 
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.src = try? container.decodeIfPresent(String.self, forKey: .src)
+        self.src = try container.decode(String.self, forKey: .src)
     }
 
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encodeIfPresent(src, forKey: .src)
+        try container.encode(src, forKey: .src)
     }
 
     private enum CodingKeys: String, CodingKey {

Modules/Tests/NetworkingTests/Mapper/OrderListMapperTests.swift

@@ -166,30 +166,67 @@ class OrderListMapperTests: XCTestCase {
 
     /// Verifies that OrderItem decoding is robust for various image field scenarios from WooCommerce API
     ///
+    /// Tests all possible image field formats:
+    /// 1. String URL - should parse successfully with image object
+    /// 2. Object with src field - should parse successfully with image object
+    /// 3. Object without src field - should be nil
+    /// 4. Invalid types should fail gracefully with nil image
+    /// 5. Nested objects - should be nil
+    /// 6. Empty values - should be nil
+    /// 7. Missing field - should be nil
+    ///
     func test_order_item_image_decoding_robustness() {
         let orders = mapOrders(from: "order-item-image")
         XCTAssertEqual(orders.count, 1)
 
         let order = orders[0]
-        XCTAssertEqual(order.items.count, 4)
+        XCTAssertEqual(order.items.count, 11)
 
-        // Item 1: Product with valid image src
+        // Item 1: Product with valid image object with src field (standard WooCommerce format)
         let item1 = order.items[0]
-        XCTAssertNotNil(item1.image)
+        XCTAssertNotNil(item1.image, "Image object should exist for object with valid src field")
         XCTAssertEqual(item1.image?.src, "https://example.com/image.jpg")
 
-        // Item 2: Product with no image field
+        // Item 2: Product with no image field - should be nil
         let item2 = order.items[1]
-        XCTAssertNil(item2.image)
+        XCTAssertNil(item2.image, "Image should be nil when field is missing")
 
-        // Item 3: Product with image but no src field
+        // Item 3: Product with image object but no src field - should be nil
         let item3 = order.items[2]
-        XCTAssertNotNil(item3.image)
-        XCTAssertNil(item3.image?.src)
+        XCTAssertNil(item3.image, "Image should be nil when object has no src field")
 
-        // Item 4: Product with wrong src type
+        // Item 4: Product with image object with wrong src type (number instead of string) - should be nil
         let item4 = order.items[3]
-        XCTAssertNil(item4.image?.src)
+        XCTAssertNil(item4.image, "Image should be nil when src is not a string")
+
+        // Item 5: Product with direct string URL image (WordPress format) - should parse successfully
+        let item5 = order.items[4]
+        XCTAssertNotNil(item5.image, "Image object should exist for valid string URL")
+        XCTAssertEqual(item5.image?.src, "https://wordpress.example/wp-content/uploads/product-image-150x150.jpeg")
+
+        // Item 6: Product with unexpected image type (array) - should fail gracefully with nil
+        let item6 = order.items[5]
+        XCTAssertNil(item6.image, "Image should be nil for array type")
+
+        // Item 7: Product with nested object in image.src - should be nil
+        let item7 = order.items[6]
+        XCTAssertNil(item7.image, "Image should be nil when src is a nested object instead of string")
+
+        // Item 8: Product with image as number - should be parsed to string if possible
+        let item8 = order.items[7]
+        XCTAssertNotNil(item8.image?.src, "Image src should be not nil for number type")
+
+        // Item 9: Product with image as boolean - should fail gracefully with nil
+        let item9 = order.items[8]
+        XCTAssertNil(item9.image, "Image should be nil for boolean type")
+
+        // Item 10: Product with empty string image - should be nil
+        let item10 = order.items[9]
+        XCTAssertNil(item10.image, "Image should be nil for empty string")
+
+        // Item 11: Product with empty object image - should be nil
+        let item11 = order.items[10]
+        XCTAssertNil(item11.image, "Image should be nil for empty object")
     }
 }
 

Modules/Tests/NetworkingTests/Responses/order-item-image.json

@@ -129,6 +129,129 @@
                     "image": {
                         "src": 12345
                     }
+                },
+                {
+                    "id": 5,
+                    "name": "Product with direct string URL image",
+                    "product_id": 127,
+                    "variation_id": 0,
+                    "quantity": 1,
+                    "price": 10.0,
+                    "sku": "",
+                    "subtotal": "10.00",
+                    "subtotal_tax": "0.00",
+                    "tax_class": "",
+                    "taxes": [],
+                    "total": "10.00",
+                    "total_tax": "0.00",
+                    "meta_data": [],
+                    "image": "https://wordpress.example/wp-content/uploads/product-image-150x150.jpeg"
+                },
+                {
+                    "id": 6,
+                    "name": "Product with unexpected image type (array)",
+                    "product_id": 128,
+                    "variation_id": 0,
+                    "quantity": 1,
+                    "price": 10.0,
+                    "sku": "",
+                    "subtotal": "10.00",
+                    "subtotal_tax": "0.00",
+                    "tax_class": "",
+                    "taxes": [],
+                    "total": "10.00",
+                    "total_tax": "0.00",
+                    "meta_data": [],
+                    "image": ["unexpected", "array"]
+                },
+                {
+                    "id": 7,
+                    "name": "Product with nested object in image",
+                    "product_id": 129,
+                    "variation_id": 0,
+                    "quantity": 1,
+                    "price": 10.0,
+                    "sku": "",
+                    "subtotal": "10.00",
+                    "subtotal_tax": "0.00",
+                    "tax_class": "",
+                    "taxes": [],
+                    "total": "10.00",
+                    "total_tax": "0.00",
+                    "meta_data": [],
+                    "image": {
+                        "src": {
+                            "url": "https://nested.com/image.jpg"
+                        }
+                    }
+                },
+                {
+                    "id": 8,
+                    "name": "Product with image as number",
+                    "product_id": 130,
+                    "variation_id": 0,
+                    "quantity": 1,
+                    "price": 10.0,
+                    "sku": "",
+                    "subtotal": "10.00",
+                    "subtotal_tax": "0.00",
+                    "tax_class": "",
+                    "taxes": [],
+                    "total": "10.00",
+                    "total_tax": "0.00",
+                    "meta_data": [],
+                    "image": 12345
+                },
+                {
+                    "id": 9,
+                    "name": "Product with image as boolean",
+                    "product_id": 131,
+                    "variation_id": 0,
+                    "quantity": 1,
+                    "price": 10.0,
+                    "sku": "",
+                    "subtotal": "10.00",
+                    "subtotal_tax": "0.00",
+                    "tax_class": "",
+                    "taxes": [],
+                    "total": "10.00",
+                    "total_tax": "0.00",
+                    "meta_data": [],
+                    "image": true
+                },
+                {
+                    "id": 10,
+                    "name": "Product with empty string image",
+                    "product_id": 132,
+                    "variation_id": 0,
+                    "quantity": 1,
+                    "price": 10.0,
+                    "sku": "",
+                    "subtotal": "10.00",
+                    "subtotal_tax": "0.00",
+                    "tax_class": "",
+                    "taxes": [],
+                    "total": "10.00",
+                    "total_tax": "0.00",
+                    "meta_data": [],
+                    "image": ""
+                },
+                {
+                    "id": 11,
+                    "name": "Product with empty object image",
+                    "product_id": 133,
+                    "variation_id": 0,
+                    "quantity": 1,
+                    "price": 10.0,
+                    "sku": "",
+                    "subtotal": "10.00",
+                    "subtotal_tax": "0.00",
+                    "tax_class": "",
+                    "taxes": [],
+                    "total": "10.00",
+                    "total_tax": "0.00",
+                    "meta_data": [],
+                    "image": {}
                 }
             ],
             "coupon_lines": [],

WooCommerce/Resources/ar.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2025-09-17 16:36:59+0000 */
+/* Translation-Revision-Date: 2025-09-22 16:54:04+0000 */
 /* Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ar */
@@ -3203,9 +3203,6 @@ which should be translated separately and considered part of this sentence. */
 /* A fallback describing the contactless limit, shown on the About Tap to Pay screen. %1$@ will be replaced with the country name of the store, which is a trade off as it can't be contextually translated, however this string is only used when there's a problem decoding the limit, so it's acceptable. */
 "In %1$@, cards may only be used with Tap to Pay for transactions up to the contactless limit." = "في %1$@، لا يمكن استخدام البطاقات إلا من خلال ميزة Tap to Pay لإجراء معاملات تصل إلى الحد غير التلامسي.";
 
-/* Accessibility label for an indeterminate loading indicator */
-"In progress" = "قيد التقدم";
-
 /* Display label for the bundle item's inventory stock status */
 "In stock" = "متوفِّر";
 
@@ -11468,6 +11465,12 @@ which should be translated separately and considered part of this sentence. */
 /* Title of the Help section within Point of Sale settings. */
 "pointOfSaleSettingsView.sidebarNavigationHelpTitle" = "المساعدة";
 
+/* Description of the settings to be found within the Local catalog section. */
+"pointOfSaleSettingsView.sidebarNavigationLocalCatalogSubtitle" = "إدارة إعدادات الكتالوج";
+
+/* Title of the Local catalog section within Point of Sale settings. */
+"pointOfSaleSettingsView.sidebarNavigationLocalCatalogTitle" = "الكتالوج";
+
 /* Description of the settings to be found within the Store section. */
 "pointOfSaleSettingsView.sidebarNavigationStoreSubtitle" = "تكوين المتجر والإعدادات";
 
@@ -11786,6 +11789,12 @@ which should be translated separately and considered part of this sentence. */
 /* Accessibility label for button to dismiss a notice banner */
 "pos.noticeView.dismiss.button.accessibiltyLabel" = "تجاهل";
 
+/* Text appearing in the order details pane when there are no orders available. */
+"pos.orderDetailsEmptyView.noOrderToDisplay" = "لا يوجد طلب للعرض";
+
+/* Title at the header for the Order Details empty view. */
+"pos.orderDetailsEmptyView.ordersTitle" = "طلب";
+
 /* Section title for the products list */
 "pos.orderDetailsLoadingView.productsTitle" = "المنتجات";
 
@@ -11798,6 +11807,9 @@ which should be translated separately and considered part of this sentence. */
 /* Label for discount total in the totals section */
 "pos.orderDetailsView.discountTotalLabel" = "إجمالي الخصم";
 
+/* Label for email receipt action on order details view */
+"pos.orderDetailsView.emailReceiptAction.title" = "إرسال الإيصال في رسالة عبر البريد الإلكتروني";
+
 /* Label for net payment amount after refunds */
 "pos.orderDetailsView.netPaymentLabel" = "المبلغ الصافي للمدفوعات";
 
@@ -11837,9 +11849,30 @@ which should be translated separately and considered part of this sentence. */
 /* Text appearing on the order list screen when there's an error loading orders. */
 "pos.orderList.failedToLoadOrdersTitle" = "يتعذر تحميل الطلبات";
 
+/* Button text for refreshing orders when list is empty. */
+"pos.orderListView.emptyOrdersButtonTitle" = "تحديث";
+
+/* Hint text suggesting to modify search terms when no orders are found. */
+"pos.orderListView.emptyOrdersSearchHint" = "حاول تعديل مصطلح البحث.";
+
+/* Subtitle appearing when order search returns no results. */
+"pos.orderListView.emptyOrdersSearchSubtitle" = "لم نتمكن من العثور على أي شيء يطابق بحثك.";
+
+/* Title appearing when order search returns no results. */
+"pos.orderListView.emptyOrdersSearchTitle" = "لم يتم العثور على طلبات";
+
+/* Subtitle appearing when there are no orders to display. */
+"pos.orderListView.emptyOrdersSubtitle" = "ستظهر الطلبات هنا بمجرد بدء معالجة المبيعات على POS.";
+
+/* Title appearing when there are no orders to display. */
+"pos.orderListView.emptyOrdersTitle" = "لا توجد طلبات حتى الآن";
+
 /* Title at the header for the Orders view. */
 "pos.orderListView.ordersTitle" = "الطلبات";
 
+/* Placeholder for a search field in the Orders view. */
+"pos.orderListView.searchFieldPlaceholder" = "البحث في الطلبات";
+
 /* Text indicating that there are options available for a parent product */
 "pos.parentProductCard.optionsAvailable" = "خيارات متوفرة";
 
@@ -11930,9 +11963,6 @@ which should be translated separately and considered part of this sentence. */
 /* Title for discount total amount field */
 "pos.totalsView.discountTotal2" = "إجمالي الخصم";
 
-/* Text for the banner requiring specific WooCommerce version. */
-"pos.totalsView.receipts.banner.updateWooCommerceVersionText" = "يرجى تحديث WooCommerce إلى الإصدار 9.5.0";
-
 /* Title for subtotal amount field */
 "pos.totalsView.subtotal" = "الإجمالي الفرعي";
 
@@ -11948,6 +11978,36 @@ which should be translated separately and considered part of this sentence. */
 /* An error shown when the Point of Sale is used in iOS split view, but with not enough horizontal space. */
 "pos.unsupportedWidth.title" = "نقطة البيع غير مدعومة في عرض الشاشة هذا.";
 
+/* Label for allow full sync on cellular data toggle in Point of Sale settings. */
+"posSettingsLocalCatalogDetailView.allowFullSyncOnCellular" = "السماح بالمزامنة الكاملة على بيانات شبكة الجوال";
+
+/* Label for catalog size field in Point of Sale settings. */
+"posSettingsLocalCatalogDetailView.catalogSize" = "حجم الكتالوج";
+
+/* Section title for catalog status in Point of Sale settings. */
+"posSettingsLocalCatalogDetailView.catalogStatus" = "حالة الكتالوج";
+
+/* Label for last full sync field in Point of Sale settings. */
+"posSettingsLocalCatalogDetailView.lastFullSync" = "آخر مزامنة كاملة";
+
+/* Label for last incremental update field in Point of Sale settings. */
+"posSettingsLocalCatalogDetailView.lastIncrementalUpdate" = "آخر تحديث تزايدي";
+
+/* Section title for managing data usage in Point of Sale settings. */
+"posSettingsLocalCatalogDetailView.managingDataUsage" = "إدارة استخدام البيانات";
+
+/* Section title for manual catalog update in Point of Sale settings. */
+"posSettingsLocalCatalogDetailView.manualCatalogUpdate" = "تحديث الكتالوج يدويًا";
+
+/* Info text explaining when to use manual catalog update. */
+"posSettingsLocalCatalogDetailView.manualUpdateInfo" = "لا تستخدم هذا التحديث إلا عندما يبدو أن شيئًا ما متوقفًا عن التشغيل - يحافظ POS على تحديث البيانات تلقائيًا.";
+
+/* Button text for refreshing the catalog manually. */
+"posSettingsLocalCatalogDetailView.refreshCatalog" = "تحديث الكتالوج";
+
+/* Navigation title for the local catalog details in POS settings. */
+"posSettingsLocalCatalogDetailView.title" = "إعدادات الكتالوج";
+
 /* Close title for the navigation bar button on the Print Shipping Label view. */
 "print.shipping.label.close.button.title" = "إغلاق";