Skip to content

Commit 870a0e7

Browse files
touppertoupper
committed
Move CPP eligibility logic to Yosemite
1 parent 75f786a commit 870a0e7

File tree

10 files changed

+133
-64
lines changed

10 files changed

+133
-64
lines changed

‎WooCommerce/Classes/ViewModels/Order Details/OrderDetailsDataSource.swift‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ private extension OrderDetailsDataSource {
567567
private func configureCustomerPaid(cell: TwoColumnHeadlineFootnoteTableViewCell) {
568568
let paymentViewModel = OrderPaymentDetailsViewModel(order: order)
569569
cell.leftText = Titles.paidByCustomer
570-
cell.rightText = paymentViewModel.paymentTotal
570+
cell.rightText = order.paymentTotal
571571
cell.updateFootnoteText(paymentViewModel.paymentSummary)
572572
}
573573

@@ -603,10 +603,8 @@ private extension OrderDetailsDataSource {
603603
}
604604

605605
private func configureNetAmount(cell: TwoColumnHeadlineFootnoteTableViewCell) {
606-
let paymentViewModel = OrderPaymentDetailsViewModel(order: order)
607-
608606
cell.leftText = Titles.netAmount
609-
cell.rightText = paymentViewModel.netAmount
607+
cell.rightText = order.netAmount
610608
cell.hideFootnote()
611609
}
612610

‎WooCommerce/Classes/ViewModels/Order Details/OrderPaymentDetailsViewModel.swift‎

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,11 @@ final class OrderPaymentDetailsViewModel {
5858
}
5959

6060
var totalValue: String {
61-
return currencyFormatter.formatAmount(order.total, with: order.currency) ?? String()
61+
order.totalValue
6262
}
6363

6464
var paymentTotal: String {
65-
if order.datePaid == nil {
66-
return currencyFormatter.formatAmount("0.00", with: order.currency) ?? String()
67-
}
68-
69-
return totalValue
65+
order.paymentTotal
7066
}
7167

7268
private var feesTotal: Decimal {
@@ -162,26 +158,10 @@ final class OrderPaymentDetailsViewModel {
162158
return currencyFormatter.formatAmount(condensedRefund.normalizedTotalAsNegative, with: order.currency)
163159
}
164160

165-
/// Format the net amount with the correct currency
166-
///
167-
var netAmount: String? {
168-
guard let netDecimal = calculateNetAmount() else {
169-
return nil
170-
}
171-
172-
return currencyFormatter.formatAmount(netDecimal, with: order.currency)
173-
}
174-
175161
var couponLines: [OrderCouponLine] {
176162
return order.coupons
177163
}
178164

179-
/// Signals whether the net amount for the order matches the total order amount
180-
///
181-
var hasBeenPartiallyCharged: Bool {
182-
return totalValue != netAmount
183-
}
184-
185165
init(order: Order, refund: Refund? = nil, currencySettings: CurrencySettings = ServiceLocator.currencySettings) {
186166
self.order = order
187167
self.refund = refund
@@ -204,19 +184,6 @@ final class OrderPaymentDetailsViewModel {
204184

205185
return NSLocalizedString("Discount", comment: "Discount label for payment view") + " (" + output + ")"
206186
}
207-
208-
/// Calculate the net amount after refunds
209-
///
210-
private func calculateNetAmount() -> NSDecimalNumber? {
211-
guard let orderTotal = currencyFormatter.convertToDecimal(order.total) else {
212-
return .zero
213-
}
214-
215-
let totalRefundedUseCase = TotalRefundedCalculationUseCase(order: order, currencyFormatter: currencyFormatter)
216-
let refundTotal = totalRefundedUseCase.totalRefunded()
217-
218-
return orderTotal.adding(refundTotal)
219-
}
220187
}
221188

222189
private extension OrderPaymentDetailsViewModel {

‎WooCommerce/WooCommerce.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,6 @@
903903
57A25C7625ACE9BC00A54A62 /* OrderFulfillmentUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57A25C7525ACE9BC00A54A62 /* OrderFulfillmentUseCase.swift */; };
904904
57A25C7C25ACFAEC00A54A62 /* OrderFulfillmentNoticePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57A25C7B25ACFAEC00A54A62 /* OrderFulfillmentNoticePresenter.swift */; };
905905
57A49128250A7EB2000FEF21 /* OrderListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57A49127250A7EB2000FEF21 /* OrderListViewController.swift */; };
906-
57A5D8D32534F92D00AA54D6 /* TotalRefundedCalculationUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57A5D8D22534F92D00AA54D6 /* TotalRefundedCalculationUseCase.swift */; };
907906
57A5D8D92534FEBB00AA54D6 /* TotalRefundedCalculationUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57A5D8D82534FEBB00AA54D6 /* TotalRefundedCalculationUseCaseTests.swift */; };
908907
57A5D8DF253500F300AA54D6 /* RefundConfirmationViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57A5D8DE253500F300AA54D6 /* RefundConfirmationViewModelTests.swift */; };
909908
57ABE36824EB048A00A64F49 /* MockSwitchStoreUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57ABE36724EB048A00A64F49 /* MockSwitchStoreUseCase.swift */; };
@@ -1222,7 +1221,6 @@
12221221
B92FF9AE27FC7217005C34E3 /* OrderListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B92FF9AD27FC7217005C34E3 /* OrderListViewController.xib */; };
12231222
B92FF9B027FC7821005C34E3 /* ProductsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B92FF9AF27FC7821005C34E3 /* ProductsViewController.xib */; };
12241223
B96B536B2816ECFC00F753E6 /* CardPresentPluginsDataProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B96B536A2816ECFC00F753E6 /* CardPresentPluginsDataProviderTests.swift */; };
1225-
B979A9B32829237A00EBB383 /* Order+CardPresentPayment.swift in Sources */ = {isa = PBXBuildFile; fileRef = B979A9B22829237A00EBB383 /* Order+CardPresentPayment.swift */; };
12261224
B979A9B8282AB69300EBB383 /* Order+CardPresentPaymentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B979A9B7282AB69300EBB383 /* Order+CardPresentPaymentTests.swift */; };
12271225
B979A9BA282D62A500EBB383 /* InPersonPaymentsDeactivateStripeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B979A9B9282D62A500EBB383 /* InPersonPaymentsDeactivateStripeView.swift */; };
12281226
B9B6DEEF283F8B9F00901FB7 /* Site+PluginsURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9B6DEEE283F8B9F00901FB7 /* Site+PluginsURL.swift */; };
@@ -1545,7 +1543,6 @@
15451543
D8EE9692264D328A0033B2F9 /* ReceiptViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8EE9690264D328A0033B2F9 /* ReceiptViewController.swift */; };
15461544
D8EE9693264D328A0033B2F9 /* ReceiptViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8EE9691264D328A0033B2F9 /* ReceiptViewController.xib */; };
15471545
D8EE9698264D3CCB0033B2F9 /* ReceiptViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8EE9697264D3CCB0033B2F9 /* ReceiptViewModel.swift */; };
1548-
D8EF1E562605121C00380EA4 /* OrderPaymentMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8EF1E552605121C00380EA4 /* OrderPaymentMethod.swift */; };
15491546
D8F01DD325DEDC1C00CE70BE /* StripeCardReaderIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F01DD225DEDC1C00CE70BE /* StripeCardReaderIntegrationTests.swift */; };
15501547
D8F82AC522AF903700B67E4B /* IconsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F82AC422AF903700B67E4B /* IconsTests.swift */; };
15511548
DE001323279A793A00EB0350 /* CouponWooTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE001322279A793A00EB0350 /* CouponWooTests.swift */; };
@@ -2640,7 +2637,6 @@
26402637
57A25C7525ACE9BC00A54A62 /* OrderFulfillmentUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderFulfillmentUseCase.swift; sourceTree = "<group>"; };
26412638
57A25C7B25ACFAEC00A54A62 /* OrderFulfillmentNoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderFulfillmentNoticePresenter.swift; sourceTree = "<group>"; };
26422639
57A49127250A7EB2000FEF21 /* OrderListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderListViewController.swift; sourceTree = "<group>"; };
2643-
57A5D8D22534F92D00AA54D6 /* TotalRefundedCalculationUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalRefundedCalculationUseCase.swift; sourceTree = "<group>"; };
26442640
57A5D8D82534FEBB00AA54D6 /* TotalRefundedCalculationUseCaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalRefundedCalculationUseCaseTests.swift; sourceTree = "<group>"; };
26452641
57A5D8DE253500F300AA54D6 /* RefundConfirmationViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefundConfirmationViewModelTests.swift; sourceTree = "<group>"; };
26462642
57ABE36724EB048A00A64F49 /* MockSwitchStoreUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockSwitchStoreUseCase.swift; sourceTree = "<group>"; };
@@ -2986,7 +2982,6 @@
29862982
B92FF9AD27FC7217005C34E3 /* OrderListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OrderListViewController.xib; sourceTree = "<group>"; };
29872983
B92FF9AF27FC7821005C34E3 /* ProductsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ProductsViewController.xib; sourceTree = "<group>"; };
29882984
B96B536A2816ECFC00F753E6 /* CardPresentPluginsDataProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPresentPluginsDataProviderTests.swift; sourceTree = "<group>"; };
2989-
B979A9B22829237A00EBB383 /* Order+CardPresentPayment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Order+CardPresentPayment.swift"; sourceTree = "<group>"; };
29902985
B979A9B7282AB69300EBB383 /* Order+CardPresentPaymentTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Order+CardPresentPaymentTests.swift"; sourceTree = "<group>"; };
29912986
B979A9B9282D62A500EBB383 /* InPersonPaymentsDeactivateStripeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InPersonPaymentsDeactivateStripeView.swift; sourceTree = "<group>"; };
29922987
B9B6DEEE283F8B9F00901FB7 /* Site+PluginsURL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Site+PluginsURL.swift"; sourceTree = "<group>"; };
@@ -3316,7 +3311,6 @@
33163311
D8EE9690264D328A0033B2F9 /* ReceiptViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReceiptViewController.swift; sourceTree = "<group>"; };
33173312
D8EE9691264D328A0033B2F9 /* ReceiptViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReceiptViewController.xib; sourceTree = "<group>"; };
33183313
D8EE9697264D3CCB0033B2F9 /* ReceiptViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReceiptViewModel.swift; sourceTree = "<group>"; };
3319-
D8EF1E552605121C00380EA4 /* OrderPaymentMethod.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderPaymentMethod.swift; sourceTree = "<group>"; };
33203314
D8F01DD225DEDC1C00CE70BE /* StripeCardReaderIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StripeCardReaderIntegrationTests.swift; sourceTree = "<group>"; };
33213315
D8F3A972258862BE0085859B /* PrologueScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrologueScreen.swift; sourceTree = "<group>"; };
33223316
D8F3A9782588659E0085859B /* GetStartedScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetStartedScreen.swift; sourceTree = "<group>"; };
@@ -4794,7 +4788,6 @@
47944788
26A630F8253F62AD00CBC3B1 /* UseCases */ = {
47954789
isa = PBXGroup;
47964790
children = (
4797-
57A5D8D22534F92D00AA54D6 /* TotalRefundedCalculationUseCase.swift */,
47984791
2667BFE42530DCF4008099D4 /* RefundItemsValuesCalculationUseCase.swift */,
47994792
2667BFEA2535FF09008099D4 /* RefundShippingCalculationUseCase.swift */,
48004793
26A630EC253F3B5C00CBC3B1 /* RefundCreationUseCase.swift */,
@@ -6395,7 +6388,6 @@
63956388
B59D1EE92190AE96009D1978 /* StorageNote+Woo.swift */,
63966389
CE24BCD7212F25D4001CD12E /* StorageOrder+Woo.swift */,
63976390
743EDD9E214B05350039071B /* TopEarnerStatsItem+Woo.swift */,
6398-
D8EF1E552605121C00380EA4 /* OrderPaymentMethod.swift */,
63996391
FEDD70AE26A7223500194C3A /* StorageEligibilityErrorInfo+Woo.swift */,
64006392
DEDB886A26E8531E00981595 /* ShippingLabelPackageAttributes.swift */,
64016393
DE77889926FD7EF0008DFF44 /* ShippingLabelPackageItem.swift */,
@@ -7069,7 +7061,6 @@
70697061
020DD48E232392C9005822B1 /* UIViewController+AppReview.swift */,
70707062
039D948C27610C6F0044EF38 /* UIView+SafeAreaConstraints.swift */,
70717063
039D948E276113490044EF38 /* UIView+SuperviewConstraints.swift */,
7072-
B979A9B22829237A00EBB383 /* Order+CardPresentPayment.swift */,
70737064
D88CA757237D1C27005D2F44 /* Ghost+Woo.swift */,
70747065
02784A02238B8BC800BDD6A8 /* UIView+Border.swift */,
70757066
02396250239948470096F34C /* UIImage+TintColor.swift */,
@@ -9129,7 +9120,6 @@
91299120
45381B4527341B8A003FEC5F /* DateRangeFilterViewController.swift in Sources */,
91309121
B57C5C9221B80E3C00FF82B2 /* APNSDevice+Woo.swift in Sources */,
91319122
174CA86C27D90E8900126524 /* WooAboutScreenConfiguration.swift in Sources */,
9132-
D8EF1E562605121C00380EA4 /* OrderPaymentMethod.swift in Sources */,
91339123
02A652FF246A908D00755A01 /* BottomSheetListSelectorPresenter.swift in Sources */,
91349124
D8CD710F237A49DB007148B9 /* UIColor+SemanticColors.swift in Sources */,
91359125
D82BB3AA26454F3300A82741 /* CardPresentModalProcessing.swift in Sources */,
@@ -9279,7 +9269,6 @@
92799269
57612989245888E2007BB2D9 /* NumberFormatter+LocalizedOrNinetyNinePlus.swift in Sources */,
92809270
B5A8532220BDBFAF00FAAB4D /* CircularImageView.swift in Sources */,
92819271
CE1F51252064179A00C6C810 /* UILabel+Helpers.swift in Sources */,
9282-
B979A9B32829237A00EBB383 /* Order+CardPresentPayment.swift in Sources */,
92839272
CC53FB382755213900C4CA4F /* ProductSelector.swift in Sources */,
92849273
0235595324496A93004BE2B8 /* BottomSheetListSelectorViewProperties.swift in Sources */,
92859274
452FE6522565849B00EB54A0 /* LinkedProductsViewModel.swift in Sources */,
@@ -9436,7 +9425,6 @@
94369425
45455EFA26580B5D00BBB0C4 /* ShippingLabelCarrierRowViewModel.swift in Sources */,
94379426
025FDD3423717D4900824006 /* AztecEditorViewController.swift in Sources */,
94389427
451B1740258B7EFB00836277 /* AddAttributeOptionsViewController.swift in Sources */,
9439-
57A5D8D32534F92D00AA54D6 /* TotalRefundedCalculationUseCase.swift in Sources */,
94409428
CE5F462723AAC8C0006B1A5C /* RefundDetailsViewModel.swift in Sources */,
94419429
D8815B132638686200EDAD62 /* CardPresentModalError.swift in Sources */,
94429430
453DBF8E2387F34A006762A5 /* UICollectionViewCell+Helpers.swift in Sources */,

0 commit comments

Comments
 (0)