Merge pull request #6161 from woocommerce/issue/5765-usage-details-row-and-polish

Coupons: Add row for usage details and some polishing for coupon details screen

Author: itsmeichigo

WooCommerce/Classes/ViewRelated/Coupons/CouponDetails/CouponDetails.swift

@@ -112,7 +112,7 @@ struct CouponDetails: View {
                         ForEach(detailRows) { row in
                             TitleAndValueRow(title: row.title,
                                              value: .content(row.content),
-                                             selectable: true,
+                                             selectable: false,
                                              action: row.action)
                                 .padding(.vertical, Constants.verticalSpacing)
                                 .padding(.horizontal, insets: geometry.safeAreaInsets)
@@ -122,6 +122,19 @@ struct CouponDetails: View {
                         }
                     }
                     .background(Color(.listForeground))
+
+                    Spacer().frame(height: Constants.margin)
+                    Divider()
+                    VStack {
+                        NavigationRow(content: {
+                            Text(Localization.usageDetails)
+                                .bodyStyle()
+                        }, action: {
+                            // TODO-5766: Add usage details screen
+                        }).padding(.horizontal, insets: geometry.safeAreaInsets)
+                    }
+                    .background(Color(.listForeground))
+                    Divider()
                 }
             }
             .background(Color(.listBackground))
@@ -165,6 +178,7 @@ private extension CouponDetails {
         static let performance = NSLocalizedString("Performance", comment: "Title of the Performance section on Coupons Details screen")
         static let discountedOrders = NSLocalizedString("Discounted Orders", comment: "Title of the Discounted Orders label on Coupon Details screen")
         static let amount = NSLocalizedString("Amount", comment: "Title of the Amount label on Coupon Details screen")
+        static let usageDetails = NSLocalizedString("Usage details", comment: "Title of the Usage details row in Coupon Details screen")
     }
 
     struct DetailRow: Identifiable {

WooCommerce/Classes/ViewRelated/Coupons/CouponDetails/CouponDetailsViewModel.swift

@@ -132,9 +132,9 @@ private extension CouponDetailsViewModel {
 
     /// Localize content for the "Apply to" field. This takes into consideration different cases of apply rules:
     ///    - When only specific products or categories are defined: Display "x Products" or "x Categories"
-    ///    - When specific products/categories and exceptions are defined: Display "x Products except y Categories" etc.
+    ///    - When specific products/categories and exceptions are defined: Display "x Products excl. y Categories" etc.
     ///    - When both specific products and categories are defined: Display "x Products and y Categories"
-    ///    - When only exceptions are defined: Display "All except x Products" or "All except y Categories"
+    ///    - When only exceptions are defined: Display "All excl. x Products" or "All excl. y Categories"
     ///
     func localizeApplyRules(productsCount: Int, excludedProductsCount: Int, categoriesCount: Int, excludedCategoriesCount: Int) -> String {
         let productText = String.pluralize(productsCount, singular: Localization.singleProduct, plural: Localization.multipleProducts)
@@ -198,8 +198,8 @@ private extension CouponDetailsViewModel {
             comment: "The number of category allowed for a coupon in plural form. " +
             "Reads like: 10 Categories"
         )
-        static let allWithException = NSLocalizedString("All except %1$@", comment: "Exception rule for a coupon. Reads like: All except 2 Products")
-        static let ruleWithException = NSLocalizedString("%1$@ except %2$@", comment: "Exception rule for a coupon. Reads like: 3 Products except 1 Category")
+        static let allWithException = NSLocalizedString("All excl. %1$@", comment: "Exception rule for a coupon. Reads like: All excl. 2 Products")
+        static let ruleWithException = NSLocalizedString("%1$@ excl. %2$@", comment: "Exception rule for a coupon. Reads like: 3 Products excl. 1 Category")
         static let combinedRules = NSLocalizedString("%1$@ and %2$@", comment: "Combined rule for a coupon. Reads like: 2 Products and 1 Category")
     }
 }

WooCommerce/WooCommerceTests/ViewRelated/Coupons/CouponDetailsViewModelTests.swift

@@ -87,7 +87,7 @@ final class CouponDetailsViewModelTests: XCTestCase {
         let viewModel = CouponDetailsViewModel(coupon: sampleCoupon)
 
         // Then
-        let appliedTo = String(format: NSLocalizedString("%d Products except %d Category", comment: ""), 3, 1)
+        let appliedTo = String(format: NSLocalizedString("%d Products excl. %d Category", comment: ""), 3, 1)
         XCTAssertEqual(viewModel.productsAppliedTo, appliedTo)
     }
 
@@ -97,7 +97,7 @@ final class CouponDetailsViewModelTests: XCTestCase {
         let viewModel = CouponDetailsViewModel(coupon: sampleCoupon)
 
         // Then
-        let appliedTo = String(format: NSLocalizedString("%d Categories except %d Products", comment: ""), 3, 2)
+        let appliedTo = String(format: NSLocalizedString("%d Categories excl. %d Products", comment: ""), 3, 2)
         XCTAssertEqual(viewModel.productsAppliedTo, appliedTo)
     }
 
@@ -107,7 +107,7 @@ final class CouponDetailsViewModelTests: XCTestCase {
         let viewModel = CouponDetailsViewModel(coupon: sampleCoupon)
 
         // Then
-        let appliedTo = String(format: NSLocalizedString("All except %d Products", comment: ""), 2)
+        let appliedTo = String(format: NSLocalizedString("All excl. %d Products", comment: ""), 2)
         XCTAssertEqual(viewModel.productsAppliedTo, appliedTo)
     }
 
@@ -117,7 +117,7 @@ final class CouponDetailsViewModelTests: XCTestCase {
         let viewModel = CouponDetailsViewModel(coupon: sampleCoupon)
 
         // Then
-        let appliedTo = String(format: NSLocalizedString("All except %d Categories", comment: ""), 2)
+        let appliedTo = String(format: NSLocalizedString("All excl. %d Categories", comment: ""), 2)
         XCTAssertEqual(viewModel.productsAppliedTo, appliedTo)
     }