Merge branch 'trunk' into task/15304-split-shipment-navigation

Author: selanthiraiyan

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -71,6 +71,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return false
         case .pointOfSale:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .enableCouponsInPointOfSale:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .googleAdsCampaignCreationOnWebView:
             return true
         case .backgroundTasks:

Experiments/Experiments/FeatureFlag.swift

@@ -157,6 +157,10 @@ public enum FeatureFlag: Int {
     ///
     case pointOfSale
 
+    /// Enables coupons in Point of Sale
+    ///
+    case enableCouponsInPointOfSale
+
     /// Enables Google ads campaign creation on web view
     ///
     case googleAdsCampaignCreationOnWebView

RELEASE-NOTES.txt

@@ -6,6 +6,7 @@
 - [*] Product Form: Fix crash related to picking photos [https://github.com/woocommerce/woocommerce-ios/pull/15275]
 - [internal] Assign `siteID` and `productID` to image product upload statuses. [https://github.com/woocommerce/woocommerce-ios/pull/15196]
 - [*] Payments: Improved payment views' adaptability to larger accessibility font sizes [https://github.com/woocommerce/woocommerce-ios/pull/15328].
+- [internal] Add site related properties to crowdsignal surveys. [https://github.com/woocommerce/woocommerce-ios/pull/15353]
 
 21.9
 -----

WooCommerce/Classes/POS/Controllers/PointOfSaleItemsController.swift

@@ -141,7 +141,7 @@ protocol PointOfSaleItemsControllerProtocol {
                                                  parentItem: parent,
                                                  pageNumber: pageNumber,
                                                  appendToExistingItems: appendToExistingItems)
-        case .simpleProduct, .variation:
+        case .simpleProduct, .variation, .coupon:
             assertionFailure("Unsupported parent type for loading child items: \(parent)")
             return false
         }
@@ -158,6 +158,14 @@ protocol PointOfSaleItemsControllerProtocol {
     }
 }
 
+@available(iOS 17.0, *)
+private extension PointOfSaleItemsController {
+    func loadPointOfSaleCoupons() {
+        let posCoupons = itemProvider.providePointOfSaleCoupons()
+        debugPrint(posCoupons)
+    }
+}
+
 @available(iOS 17.0, *)
 private extension PointOfSaleItemsController {
     func setLoadingState(base: ItemListBaseItem) {

WooCommerce/Classes/POS/Models/PointOfSaleAggregateModel.swift

@@ -119,6 +119,8 @@ private extension POSItem {
             return CartItem(id: UUID(), item: variation, title: variation.parentProductName, subtitle: variation.name, quantity: 1)
         case .variableParentProduct:
             return nil
+        case .coupon:
+            return nil
         }
     }
 }

WooCommerce/Classes/POS/Presentation/Item Selector/ItemList.swift

@@ -116,6 +116,8 @@ private struct ItemListRow: View {
             }, label: {
                 VariationCardView(variation: variation)
             })
+        case .coupon:
+            EmptyView()
         }
     }
 }

WooCommerce/Classes/POS/Utils/PreviewHelpers.swift

@@ -56,6 +56,10 @@ final class PointOfSalePreviewItemService: PointOfSaleItemServiceProtocol {
                           name: "Product 1",
                           formattedPrice: "$1.00")
     }
+
+    func providePointOfSaleCoupons() -> [POSItem] {
+        []
+    }
 }
 
 @available(iOS 17.0, *)

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift

@@ -95,11 +95,13 @@ final class HubMenuViewModel: ObservableObject {
     private let googleAdsEligibilityChecker: GoogleAdsEligibilityChecker
 
     private(set) lazy var posItemProvider: PointOfSaleItemServiceProtocol = {
+        let storage = ServiceLocator.storageManager
         let currencySettings = ServiceLocator.currencySettings
 
         return PointOfSaleItemService(siteID: siteID,
                                       currencySettings: currencySettings,
-                                      credentials: credentials)
+                                      credentials: credentials,
+                                      storage: storage)
     }()
 
     private(set) lazy var inboxViewModel = InboxViewModel(siteID: siteID)

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Hazmat Section/WooShippingHazmatDetailView.swift

