Skip to content

Commit c66b9c1

Browse files
allendavallendav
committed
Remove remaining bits of PaymentGatewayAccountStore
1 parent ed25290 commit c66b9c1

File tree

10 files changed

+144
-441
lines changed

10 files changed

+144
-441
lines changed

‎WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ private extension SettingsViewModel {
266266
.compactMap { $0 }
267267
}
268268

269-
/// Ask the PaymentGatewayAccountStore to loadAccounts from the network and update storage
269+
/// Ask the CardPresentPaymentStore to loadAccounts from the network and update storage
270270
///
271271
func loadPaymentGatewayAccounts() {
272272
guard let siteID = stores.sessionManager.defaultSite?.siteID else {

‎WooCommerce/Classes/Yosemite/AuthenticatedState.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class AuthenticatedState: StoresManagerState {
4141
OrderStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
4242
OrderStatusStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
4343
PaymentGatewayStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
44-
// TODO REMOVE PaymentGatewayAccountStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
4544
ProductAttributeStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
4645
ProductAttributeTermStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
4746
ProductReviewStore(dispatcher: dispatcher, storageManager: storageManager, network: network),

‎Yosemite/Yosemite.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
0212AC67242C799B00C51F6C /* ResultsController+StorageProductTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0212AC66242C799B00C51F6C /* ResultsController+StorageProductTests.swift */; };
2323
02137901270AB204006430F7 /* MockUserActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02137900270AB204006430F7 /* MockUserActionHandler.swift */; };
2424
02137903270ABDDE006430F7 /* MockAnnouncementsActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02137902270ABDDE006430F7 /* MockAnnouncementsActionHandler.swift */; };
25-
02137905270AC39C006430F7 /* MockPaymentGatewayAccountActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02137904270AC39C006430F7 /* MockPaymentGatewayAccountActionHandler.swift */; };
2625
02137907270AC5A0006430F7 /* MockReceiptActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02137906270AC5A0006430F7 /* MockReceiptActionHandler.swift */; };
2726
0218B4EE242E08B20083A847 /* MediaType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0218B4ED242E08B20083A847 /* MediaType.swift */; };
2827
0218B4F0242E091C0083A847 /* Media+MediaType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0218B4EF242E091C0083A847 /* Media+MediaType.swift */; };
@@ -164,12 +163,9 @@
164163
26FB056A25F6CB7600A40B26 /* Fakes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26FB056925F6CB7600A40B26 /* Fakes.framework */; };
165164
312A3D6E266AEA6900D28BC9 /* PaymentGatewayAccount+ReadOnlyConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 312A3D6D266AEA6900D28BC9 /* PaymentGatewayAccount+ReadOnlyConvertible.swift */; };
166165
312DB64D268BD22B00AA0EE9 /* AppSettingsStoreTests+CardReaderSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 312DB64C268BD22B00AA0EE9 /* AppSettingsStoreTests+CardReaderSettings.swift */; };
167-
3147030626701E2800EF253A /* PaymentGatewayAccountAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3147030526701E2800EF253A /* PaymentGatewayAccountAction.swift */; };
168-
3147030A2670295300EF253A /* PaymentGatewayAccountStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 314703092670295300EF253A /* PaymentGatewayAccountStore.swift */; };
169166
3147030C2670333200EF253A /* WCPayAccount+PaymentGatewayAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3147030B2670333200EF253A /* WCPayAccount+PaymentGatewayAccount.swift */; };
170167
31799AFA27050D9C00D78179 /* WCPayReaderLocation+ReaderLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31799AF927050D9C00D78179 /* WCPayReaderLocation+ReaderLocation.swift */; };
171168
31A89EE6278CC38F002A588E /* StripeAccount+PaymentGatewayAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A89EE5278CC38F002A588E /* StripeAccount+PaymentGatewayAccount.swift */; };
172-
31BF226526715FDE00BC5A4B /* PaymentGatewayAccountStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31BF226426715FDE00BC5A4B /* PaymentGatewayAccountStoreTests.swift */; };
173169
36941EA7B9242CAB1FF828BC /* Pods_YosemiteTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 991BBCE6E4A92F0A028885D8 /* Pods_YosemiteTests.framework */; };
174170
450106872399AB3F00E24722 /* TaxClass+ReadOnlyConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 450106862399AB3F00E24722 /* TaxClass+ReadOnlyConvertible.swift */; };
175171
45010693239A6C9F00E24722 /* TaxClassStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45010692239A6C9F00E24722 /* TaxClassStore.swift */; };
@@ -415,7 +411,6 @@
415411
0212AC66242C799B00C51F6C /* ResultsController+StorageProductTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ResultsController+StorageProductTests.swift"; sourceTree = "<group>"; };
416412
02137900270AB204006430F7 /* MockUserActionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockUserActionHandler.swift; sourceTree = "<group>"; };
417413
02137902270ABDDE006430F7 /* MockAnnouncementsActionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAnnouncementsActionHandler.swift; sourceTree = "<group>"; };
418-
02137904270AC39C006430F7 /* MockPaymentGatewayAccountActionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockPaymentGatewayAccountActionHandler.swift; sourceTree = "<group>"; };
419414
02137906270AC5A0006430F7 /* MockReceiptActionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockReceiptActionHandler.swift; sourceTree = "<group>"; };
420415
0218B4ED242E08B20083A847 /* MediaType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaType.swift; sourceTree = "<group>"; };
421416
0218B4EF242E091C0083A847 /* Media+MediaType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Media+MediaType.swift"; sourceTree = "<group>"; };
@@ -552,12 +547,9 @@
552547
26FB056925F6CB7600A40B26 /* Fakes.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Fakes.framework; sourceTree = BUILT_PRODUCTS_DIR; };
553548
312A3D6D266AEA6900D28BC9 /* PaymentGatewayAccount+ReadOnlyConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PaymentGatewayAccount+ReadOnlyConvertible.swift"; sourceTree = "<group>"; };
554549
312DB64C268BD22B00AA0EE9 /* AppSettingsStoreTests+CardReaderSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppSettingsStoreTests+CardReaderSettings.swift"; sourceTree = "<group>"; };
555-
3147030526701E2800EF253A /* PaymentGatewayAccountAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentGatewayAccountAction.swift; sourceTree = "<group>"; };
556-
314703092670295300EF253A /* PaymentGatewayAccountStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentGatewayAccountStore.swift; sourceTree = "<group>"; };
557550
3147030B2670333200EF253A /* WCPayAccount+PaymentGatewayAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WCPayAccount+PaymentGatewayAccount.swift"; sourceTree = "<group>"; };
558551
31799AF927050D9C00D78179 /* WCPayReaderLocation+ReaderLocation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WCPayReaderLocation+ReaderLocation.swift"; sourceTree = "<group>"; };
559552
31A89EE5278CC38F002A588E /* StripeAccount+PaymentGatewayAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "StripeAccount+PaymentGatewayAccount.swift"; sourceTree = "<group>"; };
560-
31BF226426715FDE00BC5A4B /* PaymentGatewayAccountStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentGatewayAccountStoreTests.swift; sourceTree = "<group>"; };
561553
35381AA86D039850A916E336 /* Pods-YosemiteTests.release-alpha.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YosemiteTests.release-alpha.xcconfig"; path = "../Pods/Target Support Files/Pods-YosemiteTests/Pods-YosemiteTests.release-alpha.xcconfig"; sourceTree = "<group>"; };
562554
450106862399AB3F00E24722 /* TaxClass+ReadOnlyConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TaxClass+ReadOnlyConvertible.swift"; sourceTree = "<group>"; };
563555
45010692239A6C9F00E24722 /* TaxClassStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaxClassStore.swift; sourceTree = "<group>"; };
@@ -994,7 +986,6 @@
994986
247CE86725832BEE00F9D9D1 /* MockShippingLabelActionHandler.swift */,
995987
02137900270AB204006430F7 /* MockUserActionHandler.swift */,
996988
02137902270ABDDE006430F7 /* MockAnnouncementsActionHandler.swift */,
997-
02137904270AC39C006430F7 /* MockPaymentGatewayAccountActionHandler.swift */,
998989
02137906270AC5A0006430F7 /* MockReceiptActionHandler.swift */,
999990
);
1000991
path = ActionHandlers;
@@ -1292,7 +1283,6 @@
12921283
7499936520EFBC7200CF01CD /* OrderNoteStore.swift */,
12931284
CE3B7AD62225ECA90050FE4B /* OrderStatusStore.swift */,
12941285
261CF1F0255B389F0090D8D3 /* PaymentGatewayStore.swift */,
1295-
314703092670295300EF253A /* PaymentGatewayAccountStore.swift */,
12961286
749374FD2249601F007D85D1 /* ProductStore.swift */,
12971287
45ED6095257E7472007B4AC6 /* ProductAttributeStore.swift */,
12981288
D831E2E1230E3513000037D0 /* ProductReviewStore.swift */,
@@ -1343,7 +1333,6 @@
13431333
7499936720EFC0ED00CF01CD /* OrderNoteStoreTests.swift */,
13441334
7455262F22305F88003F8932 /* OrderStatusStoreTests.swift */,
13451335
261CF2C6255C445A0090D8D3 /* PaymentGatewayStoreTests.swift */,
1346-
31BF226426715FDE00BC5A4B /* PaymentGatewayAccountStoreTests.swift */,
13471336
744914F6224AD2AF00546DE4 /* ProductStoreTests.swift */,
13481337
4552073C25811B4E001CF873 /* ProductAttributeStoreTests.swift */,
13491338
D831E2E7230E74EF000037D0 /* ProductReviewStoreTests.swift */,
@@ -1530,7 +1519,6 @@
15301519
7499936320EFBC1A00CF01CD /* OrderNoteAction.swift */,
15311520
CE3B7AD42225EBF10050FE4B /* OrderStatusAction.swift */,
15321521
261CF1EC255B37B40090D8D3 /* PaymentGatewayAction.swift */,
1533-
3147030526701E2800EF253A /* PaymentGatewayAccountAction.swift */,
15341522
749374FF2249605E007D85D1 /* ProductAction.swift */,
15351523
45ED6091257E72F4007B4AC6 /* ProductAttributeAction.swift */,
15361524
26E5A07D25A6640E000DF8F6 /* ProductAttributeTermAction.swift */,
@@ -1864,7 +1852,6 @@
18641852
247CE83C2582F36800F9D9D1 /* MockOrderActionHandler.swift in Sources */,
18651853
45E462142684C92D00011BF2 /* DataStore.swift in Sources */,
18661854
02FF055423D983F30058E6E7 /* MediaExport.swift in Sources */,
1867-
02137905270AC39C006430F7 /* MockPaymentGatewayAccountActionHandler.swift in Sources */,
18681855
74643EE1221F567E00EDC51A /* ShipmentAction.swift in Sources */,
18691856
02FF054E23D983F30058E6E7 /* MediaImageExporter.swift in Sources */,
18701857
2685C117263C98CF00D9EE97 /* AddOnGroupStore.swift in Sources */,
@@ -1917,7 +1904,6 @@
19171904
02137903270ABDDE006430F7 /* MockAnnouncementsActionHandler.swift in Sources */,
19181905
247CE8342582F20100F9D9D1 /* MockAppSettingsActionHandler.swift in Sources */,
19191906
025CA2CA238F515600B05C81 /* ProductShippingClassStore.swift in Sources */,
1920-
3147030A2670295300EF253A /* PaymentGatewayAccountStore.swift in Sources */,
19211907
74937508224985BB007D85D1 /* ProductDimensions+ReadOnlyConvertible.swift in Sources */,
19221908
CC2C036C262F316600928C9C /* ShippingLabelAccountSettings+ReadOnlyConvertible.swift in Sources */,
19231909
45010693239A6C9F00E24722 /* TaxClassStore.swift in Sources */,
@@ -1968,7 +1954,6 @@
19681954
CE12FBDB221F406100C59248 /* OrderStatus+ReadOnlyConvertible.swift in Sources */,
19691955
74D42DBC221C983F00B4977D /* ShipmentTracking+ReadOnlyConvertible.swift in Sources */,
19701956
247CE87A258332B400F9D9D1 /* MockNotificationActionHandler.swift in Sources */,
1971-
3147030626701E2800EF253A /* PaymentGatewayAccountAction.swift in Sources */,
19721957
025CA2CE238F53CB00B05C81 /* ProductShippingClass+ReadOnlyConvertible.swift in Sources */,
19731958
247CE86225832B1600F9D9D1 /* MockRefundActionHandler.swift in Sources */,
19741959
26E5A07625A626CA000DF8F6 /* ProductAttributeTerm+ReadOnlyConvertible.swift in Sources */,
@@ -2077,7 +2062,6 @@
20772062
45E462162684D9C000011BF2 /* DataStoreTests.swift in Sources */,
20782063
B53A56A0211245E0000776C9 /* MockStorageManager+Sample.swift in Sources */,
20792064
453305FB245AEDCB00264E50 /* SitePostStoreTests.swift in Sources */,
2080-
31BF226526715FDE00BC5A4B /* PaymentGatewayAccountStoreTests.swift in Sources */,
20812065
744914F7224AD2AF00546DE4 /* ProductStoreTests.swift in Sources */,
20822066
0218B4F2242E09E80083A847 /* MediaTypeTests.swift in Sources */,
20832067
578CE78C2475E7A500492EBF /* MockNotificationsRemote.swift in Sources */,

