Skip to content

Shipping Labels: display the discounted price rate in Carrier and Rates screen #5188

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
pmusolino merged 3 commits into from
Oct 12, 2021
Merged

Shipping Labels: display the discounted price rate in Carrier and Rates screen #5188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
232a2a7
feat: display the discounted price `rate` instead of the retail rate …
pmusolino Oct 11, 2021
1d3ce24
update: release-notes
pmusolino Oct 11, 2021
9735c17
update: release-notes
pmusolino Oct 11, 2021
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 @@ -6,6 +6,7 @@
- [*] Fix incorrect info banner color and signature option spacing on Carrier and Rates screen. [https://github.com/woocommerce/woocommerce-ios/pull/5144]
- [x] Fix an error where merchants were unable to connect to valid stores when they have other stores with corrupted information https://github.com/woocommerce/woocommerce-ios/pull/5161
- [*] Shipping Labels: The shipping address now prefills the phone number from the billing address if a shipping phone number is not available. [https://github.com/woocommerce/woocommerce-ios/pull/5177]
- [*] Shipping Labels: now in Carrier and Rates we always display the discounted rate instead of the retail rate if available. [https://github.com/woocommerce/woocommerce-ios/pull/5188]

7.7
-----
Expand Down
10 changes: 5 additions & 5 deletions ...bels/Create Shipping Label Form/Carriers and Rates/ShippingLabelCarrierRowViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ struct ShippingLabelCarrierRowViewModel: Identifiable {

price = {
if signatureSelected, let signatureRate = signatureRate {
return currencyFormatter.formatAmount(Decimal(signatureRate.retailRate)) ?? ""
return currencyFormatter.formatAmount(Decimal(signatureRate.rate)) ?? ""
}
if adultSignatureSelected, let adultSignatureRate = adultSignatureRate {
return currencyFormatter.formatAmount(Decimal(adultSignatureRate.retailRate)) ?? ""
return currencyFormatter.formatAmount(Decimal(adultSignatureRate.rate)) ?? ""
}
return currencyFormatter.formatAmount(Decimal(rate.retailRate)) ?? ""
return currencyFormatter.formatAmount(Decimal(rate.rate)) ?? ""
}()

carrierLogo = CarrierLogo(rawValue: rate.carrierID)?.image()
Expand Down Expand Up @@ -92,14 +92,14 @@ struct ShippingLabelCarrierRowViewModel: Identifiable {
displayAdultSignatureRequired = adultSignatureRate != nil

if displaySignatureRequired, let signatureRate = signatureRate {
let amount = currencyFormatter.formatAmount(Decimal(signatureRate.retailRate - rate.retailRate)) ?? ""
let amount = currencyFormatter.formatAmount(Decimal(signatureRate.rate - rate.rate)) ?? ""
signatureRequiredText = String(format: Localization.signatureRequired, amount)
} else {
signatureRequiredText = ""
}

if displayAdultSignatureRequired, let adultSignatureRate = adultSignatureRate {
let amount = currencyFormatter.formatAmount(Decimal(adultSignatureRate.retailRate - rate.retailRate)) ?? ""
let amount = currencyFormatter.formatAmount(Decimal(adultSignatureRate.rate - rate.rate)) ?? ""
adultSignatureRequiredText = String(format: Localization.adultSignatureRequired, amount)
}
else {
Expand Down
6 changes: 3 additions & 3 deletions ...Order Details/Shipping Labels/Create Shipping Label Form/ShippingLabelFormViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ final class ShippingLabelFormViewModel {

if selectedRates.count == 1, let selectedRate = selectedRates.first {
let currencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings)
let price = currencyFormatter.formatAmount(Decimal(selectedRate.retailRate)) ?? ""
let price = currencyFormatter.formatAmount(Decimal(selectedRate.totalRate)) ?? ""

let formatString = selectedRate.rate.deliveryDays == 1 ? Localization.businessDaySingular : Localization.businessDaysPlural

Expand All @@ -365,7 +365,7 @@ final class ShippingLabelFormViewModel {
} else {
let ratesCount = String(format: Localization.selectedRatesCount, selectedRates.count)

let total = selectedRates.reduce(0, { $0 + $1.retailRate })
let total = selectedRates.reduce(0, { $0 + $1.totalRate })
let currencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings)
let price = currencyFormatter.formatAmount(Decimal(total)) ?? ""
let totalRate = String(format: Localization.totalRate, price)
Expand Down Expand Up @@ -395,7 +395,7 @@ final class ShippingLabelFormViewModel {
}
let currencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings)
return selectedRates.map { rate in
currencyFormatter.formatAmount(Decimal(rate.retailRate)) ?? ""
currencyFormatter.formatAmount(Decimal(rate.totalRate)) ?? ""
}
}

Expand Down