[Woo POS][Cash & Receipts] Render cash button and navigate to cash view #14724
+176
−1
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| import SwiftUI | ||
|
|
||
| struct PointOfSaleCollectCashView: View { | ||
| @Environment(\.dismiss) private var dismiss | ||
| @EnvironmentObject private var posModel: PointOfSaleAggregateModel | ||
|
|
||
| @State private var textFieldAmountInput: String = "" | ||
| @State private var isLoading: Bool = false | ||
| @State private var errorMessage: String? | ||
|
|
||
| let orderTotal: String | ||
|
|
||
| private var formattedOrderTotal: String { | ||
| String.localizedStringWithFormat(Localization.backNavigationSubtitle, orderTotal) | ||
| } | ||
|
|
||
| var body: some View { | ||
| VStack(alignment: .center, spacing: 20) { | ||
| HStack { | ||
| Button(action: { | ||
| dismiss() | ||
| }, label: { | ||
| VStack { | ||
| HStack { | ||
| Image(systemName: "chevron.left") | ||
| Text(Localization.backNavigationTitle) | ||
| } | ||
| .font(.posTitleRegular) | ||
| .bold() | ||
| .foregroundColor(.primary) | ||
|
|
||
| Text(formattedOrderTotal) | ||
| .font(.posBodyRegular) | ||
| .foregroundColor(.primary) | ||
| } | ||
| }) | ||
| Spacer() | ||
| } | ||
| .padding() | ||
|
|
||
| TextField("$0.00", text: $textFieldAmountInput) | ||
| .keyboardType(.numbersAndPunctuation) | ||
| .textInputAutocapitalization(.none) | ||
| .autocorrectionDisabled() | ||
| .multilineTextAlignment(.center) | ||
| .font(POSFontStyle.posTitleRegular) | ||
| .focused() | ||
| .padding() | ||
| .onSubmit { | ||
| Task { @MainActor in | ||
| await markComplete() | ||
| } | ||
| } | ||
|
|
||
| if let errorMessage = errorMessage { | ||
| Text(errorMessage) | ||
| .font(POSFontStyle.posBodyRegular) | ||
| .foregroundColor(.red) | ||
| } | ||
|
|
||
| Button(action: { | ||
| Task { @MainActor in | ||
| await markComplete() | ||
| } | ||
| }, label: { | ||
| HStack(spacing: Constants.buttonSpacing) { | ||
| if isLoading { | ||
| ProgressView() | ||
| .progressViewStyle(CircularProgressViewStyle()) | ||
| .tint(Color.posPrimaryTextInverted) | ||
| } else { | ||
| Text(Localization.markPaymentCompletedButtonTitle) | ||
| .font(Constants.buttonFont) | ||
| } | ||
| } | ||
| .frame(maxWidth: .infinity) | ||
| }) | ||
| .padding(Constants.buttonPadding) | ||
| .frame(maxWidth: .infinity) | ||
| .foregroundColor(Color.posPrimaryTextInverted) | ||
| .background(Color.posOverlayFillInverted) | ||
| .cornerRadius(Constants.buttonCornerRadius) | ||
| .contentShape(Rectangle()) | ||
|
Comment on lines
+78
to
+83
There was a problem hiding this comment. I'm guessing some of these are shared with other buttons? It'd be good to put them in a button style for sharing and to make the view easier to read. There was a problem hiding this comment. Yes, we have an existing issue to make the async button a reusable component, I've logged it along: #14626 |
||
| .disabled(isLoading) | ||
|
|
||
| Spacer() | ||
| } | ||
| .padding() | ||
| .animation(.easeInOut, value: errorMessage) | ||
| .onChange(of: textFieldAmountInput) { amount in | ||
| errorMessage = nil | ||
| } | ||
| } | ||
|
|
||
| private func markComplete() async { | ||
| // TODO: | ||
| // https://github.com/woocommerce/woocommerce-ios/issues/14602 | ||
| } | ||
| } | ||
|
|
||
| private extension PointOfSaleCollectCashView { | ||
| enum Constants { | ||
| static let buttonSpacing: CGFloat = 12 | ||
| static let buttonPadding: CGFloat = 32 | ||
| static let buttonFont: POSFontStyle = .posBodyEmphasized | ||
| static let buttonCornerRadius: CGFloat = 8 | ||
| } | ||
|
|
||
| enum Localization { | ||
| static let backNavigationTitle = NSLocalizedString( | ||
| "pointOfSale.cashview.back.navigation.title", | ||
| value: "Cash payment", | ||
| comment: "Title for the cash payment view navigation back button" | ||
| ) | ||
| static let backNavigationSubtitle = NSLocalizedString( | ||
| "pointOfSale.cashview.back.navigation.subtitle", | ||
| value: "Total: %1$@", | ||
| comment: "Subtitle for the cash payment view navigation back button" + | ||
| "Reads as 'Total: $1.23'" | ||
| ) | ||
| static let markPaymentCompletedButtonTitle = NSLocalizedString( | ||
| "pointOfSale.cashview.button.markpaymentcompleted.title", | ||
| value: "Mark payment as complete", | ||
|
There was a problem hiding this comment. This is a weird way to word it... I can see it's in the designs, but maybe it's worth discussing some more? It feels very programmery, I think the merchant action is more like There was a problem hiding this comment. Yeah, I'll raise it with Wagner along the navigation icons for each platform |
||
| comment: "Button to mark a cash payment as completed" | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| #if DEBUG | ||
| #Preview { | ||
| let posModel = PointOfSaleAggregateModel( | ||
| itemsController: PointOfSalePreviewItemsController(), | ||
| cardPresentPaymentService: CardPresentPaymentPreviewService(), | ||
| orderController: PointOfSalePreviewOrderController()) | ||
| PointOfSaleCollectCashView(orderTotal: "$1.23") | ||
| .environmentObject(posModel) | ||
| } | ||
| #endif | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps another place where an AsyncButton would be good? It'd need a binding so that the text field's
onSubmitalso triggered the progress view, but that seems like a useful option.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree! I'll make the change with #14602