‎Yosemite/Yosemite/Actions/PaymentGatewayAccountAction.swift‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎Yosemite/Yosemite/Model/Mocks/ActionHandlers/MockPaymentGatewayAccountActionHandler.swift‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎Yosemite/Yosemite/Model/Mocks/MockStoresManager.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public class MockStoresManager: StoresManager {
2525
private let orderActionHandler: MockOrderActionHandler
2626
private let orderStatusActionHandler: MockOrderStatusActionHandler
2727
private let orderNoteActionHandler: MockOrderNoteActionHandler
28-
private let paymentGatewayAccountActionHandler: MockPaymentGatewayAccountActionHandler
2928
private let productActionHandler: MockProductActionHandler
3029
private let productReviewActionHandler: MockProductReviewActionHandler
3130
private let productVariationActionHandler: MockProductVariationActionHandler
@@ -51,7 +50,6 @@ public class MockStoresManager: StoresManager {
5150
settingActionHandler = MockSettingActionHandler(objectGraph: objectGraph, storageManager: storageManager)
5251
orderStatusActionHandler = MockOrderStatusActionHandler(objectGraph: objectGraph, storageManager: storageManager)
5352
orderNoteActionHandler = MockOrderNoteActionHandler(objectGraph: objectGraph, storageManager: storageManager)
54-
paymentGatewayAccountActionHandler = MockPaymentGatewayAccountActionHandler(objectGraph: objectGraph, storageManager: storageManager)
5553
productActionHandler = MockProductActionHandler(objectGraph: objectGraph, storageManager: storageManager)
5654
productVariationActionHandler = MockProductVariationActionHandler(objectGraph: objectGraph, storageManager: storageManager)
5755
receiptActionHandler = MockReceiptActionHandler(objectGraph: objectGraph, storageManager: storageManager)
@@ -127,8 +125,6 @@ public class MockStoresManager: StoresManager {
127125
userActionHandler.handle(action: action)
128126
case let action as AnnouncementsAction:
129127
announcementsActionHandler.handle(action: action)
130-
case let action as PaymentGatewayAccountAction:
131-
paymentGatewayAccountActionHandler.handle(action: action)
132128
case let action as ReceiptAction:
133129
receiptActionHandler.handle(action: action)
134130
default:

‎Yosemite/Yosemite/Stores/CardPresentPaymentStore.swift‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -562,9 +562,6 @@ private extension CardPresentPaymentStore {
562562
}
563563
}
564564

565-
/// Models errors thrown by the PaymentGatewayAccountStore. Not to be confused with
566-
/// errors originating from the card readers. Those are defined in CardReaderServiceError.
567-
///
568565
public enum PaymentGatewayAccountError: Error, LocalizedError {
569566
case orderPaymentCaptureError(message: String?)
570567
case otherError(error: AnyError)

0 commit comments

Comments
 (0)