Merge branch 'trunk' into woomob-771-shipping-label-optimize-country-fetches

Author: itsmeichigo

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -99,6 +99,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .pointOfSaleOrdersi1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .pointOfSaleOrdersi2:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Modules/Sources/Experiments/FeatureFlag.swift

@@ -203,4 +203,8 @@ public enum FeatureFlag: Int {
     /// Enables displaying Point Of Sale details in order list and order details
     ///
     case pointOfSaleOrdersi1
+
+    /// Enables displaying Point Of Sale as a filter in order list
+    ///
+    case pointOfSaleOrdersi2
 }

Modules/Sources/Yosemite/Stores/WooShippingStore.swift

@@ -192,7 +192,17 @@ private extension WooShippingStore {
 
     func loadAccountSettings(siteID: Int64,
                              completion: @escaping (Result<WooShippingAccountSettings, Error>) -> Void) {
-        remote.loadAccountSettings(siteID: siteID, completion: completion)
+        remote.loadAccountSettings(siteID: siteID, completion: { [weak self] result in
+            guard let self else { return }
+            switch result {
+            case .success(let settings):
+                upsertShippingLabelAccountSettingsInBackground(siteID: siteID, accountSettings: settings.accountSettings) {
+                    completion(.success(settings))
+                }
+            case .failure(let error):
+                completion(.failure(error))
+            }
+        })
     }
 
     func updateAccountSettings(siteID: Int64,
@@ -732,6 +742,29 @@ private extension WooShippingStore {
             storageShippingLabel.refund = nil
         }
     }
+
+    /// Updates/inserts the specified readonly shipping label account settings entity *in a background thread*.
+    /// `onCompletion` will be called on the main thread!
+    ///
+    func upsertShippingLabelAccountSettingsInBackground(siteID: Int64,
+                                                        accountSettings: ShippingLabelAccountSettings,
+                                                        onCompletion: @escaping () -> Void) {
+        storageManager.performAndSave({ storage in
+            let storageAccountSettings = storage.loadShippingLabelAccountSettings(siteID: siteID) ??
+                storage.insertNewObject(ofType: Storage.ShippingLabelAccountSettings.self)
+            storageAccountSettings.update(with: accountSettings)
+
+            // Remove all previous payment methods
+            storageAccountSettings.paymentMethods?.removeAll()
+
+            // Insert the payment methods from the read-only account settings
+            for paymentMethod in accountSettings.paymentMethods {
+                let newStoragePaymentMethod = storage.insertNewObject(ofType: Storage.ShippingLabelPaymentMethod.self)
+                newStoragePaymentMethod.update(with: paymentMethod)
+                storageAccountSettings.addToPaymentMethods(newStoragePaymentMethod)
+            }
+        }, completion: onCompletion, on: .main)
+    }
 }
 
 /// Represents errors that can be returned when purchasing a shipping label

Modules/Tests/YosemiteTests/Stores/WooShippingStoreTests.swift

@@ -2,6 +2,7 @@ import XCTest
 @testable import Yosemite
 @testable import Networking
 import protocol Storage.StorageType
