[Shipping Labels] Pre-fill shipping item customs details (#15811)

Author: itsmeichigo

RELEASE-NOTES.txt

@@ -12,6 +12,8 @@
 - [*] Shipping Labels: Fixed issue displaying fulfilled shipment after purchasing a label and quickly navigating back to the purchase form. [https://github.com/woocommerce/woocommerce-ios/pull/15790]
 - [*] Shipping Labels: Fixed mismatched indices of purchased labels on the order details screen. [https://github.com/woocommerce/woocommerce-ios/pull/15800]
 - [*] POS: Prevent card reader connection success alert flashing when connecting during a payment [https://github.com/woocommerce/woocommerce-ios/pull/15784]
+- [**] Shipping Labels: Support UPS extra services [https://github.com/woocommerce/woocommerce-ios/pull/15819, https://github.com/woocommerce/woocommerce-ios/pull/15821]
+- [*] Shipping Labels: Pre-fill custom forms with item description, value, and weight [https://github.com/woocommerce/woocommerce-ios/pull/15811]
 - [internal] POS: Improved scrolling and animation performance by refactoring the shadow implementation and updating the cart and checkout views. [https://github.com/woocommerce/woocommerce-ios/pull/15817]
 
 22.6

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsFormViewModel.swift

@@ -38,6 +38,8 @@ final class WooShippingCustomsFormViewModel: ObservableObject {
             WooShippingCustomsItemViewModel(itemName: $0.name,
                                             itemProductID: $0.productOrVariationID,
                                             itemQuantity: $0.quantity,
+                                            itemValue: $0.value,
+                                            itemWeight: $0.weight,
                                             currencySymbol: currencySymbol(from: order))
         }
 

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsItemViewModel.swift

@@ -71,12 +71,17 @@ final class WooShippingCustomsItemViewModel: ObservableObject {
     init(itemName: String,
          itemProductID: Int64,
          itemQuantity: Decimal,
+         itemValue: Double,
+         itemWeight: Double,
          currencySymbol: String,
          storageManager: StorageManagerType = ServiceLocator.storageManager,
          stores: StoresManager = ServiceLocator.stores) {
         self.title = itemName
+        self.description = itemName
         self.itemProductID = itemProductID
         self.itemQuantity = itemQuantity
+        self.valuePerUnit = String(itemValue)
+        self.weightPerUnit = String(itemWeight)
         self.currencySymbol = currencySymbol
         self.storageManager = storageManager
         self.stores = stores

WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsFormViewModelTests.swift

@@ -315,6 +315,23 @@ final class WooShippingCustomsFormViewModelTests: XCTestCase {
         // Then
         XCTAssertTrue(viewModel.requiredInformationIsEntered)
     }
+
+    func test_init_when_shipment_has_items_then_prefills_item_details() {
+        // Given
+        let shipment = sampleShipment
+        let firstItem = shipment.items.first
+
+        // When
+        viewModel = WooShippingCustomsFormViewModel(order: Order.fake(),
+                                                    shipment: shipment,
+                                                    onCompletion: { _ in })
+        let firstItemViewModel = viewModel.itemsViewModels.first
+
+        // Then
+        XCTAssertEqual(firstItemViewModel?.description, firstItem?.name)
+        XCTAssertEqual(firstItemViewModel?.valuePerUnit, String(firstItem?.value ?? 0))
+        XCTAssertEqual(firstItemViewModel?.weightPerUnit, String(firstItem?.weight ?? 0))
+    }
 }
 
 private extension WooShippingCustomsFormViewModelTests {

WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsItemViewModelTests.swift

@@ -9,6 +9,8 @@ final class WooShippingCustomsItemViewModelTests: XCTestCase {
         viewModel = WooShippingCustomsItemViewModel(itemName: "Test",
                                                     itemProductID: 22,
                                                     itemQuantity: 1,
+                                                    itemValue: 0,
+                                                    itemWeight: 0,
                                                     currencySymbol: "$")
     }
 
@@ -52,18 +54,21 @@ final class WooShippingCustomsItemViewModelTests: XCTestCase {
         viewModel = WooShippingCustomsItemViewModel(itemName: "Test",
                                                     itemProductID: 22,
                                                     itemQuantity: 1,
+                                                    itemValue: 0,
+                                                    itemWeight: 0,
                                                     currencySymbol: "$")
 
         // Then
         XCTAssertNil(viewModel.hsTariffNumberTotalValue)
-
     }
 
     func test_hsTariffNumberTotalValue_when_currency_symbol_is_$_but_hsTariffNumber_is_empty_returns_nil() {
         //Given
         viewModel = WooShippingCustomsItemViewModel(itemName: "Test",
                                                     itemProductID: 22,
                                                     itemQuantity: 1,
+                                                    itemValue: 0,
+                                                    itemWeight: 0,
                                                     currencySymbol: "$")
 
         // When
@@ -72,19 +77,19 @@ final class WooShippingCustomsItemViewModelTests: XCTestCase {
 
         // Then
         XCTAssertNil(viewModel.hsTariffNumberTotalValue)
-
     }
 
     func test_hsTariffNumberTotalValue_when_currency_symbol_is_$_but_invalid_hs_tariff_number_returns_nil() {
         // Given
         viewModel = WooShippingCustomsItemViewModel(itemName: "Test",
                                                     itemProductID: 22,
                                                     itemQuantity: 1,
+                                                    itemValue: 0,
+                                                    itemWeight: 0,
                                                     currencySymbol: "$")
         viewModel.hsTariffNumber = "123"
         viewModel.valuePerUnit = "1000"
 
-
         // Then
         XCTAssertNil(viewModel.hsTariffNumberTotalValue)
     }
@@ -94,6 +99,8 @@ final class WooShippingCustomsItemViewModelTests: XCTestCase {
         viewModel = WooShippingCustomsItemViewModel(itemName: "Test",
                                                     itemProductID: 22,
                                                     itemQuantity: 2,
+                                                    itemValue: 0,
+                                                    itemWeight: 0,
                                                     currencySymbol: "$")
         viewModel.valuePerUnit = "3000"
         viewModel.hsTariffNumber = "123456"

WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShippingShipmentDetailsViewModelTests.swift

@@ -325,7 +325,14 @@ final class WooShippingShipmentDetailsViewModelTests: XCTestCase {
 
     func test_changing_customs_form_loads_new_label_rates_with_updated_customs_form() {
         // Given
-        let expectedItem = ShippingLabelCustomsForm.Item.fake().copy(quantity: 2, productID: 1)
+        let expectedItem = ShippingLabelCustomsForm.Item.fake().copy(
+            description: "Shirt",
+            quantity: 2,
+            value: 9.99,
+            weight: 0.5,
+            productID: 1
+        )
+
         let expectedCustomsForm = ShippingLabelCustomsForm.fake().copy(contentsType: .gift,
                                                                        restrictionType: .quarantine,
                                                                        nonDeliveryOption: .abandon,