Skip to content

Commit 5102e04

Browse files
committed
Pass flow instead of order to NewOrderViewModel initializer
1 parent d7d6565 commit 5102e04

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

WooCommerce/Classes/ViewRelated/Orders/Order Creation/NewOrderViewModel.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -234,23 +234,23 @@ final class NewOrderViewModel: ObservableObject {
234234
private let orderSynchronizer: OrderSynchronizer
235235

236236
init(siteID: Int64,
237-
initialOrder: Order? = nil,
237+
flow: Flow = .creation,
238238
stores: StoresManager = ServiceLocator.stores,
239239
storageManager: StorageManagerType = ServiceLocator.storageManager,
240240
currencySettings: CurrencySettings = ServiceLocator.currencySettings,
241241
analytics: Analytics = ServiceLocator.analytics,
242242
featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService) {
243243
self.siteID = siteID
244-
if let initialOrder = initialOrder {
245-
self.flow = .editing(initialOrder: initialOrder)
246-
} else {
247-
self.flow = .creation
248-
}
244+
self.flow = flow
249245
self.stores = stores
250246
self.storageManager = storageManager
251247
self.currencyFormatter = CurrencyFormatter(currencySettings: currencySettings)
252248
self.analytics = analytics
253-
self.orderSynchronizer = RemoteOrderSynchronizer(siteID: siteID, initialOrder: initialOrder, stores: stores, currencySettings: currencySettings)
249+
if case let .editing(initialOrder) = flow {
250+
self.orderSynchronizer = RemoteOrderSynchronizer(siteID: siteID, initialOrder: initialOrder, stores: stores, currencySettings: currencySettings)
251+
} else {
252+
self.orderSynchronizer = RemoteOrderSynchronizer(siteID: siteID, initialOrder: nil, stores: stores, currencySettings: currencySettings)
253+
}
254254
self.featureFlagService = featureFlagService
255255

256256
// Set a temporary initial view model, as a workaround to avoid making it optional.

WooCommerce/Classes/ViewRelated/Orders/Order Details/OrderDetailsViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ private extension OrderDetailsViewController {
353353
/// Presents the order edit form
354354
///
355355
private func editOrder() {
356-
let viewModel = NewOrderViewModel(siteID: viewModel.order.siteID, initialOrder: viewModel.order)
356+
let viewModel = NewOrderViewModel(siteID: viewModel.order.siteID, flow: .editing(initialOrder: viewModel.order))
357357
viewModel.onOrderCreated = { [weak self] order in
358358
guard let self = self else { return }
359359
self.dismiss(animated: true)

0 commit comments

Comments
 (0)