+import class Storage.ShippingLabelPaymentMethod
 
 final class WooShippingStoreTests: XCTestCase {
 
@@ -365,6 +366,90 @@ final class WooShippingStoreTests: XCTestCase {
         XCTAssertEqual(receivedValue, [samplePackage])
     }
 
+    // MARK: `loadAccountSettings`
+
+    func test_loadAccountSettings_returns_success_response() throws {
+        // Given
+        let remote = MockWooShippingRemote()
+        let expectedSettings = WooShippingAccountSettings.fake()
+        remote.whenLoadAccountSettings(siteID: sampleSiteID, thenReturn: .success(expectedSettings))
+        let store = WooShippingStore(dispatcher: dispatcher, storageManager: storageManager, network: network, remote: remote)
+
+        // When
+        let result: Result<WooShippingAccountSettings, Error> = waitFor { promise in
+            let action = WooShippingAction.loadAccountSettings(siteID: self.sampleSiteID) { result in
+                promise(result)
+            }
+            store.onAction(action)
+        }
+
+        // Then
+        XCTAssertTrue(result.isSuccess)
+        let actualSettings = try result.get()
+        XCTAssertEqual(actualSettings, expectedSettings)
+    }
+
+    func test_loadAccountSettings_returns_error_on_failure() throws {
+        // Given
+        let remote = MockWooShippingRemote()
+        let expectedError = NetworkError.notFound()
+        remote.whenLoadAccountSettings(siteID: sampleSiteID, thenReturn: .failure(expectedError))
+        let store = WooShippingStore(dispatcher: dispatcher, storageManager: storageManager, network: network, remote: remote)
+
+        // When
+        let result: Result<WooShippingAccountSettings, Error> = waitFor { promise in
+            let action = WooShippingAction.loadAccountSettings(siteID: self.sampleSiteID) { result in
+                promise(result)
+            }
+            store.onAction(action)
+        }
+
+        // Then
+        XCTAssertTrue(result.isFailure)
+        let error = try XCTUnwrap(result.failure)
+        XCTAssertEqual(error as? NetworkError, expectedError)
+    }
+
+    func test_loadAccountSettings_when_successful_then_upserts_settings_into_storage() throws {
+        // Given
+        let remote = MockWooShippingRemote()
+        let paymentMethod = Yosemite.ShippingLabelPaymentMethod(
+            paymentMethodID: 1434,
+            name: "James Dean",
+            cardType: .visa,
+            cardDigits: "2352",
+            expiry: DateFormatter.Defaults.yearMonthDayDateFormatter.date(from: "2030-12-31")
+        )
+        let accountSettings = ShippingLabelAccountSettings.fake().copy(
+            siteID: sampleSiteID,
+            paymentMethods: [paymentMethod],
+            isEmailReceiptsEnabled: true,
+            paperSize: .a4
+        )
+        let expectedSettings = WooShippingAccountSettings.fake().copy(accountSettings: accountSettings)
+        remote.whenLoadAccountSettings(siteID: sampleSiteID, thenReturn: .success(expectedSettings))
+        let store = WooShippingStore(dispatcher: dispatcher, storageManager: storageManager, network: network, remote: remote)
+
+        // Confidence check
+        XCTAssertEqual(storageManager.viewStorage.countObjects(ofType: StorageShippingLabelAccountSettings.self), 0)
+
+        // When
+        let onSuccess: Bool = waitFor { promise in
+            let action = WooShippingAction.loadAccountSettings(siteID: self.sampleSiteID) { result in
+                promise(result.isSuccess)
+            }
+            store.onAction(action)
+        }
+
+        // Then
+        XCTAssertTrue(onSuccess)
+        XCTAssertEqual(storageManager.viewStorage.countObjects(ofType: StorageShippingLabelAccountSettings.self), 1)
+        let storedSettings = try XCTUnwrap(storageManager.viewStorage.loadShippingLabelAccountSettings(siteID: sampleSiteID))
+        XCTAssertEqual(storedSettings.siteID, sampleSiteID)
+        XCTAssertEqual(storedSettings.toReadOnly(), accountSettings)
+        XCTAssertEqual(storageManager.viewStorage.countObjects(ofType: Storage.ShippingLabelPaymentMethod.self), 1)
+    }
+
     // MARK: `loadPackages`
 
     func test_loadPackages_returns_success_response_with_rates() throws {

RELEASE-NOTES.txt

@@ -7,8 +7,10 @@
 - [*] POS: icon button with confirmation step used for clearing the cart [https://github.com/woocommerce/woocommerce-ios/pull/15829]
 - [*] Shipping Labels: Fixed a portion of layout issues caused by bigger accessibility content size categories. [https://github.com/woocommerce/woocommerce-ios/pull/15844]
 - [*] Shipping Labels: Enable the confirm button on the payment method sheet even when there are no changes. [https://github.com/woocommerce/woocommerce-ios/pull/15856]
+- [*] POS: start a new cart by scanning a barcode on the payment success screen [https://github.com/woocommerce/woocommerce-ios/pull/15870]
 - [*] Watch app: Fixed connection issue upon fresh install [https://github.com/woocommerce/woocommerce-ios/pull/15867]
 - [Internal] Shipping Labels: Optimize requests for syncing countries [https://github.com/woocommerce/woocommerce-ios/pull/15875]
+- [*] Shipping Labels: Display label size from account settings as default [https://github.com/woocommerce/woocommerce-ios/pull/15873]
 
 22.7
 -----

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSalePaymentSuccessView.swift

@@ -4,6 +4,7 @@ import SwiftUI
 struct PointOfSalePaymentSuccessView: View {
     let viewModel: PointOfSalePaymentSuccessViewModel
     @Environment(\.dynamicTypeSize) var dynamicTypeSize
+    @Environment(PointOfSaleAggregateModel.self) private var posModel
 
     @State private var isShowingSendReceiptView: Bool = false
     @State private var isShowingReceiptNotEligibleBanner: Bool = false
@@ -24,6 +25,10 @@ struct PointOfSalePaymentSuccessView: View {
                 }
                 .padding([.leading, .trailing], dynamicTypeSize.isAccessibilitySize ? nil : POSPadding.small)
                 .background(Color.posSurfaceBright)
+                .barcodeScanning { barcode in
+                    posModel.startNewCart()
+                    posModel.barcodeScanned(barcode)
+                }
             }
         }
         .onAppear {

WooCommerce/Classes/Tools/BackgroundTasks/OrderListSyncBackgroundTask.swift

@@ -77,6 +77,7 @@ private struct CurrentOrderListSyncUseCase {
                                                                    dateRange: settings.dateRangeFilter,
                                                                    product: settings.productFilter,
                                                                    customer: settings.customerFilter,
+                                                                   salesChannel: nil, // TODO: Filter persistence WOOMOB-712
                                                                    numberOfActiveFilters: settings.numberOfActiveFilters())
                     continuation.resume(returning: filters)
                 case .failure:

WooCommerce/Classes/ViewRelated/Filters/FilterListViewController.swift

@@ -92,6 +92,8 @@ enum FilterListValueSelectorConfig {
     case products(siteID: Int64)
     // Filter list selector for customer
     case customer(siteID: Int64)
+    // Filter list selector for sales channel
+    case salesChannel
 
 }
 
@@ -297,6 +299,10 @@ private extension FilterListViewController {
                     self.listSelector.reloadData()
                 }
                 self.listSelector.navigationController?.pushViewController(statusesFilterVC, animated: true)
+            case .salesChannel:
+                // TODO: Make OrderSalesChannelFilterViewController, and handle filtering selection WOOMOB-711
+                let emptyViewController = EmptyStateViewController(style: .list)
+                self.listSelector.navigationController?.pushViewController(emptyViewController, animated: true)
             case .ordersDateRange:
                 let selectedOrderFilter = selected.selectedValue as? OrderDateRangeFilter
                 let datesFilterVC = OrderDatesFilterViewController(selected: selectedOrderFilter) { dateRangeFilter in

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Post-Purchase/WooShippingPostPurchaseViewModel.swift

@@ -3,9 +3,11 @@ import Foundation
 import UIKit
 import Yosemite
 import WooFoundation
+import protocol Storage.StorageManagerType
 
 final class WooShippingPostPurchaseViewModel: ObservableObject {
     private let stores: StoresManager
+    private let storageManager: StorageManagerType
     private let siteID: Int64
     private let labelID: Int64
 
@@ -26,14 +28,27 @@ final class WooShippingPostPurchaseViewModel: ObservableObject {
     /// Customs form URL for the shipping label
     let commercialInvoiceURL: URL?
 
+    /// Shipping Label Account Settings ResultsController
+    ///
+    private lazy var accountSettingsResultsController: ResultsController<StorageShippingLabelAccountSettings> = {
+        let predicate = NSPredicate(format: "siteID == %lld", siteID)
+        return ResultsController<StorageShippingLabelAccountSettings>(
+            storageManager: storageManager,
+            matching: predicate,
+            fetchLimit: 1,
+            sortedBy: []
+        )
+    }()
+
     init(siteID: Int64,
          labelID: Int64,
          labelSizes: [ShippingLabelPaperSize],
          isRefundable: Bool,
          trackingURL: URL?,
          pickupURL: URL?,
          commercialInvoiceURL: URL?,
-         stores: StoresManager = ServiceLocator.stores) {
+         stores: StoresManager = ServiceLocator.stores,
+         storageManager: StorageManagerType = ServiceLocator.storageManager) {
         self.siteID = siteID
         self.labelID = labelID
         self.labelSizes = labelSizes
@@ -42,15 +57,20 @@ final class WooShippingPostPurchaseViewModel: ObservableObject {
         self.pickupURL = pickupURL
         self.commercialInvoiceURL = commercialInvoiceURL
         self.stores = stores
+        self.storageManager = storageManager
+
+        configureAccountSettingsResultsController()
     }
 
     convenience init(shippingLabel: ShippingLabel,
                      siteAddress: SiteAddress = SiteAddress(),
-                     stores: StoresManager = ServiceLocator.stores) {
+                     stores: StoresManager = ServiceLocator.stores,
+                     storageManager: StorageManagerType = ServiceLocator.storageManager) {
         // Label sizes aren't provided by the API, so we can hard-code them to match the extension behavior:
+        // Ref: https://github.com/woocommerce/woocommerce-shipping/blob/trunk/client/components/label-purchase/label/utils.ts
         let labelSizes = {
             var availableLabelSizes: [ShippingLabelPaperSize] = [.label, .letter]
-            if [.US, .CA, .MX, .DO].contains(siteAddress.countryCode) {
+            if [.US, .CA, .MX, .DO].contains(siteAddress.countryCode) == false {
                 availableLabelSizes.append(.a4)
             }
             return availableLabelSizes
@@ -71,7 +91,8 @@ final class WooShippingPostPurchaseViewModel: ObservableObject {
                   trackingURL: trackingURL,
                   pickupURL: pickupURL,
                   commercialInvoiceURL: commercialInvoiceURL,
-                  stores: stores)
+                  stores: stores,
+                  storageManager: storageManager)
     }
 
     /// Fetches the shipping label in the selected paper size and presents the print dialog.
@@ -89,6 +110,26 @@ final class WooShippingPostPurchaseViewModel: ObservableObject {
 }
 
 private extension WooShippingPostPurchaseViewModel {
+    /// Shipping Label Account Settings ResultsController monitoring
+    ///
+    func configureAccountSettingsResultsController() {
+        accountSettingsResultsController.onDidChangeContent = { [weak self] in
+            self?.updateSelectedLabelSize()
+        }
+
+        accountSettingsResultsController.onDidResetContent = { [weak self] in
+            self?.updateSelectedLabelSize()
+        }
+
+        try? accountSettingsResultsController.performFetch()
+        updateSelectedLabelSize()
+    }
+
+    func updateSelectedLabelSize() {
+        guard let fetchedAccountSettings = accountSettingsResultsController.fetchedObjects.first else { return }
+        selectedLabelSize = fetchedAccountSettings.paperSize
+    }
+
     /// Requests the shipping label data for printing.
     @MainActor
     func requestPrintData() async throws -> ShippingLabelPrintData {