[POS Orders] Display POS label in order details #15857
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,73 @@ | ||
| import Foundation | ||
| import Yosemite | ||
|
|
||
| struct SummaryTableViewCellViewModel { | ||
| struct OrderStatusPresentation { | ||
| let style: OrderStatusEnum | ||
| let title: String | ||
| } | ||
|
|
||
| private let billingAddress: Address? | ||
| private let dateCreated: Date | ||
| private let salesChannel: String? | ||
|
|
||
| let presentation: OrderStatusPresentation | ||
|
|
||
| private let calendar: Calendar | ||
|
|
||
| init(order: Order, | ||
| status: OrderStatus?, | ||
| calendar: Calendar = .current) { | ||
|
|
||
| billingAddress = order.billingAddress | ||
| dateCreated = order.dateCreated | ||
| salesChannel = order.createdVia | ||
|
|
||
| presentation = OrderStatusPresentation( | ||
| style: status?.status ?? order.status, | ||
| title: status?.name ?? order.status.rawValue | ||
| ) | ||
|
|
||
| self.calendar = calendar | ||
| } | ||
|
|
||
| /// The full name from the billing address | ||
| /// | ||
| var billedPersonName: String { | ||
| if let fullName = billingAddress?.fullName, fullName.isNotEmpty { | ||
| return fullName | ||
| } else { | ||
| return Localization.guestName | ||
| } | ||
| } | ||
|
|
||
| /// The date, time, and the order number concatenated together. Example, “Jan 22, 2018, 11:23 AM”. | ||
| /// | ||
| var subtitle: String { | ||
| let formatter = DateFormatter.dateAndTimeFormatter | ||
| formatter.timeZone = .siteTimezone | ||
| return formatter.string(from: dateCreated) | ||
| } | ||
|
|
||
| /// Textual representation of the sales channel | ||
| /// | ||
| var formattedSalesChannel: String? { | ||
| guard let salesChannel = salesChannel else { | ||
| return nil | ||
| } | ||
| switch salesChannel { | ||
| case "pos-rest-api": | ||
| return "POS" | ||
| default: | ||
| return nil | ||
| } | ||
| } | ||
|
Comment on lines
+54
to
+64
Contributor
Author
There was a problem hiding this comment. This |
||
| } | ||
|
|
||
| private extension SummaryTableViewCellViewModel { | ||
| enum Localization { | ||
| static let guestName: String = NSLocalizedString("SummaryTableViewCellViewModel.guestName", | ||
| value: "Guest", | ||
| comment: "In Order Details, the name of the billed person when there are no name and last name.") | ||
| } | ||
| } | ||
This file contains hidden or 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.
nit: might we want to hide the label if the text is nil? since this is in a stack view, if the stack view has a non-zero spacing (from the xib it looks like it has 4px spacing), the spacing still takes up space even if the label has zero width from nil text when it's not hidden.
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.
This fixes the order date not taking up the horizontal space when the sales channel label isn't shown, which is more obvious in large font sizes:
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.
TIL. Thanks for sharing the solution. Updated on 70df74e