Skip to content

Shipping Labels: Display base rate on service card #15916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2025
Merged

Shipping Labels: Display base rate on service card #15916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2f090c
Display base rate on service card
itsmeichigo Jul 16, 2025
e064558
Update release notes
itsmeichigo Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
22.9
-----
- [*] Order List: New orders made through Point of Sale are now filterable via the Order List filters menu [https://github.com/woocommerce/woocommerce-ios/pull/15910]
- [*] Shipping Labels: Display base rate on selected shipping service cards [https://github.com/woocommerce/woocommerce-ios/pull/15916]

22.8
-----
Expand Down
12 changes: 1 addition & 11 deletions ...pping Labels/WooShipping Package and Rate Selection/WooShippingServiceCardViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,7 @@ final class WooShippingServiceCardViewModel: Identifiable, ObservableObject {
}
}()

let rateLabel = {
let selectedRate = WooShippingSelectedRate(
rate: rate,
signatureRate: signatureRequirement == .signatureRequired ? signatureRate : nil,
adultSignatureRate: signatureRequirement == .adultSignatureRequired ? adultSignatureRate : nil,
carbonNeutralRate: carbonNeutralSelected ? carbonNeutralRate : nil,
saturdayDeliveryRate: saturdayDeliverySelected ? saturdayDeliveryRate : nil,
additionalHandlingRate: additionalHandlingSelected ? additionalHandlingRate : nil
)
return currencyFormatter.formatAmount(Decimal(selectedRate.totalRate)) ?? ""
}()
let rateLabel = currencyFormatter.formatAmount(Decimal(rate.rate)) ?? ""

let daysToDeliveryLabel: String? = {
guard let deliveryDays = rate.deliveryDays else {
Expand Down
6 changes: 3 additions & 3 deletions ...pping Label/WooShipping Create Shipping Labels/WooShippingServiceCardViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ final class WooShippingServiceCardViewModelTests: XCTestCase {
XCTAssertEqual(viewModel.signatureRequirement, .signatureRequired)
XCTAssertEqual(viewModel.title, "USPS - Parcel Select Mail")
XCTAssertEqual(viewModel.daysToDeliveryLabel, "2 business days")
XCTAssertEqual(viewModel.rateLabel, "$45.99")
XCTAssertEqual(viewModel.rateLabel, "$40.33")
XCTAssertEqual(viewModel.carrierLogo, UIImage(named: "shipping-label-usps-logo"))
XCTAssertEqual(viewModel.trackingLabel, "Tracking")
XCTAssertEqual(viewModel.insuranceLabel, "Insurance (up to $100.00)")
Expand Down Expand Up @@ -69,7 +69,7 @@ final class WooShippingServiceCardViewModelTests: XCTestCase {
XCTAssertEqual(viewModel.signatureRequirement, .signatureRequired)
XCTAssertEqual(viewModel.title, "USPS - Parcel Select Mail")
XCTAssertEqual(viewModel.daysToDeliveryLabel, "2 business days")
XCTAssertEqual(viewModel.rateLabel, "$65.58")
XCTAssertEqual(viewModel.rateLabel, "$40.33")
XCTAssertEqual(viewModel.carrierLogo, UIImage(named: "shipping-label-usps-logo"))
XCTAssertEqual(viewModel.trackingLabel, "Tracking")
XCTAssertEqual(viewModel.insuranceLabel, "Insurance (up to $100.00)")
Expand Down Expand Up @@ -102,7 +102,7 @@ final class WooShippingServiceCardViewModelTests: XCTestCase {
XCTAssertEqual(viewModel.signatureRequirement, .signatureRequired)
XCTAssertEqual(viewModel.title, "USPS - Parcel Select Mail")
XCTAssertEqual(viewModel.daysToDeliveryLabel, "2 business days")
XCTAssertEqual(viewModel.rateLabel, "$38.84")
XCTAssertEqual(viewModel.rateLabel, "$25.95")
XCTAssertEqual(viewModel.carrierLogo, UIImage(named: "shipping-label-usps-logo"))
XCTAssertEqual(viewModel.trackingLabel, "Tracking")
XCTAssertEqual(viewModel.insuranceLabel, "Insurance (up to $100.00)")
Expand Down