@@ -12,78 +12,99 @@ struct WooShippingHazmatDetailView: View {
     }
 
     var body: some View {
-        ScrollView {
-            VStack(spacing: Constants.verticalSpacing) {
-                HStack {
-                    Button(Localization.cancel) {
-                        dismiss()
-                    }
-                    .padding(.top)
-                    Spacer()
-                }
+        NavigationStack {
+            ScrollView {
+                VStack(spacing: Constants.verticalSpacing) {
 
-                Text(Localization.title)
-                    .secondaryTitleStyle()
-                    .bold()
+                    Text(Localization.title)
+                        .secondaryTitleStyle()
+                        .bold()
+                        .frame(maxWidth: .infinity, alignment: .leading)
 
-                Toggle(isOn: $isHazardous) {
-                    Text(Localization.toggleLabel)
-                }
+                    Toggle(isOn: $isHazardous) {
+                        Text(Localization.toggleLabel)
+                    }
 
-                Button(Localization.selectCategory) {
-                    // TODO: navigate to category list
-                }
-                .buttonStyle(PrimaryButtonStyle())
-                .renderedIf(isHazardous)
+                    Button(Localization.selectCategory) {
+                        // TODO: navigate to category list
+                    }
+                    .buttonStyle(PrimaryButtonStyle())
+                    .renderedIf(isHazardous)
 
-                Divider()
+                    Divider()
 
-                Text(Localization.detailLine1)
-                AttributedText(detailLine2AttributedString, enablesLinkUnderline: true)
-                AttributedText(detailLine3AttributedString, enablesLinkUnderline: true)
+                    Text(Localization.detailLine1)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                    Text(detailLine2AttributedString)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                    Text(detailLine3AttributedString)
+                        .frame(maxWidth: .infinity, alignment: .leading)
 
-                Spacer()
+                    Spacer()
+                }
+                .environment(\.openURL, OpenURLAction { url in
+                    detailURL = url
+                    return .handled
+                })
+                .safariSheet(url: $detailURL)
+                .padding(.horizontal)
+                .toolbar {
+                    ToolbarItem(placement: .cancellationAction) {
+                        Button(Localization.cancel) {
+                            dismiss()
+                        }
+                    }
+                }
+                .toolbarBackground(Color.clear, for: .navigationBar)
             }
-            .frame(maxWidth: .infinity, alignment: .leading)
-            .environment(\.openURL, OpenURLAction { url in
-                detailURL = url
-                return .handled
-            })
-            .safariSheet(url: $detailURL)
-            .padding(.horizontal)
         }
     }
 }
 
 private extension WooShippingHazmatDetailView {
-    var detailLine2AttributedString: NSAttributedString {
+    var detailLine2AttributedString: AttributedString {
         let content = String.localizedStringWithFormat(Localization.detailLine2, Constants.hazmatURL, Localization.searchTool)
+        var attributedText = AttributedString(content)
+        attributedText.font = .body
+        attributedText.foregroundColor = Color(.text)
+
+        if let range1 = attributedText.range(of: Constants.hazmatURL),
+           let url = URL(string: Constants.hazmatURL) {
+            var linkContainer = AttributeContainer()
+                .link(url)
+                .foregroundColor(Color.accentColor)
+            linkContainer.underlineStyle = .single
+            attributedText[range1].mergeAttributes(linkContainer)
+        }
 
-        let mutableAttributedText = NSMutableAttributedString(
-            string: content,
-            attributes: [.font: UIFont.body,
-                         .foregroundColor: UIColor.text]
-        )
-
-        mutableAttributedText.setAsLink(textToFind: Constants.hazmatURL,
-                                        linkURL: Constants.hazmatURL)
-        mutableAttributedText.setAsLink(textToFind: Localization.searchTool,
-                                        linkURL: Constants.searchToolURL)
-        return mutableAttributedText
+        if let range2 = attributedText.range(of: Localization.searchTool),
+           let url = URL(string: Constants.searchToolURL) {
+            var linkContainer = AttributeContainer()
+                .link(url)
+                .foregroundColor(Color.accentColor)
+            linkContainer.underlineStyle = .single
+            attributedText[range2].mergeAttributes(linkContainer)
+        }
+        return attributedText
     }
 
-    var detailLine3AttributedString: NSAttributedString {
+    var detailLine3AttributedString: AttributedString {
         let content = String.localizedStringWithFormat(Localization.detailLine3, Constants.DHLExpressName)
 
-        let mutableAttributedText = NSMutableAttributedString(
-            string: content,
-            attributes: [.font: UIFont.body,
-                         .foregroundColor: UIColor.text]
-        )
+        var attributedText = AttributedString(content)
+        attributedText.font = .body
+        attributedText.foregroundColor = Color(.text)
+
+        if let range = attributedText.range(of: Constants.DHLExpressName),
+           let url = URL(string: Constants.DHLExpressURL) {
+            var linkContainer = AttributeContainer()
+                .link(url)
+                .foregroundColor(Color.accentColor)
+            linkContainer.underlineStyle = .single
+            attributedText[range].mergeAttributes(linkContainer)
+        }
 
-        mutableAttributedText.setAsLink(textToFind: Constants.DHLExpressName,
-                                        linkURL: Constants.DHLExpressURL)
-        return mutableAttributedText
+        return attributedText
     }
 }
 

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Hazmat Section/WooShippingHazmatRow.swift

@@ -44,7 +44,7 @@ private extension WooShippingHazmatRow {
     }
 
     enum Localization {
-        static let hazmatLabel = NSLocalizedString("wooShipping.createLabel.hazmatLabel",
+        static let hazmatLabel = NSLocalizedString("wooShipping.createLabel.hazmatRow.label",
                                                    value: "Are you shipping dangerous goods or hazardous materials?",
                                                    comment: "Label for section in shipping label creation to declare when a package contains hazardous materials.")
         static let yes = NSLocalizedString(