diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 44bb1524..98221dae 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -431,6 +431,9 @@ 7E364CEB24A4455A007D6E02 /* PasswordInputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E364CE924A4455A007D6E02 /* PasswordInputViewController.swift */; }; 7E364CEC24A4455A007D6E02 /* PasswordInputViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7E364CEA24A4455A007D6E02 /* PasswordInputViewController.xib */; }; 7E364CEF24A46D27007D6E02 /* BalanceModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E364CEE24A46D27007D6E02 /* BalanceModel.swift */; }; + 7EC9DE0124A9AECE004A0AD8 /* RewardProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EC9DE0024A9AECE004A0AD8 /* RewardProduct.swift */; }; + 7EC9DE0324A9AEEC004A0AD8 /* Branch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EC9DE0224A9AEEC004A0AD8 /* Branch.swift */; }; + 7EC9DE0524A9AF65004A0AD8 /* BranchContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EC9DE0424A9AF65004A0AD8 /* BranchContainer.swift */; }; 892F9E86243DB0F300D9D88C /* ShowAPIService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 892F9E78243DB0F200D9D88C /* ShowAPIService.swift */; }; 892F9E87243DB0F300D9D88C /* ShowAPIServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 892F9E79243DB0F200D9D88C /* ShowAPIServiceType.swift */; }; 892F9E88243DB0F300D9D88C /* ShowAPIInteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 892F9E7B243DB0F200D9D88C /* ShowAPIInteractorIO.swift */; }; @@ -487,70 +490,6 @@ 89739E6224459A630016251B /* SendMoneyVerification.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 89739DFD24459A620016251B /* SendMoneyVerification.storyboard */; }; 89739E6324459A630016251B /* SendMoneyVerificationViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89739DFE24459A620016251B /* SendMoneyVerificationViewInterface.swift */; }; 89739E6424459A630016251B /* SendMoneyVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89739DFF24459A620016251B /* SendMoneyVerificationViewController.swift */; }; - 89AD7614244FD71D00D5A3AA /* RewardModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD758B244FD71B00D5A3AA /* RewardModuleInterface.swift */; }; - 89AD7615244FD71D00D5A3AA /* RewardProductContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD758E244FD71C00D5A3AA /* RewardProductContainer.swift */; }; - 89AD7616244FD71D00D5A3AA /* RewardProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD758F244FD71C00D5A3AA /* RewardProduct.swift */; }; - 89AD7617244FD71D00D5A3AA /* RewardServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7591244FD71C00D5A3AA /* RewardServiceType.swift */; }; - 89AD7618244FD71D00D5A3AA /* RewardService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7592244FD71C00D5A3AA /* RewardService.swift */; }; - 89AD7619244FD71D00D5A3AA /* RewardInteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7594244FD71C00D5A3AA /* RewardInteractorIO.swift */; }; - 89AD761A244FD71D00D5A3AA /* RewardInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7595244FD71C00D5A3AA /* RewardInteractor.swift */; }; - 89AD761B244FD71D00D5A3AA /* RewardPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7598244FD71C00D5A3AA /* RewardPresenter.swift */; }; - 89AD761C244FD71D00D5A3AA /* RewardWireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD759A244FD71C00D5A3AA /* RewardWireframeInput.swift */; }; - 89AD761D244FD71D00D5A3AA /* RewardWireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD759B244FD71C00D5A3AA /* RewardWireframe.swift */; }; - 89AD761E244FD71D00D5A3AA /* RewardViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD759D244FD71C00D5A3AA /* RewardViewInterface.swift */; }; - 89AD761F244FD71D00D5A3AA /* Reward.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 89AD759E244FD71C00D5A3AA /* Reward.storyboard */; }; - 89AD7620244FD71D00D5A3AA /* RewardItemCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75A0244FD71C00D5A3AA /* RewardItemCollectionViewCell.swift */; }; - 89AD7621244FD71D00D5A3AA /* RewardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75A1244FD71C00D5A3AA /* RewardViewController.swift */; }; - 89AD7622244FD71D00D5A3AA /* RedeemModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75A4244FD71C00D5A3AA /* RedeemModuleInterface.swift */; }; - 89AD7623244FD71D00D5A3AA /* Branch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75A7244FD71C00D5A3AA /* Branch.swift */; }; - 89AD7624244FD71D00D5A3AA /* BranchContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75A8244FD71C00D5A3AA /* BranchContainer.swift */; }; - 89AD7625244FD71D00D5A3AA /* Redeem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75A9244FD71C00D5A3AA /* Redeem.swift */; }; - 89AD7626244FD71D00D5A3AA /* RedeemServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75AB244FD71C00D5A3AA /* RedeemServiceType.swift */; }; - 89AD7627244FD71D00D5A3AA /* RedeemService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75AC244FD71C00D5A3AA /* RedeemService.swift */; }; - 89AD7628244FD71D00D5A3AA /* RedeemInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75AE244FD71C00D5A3AA /* RedeemInteractor.swift */; }; - 89AD7629244FD71D00D5A3AA /* RedeemInteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75AF244FD71C00D5A3AA /* RedeemInteractorIO.swift */; }; - 89AD762A244FD71D00D5A3AA /* RedeemPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75B2244FD71C00D5A3AA /* RedeemPresenter.swift */; }; - 89AD762B244FD71D00D5A3AA /* RedeemWireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75B4244FD71C00D5A3AA /* RedeemWireframe.swift */; }; - 89AD762C244FD71D00D5A3AA /* RedeemWireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75B5244FD71C00D5A3AA /* RedeemWireframeInput.swift */; }; - 89AD762D244FD71D00D5A3AA /* Redeem.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 89AD75B7244FD71C00D5A3AA /* Redeem.storyboard */; }; - 89AD762E244FD71D00D5A3AA /* RedeemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75B8244FD71C00D5A3AA /* RedeemViewController.swift */; }; - 89AD762F244FD71D00D5A3AA /* RedeemViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75B9244FD71C00D5A3AA /* RedeemViewInterface.swift */; }; - 89AD7630244FD71D00D5A3AA /* RewardGroupModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75BC244FD71C00D5A3AA /* RewardGroupModuleInterface.swift */; }; - 89AD7631244FD71D00D5A3AA /* RewardGroupServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75BF244FD71C00D5A3AA /* RewardGroupServiceType.swift */; }; - 89AD7632244FD71D00D5A3AA /* RewardGroupService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75C0244FD71C00D5A3AA /* RewardGroupService.swift */; }; - 89AD7633244FD71D00D5A3AA /* RewardGroupInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75C2244FD71C00D5A3AA /* RewardGroupInteractor.swift */; }; - 89AD7634244FD71D00D5A3AA /* RewardGroupInteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75C3244FD71C00D5A3AA /* RewardGroupInteractorIO.swift */; }; - 89AD7635244FD71D00D5A3AA /* RewardGroupPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75C6244FD71C00D5A3AA /* RewardGroupPresenter.swift */; }; - 89AD7636244FD71D00D5A3AA /* RewardGroupWireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75C8244FD71C00D5A3AA /* RewardGroupWireframeInput.swift */; }; - 89AD7637244FD71D00D5A3AA /* RewardGroupWireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75C9244FD71C00D5A3AA /* RewardGroupWireframe.swift */; }; - 89AD7638244FD71D00D5A3AA /* RewardGroup.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 89AD75CB244FD71C00D5A3AA /* RewardGroup.storyboard */; }; - 89AD7639244FD71D00D5A3AA /* RewardGroupViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75CC244FD71C00D5A3AA /* RewardGroupViewInterface.swift */; }; - 89AD763A244FD71D00D5A3AA /* RewardGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75CD244FD71C00D5A3AA /* RewardGroupViewController.swift */; }; - 89AD763B244FD71D00D5A3AA /* DetailOrderModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75D0244FD71C00D5A3AA /* DetailOrderModuleInterface.swift */; }; - 89AD763C244FD71D00D5A3AA /* DetailOrderService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75D3244FD71C00D5A3AA /* DetailOrderService.swift */; }; - 89AD763D244FD71D00D5A3AA /* DetailOrderServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75D4244FD71C00D5A3AA /* DetailOrderServiceType.swift */; }; - 89AD763E244FD71D00D5A3AA /* DetailOrderInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75D6244FD71C00D5A3AA /* DetailOrderInteractor.swift */; }; - 89AD763F244FD71D00D5A3AA /* DetailOrderInteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75D7244FD71C00D5A3AA /* DetailOrderInteractorIO.swift */; }; - 89AD7640244FD71D00D5A3AA /* DetailOrderPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75DA244FD71C00D5A3AA /* DetailOrderPresenter.swift */; }; - 89AD7641244FD71D00D5A3AA /* DetailOrderWireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75DC244FD71C00D5A3AA /* DetailOrderWireframeInput.swift */; }; - 89AD7642244FD71D00D5A3AA /* DetailOrderWireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75DD244FD71C00D5A3AA /* DetailOrderWireframe.swift */; }; - 89AD7643244FD71D00D5A3AA /* DetailOrderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75DF244FD71C00D5A3AA /* DetailOrderViewController.swift */; }; - 89AD7644244FD71D00D5A3AA /* DetailOrderViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75E0244FD71C00D5A3AA /* DetailOrderViewInterface.swift */; }; - 89AD7645244FD71D00D5A3AA /* DetailOrder.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 89AD75E1244FD71C00D5A3AA /* DetailOrder.storyboard */; }; - 89AD7654244FD71D00D5A3AA /* OrderHistoryModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD75FD244FD71D00D5A3AA /* OrderHistoryModuleInterface.swift */; }; - 89AD7655244FD71D00D5A3AA /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7600244FD71D00D5A3AA /* Order.swift */; }; - 89AD7656244FD71D00D5A3AA /* OrderContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7601244FD71D00D5A3AA /* OrderContainer.swift */; }; - 89AD7657244FD71D00D5A3AA /* OrderHistoryService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7603244FD71D00D5A3AA /* OrderHistoryService.swift */; }; - 89AD7658244FD71D00D5A3AA /* OrderHistoryServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7604244FD71D00D5A3AA /* OrderHistoryServiceType.swift */; }; - 89AD7659244FD71D00D5A3AA /* OrderHistoryInteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7606244FD71D00D5A3AA /* OrderHistoryInteractorIO.swift */; }; - 89AD765A244FD71D00D5A3AA /* OrderHistoryInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7607244FD71D00D5A3AA /* OrderHistoryInteractor.swift */; }; - 89AD765B244FD71D00D5A3AA /* OrderHistoryPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD760A244FD71D00D5A3AA /* OrderHistoryPresenter.swift */; }; - 89AD765C244FD71D00D5A3AA /* OrderHistoryWireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD760C244FD71D00D5A3AA /* OrderHistoryWireframe.swift */; }; - 89AD765D244FD71D00D5A3AA /* OrderHistoryWireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD760D244FD71D00D5A3AA /* OrderHistoryWireframeInput.swift */; }; - 89AD765E244FD71D00D5A3AA /* OrderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7610244FD71D00D5A3AA /* OrderCell.swift */; }; - 89AD765F244FD71D00D5A3AA /* OrderHistoryViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7611244FD71D00D5A3AA /* OrderHistoryViewInterface.swift */; }; - 89AD7660244FD71D00D5A3AA /* OrderHistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD7612244FD71D00D5A3AA /* OrderHistoryViewController.swift */; }; - 89AD7661244FD71D00D5A3AA /* OrderHistory.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 89AD7613244FD71D00D5A3AA /* OrderHistory.storyboard */; }; 89EA0D25243EC0D2003ACCC8 /* Profile.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 89EA0CF3243EC0D1003ACCC8 /* Profile.storyboard */; }; 89EA0D34243EC0D2003ACCC8 /* ProfileChangePasswordViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EA0D0C243EC0D2003ACCC8 /* ProfileChangePasswordViewController.swift */; }; 89EA0D35243EC0D2003ACCC8 /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EA0D0D243EC0D2003ACCC8 /* ProfileViewController.swift */; }; @@ -1268,6 +1207,9 @@ 7E364CE924A4455A007D6E02 /* PasswordInputViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordInputViewController.swift; sourceTree = ""; }; 7E364CEA24A4455A007D6E02 /* PasswordInputViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PasswordInputViewController.xib; sourceTree = ""; }; 7E364CEE24A46D27007D6E02 /* BalanceModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BalanceModel.swift; sourceTree = ""; }; + 7EC9DE0024A9AECE004A0AD8 /* RewardProduct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RewardProduct.swift; sourceTree = ""; }; + 7EC9DE0224A9AEEC004A0AD8 /* Branch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Branch.swift; sourceTree = ""; }; + 7EC9DE0424A9AF65004A0AD8 /* BranchContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BranchContainer.swift; sourceTree = ""; }; 892F9E78243DB0F200D9D88C /* ShowAPIService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShowAPIService.swift; sourceTree = ""; }; 892F9E79243DB0F200D9D88C /* ShowAPIServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShowAPIServiceType.swift; sourceTree = ""; }; 892F9E7B243DB0F200D9D88C /* ShowAPIInteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShowAPIInteractorIO.swift; sourceTree = ""; }; @@ -1324,70 +1266,6 @@ 89739DFD24459A620016251B /* SendMoneyVerification.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SendMoneyVerification.storyboard; sourceTree = ""; }; 89739DFE24459A620016251B /* SendMoneyVerificationViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SendMoneyVerificationViewInterface.swift; sourceTree = ""; }; 89739DFF24459A620016251B /* SendMoneyVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SendMoneyVerificationViewController.swift; sourceTree = ""; }; - 89AD758B244FD71B00D5A3AA /* RewardModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardModuleInterface.swift; sourceTree = ""; }; - 89AD758E244FD71C00D5A3AA /* RewardProductContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardProductContainer.swift; sourceTree = ""; }; - 89AD758F244FD71C00D5A3AA /* RewardProduct.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardProduct.swift; sourceTree = ""; }; - 89AD7591244FD71C00D5A3AA /* RewardServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardServiceType.swift; sourceTree = ""; }; - 89AD7592244FD71C00D5A3AA /* RewardService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardService.swift; sourceTree = ""; }; - 89AD7594244FD71C00D5A3AA /* RewardInteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardInteractorIO.swift; sourceTree = ""; }; - 89AD7595244FD71C00D5A3AA /* RewardInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardInteractor.swift; sourceTree = ""; }; - 89AD7598244FD71C00D5A3AA /* RewardPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardPresenter.swift; sourceTree = ""; }; - 89AD759A244FD71C00D5A3AA /* RewardWireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardWireframeInput.swift; sourceTree = ""; }; - 89AD759B244FD71C00D5A3AA /* RewardWireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardWireframe.swift; sourceTree = ""; }; - 89AD759D244FD71C00D5A3AA /* RewardViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardViewInterface.swift; sourceTree = ""; }; - 89AD759E244FD71C00D5A3AA /* Reward.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Reward.storyboard; sourceTree = ""; }; - 89AD75A0244FD71C00D5A3AA /* RewardItemCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardItemCollectionViewCell.swift; sourceTree = ""; }; - 89AD75A1244FD71C00D5A3AA /* RewardViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardViewController.swift; sourceTree = ""; }; - 89AD75A4244FD71C00D5A3AA /* RedeemModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RedeemModuleInterface.swift; sourceTree = ""; }; - 89AD75A7244FD71C00D5A3AA /* Branch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Branch.swift; sourceTree = ""; }; - 89AD75A8244FD71C00D5A3AA /* BranchContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BranchContainer.swift; sourceTree = ""; }; - 89AD75A9244FD71C00D5A3AA /* Redeem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Redeem.swift; sourceTree = ""; }; - 89AD75AB244FD71C00D5A3AA /* RedeemServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RedeemServiceType.swift; sourceTree = ""; }; - 89AD75AC244FD71C00D5A3AA /* RedeemService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RedeemService.swift; sourceTree = ""; }; - 89AD75AE244FD71C00D5A3AA /* RedeemInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RedeemInteractor.swift; sourceTree = ""; }; - 89AD75AF244FD71C00D5A3AA /* RedeemInteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RedeemInteractorIO.swift; sourceTree = ""; }; - 89AD75B2244FD71C00D5A3AA /* RedeemPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RedeemPresenter.swift; sourceTree = ""; }; - 89AD75B4244FD71C00D5A3AA /* RedeemWireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RedeemWireframe.swift; sourceTree = ""; }; - 89AD75B5244FD71C00D5A3AA /* RedeemWireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RedeemWireframeInput.swift; sourceTree = ""; }; - 89AD75B7244FD71C00D5A3AA /* Redeem.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Redeem.storyboard; sourceTree = ""; }; - 89AD75B8244FD71C00D5A3AA /* RedeemViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RedeemViewController.swift; sourceTree = ""; }; - 89AD75B9244FD71C00D5A3AA /* RedeemViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RedeemViewInterface.swift; sourceTree = ""; }; - 89AD75BC244FD71C00D5A3AA /* RewardGroupModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardGroupModuleInterface.swift; sourceTree = ""; }; - 89AD75BF244FD71C00D5A3AA /* RewardGroupServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardGroupServiceType.swift; sourceTree = ""; }; - 89AD75C0244FD71C00D5A3AA /* RewardGroupService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardGroupService.swift; sourceTree = ""; }; - 89AD75C2244FD71C00D5A3AA /* RewardGroupInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardGroupInteractor.swift; sourceTree = ""; }; - 89AD75C3244FD71C00D5A3AA /* RewardGroupInteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardGroupInteractorIO.swift; sourceTree = ""; }; - 89AD75C6244FD71C00D5A3AA /* RewardGroupPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardGroupPresenter.swift; sourceTree = ""; }; - 89AD75C8244FD71C00D5A3AA /* RewardGroupWireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardGroupWireframeInput.swift; sourceTree = ""; }; - 89AD75C9244FD71C00D5A3AA /* RewardGroupWireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardGroupWireframe.swift; sourceTree = ""; }; - 89AD75CB244FD71C00D5A3AA /* RewardGroup.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = RewardGroup.storyboard; sourceTree = ""; }; - 89AD75CC244FD71C00D5A3AA /* RewardGroupViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardGroupViewInterface.swift; sourceTree = ""; }; - 89AD75CD244FD71C00D5A3AA /* RewardGroupViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardGroupViewController.swift; sourceTree = ""; }; - 89AD75D0244FD71C00D5A3AA /* DetailOrderModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailOrderModuleInterface.swift; sourceTree = ""; }; - 89AD75D3244FD71C00D5A3AA /* DetailOrderService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailOrderService.swift; sourceTree = ""; }; - 89AD75D4244FD71C00D5A3AA /* DetailOrderServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailOrderServiceType.swift; sourceTree = ""; }; - 89AD75D6244FD71C00D5A3AA /* DetailOrderInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailOrderInteractor.swift; sourceTree = ""; }; - 89AD75D7244FD71C00D5A3AA /* DetailOrderInteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailOrderInteractorIO.swift; sourceTree = ""; }; - 89AD75DA244FD71C00D5A3AA /* DetailOrderPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailOrderPresenter.swift; sourceTree = ""; }; - 89AD75DC244FD71C00D5A3AA /* DetailOrderWireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailOrderWireframeInput.swift; sourceTree = ""; }; - 89AD75DD244FD71C00D5A3AA /* DetailOrderWireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailOrderWireframe.swift; sourceTree = ""; }; - 89AD75DF244FD71C00D5A3AA /* DetailOrderViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailOrderViewController.swift; sourceTree = ""; }; - 89AD75E0244FD71C00D5A3AA /* DetailOrderViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailOrderViewInterface.swift; sourceTree = ""; }; - 89AD75E1244FD71C00D5A3AA /* DetailOrder.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = DetailOrder.storyboard; sourceTree = ""; }; - 89AD75FD244FD71D00D5A3AA /* OrderHistoryModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderHistoryModuleInterface.swift; sourceTree = ""; }; - 89AD7600244FD71D00D5A3AA /* Order.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = ""; }; - 89AD7601244FD71D00D5A3AA /* OrderContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderContainer.swift; sourceTree = ""; }; - 89AD7603244FD71D00D5A3AA /* OrderHistoryService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderHistoryService.swift; sourceTree = ""; }; - 89AD7604244FD71D00D5A3AA /* OrderHistoryServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderHistoryServiceType.swift; sourceTree = ""; }; - 89AD7606244FD71D00D5A3AA /* OrderHistoryInteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderHistoryInteractorIO.swift; sourceTree = ""; }; - 89AD7607244FD71D00D5A3AA /* OrderHistoryInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderHistoryInteractor.swift; sourceTree = ""; }; - 89AD760A244FD71D00D5A3AA /* OrderHistoryPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderHistoryPresenter.swift; sourceTree = ""; }; - 89AD760C244FD71D00D5A3AA /* OrderHistoryWireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderHistoryWireframe.swift; sourceTree = ""; }; - 89AD760D244FD71D00D5A3AA /* OrderHistoryWireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderHistoryWireframeInput.swift; sourceTree = ""; }; - 89AD7610244FD71D00D5A3AA /* OrderCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderCell.swift; sourceTree = ""; }; - 89AD7611244FD71D00D5A3AA /* OrderHistoryViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderHistoryViewInterface.swift; sourceTree = ""; }; - 89AD7612244FD71D00D5A3AA /* OrderHistoryViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderHistoryViewController.swift; sourceTree = ""; }; - 89AD7613244FD71D00D5A3AA /* OrderHistory.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = OrderHistory.storyboard; sourceTree = ""; }; 89EA0CF3243EC0D1003ACCC8 /* Profile.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Profile.storyboard; sourceTree = ""; }; 89EA0D0C243EC0D2003ACCC8 /* ProfileChangePasswordViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileChangePasswordViewController.swift; sourceTree = ""; }; 89EA0D0D243EC0D2003ACCC8 /* ProfileViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = ""; }; @@ -2060,18 +1938,6 @@ path = View; sourceTree = ""; }; - 730D784F227A94E1007E517E /* RewardModules */ = { - isa = PBXGroup; - children = ( - 89AD75CE244FD71C00D5A3AA /* DetailOrder */, - 89AD75FB244FD71D00D5A3AA /* OrderHistory */, - 89AD75A2244FD71C00D5A3AA /* Redeem */, - 89AD7589244FD71B00D5A3AA /* Reward */, - 89AD75BA244FD71C00D5A3AA /* RewardGroup */, - ); - path = RewardModules; - sourceTree = ""; - }; 730D7896227A94F2007E517E /* SearchAddress */ = { isa = PBXGroup; children = ( @@ -4486,6 +4352,7 @@ 7E364CE824A44531007D6E02 /* Shared */ = { isa = PBXGroup; children = ( + 7EC9DDFF24A9AEBD004A0AD8 /* Models */, 7E364CE924A4455A007D6E02 /* PasswordInputViewController.swift */, 7E364CEA24A4455A007D6E02 /* PasswordInputViewController.xib */, ); @@ -4500,6 +4367,16 @@ path = Shared; sourceTree = ""; }; + 7EC9DDFF24A9AEBD004A0AD8 /* Models */ = { + isa = PBXGroup; + children = ( + 7EC9DE0024A9AECE004A0AD8 /* RewardProduct.swift */, + 7EC9DE0224A9AEEC004A0AD8 /* Branch.swift */, + 7EC9DE0424A9AF65004A0AD8 /* BranchContainer.swift */, + ); + path = Models; + sourceTree = ""; + }; 892F9E74243DB0F200D9D88C /* ShowAPI */ = { isa = PBXGroup; children = ( @@ -4918,465 +4795,6 @@ path = View; sourceTree = ""; }; - 89AD7589244FD71B00D5A3AA /* Reward */ = { - isa = PBXGroup; - children = ( - 89AD758A244FD71B00D5A3AA /* Module Interface */, - 89AD758C244FD71B00D5A3AA /* Application Logic */, - 89AD7596244FD71C00D5A3AA /* User Interface */, - ); - path = Reward; - sourceTree = ""; - }; - 89AD758A244FD71B00D5A3AA /* Module Interface */ = { - isa = PBXGroup; - children = ( - 89AD758B244FD71B00D5A3AA /* RewardModuleInterface.swift */, - ); - path = "Module Interface"; - sourceTree = ""; - }; - 89AD758C244FD71B00D5A3AA /* Application Logic */ = { - isa = PBXGroup; - children = ( - 89AD758D244FD71C00D5A3AA /* Model */, - 89AD7590244FD71C00D5A3AA /* Service */, - 89AD7593244FD71C00D5A3AA /* Interactor */, - ); - path = "Application Logic"; - sourceTree = ""; - }; - 89AD758D244FD71C00D5A3AA /* Model */ = { - isa = PBXGroup; - children = ( - 89AD758E244FD71C00D5A3AA /* RewardProductContainer.swift */, - 89AD758F244FD71C00D5A3AA /* RewardProduct.swift */, - ); - path = Model; - sourceTree = ""; - }; - 89AD7590244FD71C00D5A3AA /* Service */ = { - isa = PBXGroup; - children = ( - 89AD7591244FD71C00D5A3AA /* RewardServiceType.swift */, - 89AD7592244FD71C00D5A3AA /* RewardService.swift */, - ); - path = Service; - sourceTree = ""; - }; - 89AD7593244FD71C00D5A3AA /* Interactor */ = { - isa = PBXGroup; - children = ( - 89AD7594244FD71C00D5A3AA /* RewardInteractorIO.swift */, - 89AD7595244FD71C00D5A3AA /* RewardInteractor.swift */, - ); - path = Interactor; - sourceTree = ""; - }; - 89AD7596244FD71C00D5A3AA /* User Interface */ = { - isa = PBXGroup; - children = ( - 89AD7597244FD71C00D5A3AA /* Presenter */, - 89AD7599244FD71C00D5A3AA /* Wireframe */, - 89AD759C244FD71C00D5A3AA /* View */, - ); - path = "User Interface"; - sourceTree = ""; - }; - 89AD7597244FD71C00D5A3AA /* Presenter */ = { - isa = PBXGroup; - children = ( - 89AD7598244FD71C00D5A3AA /* RewardPresenter.swift */, - ); - path = Presenter; - sourceTree = ""; - }; - 89AD7599244FD71C00D5A3AA /* Wireframe */ = { - isa = PBXGroup; - children = ( - 89AD759A244FD71C00D5A3AA /* RewardWireframeInput.swift */, - 89AD759B244FD71C00D5A3AA /* RewardWireframe.swift */, - ); - path = Wireframe; - sourceTree = ""; - }; - 89AD759C244FD71C00D5A3AA /* View */ = { - isa = PBXGroup; - children = ( - 89AD759D244FD71C00D5A3AA /* RewardViewInterface.swift */, - 89AD759E244FD71C00D5A3AA /* Reward.storyboard */, - 89AD759F244FD71C00D5A3AA /* Cell */, - 89AD75A1244FD71C00D5A3AA /* RewardViewController.swift */, - ); - path = View; - sourceTree = ""; - }; - 89AD759F244FD71C00D5A3AA /* Cell */ = { - isa = PBXGroup; - children = ( - 89AD75A0244FD71C00D5A3AA /* RewardItemCollectionViewCell.swift */, - ); - path = Cell; - sourceTree = ""; - }; - 89AD75A2244FD71C00D5A3AA /* Redeem */ = { - isa = PBXGroup; - children = ( - 89AD75A3244FD71C00D5A3AA /* Module Interface */, - 89AD75A5244FD71C00D5A3AA /* Application Logic */, - 89AD75B0244FD71C00D5A3AA /* User Interface */, - ); - path = Redeem; - sourceTree = ""; - }; - 89AD75A3244FD71C00D5A3AA /* Module Interface */ = { - isa = PBXGroup; - children = ( - 89AD75A4244FD71C00D5A3AA /* RedeemModuleInterface.swift */, - ); - path = "Module Interface"; - sourceTree = ""; - }; - 89AD75A5244FD71C00D5A3AA /* Application Logic */ = { - isa = PBXGroup; - children = ( - 89AD75A6244FD71C00D5A3AA /* Model */, - 89AD75AA244FD71C00D5A3AA /* Service */, - 89AD75AD244FD71C00D5A3AA /* Interactor */, - ); - path = "Application Logic"; - sourceTree = ""; - }; - 89AD75A6244FD71C00D5A3AA /* Model */ = { - isa = PBXGroup; - children = ( - 89AD75A7244FD71C00D5A3AA /* Branch.swift */, - 89AD75A8244FD71C00D5A3AA /* BranchContainer.swift */, - 89AD75A9244FD71C00D5A3AA /* Redeem.swift */, - ); - path = Model; - sourceTree = ""; - }; - 89AD75AA244FD71C00D5A3AA /* Service */ = { - isa = PBXGroup; - children = ( - 89AD75AB244FD71C00D5A3AA /* RedeemServiceType.swift */, - 89AD75AC244FD71C00D5A3AA /* RedeemService.swift */, - ); - path = Service; - sourceTree = ""; - }; - 89AD75AD244FD71C00D5A3AA /* Interactor */ = { - isa = PBXGroup; - children = ( - 89AD75AE244FD71C00D5A3AA /* RedeemInteractor.swift */, - 89AD75AF244FD71C00D5A3AA /* RedeemInteractorIO.swift */, - ); - path = Interactor; - sourceTree = ""; - }; - 89AD75B0244FD71C00D5A3AA /* User Interface */ = { - isa = PBXGroup; - children = ( - 89AD75B1244FD71C00D5A3AA /* Presenter */, - 89AD75B3244FD71C00D5A3AA /* Wireframe */, - 89AD75B6244FD71C00D5A3AA /* View */, - ); - path = "User Interface"; - sourceTree = ""; - }; - 89AD75B1244FD71C00D5A3AA /* Presenter */ = { - isa = PBXGroup; - children = ( - 89AD75B2244FD71C00D5A3AA /* RedeemPresenter.swift */, - ); - path = Presenter; - sourceTree = ""; - }; - 89AD75B3244FD71C00D5A3AA /* Wireframe */ = { - isa = PBXGroup; - children = ( - 89AD75B4244FD71C00D5A3AA /* RedeemWireframe.swift */, - 89AD75B5244FD71C00D5A3AA /* RedeemWireframeInput.swift */, - ); - path = Wireframe; - sourceTree = ""; - }; - 89AD75B6244FD71C00D5A3AA /* View */ = { - isa = PBXGroup; - children = ( - 89AD75B7244FD71C00D5A3AA /* Redeem.storyboard */, - 89AD75B8244FD71C00D5A3AA /* RedeemViewController.swift */, - 89AD75B9244FD71C00D5A3AA /* RedeemViewInterface.swift */, - ); - path = View; - sourceTree = ""; - }; - 89AD75BA244FD71C00D5A3AA /* RewardGroup */ = { - isa = PBXGroup; - children = ( - 89AD75BB244FD71C00D5A3AA /* Module Interface */, - 89AD75BD244FD71C00D5A3AA /* Application Logic */, - 89AD75C4244FD71C00D5A3AA /* User Interface */, - ); - path = RewardGroup; - sourceTree = ""; - }; - 89AD75BB244FD71C00D5A3AA /* Module Interface */ = { - isa = PBXGroup; - children = ( - 89AD75BC244FD71C00D5A3AA /* RewardGroupModuleInterface.swift */, - ); - path = "Module Interface"; - sourceTree = ""; - }; - 89AD75BD244FD71C00D5A3AA /* Application Logic */ = { - isa = PBXGroup; - children = ( - 89AD75BE244FD71C00D5A3AA /* Service */, - 89AD75C1244FD71C00D5A3AA /* Interactor */, - ); - path = "Application Logic"; - sourceTree = ""; - }; - 89AD75BE244FD71C00D5A3AA /* Service */ = { - isa = PBXGroup; - children = ( - 89AD75BF244FD71C00D5A3AA /* RewardGroupServiceType.swift */, - 89AD75C0244FD71C00D5A3AA /* RewardGroupService.swift */, - ); - path = Service; - sourceTree = ""; - }; - 89AD75C1244FD71C00D5A3AA /* Interactor */ = { - isa = PBXGroup; - children = ( - 89AD75C2244FD71C00D5A3AA /* RewardGroupInteractor.swift */, - 89AD75C3244FD71C00D5A3AA /* RewardGroupInteractorIO.swift */, - ); - path = Interactor; - sourceTree = ""; - }; - 89AD75C4244FD71C00D5A3AA /* User Interface */ = { - isa = PBXGroup; - children = ( - 89AD75C5244FD71C00D5A3AA /* Presenter */, - 89AD75C7244FD71C00D5A3AA /* Wireframe */, - 89AD75CA244FD71C00D5A3AA /* View */, - ); - path = "User Interface"; - sourceTree = ""; - }; - 89AD75C5244FD71C00D5A3AA /* Presenter */ = { - isa = PBXGroup; - children = ( - 89AD75C6244FD71C00D5A3AA /* RewardGroupPresenter.swift */, - ); - path = Presenter; - sourceTree = ""; - }; - 89AD75C7244FD71C00D5A3AA /* Wireframe */ = { - isa = PBXGroup; - children = ( - 89AD75C8244FD71C00D5A3AA /* RewardGroupWireframeInput.swift */, - 89AD75C9244FD71C00D5A3AA /* RewardGroupWireframe.swift */, - ); - path = Wireframe; - sourceTree = ""; - }; - 89AD75CA244FD71C00D5A3AA /* View */ = { - isa = PBXGroup; - children = ( - 89AD75CB244FD71C00D5A3AA /* RewardGroup.storyboard */, - 89AD75CC244FD71C00D5A3AA /* RewardGroupViewInterface.swift */, - 89AD75CD244FD71C00D5A3AA /* RewardGroupViewController.swift */, - ); - path = View; - sourceTree = ""; - }; - 89AD75CE244FD71C00D5A3AA /* DetailOrder */ = { - isa = PBXGroup; - children = ( - 89AD75CF244FD71C00D5A3AA /* Module Interface */, - 89AD75D1244FD71C00D5A3AA /* Application Logic */, - 89AD75D8244FD71C00D5A3AA /* User Interface */, - ); - path = DetailOrder; - sourceTree = ""; - }; - 89AD75CF244FD71C00D5A3AA /* Module Interface */ = { - isa = PBXGroup; - children = ( - 89AD75D0244FD71C00D5A3AA /* DetailOrderModuleInterface.swift */, - ); - path = "Module Interface"; - sourceTree = ""; - }; - 89AD75D1244FD71C00D5A3AA /* Application Logic */ = { - isa = PBXGroup; - children = ( - 89AD75D2244FD71C00D5A3AA /* Service */, - 89AD75D5244FD71C00D5A3AA /* Interactor */, - ); - path = "Application Logic"; - sourceTree = ""; - }; - 89AD75D2244FD71C00D5A3AA /* Service */ = { - isa = PBXGroup; - children = ( - 89AD75D3244FD71C00D5A3AA /* DetailOrderService.swift */, - 89AD75D4244FD71C00D5A3AA /* DetailOrderServiceType.swift */, - ); - path = Service; - sourceTree = ""; - }; - 89AD75D5244FD71C00D5A3AA /* Interactor */ = { - isa = PBXGroup; - children = ( - 89AD75D6244FD71C00D5A3AA /* DetailOrderInteractor.swift */, - 89AD75D7244FD71C00D5A3AA /* DetailOrderInteractorIO.swift */, - ); - path = Interactor; - sourceTree = ""; - }; - 89AD75D8244FD71C00D5A3AA /* User Interface */ = { - isa = PBXGroup; - children = ( - 89AD75D9244FD71C00D5A3AA /* Presenter */, - 89AD75DB244FD71C00D5A3AA /* Wireframe */, - 89AD75DE244FD71C00D5A3AA /* View */, - ); - path = "User Interface"; - sourceTree = ""; - }; - 89AD75D9244FD71C00D5A3AA /* Presenter */ = { - isa = PBXGroup; - children = ( - 89AD75DA244FD71C00D5A3AA /* DetailOrderPresenter.swift */, - ); - path = Presenter; - sourceTree = ""; - }; - 89AD75DB244FD71C00D5A3AA /* Wireframe */ = { - isa = PBXGroup; - children = ( - 89AD75DC244FD71C00D5A3AA /* DetailOrderWireframeInput.swift */, - 89AD75DD244FD71C00D5A3AA /* DetailOrderWireframe.swift */, - ); - path = Wireframe; - sourceTree = ""; - }; - 89AD75DE244FD71C00D5A3AA /* View */ = { - isa = PBXGroup; - children = ( - 89AD75DF244FD71C00D5A3AA /* DetailOrderViewController.swift */, - 89AD75E0244FD71C00D5A3AA /* DetailOrderViewInterface.swift */, - 89AD75E1244FD71C00D5A3AA /* DetailOrder.storyboard */, - ); - path = View; - sourceTree = ""; - }; - 89AD75FB244FD71D00D5A3AA /* OrderHistory */ = { - isa = PBXGroup; - children = ( - 89AD75FC244FD71D00D5A3AA /* Module Interface */, - 89AD75FE244FD71D00D5A3AA /* Application Logic */, - 89AD7608244FD71D00D5A3AA /* User Interface */, - ); - path = OrderHistory; - sourceTree = ""; - }; - 89AD75FC244FD71D00D5A3AA /* Module Interface */ = { - isa = PBXGroup; - children = ( - 89AD75FD244FD71D00D5A3AA /* OrderHistoryModuleInterface.swift */, - ); - path = "Module Interface"; - sourceTree = ""; - }; - 89AD75FE244FD71D00D5A3AA /* Application Logic */ = { - isa = PBXGroup; - children = ( - 89AD75FF244FD71D00D5A3AA /* Model */, - 89AD7602244FD71D00D5A3AA /* Service */, - 89AD7605244FD71D00D5A3AA /* Interactor */, - ); - path = "Application Logic"; - sourceTree = ""; - }; - 89AD75FF244FD71D00D5A3AA /* Model */ = { - isa = PBXGroup; - children = ( - 89AD7600244FD71D00D5A3AA /* Order.swift */, - 89AD7601244FD71D00D5A3AA /* OrderContainer.swift */, - ); - path = Model; - sourceTree = ""; - }; - 89AD7602244FD71D00D5A3AA /* Service */ = { - isa = PBXGroup; - children = ( - 89AD7603244FD71D00D5A3AA /* OrderHistoryService.swift */, - 89AD7604244FD71D00D5A3AA /* OrderHistoryServiceType.swift */, - ); - path = Service; - sourceTree = ""; - }; - 89AD7605244FD71D00D5A3AA /* Interactor */ = { - isa = PBXGroup; - children = ( - 89AD7606244FD71D00D5A3AA /* OrderHistoryInteractorIO.swift */, - 89AD7607244FD71D00D5A3AA /* OrderHistoryInteractor.swift */, - ); - path = Interactor; - sourceTree = ""; - }; - 89AD7608244FD71D00D5A3AA /* User Interface */ = { - isa = PBXGroup; - children = ( - 89AD7609244FD71D00D5A3AA /* Presenter */, - 89AD760B244FD71D00D5A3AA /* Wireframe */, - 89AD760E244FD71D00D5A3AA /* View */, - ); - path = "User Interface"; - sourceTree = ""; - }; - 89AD7609244FD71D00D5A3AA /* Presenter */ = { - isa = PBXGroup; - children = ( - 89AD760A244FD71D00D5A3AA /* OrderHistoryPresenter.swift */, - ); - path = Presenter; - sourceTree = ""; - }; - 89AD760B244FD71D00D5A3AA /* Wireframe */ = { - isa = PBXGroup; - children = ( - 89AD760C244FD71D00D5A3AA /* OrderHistoryWireframe.swift */, - 89AD760D244FD71D00D5A3AA /* OrderHistoryWireframeInput.swift */, - ); - path = Wireframe; - sourceTree = ""; - }; - 89AD760E244FD71D00D5A3AA /* View */ = { - isa = PBXGroup; - children = ( - 89AD760F244FD71D00D5A3AA /* Cell */, - 89AD7611244FD71D00D5A3AA /* OrderHistoryViewInterface.swift */, - 89AD7612244FD71D00D5A3AA /* OrderHistoryViewController.swift */, - 89AD7613244FD71D00D5A3AA /* OrderHistory.storyboard */, - ); - path = View; - sourceTree = ""; - }; - 89AD760F244FD71D00D5A3AA /* Cell */ = { - isa = PBXGroup; - children = ( - 89AD7610244FD71D00D5A3AA /* OrderCell.swift */, - ); - path = Cell; - sourceTree = ""; - }; 89EA0CF2243EC0D1003ACCC8 /* Profile */ = { isa = PBXGroup; children = ( @@ -6030,7 +5448,6 @@ 9F9DF0CA1FEBC0A0005B8F42 /* RecipientModules */, 73138D9322B7509F001280D3 /* RegisterModules */, 73A6211E233073D2000FFB5B /* RemittanceModules */, - 730D784F227A94E1007E517E /* RewardModules */, 042E6EFB203EAE3A004667A1 /* SideMenu */, D96A4FBF21460B4900CFD507 /* SplashScreen */, D96BD100216479E200DFE7D8 /* WalletStatement */, @@ -7334,7 +6751,6 @@ 733A3BA52355580000E6B87E /* CreditCardView.xib in Resources */, D96BD11D216479E200DFE7D8 /* WalletStatement.storyboard in Resources */, 7318F84C23BD7A27002BE004 /* CheckBox.xib in Resources */, - 89AD761F244FD71D00D5A3AA /* Reward.storyboard in Resources */, D9B414402161AD2000A53D9D /* TransactionHistoryDatePicker.storyboard in Resources */, 5565FF2F1FE275E5002934E9 /* SanFranciscoDisplay-Thin.otf in Resources */, 5565FF1D1FE275E5002934E9 /* SanFranciscoDisplay-Heavy.otf in Resources */, @@ -7342,7 +6758,6 @@ 73EC6C1A236984B200060448 /* InternationalTopup.storyboard in Resources */, 7384B28322CB377300DD04D9 /* GMEAlertViewController.xib in Resources */, 5565FF2A1FE275E5002934E9 /* SanFranciscoDisplay-Bold.otf in Resources */, - 89AD7645244FD71D00D5A3AA /* DetailOrder.storyboard in Resources */, 5565FF2B1FE275E5002934E9 /* SanFranciscoText-Heavy.otf in Resources */, 5565FF301FE275E5002934E9 /* SanFranciscoText-Light.otf in Resources */, 5565FF321FE275E5002934E9 /* SanFranciscoDisplay-Semibold.otf in Resources */, @@ -7379,7 +6794,6 @@ 89739E3424459A630016251B /* SendMoneyParent.storyboard in Resources */, 5565FF271FE275E5002934E9 /* README.md in Resources */, D95B5E4221311057000C0B33 /* GmeContacts.storyboard in Resources */, - 89AD7661244FD71D00D5A3AA /* OrderHistory.storyboard in Resources */, 89EA0D25243EC0D2003ACCC8 /* Profile.storyboard in Resources */, D950BED921549242008367A1 /* Home.storyboard in Resources */, D931E22A216DCC2A008A8CD1 /* MessageCompose.storyboard in Resources */, @@ -7392,7 +6806,6 @@ 73210DA922FBE73100715D6C /* Recipients.storyboard in Resources */, 73FBBF2B23F231A8009D7627 /* DetailNotification.storyboard in Resources */, BE74AFC5227C8FF200F05CE7 /* AddAccount.storyboard in Resources */, - 89AD762D244FD71D00D5A3AA /* Redeem.storyboard in Resources */, 734BF68A2353F7D8004E8D60 /* PhoneCardRecharge.storyboard in Resources */, 5565FF251FE275E5002934E9 /* SanFranciscoText-LightItalic.otf in Resources */, 5565FF1F1FE275E5002934E9 /* SanFranciscoText-Regular.otf in Resources */, @@ -7401,7 +6814,6 @@ 5565FF291FE275E5002934E9 /* SanFranciscoDisplay-Black.otf in Resources */, FF6E7D9421BF951D00A003B9 /* AppUpdate.storyboard in Resources */, D9692A1B221396AF00795EBC /* Setting.storyboard in Resources */, - 89AD7638244FD71D00D5A3AA /* RewardGroup.storyboard in Resources */, 73195ABC22FD14D500151434 /* SetupRecipient.storyboard in Resources */, 892F9E8E243DB0F300D9D88C /* ShowAPI.storyboard in Resources */, 735F68E22394A76800A2DBC8 /* NewRegister.storyboard in Resources */, @@ -7796,7 +7208,6 @@ 739045D8237921D500CD5D8A /* ManageAccountGroupInteractor.swift in Sources */, 73B6D6882306402200A0CB6E /* PaymentMethodModel.swift in Sources */, D9D2242B22407EBA00C7313D /* ResendListModel.swift in Sources */, - 89AD763F244FD71D00D5A3AA /* DetailOrderInteractorIO.swift in Sources */, 89739E4524459A630016251B /* SendMoneyExchangeRateService.swift in Sources */, 04E36E2121AE585200783685 /* PennyTestSubmitViewController.swift in Sources */, D92B80262140C3CB00A25B26 /* MainService.swift in Sources */, @@ -7807,7 +7218,6 @@ 733E8F8C23580BDF0050E499 /* RechargeReceiptServiceType.swift in Sources */, 89EA0D73243EC1C5003ACCC8 /* PersonalInformationModel.swift in Sources */, 89739E4124459A630016251B /* SendMoneyExchangeRateModuleInterface.swift in Sources */, - 89AD7658244FD71D00D5A3AA /* OrderHistoryServiceType.swift in Sources */, 89739E3724459A630016251B /* SendMoneyReceiptService.swift in Sources */, 9FD260F81FD00458007A511D /* AppDelegate.swift in Sources */, D903113E214786EA00AD5BA9 /* ForgotPasswordService.swift in Sources */, @@ -7817,8 +7227,6 @@ 73210DA222FBE73100715D6C /* RecipientsService.swift in Sources */, D96A4FDC21460B4A00CFD507 /* SplashScreenViewInterface.swift in Sources */, D950BED721549242008367A1 /* HomeWireframeInput.swift in Sources */, - 89AD7634244FD71D00D5A3AA /* RewardGroupInteractorIO.swift in Sources */, - 89AD7624244FD71D00D5A3AA /* BranchContainer.swift in Sources */, 89EA0D85243EC1C5003ACCC8 /* ChangePersonalInformationInteractor.swift in Sources */, 73FBBF2923F231A8009D7627 /* DetailNotificationWireframe.swift in Sources */, 7367FF5E237401860005F644 /* PushNotificationParam.swift in Sources */, @@ -7828,7 +7236,6 @@ 73FBBF2123F231A8009D7627 /* NotificationHistoryWireframeInput.swift in Sources */, D903113C214786EA00AD5BA9 /* ForgotPasswordModuleInterface.swift in Sources */, 89739E4624459A630016251B /* SendMoneyExchangeRateInteractorIO.swift in Sources */, - 89AD7632244FD71D00D5A3AA /* RewardGroupService.swift in Sources */, 730D78BD227A94F2007E517E /* SearchAddressViewInterface.swift in Sources */, 736A8C462277EB2A00337A50 /* BiometricNotificationWireframeInput.swift in Sources */, BEC9B003224FC49C00A2DA06 /* BiometricAuthenticationWireframeInput.swift in Sources */, @@ -7851,7 +7258,6 @@ BE74AFBB227C8FF200F05CE7 /* KFTCBankList.swift in Sources */, D9B7ADF22130048E009B0564 /* ExchangeRatesServiceType.swift in Sources */, FF6E7D9721BF951D00A003B9 /* AppUpdateWireframe.swift in Sources */, - 89AD7633244FD71D00D5A3AA /* RewardGroupInteractor.swift in Sources */, D9DAFE2921353D6C00483E71 /* SendMoneyPaymentModeModel.swift in Sources */, D9030ABB2138DDD900A1BCA0 /* SendMoneyExchangeRate.swift in Sources */, 73AEFF7B2334A13100A967FB /* TransactionHistoryGroupViewController.swift in Sources */, @@ -7872,7 +7278,6 @@ 89739E5E24459A630016251B /* SendMoneyVerificationInteractor.swift in Sources */, FF6E7D9021BF951D00A003B9 /* AppUpdateService.swift in Sources */, BE74AFBD227C8FF200F05CE7 /* AddAccountServiceType.swift in Sources */, - 89AD7660244FD71D00D5A3AA /* OrderHistoryViewController.swift in Sources */, 043770E721AD04240005B22D /* PennyTestModuleInterface.swift in Sources */, 73195ABD22FD14D500151434 /* SetupRecipientViewController.swift in Sources */, 733A3BA723558F8F00E6B87E /* CreditCardType.swift in Sources */, @@ -7887,7 +7292,6 @@ 73AEFF782334A13100A967FB /* TransactionHistoryGroupViewModelInterface.swift in Sources */, 73210DB122FBF4B000715D6C /* ObservableType+Ext.swift in Sources */, D96BD119216479E200DFE7D8 /* WalletStatementInteractor.swift in Sources */, - 89AD7636244FD71D00D5A3AA /* RewardGroupWireframeInput.swift in Sources */, 73071ACA2296CF9B008840FD /* HotLineWireframeInput.swift in Sources */, D9031140214786EA00AD5BA9 /* ForgotPasswordInteractorIO.swift in Sources */, 73911162237A7A0F00697D27 /* PenneyTestVerify.swift in Sources */, @@ -7920,13 +7324,10 @@ 73FBBF2323F231A8009D7627 /* NotificationHistoryViewController.swift in Sources */, 730D78B4227A94F2007E517E /* JusoCommon.swift in Sources */, 73B6D68423063DFD00A0CB6E /* ResponseContainer.swift in Sources */, - 89AD765C244FD71D00D5A3AA /* OrderHistoryWireframe.swift in Sources */, 733A3B9D23554DAF00E6B87E /* RechargePaymentWireframe.swift in Sources */, - 89AD763C244FD71D00D5A3AA /* DetailOrderService.swift in Sources */, 89739E3824459A630016251B /* SendMoneyReceiptServiceType.swift in Sources */, D97785AC215DD23400754079 /* TransactionModel.swift in Sources */, BE74AFC7227C8FF200F05CE7 /* AutoDebitService.swift in Sources */, - 89AD7656244FD71D00D5A3AA /* OrderContainer.swift in Sources */, 7318F85023BDB475002BE004 /* CheckBox+Rx.swift in Sources */, 04E36E1A21AE585200783685 /* PennyTestSubmitServiceType.swift in Sources */, 73FBBF2C23F231A8009D7627 /* DetailNotificationViewController.swift in Sources */, @@ -7949,9 +7350,7 @@ 73210DB522FC01C200715D6C /* RecipientCell.swift in Sources */, 739045D9237921D500CD5D8A /* ManageAccountGroupPresenter.swift in Sources */, 89EA0D35243EC0D2003ACCC8 /* ProfileViewController.swift in Sources */, - 89AD7626244FD71D00D5A3AA /* RedeemServiceType.swift in Sources */, D9031143214786EA00AD5BA9 /* ForgotPasswordWireframeInput.swift in Sources */, - 89AD7635244FD71D00D5A3AA /* RewardGroupPresenter.swift in Sources */, 73EC6C17236984B200060448 /* InternationalTopupWireframe.swift in Sources */, 738FD4882303D70E008B144D /* RequestModelType.swift in Sources */, D92C24A721477EA600F6876F /* ResponseMessage.swift in Sources */, @@ -7963,7 +7362,6 @@ 89739E3624459A630016251B /* SendMoneyReceiptModuleInterface.swift in Sources */, 736A8C452277EB2A00337A50 /* BiometricNotificationPresenter.swift in Sources */, 89739E3924459A630016251B /* SendMoneyReceiptInteractor.swift in Sources */, - 89AD7637244FD71D00D5A3AA /* RewardGroupWireframe.swift in Sources */, 73FBBF1E23F231A8009D7627 /* NotificationHistoryInteractor.swift in Sources */, BE74AFBE227C8FF200F05CE7 /* AddAccountInteractorIO.swift in Sources */, 7384B28222CB377300DD04D9 /* GMEAlertViewController.swift in Sources */, @@ -7978,7 +7376,6 @@ D903113F214786EA00AD5BA9 /* ForgotPasswordInteractor.swift in Sources */, 73157BA422DC1EEC009B836F /* PopupNotificationViewController.swift in Sources */, D962230C212BD7A100B7A115 /* Array+Ext.swift in Sources */, - 89AD7617244FD71D00D5A3AA /* RewardServiceType.swift in Sources */, 73157B9B22DC1EEC009B836F /* PopupNotificationModuleInterface.swift in Sources */, D96848CE212D419400EF12B1 /* ApiServiceType.swift in Sources */, 043770EA21AD04240005B22D /* PennyTestInteractor.swift in Sources */, @@ -7992,7 +7389,6 @@ 73195B3522FD5BC600151434 /* APIRouter.swift in Sources */, 73A6E20222CEE51600E9BC68 /* BadgeAppearance.swift in Sources */, 738B3E4C233B56C6000EA5E5 /* UISearchBar+Ext.swift in Sources */, - 89AD7659244FD71D00D5A3AA /* OrderHistoryInteractorIO.swift in Sources */, D97785AA215DD04400754079 /* TransactionHistoryTableViewCell.swift in Sources */, 738D7283239F3243006B4EA7 /* PrimaryInformation.swift in Sources */, 89EA0D88243EC1C5003ACCC8 /* ChangePersonalInformationWireframeInputOutput.swift in Sources */, @@ -8011,21 +7407,17 @@ 7389601022C2F208003FEA90 /* TablePresenterWireframeInput.swift in Sources */, 73FBBF2823F231A8009D7627 /* DetailNotificationPresenter.swift in Sources */, 733E8F8F23580BE00050E499 /* RechargeReceiptInteractorIO.swift in Sources */, - 89AD762C244FD71D00D5A3AA /* RedeemWireframeInput.swift in Sources */, D95B5E4021311057000C0B33 /* GmeContactsWireframe.swift in Sources */, BEC9B005224FC49C00A2DA06 /* BiometricAuthenticationViewController.swift in Sources */, 0496B84E1FE7DFCD0044810E /* UIViewController+Ext.swift in Sources */, - 89AD7655244FD71D00D5A3AA /* Order.swift in Sources */, BEC9AFFD224FC49C00A2DA06 /* BiometricAuthenticationService.swift in Sources */, 89EA0D7E243EC1C5003ACCC8 /* PersonalInformationViewInterface.swift in Sources */, 73210DAA22FBE73100715D6C /* RecipientsViewModelInterface.swift in Sources */, - 89AD7623244FD71D00D5A3AA /* Branch.swift in Sources */, 73157B9D22DC1EEC009B836F /* PopupNotificationService.swift in Sources */, D9031145214786EA00AD5BA9 /* ForgotPasswordViewController.swift in Sources */, 89EA0D87243EC1C5003ACCC8 /* ChangePersonalInformationPresenter.swift in Sources */, D95B7043213F9A2C0053CC3D /* CALayer+Ext.swift in Sources */, 73911160237A6F4500697D27 /* InboundAccountCell.swift in Sources */, - 89AD765E244FD71D00D5A3AA /* OrderCell.swift in Sources */, 73EC6C14236984B200060448 /* InternationalTopupInteractorIO.swift in Sources */, 733A3B9A23554DAF00E6B87E /* RechargePaymentInteractorIO.swift in Sources */, 73195AB322FD14D500151434 /* SetupRecipientServiceType.swift in Sources */, @@ -8036,13 +7428,12 @@ 89739E4B24459A630016251B /* SendMoneyExchangeRateViewController.swift in Sources */, 7391117B237AA3C300697D27 /* InboundPennyTestSubmitInteractorIO.swift in Sources */, 73B6D68E2306413100A0CB6E /* RecipientCommonType.swift in Sources */, + 7EC9DE0324A9AEEC004A0AD8 /* Branch.swift in Sources */, D962231E212C126500B7A115 /* ExchangeModel.swift in Sources */, D903113D214786EA00AD5BA9 /* ForgotPasswordServiceType.swift in Sources */, - 89AD7614244FD71D00D5A3AA /* RewardModuleInterface.swift in Sources */, 734DD31A2366881600BFA7EE /* VerificationAndBuy.swift in Sources */, D9B39677214F7DDC0072A9B8 /* ImageCroper.swift in Sources */, 730D78B9227A94F2007E517E /* SearchAddressInteractor.swift in Sources */, - 89AD761B244FD71D00D5A3AA /* RewardPresenter.swift in Sources */, D923EBBB215C7E67008A3026 /* HomeCollectionModel.swift in Sources */, 733A3B9923554DAF00E6B87E /* RechargePaymentInteractor.swift in Sources */, D96A4FF72146625C00CFD507 /* RegisterServiceType.swift in Sources */, @@ -8050,7 +7441,6 @@ D95B5E3C21311057000C0B33 /* GmeContactsInteractor.swift in Sources */, BEC9AFFF224FC49C00A2DA06 /* BiometricAuthenticationInteractorIO.swift in Sources */, 73185314230E19DD00BA9AE3 /* ValidateAccountRequest.swift in Sources */, - 89AD7619244FD71D00D5A3AA /* RewardInteractorIO.swift in Sources */, 73FBBF1D23F231A8009D7627 /* NotificationHistoryInteractorIO.swift in Sources */, D9B7ADF32130048E009B0564 /* ExchangeRatesInteractorIO.swift in Sources */, 73911157237A6DB400697D27 /* InboundAccountsServiceType.swift in Sources */, @@ -8062,7 +7452,6 @@ 89739E5B24459A630016251B /* SendMoneyVerificationServiceType.swift in Sources */, 7391115B237A6DB400697D27 /* InboundAccountsWireframeInput.swift in Sources */, 739045D5237921D500CD5D8A /* ManageAccountGroupServiceType.swift in Sources */, - 89AD7625244FD71D00D5A3AA /* Redeem.swift in Sources */, 73185350230EACA400BA9AE3 /* SendMoneyCountryViewModel.swift in Sources */, 73106884236FFBCB00B6F28A /* RechargeHistoryCell.swift in Sources */, 89EA0D7A243EC1C5003ACCC8 /* PersonalInformationPresenter.swift in Sources */, @@ -8073,14 +7462,11 @@ 89739E5C24459A630016251B /* SendMoneyVerificationService.swift in Sources */, D92B802B2140C3CB00A25B26 /* MainWireframeInput.swift in Sources */, 9FA00FBE1FEE69AF0049753E /* UIView+Ext.swift in Sources */, - 89AD7657244FD71D00D5A3AA /* OrderHistoryService.swift in Sources */, 730D78B5227A94F2007E517E /* JusoContainer.swift in Sources */, 739045B82378FC9500CD5D8A /* AddInboundAccountWireframe.swift in Sources */, D9B7ADF12130048E009B0564 /* ExchangeRatesService.swift in Sources */, - 89AD761A244FD71D00D5A3AA /* RewardInteractor.swift in Sources */, 73549BB4236FDD5600AD75D2 /* RechargeHistoryInteractorIO.swift in Sources */, 739045B62378FC9500CD5D8A /* AddInboundAccountInteractorIO.swift in Sources */, - 89AD7654244FD71D00D5A3AA /* OrderHistoryModuleInterface.swift in Sources */, 731627A52301009800BA48A8 /* ExchangeRateRequestModel.swift in Sources */, BEC9B001224FC49C00A2DA06 /* BiometricAuthenticationPresenter.swift in Sources */, 73157BA722DC3F14009B836F /* Date+Ext.swift in Sources */, @@ -8092,8 +7478,6 @@ 89EA0D8C243EC1C6003ACCC8 /* ChangePersonalInformationViewController.swift in Sources */, D950BED121549242008367A1 /* HomeModuleInterface.swift in Sources */, 73BA8CC9237E326C00F3E579 /* TotalManageAccountsInteractor.swift in Sources */, - 89AD7642244FD71D00D5A3AA /* DetailOrderWireframe.swift in Sources */, - 89AD762E244FD71D00D5A3AA /* RedeemViewController.swift in Sources */, 733E8F9123580BE00050E499 /* RechargeReceiptWireframeInputOutput.swift in Sources */, 7391115D237A6DB400697D27 /* InboundAccountsViewController.swift in Sources */, 739045B92378FC9500CD5D8A /* AddInboundAccountWireframeInput.swift in Sources */, @@ -8112,16 +7496,13 @@ D9B7ADFA2130048E009B0564 /* ExchangeRatesViewInterface.swift in Sources */, D9E57945212E938D00D47AC0 /* ExchangeRateDetailModel.swift in Sources */, D96848C7212D3A7400EF12B1 /* DataRequest+Ext.swift in Sources */, - 89AD7615244FD71D00D5A3AA /* RewardProductContainer.swift in Sources */, D95B5E3D21311057000C0B33 /* GmeContactsInteractorIO.swift in Sources */, BE74AFC2227C8FF200F05CE7 /* AddAccountWireframe.swift in Sources */, D96A4FDA21460B4A00CFD507 /* SplashScreenWireframe.swift in Sources */, 73FDCE1D225C167700CC6912 /* KeyChain.swift in Sources */, 89739E2D24459A630016251B /* SendMoneyParentInteractor.swift in Sources */, - 89AD761E244FD71D00D5A3AA /* RewardViewInterface.swift in Sources */, D946719A21426DFB003924DB /* LoginPresenter.swift in Sources */, 73911158237A6DB400697D27 /* InboundAccountsInteractorIO.swift in Sources */, - 89AD7622244FD71D00D5A3AA /* RedeemModuleInterface.swift in Sources */, D92B802C2140C3CB00A25B26 /* MainWireframe.swift in Sources */, 89739E6324459A630016251B /* SendMoneyVerificationViewInterface.swift in Sources */, 73AEFF752334A13100A967FB /* TransactionHistoryGroupPresenter.swift in Sources */, @@ -8135,7 +7516,6 @@ 73FBBF2A23F231A8009D7627 /* DetailNotificationWireframeInput.swift in Sources */, 739045B52378FC9500CD5D8A /* AddInboundAccountInteractor.swift in Sources */, D96A50002146625C00CFD507 /* RegisterViewController.swift in Sources */, - 89AD7643244FD71D00D5A3AA /* DetailOrderViewController.swift in Sources */, D950BEDA21549242008367A1 /* HomeViewController.swift in Sources */, FF6E7D9821BF951D00A003B9 /* AppUpdateWireframeInput.swift in Sources */, D96A4FDE21460B4A00CFD507 /* SplashScreenViewController.swift in Sources */, @@ -8154,7 +7534,6 @@ 04DC27EC21A51E29003714F5 /* AutoRefund.swift in Sources */, D96BD11A216479E200DFE7D8 /* WalletStatementPresenter.swift in Sources */, BE74AFBA227C8FF200F05CE7 /* AddAccountModuleInterface.swift in Sources */, - 89AD765B244FD71D00D5A3AA /* OrderHistoryPresenter.swift in Sources */, 7366BECE235D331B00A8AE7C /* PriceModel.swift in Sources */, D97785A2215DC55F00754079 /* TransactionHistoryPresenter.swift in Sources */, 738B6B5523F4E6F0006FA928 /* DetailNoticeModel.swift in Sources */, @@ -8167,15 +7546,12 @@ 73BA8CC8237E326C00F3E579 /* TotalManageAccountsInteractorIO.swift in Sources */, D96A4FD621460B4A00CFD507 /* SplashScreenServiceType.swift in Sources */, 736A8C412277EB2A00337A50 /* BiometricNotificationService.swift in Sources */, - 89AD7628244FD71D00D5A3AA /* RedeemInteractor.swift in Sources */, 73210DA122FBE73100715D6C /* RecipientsModuleInterface.swift in Sources */, 7327568223B0456400BF66C5 /* ManageAgreementInteractor.swift in Sources */, 735F68F92394CD6B00A2DBC8 /* NewRegisterStep1Service.swift in Sources */, 892F9E87243DB0F300D9D88C /* ShowAPIServiceType.swift in Sources */, 735F68E12394A76800A2DBC8 /* NewRegisterWireframe.swift in Sources */, 7327568723B0456400BF66C5 /* ManageAgreementViewController.swift in Sources */, - 89AD763A244FD71D00D5A3AA /* RewardGroupViewController.swift in Sources */, - 89AD7621244FD71D00D5A3AA /* RewardViewController.swift in Sources */, D977859E215DC55F00754079 /* TransactionHistoryService.swift in Sources */, D95B5E3A21311057000C0B33 /* GmeContactsService.swift in Sources */, D95B5E3F21311057000C0B33 /* GmeContactsWireframeInput.swift in Sources */, @@ -8191,7 +7567,6 @@ 73AEFF722334A13100A967FB /* TransactionHistoryGroupService.swift in Sources */, 739045BD2379171100CD5D8A /* PenneyTestRequest.swift in Sources */, 733A3B9723554DAF00E6B87E /* RechargePaymentService.swift in Sources */, - 89AD7629244FD71D00D5A3AA /* RedeemInteractorIO.swift in Sources */, 89EA0D81243EC1C5003ACCC8 /* ChangePersonalInformationModel.swift in Sources */, 730D78C0227A94F2007E517E /* SearchAddressViewController.swift in Sources */, 738FD48C2303E157008B144D /* FieldModel.swift in Sources */, @@ -8200,7 +7575,6 @@ 73549BB2236FDD5600AD75D2 /* RechargeHistoryServiceType.swift in Sources */, 73AEFF762334A13100A967FB /* TransactionHistoryGroupWireframeInputOutput.swift in Sources */, 732B5F9723C40C1F00074442 /* AgreePDFDocument.swift in Sources */, - 89AD7616244FD71D00D5A3AA /* RewardProduct.swift in Sources */, 739045D7237921D500CD5D8A /* ManageAccountGroupInteractorIO.swift in Sources */, 738D7281239F31C4006B4EA7 /* PersonalInformation.swift in Sources */, 734BF6882353F7D8004E8D60 /* PhoneCardRechargeWireframeInputOutput.swift in Sources */, @@ -8232,7 +7606,6 @@ D97785A0215DC55F00754079 /* TransactionHistoryInteractorIO.swift in Sources */, 734BF6862353F7D8004E8D60 /* PhoneCardRechargePresenter.swift in Sources */, 739045B72378FC9500CD5D8A /* AddInboundAccountPresenter.swift in Sources */, - 89AD7631244FD71D00D5A3AA /* RewardGroupServiceType.swift in Sources */, D945F129213E4A9D00A24824 /* SendMoneyReciept.swift in Sources */, 733E8F9323580BE00050E499 /* RechargeReceiptViewController.swift in Sources */, D9B7ADF02130048E009B0564 /* ExchangeRatesModuleInterface.swift in Sources */, @@ -8241,7 +7614,6 @@ 739045BB2378FC9500CD5D8A /* AddInboundAccountViewController.swift in Sources */, 043770EE21AD04240005B22D /* PennyTestWireframe.swift in Sources */, 89739E3F24459A630016251B /* SendMoneyReceiptViewController.swift in Sources */, - 89AD763D244FD71D00D5A3AA /* DetailOrderServiceType.swift in Sources */, D96A4FBC2146079600CFD507 /* AppConstants.swift in Sources */, 733A3B9823554DAF00E6B87E /* RechargePaymentServiceType.swift in Sources */, 733E8F77235804810050E499 /* CreditCardReceipt.swift in Sources */, @@ -8272,12 +7644,10 @@ 89739E6424459A630016251B /* SendMoneyVerificationViewController.swift in Sources */, 736A8C4A2277EB2A00337A50 /* BiometricNotificationViewInterface.swift in Sources */, 738FD48E2303F87D008B144D /* DynamicFieldModel.swift in Sources */, - 89AD762F244FD71D00D5A3AA /* RedeemViewInterface.swift in Sources */, D9B7ADF82130048E009B0564 /* ExchangeRatesViewController.swift in Sources */, 89739E3124459A630016251B /* SendMoneyParentWireframeInput.swift in Sources */, D950BED321549242008367A1 /* HomeService.swift in Sources */, 045976B221A3D8F30001E92A /* AutoRefundsViewController.swift in Sources */, - 89AD7639244FD71D00D5A3AA /* RewardGroupViewInterface.swift in Sources */, 733A3B9F23554DAF00E6B87E /* RechargePaymentViewController.swift in Sources */, 7327568123B0456400BF66C5 /* ManageAgreementInteractorIO.swift in Sources */, 734BF6842353F7D8004E8D60 /* PhoneCardRechargeInteractor.swift in Sources */, @@ -8295,12 +7665,12 @@ 73AEFF772334A13100A967FB /* TransactionHistoryGroupWireframe.swift in Sources */, 89EA0D34243EC0D2003ACCC8 /* ProfileChangePasswordViewController.swift in Sources */, 73149F6A22E5AF8000D66B26 /* LauncherScreenWireframe.swift in Sources */, + 7EC9DE0524A9AF65004A0AD8 /* BranchContainer.swift in Sources */, 73210DAF22FBF2BA00715D6C /* ViewModelType.swift in Sources */, 89739E3224459A630016251B /* SenMoneyPaymentModeRecipientViewModel.swift in Sources */, 7391117E237AA3C300697D27 /* InboundPennyTestSubmitWireframe.swift in Sources */, D96A4FFC2146625C00CFD507 /* RegisterWireframeInput.swift in Sources */, 73149F6C22E5AF8000D66B26 /* LauncherScreenViewInterface.swift in Sources */, - 89AD7618244FD71D00D5A3AA /* RewardService.swift in Sources */, BEC9B002224FC49C00A2DA06 /* BiometricAuthenticationWireframe.swift in Sources */, 73FBBF1F23F231A8009D7627 /* NotificationHistoryPresenter.swift in Sources */, 7391117C237AA3C300697D27 /* InboundPennyTestSubmitInteractor.swift in Sources */, @@ -8310,7 +7680,6 @@ 7389600A22C2F208003FEA90 /* TablePresenterModuleInterface.swift in Sources */, 73071AC92296CF9B008840FD /* HotLinePresenter.swift in Sources */, 04DC27EE21A51E83003714F5 /* autoRefundService.swift in Sources */, - 89AD7641244FD71D00D5A3AA /* DetailOrderWireframeInput.swift in Sources */, 892F9E89243DB0F300D9D88C /* ShowAPIInteractor.swift in Sources */, 049E61A51FF0AE9D00817C76 /* UrlManager.swift in Sources */, 89739E3B24459A630016251B /* SendMoneyReceiptPresenter.swift in Sources */, @@ -8320,11 +7689,9 @@ BE74AFC1227C8FF200F05CE7 /* AddAccountWireframeInput.swift in Sources */, BEC9AFFC224FC49C00A2DA06 /* BiometricAuthenticationModuleInterface.swift in Sources */, 735F68DD2394A76800A2DBC8 /* NewRegisterInteractorIO.swift in Sources */, - 89AD7630244FD71D00D5A3AA /* RewardGroupModuleInterface.swift in Sources */, 733E8F8D23580BDF0050E499 /* RechargeReceiptService.swift in Sources */, D97785A3215DC55F00754079 /* TransactionHistoryWireframeInput.swift in Sources */, 738714B7237CE86E0038FCB1 /* InboundReceiptPresenter.swift in Sources */, - 89AD765A244FD71D00D5A3AA /* OrderHistoryInteractor.swift in Sources */, 892F9E8A243DB0F300D9D88C /* ShowAPIPresenter.swift in Sources */, 7383F43622DEB864003D6393 /* GMEDB.swift in Sources */, 04E36E2021AE585200783685 /* PennyTestSubmitWireframeInput.swift in Sources */, @@ -8341,8 +7708,6 @@ D950BEDB21549242008367A1 /* HomeViewInterface.swift in Sources */, 73EC6C15236984B200060448 /* InternationalTopupInteractor.swift in Sources */, FF6E7D9121BF951D00A003B9 /* AppUpdateServiceType.swift in Sources */, - 89AD7644244FD71D00D5A3AA /* DetailOrderViewInterface.swift in Sources */, - 89AD7620244FD71D00D5A3AA /* RewardItemCollectionViewCell.swift in Sources */, 89EA0D76243EC1C5003ACCC8 /* PersonalInformationService.swift in Sources */, D96BD117216479E200DFE7D8 /* WalletStatementService.swift in Sources */, D90D55B121326DA800EEEE04 /* ReciepientEx.swift in Sources */, @@ -8350,11 +7715,9 @@ D950BED821549242008367A1 /* HomeWireframe.swift in Sources */, 73195ABA22FD14D500151434 /* SetupRecipientViewModel.swift in Sources */, 7389601422C2F208003FEA90 /* TablePresenterViewController.swift in Sources */, - 89AD762A244FD71D00D5A3AA /* RedeemPresenter.swift in Sources */, 739F8187234AFF13003ABCF3 /* DebugManager.swift in Sources */, 735F68FD2394CD6B00A2DBC8 /* NewRegisterStep1Wireframe.swift in Sources */, 7E364CEF24A46D27007D6E02 /* BalanceModel.swift in Sources */, - 89AD761D244FD71D00D5A3AA /* RewardWireframe.swift in Sources */, D96BD11B216479E200DFE7D8 /* WalletStatementWireframe.swift in Sources */, D96BD116216479E200DFE7D8 /* WalletStatementServiceType.swift in Sources */, D946719621426DFB003924DB /* LoginService.swift in Sources */, @@ -8364,16 +7727,14 @@ 731AADEB230CC08F008BE38F /* ValidationTextField.swift in Sources */, 04E36E1E21AE585200783685 /* PennyTestSubmitPresenter.swift in Sources */, 7318F84A23BD7A19002BE004 /* CheckBox.swift in Sources */, - 89AD761C244FD71D00D5A3AA /* RewardWireframeInput.swift in Sources */, D97785A4215DC55F00754079 /* TransactionHistoryWireframe.swift in Sources */, + 7EC9DE0124A9AECE004A0AD8 /* RewardProduct.swift in Sources */, D96848CC212D3F2300EF12B1 /* ExchangeRateApiService.swift in Sources */, 7310688623701A1800B6F28A /* RechargeHistory.swift in Sources */, - 89AD762B244FD71D00D5A3AA /* RedeemWireframe.swift in Sources */, D9DC108421639E56008F3C51 /* SuccessMessage.swift in Sources */, 738D7285239F32C7006B4EA7 /* PictureInformation.swift in Sources */, 89739E4A24459A630016251B /* SendMoneyExchangeRateWireframe.swift in Sources */, 7318534E230EACA400BA9AE3 /* SendMoneyTransFerReasonViewModel.swift in Sources */, - 89AD7640244FD71D00D5A3AA /* DetailOrderPresenter.swift in Sources */, 73195ABB22FD14D500151434 /* SetupRecipientViewModelInterface.swift in Sources */, 7389601922C2FADD003FEA90 /* TableCell.swift in Sources */, D92B802A2140C3CB00A25B26 /* MainPresenter.swift in Sources */, @@ -8406,7 +7767,6 @@ 73927A90230BADA700B856D0 /* CountryAndServiceModel.swift in Sources */, D96BD11F216479E200DFE7D8 /* WalletStatementViewController.swift in Sources */, 0470301221CA4BD000B6C9C3 /* AccountEx.swift in Sources */, - 89AD765F244FD71D00D5A3AA /* OrderHistoryViewInterface.swift in Sources */, 892F9E8B243DB0F300D9D88C /* ShowAPIWireframe.swift in Sources */, 7391115C237A6DB400697D27 /* InboundAccountsWireframe.swift in Sources */, D94173B3214B40ED00D04BE5 /* KycModel.swift in Sources */, @@ -8423,7 +7783,6 @@ 734BF6892353F7D8004E8D60 /* PhoneCardRechargeViewController.swift in Sources */, 7388821922CDF20F00592960 /* UITextField+Ext.swift in Sources */, 73B6D68C230640D400A0CB6E /* BranchModel.swift in Sources */, - 89AD763B244FD71D00D5A3AA /* DetailOrderModuleInterface.swift in Sources */, 73BA8CD2237E427D00F3E579 /* TotalAccount.swift in Sources */, 7389601122C2F208003FEA90 /* TablePresenterWireframe.swift in Sources */, 73FBBF2423F231A8009D7627 /* DetailNotificationService.swift in Sources */, @@ -8444,13 +7803,11 @@ 735F69002394CD6B00A2DBC8 /* NewRegisterStep1ViewController.swift in Sources */, D92B802E2140C3CB00A25B26 /* MainViewController.swift in Sources */, 73210DA622FBE73100715D6C /* RecipientsPresenter.swift in Sources */, - 89AD765D244FD71D00D5A3AA /* OrderHistoryWireframeInput.swift in Sources */, 041A86A721D1F5590044C83C /* WkWebViewController.swift in Sources */, 730D78B1227A94F2007E517E /* SearchAddressModuleInterface.swift in Sources */, D90D55D72132846000EEEE04 /* SendMoneyCountryModel.swift in Sources */, 73149F6522E5AF8000D66B26 /* LauncherScreenService.swift in Sources */, D95B5E3B21311057000C0B33 /* GmeContactsServiceType.swift in Sources */, - 89AD7627244FD71D00D5A3AA /* RedeemService.swift in Sources */, 73549BB5236FDD5600AD75D2 /* RechargeHistoryInteractor.swift in Sources */, D9B39678214F7DDC0072A9B8 /* MultiMediaManager.swift in Sources */, D950BED621549242008367A1 /* HomePresenter.swift in Sources */, @@ -8465,7 +7822,6 @@ 892F9E8D243DB0F300D9D88C /* ShowAPIViewController.swift in Sources */, 73195AB822FD14D500151434 /* SetupRecipientWireframe.swift in Sources */, D9DC108021639078008F3C51 /* MessageComposeViewController.swift in Sources */, - 89AD763E244FD71D00D5A3AA /* DetailOrderInteractor.swift in Sources */, 7327568B23B052DB00BF66C5 /* PDFViewController.swift in Sources */, 7315526E23C839CF0011D37C /* Rx+UserDefaultsWrapper.swift in Sources */, ); diff --git a/GME Remit/Modules/RewardModules/DetailOrder/Application Logic/Interactor/DetailOrderInteractor.swift b/GME Remit/Modules/RewardModules/DetailOrder/Application Logic/Interactor/DetailOrderInteractor.swift deleted file mode 100644 index db082672..00000000 --- a/GME Remit/Modules/RewardModules/DetailOrder/Application Logic/Interactor/DetailOrderInteractor.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// DetailOrderInteractor.swift -// GME Remit -// -// Created by InKwon Devik Kim on 15/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class DetailOrderInteractor { - - // MARK: Properties - - weak var output: DetailOrderInteractorOutput? - private let service: DetailOrderServiceType - private let order: Order? - // MARK: Initialization - - init(service: DetailOrderServiceType, order: Order?) { - self.service = service - self.order = order - } - -} - -// MARK: DetailOrder interactor input interface - -extension DetailOrderInteractor: DetailOrderInteractorInput { - func fetchOrder() { - output?.setOrder(order) - } -} diff --git a/GME Remit/Modules/RewardModules/DetailOrder/Application Logic/Interactor/DetailOrderInteractorIO.swift b/GME Remit/Modules/RewardModules/DetailOrder/Application Logic/Interactor/DetailOrderInteractorIO.swift deleted file mode 100644 index 9684ae19..00000000 --- a/GME Remit/Modules/RewardModules/DetailOrder/Application Logic/Interactor/DetailOrderInteractorIO.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// DetailOrderInteractorIO.swift -// GME Remit -// -// Created by InKwon Devik Kim on 15/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol DetailOrderInteractorInput: class { - func fetchOrder() -} - -protocol DetailOrderInteractorOutput: class { - func setOrder(_ order: Order?) -} diff --git a/GME Remit/Modules/RewardModules/DetailOrder/Application Logic/Service/DetailOrderService.swift b/GME Remit/Modules/RewardModules/DetailOrder/Application Logic/Service/DetailOrderService.swift deleted file mode 100644 index e46397e5..00000000 --- a/GME Remit/Modules/RewardModules/DetailOrder/Application Logic/Service/DetailOrderService.swift +++ /dev/null @@ -1,13 +0,0 @@ -// -// DetailOrderService.swift -// GME Remit -// -// Created by InKwon Devik Kim on 15/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class DetailOrderService: DetailOrderServiceType { - -} diff --git a/GME Remit/Modules/RewardModules/DetailOrder/Application Logic/Service/DetailOrderServiceType.swift b/GME Remit/Modules/RewardModules/DetailOrder/Application Logic/Service/DetailOrderServiceType.swift deleted file mode 100644 index 226d5bd9..00000000 --- a/GME Remit/Modules/RewardModules/DetailOrder/Application Logic/Service/DetailOrderServiceType.swift +++ /dev/null @@ -1,11 +0,0 @@ -// -// DetailOrderServiceType.swift -// GME Remit -// -// Created by InKwon Devik Kim on 15/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol DetailOrderServiceType: class { - -} diff --git a/GME Remit/Modules/RewardModules/DetailOrder/Module Interface/DetailOrderModuleInterface.swift b/GME Remit/Modules/RewardModules/DetailOrder/Module Interface/DetailOrderModuleInterface.swift deleted file mode 100644 index 3e3d4392..00000000 --- a/GME Remit/Modules/RewardModules/DetailOrder/Module Interface/DetailOrderModuleInterface.swift +++ /dev/null @@ -1,11 +0,0 @@ -// -// DetailOrderModuleInterface.swift -// GME Remit -// -// Created by InKwon Devik Kim on 15/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol DetailOrderModuleInterface: class { - func fetchOrder() -} diff --git a/GME Remit/Modules/RewardModules/DetailOrder/User Interface/Presenter/DetailOrderPresenter.swift b/GME Remit/Modules/RewardModules/DetailOrder/User Interface/Presenter/DetailOrderPresenter.swift deleted file mode 100644 index 35db9171..00000000 --- a/GME Remit/Modules/RewardModules/DetailOrder/User Interface/Presenter/DetailOrderPresenter.swift +++ /dev/null @@ -1,35 +0,0 @@ -// -// DetailOrderPresenter.swift -// GME Remit -// -// Created by InKwon Devik Kim on 15/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class DetailOrderPresenter { - - // MARK: Properties - - weak var view: DetailOrderViewInterface? - var interactor: DetailOrderInteractorInput? - var wireframe: DetailOrderWireframeInput? - -} - -// MARK: DetailOrder module interface - -extension DetailOrderPresenter: DetailOrderModuleInterface { - func fetchOrder() { - interactor?.fetchOrder() - } -} - -// MARK: DetailOrder interactor output interface - -extension DetailOrderPresenter: DetailOrderInteractorOutput { - func setOrder(_ order: Order?) { - view?.setOrder(order) - } -} diff --git a/GME Remit/Modules/RewardModules/DetailOrder/User Interface/View/DetailOrder.storyboard b/GME Remit/Modules/RewardModules/DetailOrder/User Interface/View/DetailOrder.storyboard deleted file mode 100644 index 4031efe9..00000000 --- a/GME Remit/Modules/RewardModules/DetailOrder/User Interface/View/DetailOrder.storyboard +++ /dev/null @@ -1,509 +0,0 @@ - - - - - - - - - - - - - SanFranciscoDisplay-Bold - - - SanFranciscoText-Bold - - - SanFranciscoText-Regular - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GME Remit/Modules/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift b/GME Remit/Modules/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift deleted file mode 100644 index a71c4479..00000000 --- a/GME Remit/Modules/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift +++ /dev/null @@ -1,145 +0,0 @@ -// -// DetailOrderViewController.swift -// GME Remit -// -// Created by InKwon Devik Kim on 15/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit - -class DetailOrderViewController: UIViewController { - - // MARK: Properties - - var presenter: DetailOrderModuleInterface? - - // MARK: Computed Properties - - private var order: Order? { - didSet { - guard - let order = order, - let statusCode = order.orderStatus, - let status = OrderCell.Status(rawValue: statusCode) - else { return } - - receiverNameLabel.text = order.recvName - mobileNumberLabel.text = order.recvPhoneNumber - pickupBranchLabel.text = order.branchName - - productNameLabel.text = order.productName - productPointLabel.text = order.usePoint?.likeCommaMoney() - - orderStatusLabel.text = status.message - orderDateLabel.text = order.createdDate - orderIDNumberLabel.text = order.orderID - orderTypeLabel.text = order.orderType == "9" ? - "canceled_text".localized() : "pickup_from_branch_text".localized() - - switch order.orderStatus { - case "9" : - orderStatusDateLabel.text = order.modifiedDate - orderStatusDateTitleLabel.text = "order_canceled_date_text".localized() - default : - orderStatusDateLabel.text = order.recvDate - orderStatusDateTitleLabel.text = "order_receive_date_text".localized() - } - } - } - - // MARK: IBOutlets - value Label - @IBOutlet weak var orderStatusLabel: UILabel! - @IBOutlet weak var orderDetailContentView: UIView! - - @IBOutlet weak var receiverNameLabel: UILabel! - @IBOutlet weak var pickupBranchLabel: UILabel! - @IBOutlet weak var mobileNumberLabel: UILabel! - - @IBOutlet weak var productNameLabel: UILabel! - @IBOutlet weak var productPointLabel: UILabel! - - @IBOutlet weak var orderDateLabel: UILabel! - @IBOutlet weak var orderStatusDateLabel: UILabel! - @IBOutlet weak var orderIDNumberLabel: UILabel! - @IBOutlet weak var orderTypeLabel: UILabel! - - // MARK: IBOutlets - Title Label - @IBOutlet weak var receiverNameTitleLabel: UILabel! - @IBOutlet weak var pickupBranchTitleLabel: UILabel! - @IBOutlet weak var mobileNumberTitleLabel: UILabel! - - @IBOutlet weak var productNameTitleLabel: UILabel! - @IBOutlet weak var productPointTitleLabel: UILabel! - - @IBOutlet weak var orderDateTitleLabel: UILabel! - @IBOutlet weak var orderStatusDateTitleLabel: UILabel! - @IBOutlet weak var orderIDNumberTitleLabel: UILabel! - @IBOutlet weak var orderTypeTitleLabel: UILabel! - - @IBOutlet weak var summaryView: UIView! - // MARK: VC's Life cycle - - override func viewDidLoad() { - super.viewDidLoad() - setup() - setMultiLanguage() - } - - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - - title = "detail_order_title_text".localized() - } - - override func viewWillDisappear(_ animated: Bool) { - super.viewWillDisappear(animated) - - title = "" - } - - // MARK: IBActions - -} - -// MARK: DetailOrderViewInterface -extension DetailOrderViewController: DetailOrderViewInterface { - func setOrder(_ order: Order?) { - self.order = order - } -} - -// MARK: Other Functions -extension DetailOrderViewController { - private func setup() { - // all setup should be done here - presenter?.fetchOrder() - - summaryView.layer.cornerRadius = 5 - - navigationController?.interactivePopGestureRecognizer?.delegate = self - navigationController?.interactivePopGestureRecognizer?.isEnabled = true - } - - private func setMultiLanguage() { - receiverNameTitleLabel.text = "receiver_text".localized() - mobileNumberTitleLabel.text = "mobile_number_text".localized() - pickupBranchTitleLabel.text = "pickup_banch_text".localized() - productNameTitleLabel.text = "product_name_text".localized() - productPointTitleLabel.text = "product_point_text".localized() - orderIDNumberTitleLabel.text = "order_no_text".localized() - orderDateTitleLabel.text = "order_date_text".localized() - orderTypeTitleLabel.text = "order_type_text".localized() - - } -} - -// MARK: - UIGestureRecognizerDelegate -extension DetailOrderViewController: UIGestureRecognizerDelegate { - func gestureRecognizer( - _ gestureRecognizer: UIGestureRecognizer, - shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer - ) -> Bool { - return true - } -} diff --git a/GME Remit/Modules/RewardModules/DetailOrder/User Interface/View/DetailOrderViewInterface.swift b/GME Remit/Modules/RewardModules/DetailOrder/User Interface/View/DetailOrderViewInterface.swift deleted file mode 100644 index 4e25018a..00000000 --- a/GME Remit/Modules/RewardModules/DetailOrder/User Interface/View/DetailOrderViewInterface.swift +++ /dev/null @@ -1,11 +0,0 @@ -// -// DetailOrderViewInterface.swift -// GME Remit -// -// Created by InKwon Devik Kim on 15/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol DetailOrderViewInterface: class { - func setOrder(_ order: Order?) -} diff --git a/GME Remit/Modules/RewardModules/DetailOrder/User Interface/Wireframe/DetailOrderWireframe.swift b/GME Remit/Modules/RewardModules/DetailOrder/User Interface/Wireframe/DetailOrderWireframe.swift deleted file mode 100644 index 5821b287..00000000 --- a/GME Remit/Modules/RewardModules/DetailOrder/User Interface/Wireframe/DetailOrderWireframe.swift +++ /dev/null @@ -1,42 +0,0 @@ -// -// DetailOrderWireframe.swift -// GME Remit -// -// Created by InKwon Devik Kim on 15/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit - -class DetailOrderWireframe { - weak var view: UIViewController! - private var order: Order? -} - -extension DetailOrderWireframe: DetailOrderWireframeInput { - - var storyboardName: String {return "DetailOrder"} - - func getMainView() -> UIViewController { - let service = DetailOrderService() - let interactor = DetailOrderInteractor(service: service, order: order) - let presenter = DetailOrderPresenter() - let viewController = viewControllerFromStoryboard(of: DetailOrderViewController.self) - - viewController.presenter = presenter - interactor.output = presenter - presenter.interactor = interactor - presenter.wireframe = self - presenter.view = viewController - - view = viewController - return viewController - } - - func pushMainView(on source: UIViewController, order: Order?) { - self.order = order - - let mainView = self.getMainView() - source.navigationController?.pushViewController(mainView, animated: true) - } -} diff --git a/GME Remit/Modules/RewardModules/DetailOrder/User Interface/Wireframe/DetailOrderWireframeInput.swift b/GME Remit/Modules/RewardModules/DetailOrder/User Interface/Wireframe/DetailOrderWireframeInput.swift deleted file mode 100644 index 47b78769..00000000 --- a/GME Remit/Modules/RewardModules/DetailOrder/User Interface/Wireframe/DetailOrderWireframeInput.swift +++ /dev/null @@ -1,14 +0,0 @@ -// -// DetailOrderWireframeInput.swift -// GME Remit -// -// Created by InKwon Devik Kim on 15/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation -import UIKit - -protocol DetailOrderWireframeInput: WireframeInput { - func pushMainView(on source: UIViewController, order: Order?) -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Interactor/OrderHistoryInteractor.swift b/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Interactor/OrderHistoryInteractor.swift deleted file mode 100644 index 1aa8cb88..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Interactor/OrderHistoryInteractor.swift +++ /dev/null @@ -1,81 +0,0 @@ -// -// OrderHistoryInteractor.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class OrderHistoryInteractor { - - // MARK: Properties - - weak var output: OrderHistoryInteractorOutput? - private let service: OrderHistoryServiceType - - private var orders: [Order]? - - // MARK: Initialization - - init(service: OrderHistoryServiceType) { - self.service = service - } - -} - -// MARK: OrderHistory interactor input interface - -extension OrderHistoryInteractor: OrderHistoryInteractorInput { - func fetchOrderHistory(from startDate: String, to endDate: String) { - service.fetchOrderHistory( - from: startDate, - to: endDate, - success: {[weak self] in - guard let `self` = self else { - return - } - if self.orders != $0 { - self.orders = $0 - } - - self.output?.setOrderHistoryModel(with: self.orders) - }, - failure: {[weak self] in - guard let `self` = self else { - return - } - self.output?.didFailFetchOrderHistory(with: $0) - } - ) - } - - func fetchFilteredOrders(by searchText: String) { - if searchText == "" { - self.output?.setOrderHistoryModel(with: orders) - return - } - - let filterdOrder = orders?.filter { - guard - let productName = $0.productName, - let receiverName = $0.recvName, - let createDate = $0.createdDate, - let orderID = $0.orderID, - let mobileNumber = $0.recvPhoneNumber - else { - return false - } - - return productName.lowercased().contains(searchText.lowercased()) || - receiverName.lowercased().contains(searchText.lowercased()) || - createDate.lowercased().contains(searchText.lowercased()) || - orderID.lowercased().contains(searchText.lowercased()) || - mobileNumber.lowercased().contains(searchText.lowercased()) - } - - self.output?.setOrderHistoryModel(with: filterdOrder) - } - -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Interactor/OrderHistoryInteractorIO.swift b/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Interactor/OrderHistoryInteractorIO.swift deleted file mode 100644 index 143d4c5d..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Interactor/OrderHistoryInteractorIO.swift +++ /dev/null @@ -1,37 +0,0 @@ -// -// OrderHistoryInteractorIO.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol OrderHistoryInteractorInput: class { - - /// Fetch order history using OrderHistoryService - /// - /// - Parameters: - /// - starDate: Inquiry start date - /// - endDate: Inquiry end date - func fetchOrderHistory(from startDate: String, to endDate: String) - - /// Fetch orders history as filterd from searchText - /// - /// - Parameter searchText: search text - func fetchFilteredOrders(by searchText: String) - -} - -protocol OrderHistoryInteractorOutput: class { - - /// If success fetch order history, send model to presenter - /// - /// - Parameter model: order history - func setOrderHistoryModel(with model: [Order]?) - - /// If fail fetch order history, send error to presenter - /// - /// - Parameter error: error - func didFailFetchOrderHistory(with error: Error) - -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Model/Order.swift b/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Model/Order.swift deleted file mode 100644 index 80d66545..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Model/Order.swift +++ /dev/null @@ -1,73 +0,0 @@ -// -// Order.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation -import ObjectMapper - -struct Order: Mappable { - var orderID: String? - var productCode: String? - var productName: String? - var usePoint: String? - var orderType: String? - var recvType: String? - var branchCode: String? - var recvAddress: String? - var recvZipCode: String? - var recvPhoneNumber: String? - var recvName: String? - var orderStatus: String? - var createdDate: String? - var modifiedDate: String? - var branchName: String? - var recvDate: String? - - init?(map: Map) { } - - mutating func mapping(map: Map) { - orderID <- map["orderId"] - productCode <- map["productCode"] - productName <- map["productName"] - usePoint <- map["usePoint"] - orderType <- map["orderType"] - recvType <- map["recvType"] - branchCode <- map["branchCode"] - recvAddress <- map["recvAddress"] - recvZipCode <- map["recvZipCode"] - recvPhoneNumber <- map["recvPhoneNumber"] - recvName <- map["recvName"] - orderStatus <- map["orderStatus"] - createdDate <- map["createdDate"] - modifiedDate <- map["modifiedDate"] - recvDate <- map["recvDate"] - branchName <- map["branchName"] - - } - -} - -extension Order: Equatable { - static func == (lhs: Order, rhs: Order) -> Bool { - return lhs.orderID == rhs.orderID && - lhs.productCode == rhs.productCode && - lhs.productName == rhs.productName && - lhs.usePoint == rhs.usePoint && - lhs.orderType == rhs.orderType && - lhs.recvType == rhs.recvType && - lhs.branchCode == rhs.branchCode && - lhs.recvAddress == rhs.recvAddress && - lhs.recvZipCode == rhs.recvZipCode && - lhs.recvPhoneNumber == rhs.recvPhoneNumber && - lhs.recvName == rhs.recvName && - lhs.orderStatus == rhs.orderStatus && - lhs.createdDate == rhs.createdDate && - lhs.modifiedDate == rhs.modifiedDate && - lhs.recvDate == rhs.recvDate && - lhs.branchName == rhs.branchName - } -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Model/OrderContainer.swift b/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Model/OrderContainer.swift deleted file mode 100644 index a8bd55e4..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Model/OrderContainer.swift +++ /dev/null @@ -1,31 +0,0 @@ -// -// OrderContainer.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation -import ObjectMapper - -struct OrderContainer: Mappable { - var errorCode: String? - var message: String? - var id: String? - var extra: String? - var extra2: String? - var data: [Order]? - - init?(map: Map) { } - - mutating func mapping(map: Map) { - errorCode <- map["ErrorCode"] - message <- map["Msg"] - id <- map["Id"] - extra <- map["Extra"] - extra2 <- map["Extra2"] - data <- map["Data"] - } - -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Service/.DS_Store b/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Service/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Service/.DS_Store and /dev/null differ diff --git a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Service/OrderHistoryService.swift b/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Service/OrderHistoryService.swift deleted file mode 100644 index ef1a73fd..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Service/OrderHistoryService.swift +++ /dev/null @@ -1,59 +0,0 @@ -// -// OrderHistoryService.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class OrderHistoryService: OrderHistoryServiceType { - func fetchOrderHistory( - from startDate: String, - to endDate: String, - success: @escaping([Order]?) -> Void, - failure: @escaping(Error) -> Void - ) { - - guard let userId = GMEDB.shared.user.string(.userId) else { - let error = NSError.init( - domain: "Network", - code: 0, - userInfo: [NSLocalizedDescriptionKey : "no exist email"]) - failure(error) - - return - } - - let parameter = [ - "userId": userId, - "startDate": startDate, - "endDate": endDate - ] - - let url = baseUrlWithoutVersion + "v2/reward/productOrderedList" -// let url = baseUrlWithoutVersion + "v2/reward/productOrderd" - auth.request( - method: .post, - url: url, - params: parameter, - success: { (response: OrderContainer) in - if (response.errorCode ?? "") == "1" { - let error = NSError.init( - domain: "Network", - code: 0, - userInfo: [NSLocalizedDescriptionKey : - response.message ?? ""]) - - failure(error) - } else { - let model = response.data - success(model) - } - }, - failure: { failure($0) } - ) - } - -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Service/OrderHistoryServiceType.swift b/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Service/OrderHistoryServiceType.swift deleted file mode 100644 index 64b413b9..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/Application Logic/Service/OrderHistoryServiceType.swift +++ /dev/null @@ -1,25 +0,0 @@ -// -// OrderHistoryServiceType.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol OrderHistoryServiceType: class, ApiServiceType { - - /// Fetch order history - /// - /// - Parameters: - /// - startDate: Inquiry start date - /// - endDate: Inquiry end date - /// - success: ([Order]?) -> Void - /// - failure: (Error) -> Void - func fetchOrderHistory( - from startDate: String, - to endDate: String, - success: @escaping([Order]?) -> Void, - failure: @escaping(Error) -> Void - ) - -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/Module Interface/OrderHistoryModuleInterface.swift b/GME Remit/Modules/RewardModules/OrderHistory/Module Interface/OrderHistoryModuleInterface.swift deleted file mode 100644 index 8c05c43e..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/Module Interface/OrderHistoryModuleInterface.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// OrderHistoryModuleInterface.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol OrderHistoryModuleInterface: class { - /// request to presenter about fetch order history - /// - /// - Parameters: - /// - startData: Inquiry start date - /// - endDate: Inquiry end date - func fetchOrders(from startDate: String, to endDate: String) - - /// Fetch orders history as filterd from searchText - /// - /// - Parameter searchText: search text - func fetchFilteredOrders(by searchText: String) - - /// move DetailOrderViewController - /// - /// - Parameter order: selected order - func pushDetailOrder(with order: Order?) - - /// present DataPicker ViewController - /// - /// - Parameter completion: selected dates handle closure - func presentDatePicker(completion: ((_ from: String?, _ to: String?) -> Void)?) - -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/Presenter/OrderHistoryPresenter.swift b/GME Remit/Modules/RewardModules/OrderHistory/User Interface/Presenter/OrderHistoryPresenter.swift deleted file mode 100644 index 942c3e8c..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/Presenter/OrderHistoryPresenter.swift +++ /dev/null @@ -1,56 +0,0 @@ -// -// OrderHistoryPresenter.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class OrderHistoryPresenter { - - // MARK: Properties - - weak var view: OrderHistoryViewInterface? - var interactor: OrderHistoryInteractorInput? - var wireframe: OrderHistoryWireframeInput? - -} - -// MARK: OrderHistory module interface - -extension OrderHistoryPresenter: OrderHistoryModuleInterface { - func fetchOrders(from startDate: String, to endDate: String) { - view?.stardLoading() - interactor?.fetchOrderHistory(from: startDate, to: endDate) - } - - func fetchFilteredOrders(by searchText: String) { - interactor?.fetchFilteredOrders(by: searchText) - } - - func pushDetailOrder(with order: Order?) { - wireframe?.pushDetailOrder(with: order) - } - - func presentDatePicker(completion: ((_ from: String?, _ to: String?) -> Void)?) { - wireframe?.presentDatePicker(completion: completion) - } - -} - -// MARK: OrderHistory interactor output interface - -extension OrderHistoryPresenter: OrderHistoryInteractorOutput { - func setOrderHistoryModel(with model: [Order]?) { - view?.endLoading() - view?.setOrderHistoryModel(with: model) - } - - func didFailFetchOrderHistory(with error: Error) { - view?.endLoading() - view?.didFailFetchOrderHistory(with: error) - } - -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/.DS_Store b/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/.DS_Store and /dev/null differ diff --git a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/Cell/OrderCell.swift b/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/Cell/OrderCell.swift deleted file mode 100644 index 7f71897b..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/Cell/OrderCell.swift +++ /dev/null @@ -1,102 +0,0 @@ -// -// OrderCell.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit - -class OrderCell: UITableViewCell { - - @IBOutlet weak var orderDateLabel: UILabel! - @IBOutlet weak var orderStatusLabel: UILabel! - @IBOutlet weak var branchNameLabel: UILabel! - - @IBOutlet weak var orderedProductNameLabel: UILabel! - @IBOutlet weak var orderedProductPointLabel: UILabel! - - @IBOutlet weak var orderIDLabel: UILabel! - - @IBOutlet weak var cellContentView: UIView! - - enum Status: String { - case orderCompleted = "1" - case delivered = "2" - case received = "3" - case orderCanceled = "9" - - var color: UIColor { - switch self { - case .orderCanceled: - return .themeRed - case .delivered: - return .init(hex: "#08a384") - case .received: - return .themeBlue - case .orderCompleted: - return .init(hex: "#08a384") - } - } - - var shortMessage: String { - switch self { - case .orderCanceled: - return "canceled_text".localized() - case .delivered: - return "DELIVERED".localized() - case .received: - return "received_text".localized() - case .orderCompleted: - return "ordered_text".localized() - } - } - - var message: String { - switch self { - case .orderCanceled: - return "your_order_canceled_text".localized() - case .delivered: - return "Delivered_text".localized() - case .received: - return "you_received_reward_text".localized() - case .orderCompleted: - return "your_order_completed_text".localized() - } - } - } - - override func awakeFromNib() { - super.awakeFromNib() - // Initialization code - } - - override func setSelected(_ selected: Bool, animated: Bool) { - super.setSelected(selected, animated: animated) - - // Configure the view for the selected state - } - - func setModel(with model: Order?) { - guard - let model = model, - let statusCode = model.orderStatus, - let status = Status(rawValue: statusCode) - else {return} - - orderIDLabel.text = model.orderID - orderDateLabel.text = model.createdDate - orderStatusLabel.text = status.shortMessage - - branchNameLabel.text = model.branchName - - orderedProductNameLabel.text = model.productName - orderedProductPointLabel.text = model.usePoint?.likeCommaMoney() - - orderStatusLabel.layer.cornerRadius = 5 - orderStatusLabel.backgroundColor = status.color - cellContentView.layer.cornerRadius = 5 - } - -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistory.storyboard b/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistory.storyboard deleted file mode 100644 index 30c78fbb..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistory.storyboard +++ /dev/null @@ -1,367 +0,0 @@ - - - - - - - - - - - - - SanFranciscoDisplay-Medium - - - SanFranciscoDisplay-Regular - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistoryViewController.swift b/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistoryViewController.swift deleted file mode 100644 index d3ff5412..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistoryViewController.swift +++ /dev/null @@ -1,258 +0,0 @@ -// -// OrderHistoryViewController.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit -import XLPagerTabStrip - -class OrderHistoryViewController: UIViewController { - - // MARK: Properties - - var presenter: OrderHistoryModuleInterface? - - private lazy var refreshControl = UIRefreshControl() - - private lazy var isSearch = false - - // MARK: Computed Properties - - private var orders: [Order]? { - didSet { - guard - let orders = self.orders, - orders.count != 0 - else { - noOrderHistoryLabel.isHidden = false - noOrderHistoryLabel.text = - isSearch ? "no_search_orders_message_text".localized() : "no_orders_message_text".localized() - tableView.reloadData() - return - } - - tableView.reloadData() - noOrderHistoryLabel.isHidden = true - } - } - - // MARK: IBOutlets - - @IBOutlet private weak var tableView: UITableView! - @IBOutlet private weak var searchBar: UISearchBar! - @IBOutlet private weak var periodView: UIView! - @IBOutlet private weak var perioidContentView: UIView! - @IBOutlet private weak var noOrderHistoryLabel: UILabel! - - @IBOutlet private weak var startDateLabel: UILabel! - @IBOutlet private weak var endDateLabel: UILabel! - - @IBOutlet private weak var orderedColorLabel: UILabel! - @IBOutlet private weak var receivedColorLabel: UILabel! - @IBOutlet private weak var canceledColorLabel: UILabel! - - @IBOutlet private weak var periodViewHeightConstraint: NSLayoutConstraint! - - // MARK: VC's Life cycle - - override func viewDidLoad() { - super.viewDidLoad() - setup() - } - - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - - if searchBar.text == "" && startDateLabel.text == ""{ - isSearch = false - presenter?.fetchOrders(from: "", to: "") - } - } - - override func viewWillDisappear(_ animated: Bool) { - super.viewWillDisappear(animated) - } - - // MARK: IBActions - - @IBAction private func touchCalendar(_ sender: UIButton) { - presenter?.presentDatePicker { [weak self] (from, to) in - guard let `self` = self else { return } - - let originDateFormatter = DateFormatter() - originDateFormatter.dateFormat = "yyyy-MM-dd" - - let dateFormatter = DateFormatter() - dateFormatter.dateFormat = "MMM d, yyyy" - - guard - let startDate = from, - let endDate = to, - let changeFormatStartDate = originDateFormatter.date(from: startDate), - let changeFormatEndDate = originDateFormatter.date(from: endDate) - else { return } - - self.startDateLabel.text = dateFormatter.string(from: changeFormatStartDate) - self.endDateLabel.text = dateFormatter.string(from: changeFormatEndDate) - - self.setPeriodViewStatus(isHidden: false) - self.searchBar.text?.removeAll() - - self.isSearch = true - - self.presenter?.fetchOrders(from: startDate, to: endDate) - } - } - - @IBAction func touchHidePerioidContentView(_ sender: Any) { - startDateLabel.text?.removeAll() - endDateLabel.text?.removeAll() - refresh() - } -} - -// MARK: OrderHistoryViewInterface -extension OrderHistoryViewController: OrderHistoryViewInterface { - func setOrderHistoryModel(with model: [Order]?) { - orders = model - } - - func didFailFetchOrderHistory(with error: Error) { - alert(type: .error, message: error.localizedDescription) - } - - func stardLoading() { - showProgressHud() - } - - func endLoading() { - hideProgressHud() - - DispatchQueue.main.asyncAfter(deadline: .now()) { [weak self] in - guard let `self` = self else { return } - - if #available(iOS 10.0, *) { - self.tableView.refreshControl?.endRefreshing() - } else { - self.refreshControl.endRefreshing() - } - } - } - -} - -// MARK: Other Functions -extension OrderHistoryViewController { - private func setup() { - initDelegate() - initUI() - setMultiLanguage() - - orderedColorLabel.layer.cornerRadius = 5 - receivedColorLabel.layer.cornerRadius = 5 - canceledColorLabel.layer.cornerRadius = 5 - - perioidContentView.layer.cornerRadius = 5 - - canceledColorLabel.backgroundColor = .themeRed - } - - private func setMultiLanguage() { - searchBar.placeholder = "search_text".localized() - orderedColorLabel.text = "ordered_text".localized() - receivedColorLabel.text = "received_text".localized() - canceledColorLabel.text = "canceled_text".localized() - noOrderHistoryLabel.text = "no_orders_message_text".localized() - } - - private func initDelegate() { - tableView.delegate = self - tableView.dataSource = self - searchBar.delegate = self - } - - private func initUI() { - setPeriodViewStatus(isHidden: true) - addRefreshControl() - } - - private func addRefreshControl() { - let colorOption = [NSAttributedString.Key.foregroundColor : UIColor.themeWhite] - - let title = NSAttributedString(string: "pull to refresh", attributes: colorOption) - - refreshControl.attributedTitle = title - refreshControl.backgroundColor = .themeBlue - refreshControl.tintColor = .themeWhite - refreshControl.addTarget(self, action: #selector(refresh), for: .valueChanged) - - if #available(iOS 10.0, *) { - tableView.refreshControl = refreshControl - } else { - tableView.addSubview(refreshControl) - } - } - - private func setPeriodViewStatus(isHidden: Bool) { - periodView.isHidden = isHidden - periodViewHeightConstraint.constant = isHidden ? 0.0 : 35.0 - } - - @objc - private func refresh() { - setPeriodViewStatus(isHidden: true) - searchBar.text?.removeAll() - isSearch = false - presenter?.fetchOrders(from: "", to: "") - } - -} - -// MARK: - XLPagerTabStrip'`s IndicatorInfoProvider -extension OrderHistoryViewController: IndicatorInfoProvider { - func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo { - return IndicatorInfo.init(title: "orders_group_title_text".localized()) - } - -} - -// MARK: - UITableViewDataSource -extension OrderHistoryViewController: UITableViewDataSource { - func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - guard let orders = self.orders else { - return 0 - } - - return orders.count - } - - func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - guard let cell = tableView.dequeueReusableCell(withIdentifier: "OrderCell") as? OrderCell - else { - return UITableViewCell() - } - - cell.setModel(with: orders?[indexPath.row]) - return cell - } - -} - -// MARK: - UITableViewDelegate -extension OrderHistoryViewController: UITableViewDelegate { - func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - presenter?.pushDetailOrder(with: orders?[indexPath.row]) - } -} - -// MARK: - UISearchBarDelegate -extension OrderHistoryViewController: UISearchBarDelegate { - func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) { - isSearch = true - presenter?.fetchFilteredOrders(by: searchText) - } - -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistoryViewInterface.swift b/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistoryViewInterface.swift deleted file mode 100644 index 9ab61ffb..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistoryViewInterface.swift +++ /dev/null @@ -1,27 +0,0 @@ -// -// OrderHistoryViewInterface.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol OrderHistoryViewInterface: class { - - /// set order history model from presenter - /// - /// - Parameter model: order history model - func setOrderHistoryModel(with model: [Order]?) - - /// raise error from presenter - /// - /// - Parameter error: error - func didFailFetchOrderHistory(with error: Error) - - /// present activity indicator for something process - func stardLoading() - - /// dismiss activity indicator for something process - func endLoading() - -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/Wireframe/OrderHistoryWireframe.swift b/GME Remit/Modules/RewardModules/OrderHistory/User Interface/Wireframe/OrderHistoryWireframe.swift deleted file mode 100644 index 90e622b9..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/Wireframe/OrderHistoryWireframe.swift +++ /dev/null @@ -1,51 +0,0 @@ -// -// OrderHistoryWireframe.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit - -class OrderHistoryWireframe { - weak var view: UIViewController! -} - -extension OrderHistoryWireframe: OrderHistoryWireframeInput { - - var storyboardName: String {return "OrderHistory"} - - func getMainView() -> UIViewController { - let service = OrderHistoryService() - let interactor = OrderHistoryInteractor(service: service) - let presenter = OrderHistoryPresenter() - let viewController = viewControllerFromStoryboard(of: OrderHistoryViewController.self) - - viewController.presenter = presenter - interactor.output = presenter - presenter.interactor = interactor - presenter.wireframe = self - presenter.view = viewController - - view = viewController - return viewController - } - - func pushDetailOrder(with order: Order?) { - DetailOrderWireframe().pushMainView(on: view, order: order) - } - - func presentDatePicker(completion: ((_ from: String?, _ to: String?) -> Void)?) { - guard let datePickerViewController = UIStoryboard - .init(name: "TransactionHistoryDatePicker", bundle: nil) - .instantiateViewController( - withIdentifier: "DatePickerViewController" - ) as? DatePickerViewController else { return } - - datePickerViewController.completion = completion - - view.present(datePickerViewController, animated: true, completion: nil) - } - -} diff --git a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/Wireframe/OrderHistoryWireframeInput.swift b/GME Remit/Modules/RewardModules/OrderHistory/User Interface/Wireframe/OrderHistoryWireframeInput.swift deleted file mode 100644 index e764b614..00000000 --- a/GME Remit/Modules/RewardModules/OrderHistory/User Interface/Wireframe/OrderHistoryWireframeInput.swift +++ /dev/null @@ -1,23 +0,0 @@ -// -// OrderHistoryWireframeInput.swift -// GME Remit -// -// Created by InKwon Devik Kim on 14/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -protocol OrderHistoryWireframeInput: WireframeInput { - - /// push DetailOrderViewController - /// - /// - Parameter order: selected order - func pushDetailOrder(with order: Order?) - - /// present DataPicker ViewController - /// - /// - Parameter completion: selected dates handle closure - func presentDatePicker(completion: ((_ from: String?, _ to: String?) -> Void)?) - -} diff --git a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Interactor/RedeemInteractor.swift b/GME Remit/Modules/RewardModules/Redeem/Application Logic/Interactor/RedeemInteractor.swift deleted file mode 100644 index 5f7f67e9..00000000 --- a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Interactor/RedeemInteractor.swift +++ /dev/null @@ -1,68 +0,0 @@ -// -// RedeemInteractor.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class RedeemInteractor { - - // MARK: Properties - - weak var output: RedeemInteractorOutput? - private let service: RedeemServiceType - - // MARK: Initialization - - init(service: RedeemServiceType) { - self.service = service - } - - // MARK: Converting entities -} - -// MARK: Redeem interactor input interface - -extension RedeemInteractor: RedeemInteractorInput { - func fetchBranches() { - service.fetchBranches( - success: { - self.output?.setBranches(with: $0) - }, - failure: { - self.output?.setBranchesError(with: $0) - } - ) - } - - func viewIsReady(model: RewardProduct?) { - self.output?.result(model: model) - } - - func submit(with model: Redeem?) { - self.service.submit( - with: model, - success: { - self.output?.submitSuccess() - }, - failure: { - self.output?.submitFailure(with: $0) - } - ) - } - - func refreshRewardPoint() { - self.service.fetchUserInfo( - success: { - Utility.save(user: $0) - self.output?.successRefreshRewardPoint() - }, - failure: { - self.output?.failureRefreshRewardPoint(with: $0) - } - ) - } -} diff --git a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Interactor/RedeemInteractorIO.swift b/GME Remit/Modules/RewardModules/Redeem/Application Logic/Interactor/RedeemInteractorIO.swift deleted file mode 100644 index 9cbab552..00000000 --- a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Interactor/RedeemInteractorIO.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// RedeemInteractorIO.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol RedeemInteractorInput: class { - func viewIsReady(model: RewardProduct?) - func fetchBranches() - func submit(with model: Redeem?) - func refreshRewardPoint() -} - -protocol RedeemInteractorOutput: class { - func result(model: RewardProduct?) - func setBranches(with model: [Branch]?) - func setBranchesError(with error: Error) - - func submitSuccess() - func submitFailure(with error: Error) - - func successRefreshRewardPoint() - func failureRefreshRewardPoint(with error: Error) -} diff --git a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Model/Redeem.swift b/GME Remit/Modules/RewardModules/Redeem/Application Logic/Model/Redeem.swift deleted file mode 100644 index 314b62f7..00000000 --- a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Model/Redeem.swift +++ /dev/null @@ -1,23 +0,0 @@ -// -// Redeem.swift -// GME Remit -// -// Created by InKwon Devik Kim on 03/05/2019. -// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -struct Redeem { - let userID: String? - let productCode: String? - let usePoint: String? - let orderType: String? - let recvType: String? - let branchCode: String? - let recvAddress: String? - let recvZipCode: String? - let recvPhoneNumber: String? - let recvName: String? -// let rewardType: String? -} diff --git a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Service/.DS_Store b/GME Remit/Modules/RewardModules/Redeem/Application Logic/Service/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Service/.DS_Store and /dev/null differ diff --git a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Service/RedeemService.swift b/GME Remit/Modules/RewardModules/Redeem/Application Logic/Service/RedeemService.swift deleted file mode 100644 index 23106029..00000000 --- a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Service/RedeemService.swift +++ /dev/null @@ -1,107 +0,0 @@ -// -// RedeemService.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation -import FirebaseInstanceID - -class RedeemService: RedeemServiceType { - - // MARK: Properties - - // MARK: Initialization - - // MARK: Data management - - func fetchBranches( - success: @escaping ([Branch]?) -> Void, - failure: @escaping (Error) -> Void - ) { - - let url = baseUrlWithoutVersion + "/v2/reward/branchInfo" - // let url = "http://gmeuat.gmeremit.com:5018/api/v2/reward/branchInfo" - - auth.request( - method: .post, - url: url, - params: nil, - success: { (response: BranchContainer) in - if (response.errorCode ?? "") == "1" { - let error = NSError.init( - domain: "Network", - code: 0, - userInfo: [NSLocalizedDescriptionKey : response.message ?? ""] - ) - - failure(error) - } else { - success(response.data) - } - }, - failure: { (error) in - failure(error) - }) - } - - func submit( - with model: Redeem?, - success: @escaping () -> Void, - failure: @escaping (Error) -> Void - ) { - // let url = baseUrl + "/reward/productBuy" - let url = baseUrlWithoutVersion + "/v2/reward/productBuy" - // let url = "http://gmeuat.gmeremit.com:5018/api/v2/reward/productBuy" - - let params: [String: String] = [ - "userId": model?.userID ?? "", - "productCode": model?.productCode ?? "", - "usePoint": model?.usePoint ?? "", - "orderType": model?.orderType ?? "", //1 - 승인 9 취소 - "recvType": model?.recvType ?? "", - "branchCode": model?.branchCode ?? "", - "recvAddress": model?.recvAddress ?? "", - "recvZipCode": model?.recvZipCode ?? "", - "recvPhoneNumber": model?.recvPhoneNumber ?? "", - "recvName": model?.recvName ?? "" - ] - - auth.request( - method: .post, - url: url, - params: params, - success: { (response: ResponseMessage) in - if (response.errorCode ?? "") == "1" { - let error = NSError.init( - domain: "Network", - code: 0, - userInfo: [NSLocalizedDescriptionKey : response.message ?? ""] - ) - - failure(error) - } else { - success() - } - }, - failure: { (error) in - failure(error) - } - ) - } - - func fetchUserInfo(success: @escaping (User) -> Void, failure: @escaping (Error) -> Void) { - let service = HomeService() - - GMEDB.shared.getFcmToken { (token, error) in - guard let error = error else { - service.fetchUserInfo(token: token ?? "", success: success, failure: failure) - return - } - - failure(error) - } - } -} diff --git a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Service/RedeemServiceType.swift b/GME Remit/Modules/RewardModules/Redeem/Application Logic/Service/RedeemServiceType.swift deleted file mode 100644 index 8aab629c..00000000 --- a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Service/RedeemServiceType.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// RedeemServiceType.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -protocol RedeemServiceType: class, ApiServiceType { - func fetchBranches( - success: @escaping ([Branch]?) -> Void, - failure: @escaping (Error) -> Void - ) - - func submit( - with model: Redeem?, - success: @escaping () -> Void, - failure: @escaping (Error) -> Void - ) - - func fetchUserInfo( - success: @escaping (User) -> Void, - failure: @escaping (Error) -> Void) -} diff --git a/GME Remit/Modules/RewardModules/Redeem/Module Interface/RedeemModuleInterface.swift b/GME Remit/Modules/RewardModules/Redeem/Module Interface/RedeemModuleInterface.swift deleted file mode 100644 index c8b04c68..00000000 --- a/GME Remit/Modules/RewardModules/Redeem/Module Interface/RedeemModuleInterface.swift +++ /dev/null @@ -1,18 +0,0 @@ -// -// RedeemModuleInterface.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol RedeemModuleInterface: class { - func viewIsReady() - func showSearchAddressVC() - func fetchBranches() - func showBranchesVC() - func submit(with model: Redeem?) - func goRewardHome() - - func refreshRewardPoint() -} diff --git a/GME Remit/Modules/RewardModules/Redeem/User Interface/Presenter/RedeemPresenter.swift b/GME Remit/Modules/RewardModules/Redeem/User Interface/Presenter/RedeemPresenter.swift deleted file mode 100644 index a2c59cf2..00000000 --- a/GME Remit/Modules/RewardModules/Redeem/User Interface/Presenter/RedeemPresenter.swift +++ /dev/null @@ -1,102 +0,0 @@ -// -// RedeemPresenter.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class RedeemPresenter { - - // MARK: Properties - - weak var view: RedeemViewInterface? - var interactor: RedeemInteractorInput? - var wireframe: RedeemWireframeInput? - - private var model: RewardProduct? - - init(with model: RewardProduct?) { - self.model = model - } - - // MARK: Converting entities - -} - -// MARK: Redeem module interface - -extension RedeemPresenter: RedeemModuleInterface { - func viewIsReady() { - view?.startLoading() - interactor?.viewIsReady(model: model) - } - - func showSearchAddressVC() { - wireframe?.showSearchAddressVC() - } - - func fetchBranches() { - view?.startLoading() - interactor?.fetchBranches() - } - - func showBranchesVC() { - wireframe?.showBranchesVC() - } - - func submit(with model: Redeem?) { - view?.startLoading() - interactor?.submit(with: model) - } - - func goRewardHome() { - wireframe?.goRewardVC() - } - - func refreshRewardPoint() { - view?.startLoading() - interactor?.refreshRewardPoint() - } -} - -// MARK: Redeem interactor output interface - -extension RedeemPresenter: RedeemInteractorOutput { - func successRefreshRewardPoint() { - view?.endLoading() - view?.successRefreshRewardPoint() - } - - func failureRefreshRewardPoint(with error: Error) { - view?.endLoading() - view?.failureRefreshRewardPoint(with: error) - } - - func result(model: RewardProduct?) { - view?.endLoading() - view?.setModel(model: model) - } - - func setBranches(with model: [Branch]?) { - view?.endLoading() - view?.setBranches(with: model) - } - - func setBranchesError(with error: Error) { - view?.endLoading() - view?.setBranchesError(with: error) - } - - func submitSuccess() { - view?.endLoading() - view?.submitSuccess() - } - - func submitFailure(with error: Error) { - view?.endLoading() - view?.submitFailure(with: error) - } -} diff --git a/GME Remit/Modules/RewardModules/Redeem/User Interface/View/.DS_Store b/GME Remit/Modules/RewardModules/Redeem/User Interface/View/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/GME Remit/Modules/RewardModules/Redeem/User Interface/View/.DS_Store and /dev/null differ diff --git a/GME Remit/Modules/RewardModules/Redeem/User Interface/View/Redeem.storyboard b/GME Remit/Modules/RewardModules/Redeem/User Interface/View/Redeem.storyboard deleted file mode 100644 index 187a201b..00000000 --- a/GME Remit/Modules/RewardModules/Redeem/User Interface/View/Redeem.storyboard +++ /dev/null @@ -1,382 +0,0 @@ - - - - - - - - - - - - - SanFranciscoDisplay-Medium - - - SanFranciscoDisplay-Regular - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GME Remit/Modules/RewardModules/Redeem/User Interface/View/RedeemViewController.swift b/GME Remit/Modules/RewardModules/Redeem/User Interface/View/RedeemViewController.swift deleted file mode 100644 index b3f42a4b..00000000 --- a/GME Remit/Modules/RewardModules/Redeem/User Interface/View/RedeemViewController.swift +++ /dev/null @@ -1,509 +0,0 @@ -// -// RedeemViewController.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit -import Kingfisher - -class RedeemViewController: UIViewController { - - // MARK: Properties - - var presenter: RedeemModuleInterface? - - private var model: RewardProduct? { - didSet { - if let imageData = model?.productImgPath, - let url = URL(string: imageData) { - selectedItemImageView.kf.setImage(with: url) - } - - guard - let selectedItemName = model?.productName, - let selectedItemPoint = model?.pointPrice?.likeCommaMoney() else { - return - } - - let message = "selected_product_message_text" - .localized() - .replacingOccurrences(of: "xxx", with: selectedItemName) - .replacingOccurrences(of: "ooo", with: selectedItemPoint) - - selectInformationLabel.text = message - } - } - - private var ordered: Redeem? - - private enum AddressType: Int { - case branch = 0 - case custom - } - - private enum UserType: Int { - case user - case custom - } - - private var selectedUserType = UserType.user { - didSet { - let name: String? - let phoneNumber: String? - let isEnable: Bool - switch selectedUserType { - case .user: - isEnable = false - name = GMEDB.shared.user.string(.fullName) - phoneNumber = GMEDB.shared.user.string(.mobileNumber) - case .custom: - isEnable = true - name = "" - phoneNumber = "" - } - - userNameTextField.isEnabled = isEnable - userPhoneNumberTextField.isEnabled = isEnable - - userNameTextField.text = name - userPhoneNumberTextField.text = phoneNumber - - userNameTextField.sendActions(for: .editingChanged) - userPhoneNumberTextField.sendActions(for: .editingChanged) - - userInfoView.isHidden = false - selectAddressInfoLabel.isHidden = false - addressSegmentView.isHidden = false - - UIView.animate(withDuration: 0.3, animations: {[weak self] in - guard let `self` = self else { return } - - self.userInfoView.alpha = 1 - self.selectAddressInfoLabel.alpha = 1 - self.addressSegmentView.alpha = 1 - }, completion: nil) - } - } - - private var selectedAddressType = AddressType.branch { - - didSet { - switch selectedAddressType { - case .branch: - - selectedAddress = nil -// selectedCoupon = nil - detailAddressTextField.text = "" - branchesView.isHidden = false - addressView.isHidden = true - - UIView.animate(withDuration: 0.3, animations: { [weak self] in - guard let `self` = self else {return} - - self.branchesView.alpha = 1 - self.addressView.alpha = 0 - }, completion: nil) - - case .custom: - selectedBranch = nil - branchesView.isHidden = true - addressView.isHidden = false - - UIView.animate(withDuration: 0.3, animations: {[weak self] in - guard let `self` = self else {return} - - self.branchesView.alpha = 0 - self.addressView.alpha = 1 - }, completion: nil) - - UIView.animate(withDuration: 0.3, animations: {[weak self] in - guard let `self` = self else {return} - - self.branchesView.alpha = 0 - self.addressView.alpha = 0 - }, completion: nil) - } - - submitButton.isHidden = false - perform(#selector(self.moveToBottom), with: nil, afterDelay: 0.3) - - } - } - - private var selectedBranch: Branch? { - didSet { - branchTextField.text = selectedBranch?.agentName - branchTextField.sendActions(for: .editingChanged) - } - } - - private var selectedAddress: Juso? { - didSet { - zipcodeTextField.text = selectedAddress?.zipNo - addressTextField.text = selectedAddress?.roadAddr - detailAddressTextField.sendActions(for: .editingChanged) - } - } - - private lazy var branchesPickerView = UIPickerView() - - private var branches: [Branch]? - - // MARK: IBOutlets - - @IBOutlet private weak var selectedItemInfoView: UIView! - @IBOutlet private weak var selectedItemImageView: UIImageView! - @IBOutlet private weak var selectInformationLabel: UILabel! - - @IBOutlet private weak var userInfoSegmentedControl: UISegmentedControl! - @IBOutlet private weak var addressSegmentedControl: UISegmentedControl! - - @IBOutlet private weak var userNameTextField: UITextField! - @IBOutlet private weak var userPhoneNumberTextField: UITextField! - - @IBOutlet private weak var branchTextField: UITextField! - @IBOutlet weak var onlineCouponTextField: UITextField! - @IBOutlet private weak var detailAddressTextField: UITextField! - - @IBOutlet private weak var addressTextField: UITextField! - @IBOutlet private weak var zipcodeTextField: UITextField! - - @IBOutlet private weak var submitButton: UIButton! - @IBOutlet private weak var searchButton: UIButton! - - @IBOutlet private weak var branchesView: UIStackView! - @IBOutlet private weak var addressView: UIStackView! - @IBOutlet weak var onlineCouponView: UIStackView! - @IBOutlet private weak var userInfoView: UIStackView! - @IBOutlet private weak var selectAddressInfoLabel: UILabel! - @IBOutlet private weak var addressSegmentView: UIView! - @IBOutlet private weak var scrollView: UIScrollView! - - @IBOutlet weak var receiverTitleLabel: UILabel! - @IBOutlet weak var phoneNumberTitleLabel: UILabel! - @IBOutlet weak var branchInfotmationTitleLabel: UILabel! - - - // MARK: VC's Life cycle - - override func viewDidLoad() { - super.viewDidLoad() - setup() - - presenter?.viewIsReady() - presenter?.fetchBranches() - } - - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - title = "reward_group_title_text".localized() - } - - override func viewWillDisappear(_ animated: Bool) { - super.viewWillDisappear(animated) - title = "" - } - - // MARK: IBActions - - @IBAction - private func cancelButtonTouch(_ sender: UIBarButtonItem) { - dismiss(animated: true, completion: nil) - } - - @IBAction - private func touchSearchAddressButton(_ sender: UIButton) { - presenter?.showSearchAddressVC() - } - - @IBAction - private func touchBranches(_ sender: UIButton) { - presenter?.showBranchesVC() - } - - @IBAction - private func touchSubmitButton(_ sender: UIButton) { - - let address = "\(detailAddressTextField.text ?? ""), \(addressTextField.text ?? "")" - - let confirmVC = ConfirmViewController(nibName: "ConfirmViewController", bundle: nil) - - var configure = ConfirmViewControllerConfiguration() - - configure.content1 = userNameTextField.text - configure.content2 = userPhoneNumberTextField.text - configure.multiLineContent = (selectedAddressType == .custom) ? address : selectedBranch?.agentName - configure.model = model - - confirmVC.setConfigure(with: configure) - confirmVC.delegate = self - - present(confirmVC, animated: true, completion: nil) - } - - // MARK: Other Functions - - private func setup() { - // all setup should be done here - branchesPickerView.delegate = self - branchesPickerView.dataSource = self - - userNameTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged) - userPhoneNumberTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged) - branchTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged) - detailAddressTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged) - - setButton() - setSegmentedControl() - // self.setDefaultState() - setOnlyBranchMode() - - setMultiLanguage() - - navigationController?.interactivePopGestureRecognizer?.delegate = self - navigationController?.interactivePopGestureRecognizer?.isEnabled = true - - branchInfotmationTitleLabel.textColor = .themeRed - } -} - -// MARK: RedeemViewInterface - -extension RedeemViewController: RedeemViewInterface { - func setModel(model: RewardProduct?) { - self.model = model - } - - func setBranches(with model: [Branch]?) { - branches = model - } - - func setBranchesError(with error: Error) { - alert(type: .error, message: error.localizedDescription) - } - - func submitSuccess() { - alert( - type: .normal, - message: - "order_completed_message_text".localized(), - title: "order_completed_message_title_text".localized() - ) {[weak self] in - guard let `self` = self else {return} - - self.presenter?.refreshRewardPoint() - } - } - - func submitFailure(with error: Error) { - alert(type: .error, message: error.localizedDescription) - } - - func startLoading() { - showProgressHud() - } - - func endLoading() { - hideProgressHud() - } - - func failureRefreshRewardPoint(with error: Error) { - alert(type: .error, message: error.localizedDescription, title: "Alert") {[weak self] in - guard let `self` = self else { return } - self.presenter?.goRewardHome() - } - } - - func successRefreshRewardPoint() { - presenter?.goRewardHome() - } -} - -// MARK: - UIPickerViewDataSource, UIPickerViewDelegate - -extension RedeemViewController: UIPickerViewDataSource, UIPickerViewDelegate { - func numberOfComponents(in pickerView: UIPickerView) -> Int { - return 1 - } - - func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int { - return branches?.count ?? 0 - } - - func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? { - return branches?[row].agentName - } - - func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) { - selectedBranch = branches?[row] - } -} - -// MARK: - SearchAddressDelegate - -extension RedeemViewController: SearchAddressDelegate { - func searchAddress(viewController: SearchAddressViewController, selectedJuso: Juso) { - selectedAddress = selectedJuso - viewController.dismiss(animated: true, completion: nil) - } -} - -// MARK: - Other Methods - -extension RedeemViewController { - - private func setButton() { - submitButton.layer.cornerRadius = 5 - } - - private func setDefaultState() { - branchesView.isHidden = true - addressView.isHidden = true - userInfoView.isHidden = true - submitButton.isHidden = true - selectAddressInfoLabel.isHidden = true - addressSegmentView.isHidden = true - - userInfoView.alpha = 0 - selectAddressInfoLabel.alpha = 0 - addressSegmentView.alpha = 0 - branchesView.alpha = 0 - addressView.alpha = 0 - - addressTextField.layer.cornerRadius = 5 - branchTextField.inputView = branchesPickerView - } - - private func setSegmentedControl() { - let font = UIFont.sanfrancisco(.medium, size: 14) - - addressSegmentedControl.setTitleTextAttributes( - [NSAttributedString.Key.font: font], - for: .normal - ) - - addressSegmentedControl.addTarget( - self, - action: #selector(addressTypeChange(_:)), - for: .valueChanged - ) - - userInfoSegmentedControl.setTitleTextAttributes( - [NSAttributedString.Key.font: font], - for: .normal - ) - - userInfoSegmentedControl.addTarget( - self, - action: #selector(userInfoChange(_:)), - for: .valueChanged - ) - } - - private func setOnlyBranchMode() { - userNameTextField.isEnabled = false - userPhoneNumberTextField.isEnabled = false - - userNameTextField.text = GMEDB.shared.user.string(.fullName) - userPhoneNumberTextField.text = GMEDB.shared.user.string(.mobileNumber) - - userNameTextField.sendActions(for: .editingChanged) - userPhoneNumberTextField.sendActions(for: .editingChanged) - - branchTextField.inputView = branchesPickerView - } - - private func setMultiLanguage() { - receiverTitleLabel.text = "receiver_text".localized() - phoneNumberTitleLabel.text = "mobile_number_text".localized() - - selectAddressInfoLabel.text = "select_branch_for_redeem_your_reward_text".localized() - branchTextField.placeholder = "select_branch_text".localized() - branchInfotmationTitleLabel.text = "you_visit_nearest_gme_branch_to_redeem_text".localized() - - selectInformationLabel.text = "selected_product_message_text".localized() - - submitButton.setTitle("submit_text".localized(), for: .normal) - - } - - @objc - private func addressTypeChange(_ sender: UISegmentedControl) { - selectedAddressType = AddressType(rawValue: sender.selectedSegmentIndex) ?? .branch - } - - @objc - private func userInfoChange(_ sender: UISegmentedControl) { - selectedUserType = UserType(rawValue: sender.selectedSegmentIndex) ?? .user - } - - @objc - private func editingChanged(_ textField: UITextField) { - guard - let name = userNameTextField.text, - let phoneNumber = userPhoneNumberTextField.text, - let branch = branchTextField.text, - let detail = detailAddressTextField.text, - let address = addressTextField.text else { return } - - var isValid = name.count > 0 && phoneNumber.count > 0 - - switch selectedAddressType { - case .branch: - isValid = isValid && branch.count > 0 - case .custom: - isValid = isValid && address.count > 0 && detail.count > 0 - } - - submitButton.isEnabled = isValid - submitButton.backgroundColor = isValid ? .themeRed : .lightGray - } - - @objc private func moveToBottom() { - if scrollView.contentSize.height - scrollView.bounds.size.height > 0 { - let bottomOffset = CGPoint(x: 0, y: scrollView.contentSize.height - scrollView.bounds.size.height) - scrollView.setContentOffset(bottomOffset, animated: true) - } - } -} - -// MARK: - ConfirmViewControllerDelegate -extension RedeemViewController: ConfirmViewControllerDelegate { - func confirm(_ viewController: ConfirmViewController) { - - let recvType = selectedAddressType == .custom ? "1" : "2" - let address = "\(detailAddressTextField.text ?? ""), \(addressTextField.text ?? "")" - - ordered = Redeem( - userID: GMEDB.shared.user.string(.userId), - productCode: model?.productCode, - usePoint: model?.pointPrice, - orderType: "1", - recvType: recvType, - branchCode: selectedBranch?.agentID, - recvAddress: address, - recvZipCode: selectedAddress?.zipNo, - recvPhoneNumber: userPhoneNumberTextField.text, - recvName: userNameTextField.text - ) - - presenter?.submit(with: ordered) - } - - func cancel(_ viewController: ConfirmViewController) { - - } -} - -// MARK: - UIGestureRecognizerDelegate -extension RedeemViewController: UIGestureRecognizerDelegate { - func gestureRecognizer( - _ gestureRecognizer: UIGestureRecognizer, - shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer - ) -> Bool { - return true - } -} diff --git a/GME Remit/Modules/RewardModules/Redeem/User Interface/View/RedeemViewInterface.swift b/GME Remit/Modules/RewardModules/Redeem/User Interface/View/RedeemViewInterface.swift deleted file mode 100644 index 165c6f96..00000000 --- a/GME Remit/Modules/RewardModules/Redeem/User Interface/View/RedeemViewInterface.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// RedeemViewInterface.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol RedeemViewInterface: class { - func setModel(model: RewardProduct?) - func setBranches(with model: [Branch]?) - func setBranchesError(with error: Error) - - func submitSuccess() - func submitFailure(with error: Error) - - func startLoading() - func endLoading() - - func failureRefreshRewardPoint(with error: Error) - func successRefreshRewardPoint() -} diff --git a/GME Remit/Modules/RewardModules/Redeem/User Interface/Wireframe/RedeemWireframe.swift b/GME Remit/Modules/RewardModules/Redeem/User Interface/Wireframe/RedeemWireframe.swift deleted file mode 100644 index 0942f0ed..00000000 --- a/GME Remit/Modules/RewardModules/Redeem/User Interface/Wireframe/RedeemWireframe.swift +++ /dev/null @@ -1,63 +0,0 @@ -// -// RedeemWireframe.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit - -class RedeemWireframe { - weak var view: UIViewController! - private var model: RewardProduct? -} - -extension RedeemWireframe: RedeemWireframeInput { - - var storyboardName: String {return "Redeem"} - - func getMainView() -> UIViewController { - let service = RedeemService() - let interactor = RedeemInteractor(service: service) - let presenter = RedeemPresenter(with: self.model) - let viewController = viewControllerFromStoryboard(of: RedeemViewController.self) - - viewController.presenter = presenter - interactor.output = presenter - presenter.interactor = interactor - presenter.wireframe = self - presenter.view = viewController - - view = viewController - return viewController - } - - func pushMainViewWithModel(with model: RewardProduct?, in source: UINavigationController) { - self.model = model - pushMainView(in: source) - } - - func showSearchAddressVC() { - let wireframe = SearchAddressWireframe() - guard let delegate = view as? SearchAddressDelegate else {return} - - wireframe.openViewControllerWithNavigationWithDelegate( - delegate: delegate, - viewController: wireframe.getMainView(), - source: view - ) - } - - func showBranchesVC() { - let wireframe = GmeContactsWireframe() - let vc = wireframe.getMainView() - - wireframe.openViewControllerWithNavigation(viewController: vc, source: view) - } - - func goRewardVC() { - view.navigationController?.popToRootViewController(animated: true) - } - -} diff --git a/GME Remit/Modules/RewardModules/Redeem/User Interface/Wireframe/RedeemWireframeInput.swift b/GME Remit/Modules/RewardModules/Redeem/User Interface/Wireframe/RedeemWireframeInput.swift deleted file mode 100644 index 3b94d9d3..00000000 --- a/GME Remit/Modules/RewardModules/Redeem/User Interface/Wireframe/RedeemWireframeInput.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// RedeemWireframeInput.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation -import UIKit - -protocol RedeemWireframeInput: WireframeInput { - func pushMainViewWithModel(with model: RewardProduct?, in source: UINavigationController) - func showSearchAddressVC() - func showBranchesVC() - func goRewardVC() -} diff --git a/GME Remit/Modules/RewardModules/Reward/Application Logic/Interactor/RewardInteractor.swift b/GME Remit/Modules/RewardModules/Reward/Application Logic/Interactor/RewardInteractor.swift deleted file mode 100644 index 071ea77b..00000000 --- a/GME Remit/Modules/RewardModules/Reward/Application Logic/Interactor/RewardInteractor.swift +++ /dev/null @@ -1,63 +0,0 @@ -// -// RewardInteractor.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class RewardInteractor { - - // MARK: Properties - - weak var output: RewardInteractorOutput? - private let service: RewardServiceType - - // MARK: Initialization - - init(service: RewardServiceType) { - self.service = service - } - - // MARK: Converting entities -} - -// MARK: Reward interactor input interface - -extension RewardInteractor: RewardInteractorInput { - func submit(with model: RewardProduct?) { - self.service.submit( - with: model, - success: { - self.output?.submitSuccess() - }, - failure: { - self.output?.submitFailure(with: $0) - } - ) - } - - func viewIsReady() { - service.fetchProductList( - success: { - self.output?.setRewardProducts(models: $0) - }, - failure: { - self.output?.failure(error: $0) - } - ) - } - func refreshRewardPoint() { - self.service.couponFetchUserInfo( - success: { - Utility.save(user: $0) - self.output?.successRefreshRewardPoint() - }, - failure: { - self.output?.failureRefreshRewardPoint(with: $0) - } - ) - } -} diff --git a/GME Remit/Modules/RewardModules/Reward/Application Logic/Interactor/RewardInteractorIO.swift b/GME Remit/Modules/RewardModules/Reward/Application Logic/Interactor/RewardInteractorIO.swift deleted file mode 100644 index 577a9b8e..00000000 --- a/GME Remit/Modules/RewardModules/Reward/Application Logic/Interactor/RewardInteractorIO.swift +++ /dev/null @@ -1,25 +0,0 @@ -// -// RewardInteractorIO.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol RewardInteractorInput: class { - func viewIsReady() - func submit(with model: RewardProduct?) - func refreshRewardPoint() - - -} - -protocol RewardInteractorOutput: class { - func setRewardProducts(models: [RewardProduct]?) - func failure(error: Error) - func submitSuccess() - func submitFailure(with error: Error) - - func successRefreshRewardPoint() - func failureRefreshRewardPoint(with error: Error) -} diff --git a/GME Remit/Modules/RewardModules/Reward/Application Logic/Model/RewardProductContainer.swift b/GME Remit/Modules/RewardModules/Reward/Application Logic/Model/RewardProductContainer.swift deleted file mode 100644 index 1b8a497f..00000000 --- a/GME Remit/Modules/RewardModules/Reward/Application Logic/Model/RewardProductContainer.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// ProductList.swift -// GME Remit -// -// Created by InKwon Devik Kim on 17/04/2019. -// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation -import ObjectMapper - -struct RewardProductContainer: Mappable { - var errorCode: String? //ErrorCode - var msg: String? //Msg - var id: String? //Id - var extra: String? //Extra - var extra2: String? //Extra2 - var data: [RewardProduct]? // Data - - init?(map: Map) { - - } - - mutating func mapping(map: Map) { - errorCode <- map["ErrorCode"] - msg <- map["Msg"] - id <- map["Id"] - extra <- map["Extra"] - extra2 <- map["Extra2"] - data <- map["Data"] - } - -} diff --git a/GME Remit/Modules/RewardModules/Reward/Application Logic/Service/RewardService.swift b/GME Remit/Modules/RewardModules/Reward/Application Logic/Service/RewardService.swift deleted file mode 100644 index bc1c5520..00000000 --- a/GME Remit/Modules/RewardModules/Reward/Application Logic/Service/RewardService.swift +++ /dev/null @@ -1,115 +0,0 @@ -// -// RewardService.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class RewardService: RewardServiceType { - - - - // MARK: Properties - - // MARK: Initialization - - // MARK: Data management - - // /api/v2/reward/productList - func fetchProductList( - success: @escaping ([RewardProduct]?) -> Void, - failure: @escaping (Error) -> Void - ) { - - let url = baseUrlWithoutVersion + "/v2/reward/productList" - - auth.request( - method: .post, - url: url, - params: nil, - success: { (response: RewardProductContainer) in - if (response.errorCode ?? "") == "1" { - let error = NSError( - domain: "Network", - code: 0, - userInfo: [NSLocalizedDescriptionKey : response.msg ?? ""] - ) - failure(error) - } else { - let model = response.data - success(model) - } - }, - failure: { (error) in - failure(error) - } - ) - } - - func submit( - with model: RewardProduct?, - success: @escaping () -> Void, - failure: @escaping (Error) -> Void - ) { - // let url = baseUrl + "/reward/productBuy" - let url = baseUrlWithoutVersion + "/v2/reward/productBuy" - // let url = "http://gmeuat.gmeremit.com:5018/api/v2/reward/productBuy" - - let params: [String: String] = [ - -// "productCode": model?.productCode ?? "", - - "userId": GMEDB.shared.user.string(.userId) ?? "", - "productCode": model?.productCode ?? "", - "usePoint": model?.pointPrice ?? "", - "orderType": "1", - "recvType": "3", //1 - 직접수령 2 - 배송 3-온라인 - "branchCode": "1034", //여기는 <온라인>으로 - "recvAddress": "", - "recvZipCode": "", - "recvPhoneNumber": GMEDB.shared.user.string(.mobileNumber) ?? "", - "recvName": GMEDB.shared.user.string(.fullName) ?? "", - "rewardType": model?.rewardType ?? "" - ] - - auth.request( - method: .post, - url: url, - params: params, - success: { (response: ResponseMessage) in - if (response.errorCode ?? "") == "1" { - let error = NSError.init( - domain: "Network", - code: 0, - userInfo: [NSLocalizedDescriptionKey : response.message ?? ""] - ) - - failure(error) - } else { - success() - } - }, - failure: { (error) in - failure(error) - } - ) - } - func couponFetchUserInfo(success: @escaping (User) -> Void, failure: @escaping (Error) -> Void) { - let service = HomeService() - - GMEDB.shared.getFcmToken { (token, error) in - guard let error = error else { - service.fetchUserInfo(token: token ?? "", success: success, failure: failure) - return - } - - failure(error) - } - } - - - -} diff --git a/GME Remit/Modules/RewardModules/Reward/Application Logic/Service/RewardServiceType.swift b/GME Remit/Modules/RewardModules/Reward/Application Logic/Service/RewardServiceType.swift deleted file mode 100644 index d4e3b783..00000000 --- a/GME Remit/Modules/RewardModules/Reward/Application Logic/Service/RewardServiceType.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// RewardServiceType.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -protocol RewardServiceType: class, ApiServiceType { - func fetchProductList( - success: @escaping ([RewardProduct]?) -> Void, - failure: @escaping (Error) -> Void - ) - - func submit( - with model: RewardProduct?, - success: @escaping () -> Void, - failure: @escaping (Error) -> Void - ) - - func couponFetchUserInfo( - success: @escaping (User) -> Void, - failure: @escaping (Error) -> Void) -} diff --git a/GME Remit/Modules/RewardModules/Reward/Module Interface/RewardModuleInterface.swift b/GME Remit/Modules/RewardModules/Reward/Module Interface/RewardModuleInterface.swift deleted file mode 100644 index 31964784..00000000 --- a/GME Remit/Modules/RewardModules/Reward/Module Interface/RewardModuleInterface.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// RewardModuleInterface.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol RewardModuleInterface: class { - func viewIsReady() - func goRedeemViewController(with model: RewardProduct?) - func submit(with model: RewardProduct?) - - func refreshRewardPoint() - func goRewardHome() -} diff --git a/GME Remit/Modules/RewardModules/Reward/User Interface/Presenter/RewardPresenter.swift b/GME Remit/Modules/RewardModules/Reward/User Interface/Presenter/RewardPresenter.swift deleted file mode 100644 index 3750668f..00000000 --- a/GME Remit/Modules/RewardModules/Reward/User Interface/Presenter/RewardPresenter.swift +++ /dev/null @@ -1,82 +0,0 @@ -// -// RewardPresenter.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class RewardPresenter { - - // MARK: Properties - - weak var view: RewardViewInterface? - var interactor: RewardInteractorInput? - var wireframe: RewardWireframeInput? - - // MARK: Converting entities -} - -// MARK: Reward module interface - -extension RewardPresenter: RewardModuleInterface { - - func refreshRewardPoint() { - view?.startLoading() - interactor?.refreshRewardPoint() - } - - func goRewardHome() { - wireframe?.goRewardVC() - } - - func viewIsReady() { - view?.startLoading() - interactor?.viewIsReady() - } - - func goRedeemViewController(with model: RewardProduct?) { - wireframe?.goRedeemViewController(with: model) - } - - func submit(with model: RewardProduct?) { - view?.startLoading() - interactor?.submit(with: model) - } -} - -// MARK: Reward interactor output interface - -extension RewardPresenter: RewardInteractorOutput { - func successRefreshRewardPoint() { - view?.endLoading() - view?.successRefreshRewardPoint() - } - - func failureRefreshRewardPoint(with error: Error) { - view?.endLoading() - view?.failureRefreshRewardPoint(with: error) - } - - func submitSuccess() { - view?.endLoading() - view?.submitSuccess() - } - - func submitFailure(with error: Error) { - view?.endLoading() - view?.submitFailure(with: error) - } - - func setRewardProducts(models: [RewardProduct]?) { - view?.endLoading() - view?.setRewardProducts(models: models) - } - - func failure(error: Error) { - view?.endLoading() - view?.failure(error: error) - } -} diff --git a/GME Remit/Modules/RewardModules/Reward/User Interface/View/.DS_Store b/GME Remit/Modules/RewardModules/Reward/User Interface/View/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/GME Remit/Modules/RewardModules/Reward/User Interface/View/.DS_Store and /dev/null differ diff --git a/GME Remit/Modules/RewardModules/Reward/User Interface/View/Cell/.DS_Store b/GME Remit/Modules/RewardModules/Reward/User Interface/View/Cell/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/GME Remit/Modules/RewardModules/Reward/User Interface/View/Cell/.DS_Store and /dev/null differ diff --git a/GME Remit/Modules/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift b/GME Remit/Modules/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift deleted file mode 100644 index 59cfa031..00000000 --- a/GME Remit/Modules/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift +++ /dev/null @@ -1,73 +0,0 @@ -// -// RewardItemCollectionViewCell.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit -import Kingfisher - -class RewardItemCollectionViewCell: UICollectionViewCell { - @IBOutlet weak var itemImage: UIImageView! - @IBOutlet weak var itemNameLabel: UILabel! - @IBOutlet weak var itemPriceLabel: UILabel! - @IBOutlet weak var redeemButton: UIButton! - @IBOutlet weak var contentsView: UIView! - @IBOutlet weak var pointTitleLabel: UILabel! - - private var model: RewardProduct? - - weak var delegate: RewardViewInterface? - - func setModel(with model: RewardProduct?, delegate: RewardViewInterface?) { - if let imageData = model?.productImgPath, - let url = URL(string: imageData) { - itemImage.kf.setImage(with: url) - } - - self.itemNameLabel.text = model?.productName - self.itemPriceLabel.text = model?.pointPrice?.likeCommaMoney() - - self.model = model - self.delegate = delegate - - self.setUI() - } - - private func setUI() { - self.contentsView.layer.cornerRadius = 5 - self.setButton() - setMultiLanguage() - } - - func setButton() { -// self.redeemButton.layer.cornerRadius = 10 - self.redeemButton.addTarget(self, action: #selector(redeemButtonTouch), for: .touchUpInside) - - let totalPoint = GMEDB.shared.user.integer(.rewardPoint) - - let isEnable = totalPoint >= Int(self.model?.pointPrice ?? "") ?? 0 - - self.redeemButton.backgroundColor = isEnable ? .themeRed : .lightGray - self.redeemButton.isEnabled = isEnable - - redeemButton.titleLabel?.adjustsFontSizeToFitWidth(true, scale: 0.5) - redeemButton.titleLabel?.numberOfLines = 2 - - pointTitleLabel.textColor = .themeRed - itemPriceLabel.textColor = .themeRed - } - - private func setMultiLanguage() { - pointTitleLabel.text = "points_text".localized() - redeemButton.setTitle("redeem_text".localized(), for: .normal) - } - - @objc - func redeemButtonTouch() { - print("touched \(self.itemNameLabel.text ?? "") redeem button") - delegate?.goRedeemViewController(with: self.model) - } -} diff --git a/GME Remit/Modules/RewardModules/Reward/User Interface/View/Reward.storyboard b/GME Remit/Modules/RewardModules/Reward/User Interface/View/Reward.storyboard deleted file mode 100644 index 0a87bb18..00000000 --- a/GME Remit/Modules/RewardModules/Reward/User Interface/View/Reward.storyboard +++ /dev/null @@ -1,290 +0,0 @@ - - - - - - - - - - - - - SanFranciscoDisplay-Medium - - - SanFranciscoDisplay-Regular - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GME Remit/Modules/RewardModules/Reward/User Interface/View/RewardViewController.swift b/GME Remit/Modules/RewardModules/Reward/User Interface/View/RewardViewController.swift deleted file mode 100644 index 1a0a4921..00000000 --- a/GME Remit/Modules/RewardModules/Reward/User Interface/View/RewardViewController.swift +++ /dev/null @@ -1,287 +0,0 @@ -// -// RewardViewController.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit -import XLPagerTabStrip - -class RewardViewController: UIViewController { - - // MARK: Properties - private enum ProductType: String { - case product = "Product" - case coupon = "Coupon" - }   - - var presenter: RewardModuleInterface? - private lazy var refreshControl = UIRefreshControl() - - private var models: [RewardProduct]? { - didSet { - collectionView.reloadData() - } - } - - private var couponModel: RewardProduct? { - didSet { - let confirmVC = ConfirmViewController(nibName: "ConfirmViewController", bundle: nil) - - var configure = ConfirmViewControllerConfiguration() - - configure.content1 = GMEDB.shared.user.string(.fullName) - configure.content2 = GMEDB.shared.user.string(.mobileNumber) - configure.receiveLocation = "location_title_text".localized() - configure.multiLineContent = "online_title_text".localized() - configure.productType = "\(couponModel?.rewardType ?? "")" - - confirmVC.setConfigure(with: configure) - - confirmVC.delegate = self - - present(confirmVC, animated: true, completion: nil) - } - } - - private var rewardPoint: String? { - didSet { - rewardPointLabel.text = rewardPoint - } - } - - private var couponOrdered: Redeem? - - // MARK: IBOutlets - - @IBOutlet weak var collectionView: UICollectionView! - @IBOutlet weak var rewardPointLabel: UILabel! - @IBOutlet weak var rewardPointTitleLabel: UILabel! - @IBOutlet weak var rewardNoteLabel: UILabel! - @IBOutlet weak var rewardPointContainerView: UIView! - @IBOutlet weak var layoutSegment: UISegmentedControl! - - // MARK: VC's Life cycle - - override func viewDidLoad() { - super.viewDidLoad() - setup() - - layoutSegment.addTarget(self, action: #selector(selectLayout(_:)), for: .valueChanged) - } - - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - title = "reward_group_title_text".localized() - - collectionView.setContentOffset(.zero, animated: false) - rewardPoint = GMEDB.shared.user.string(.rewardPoint)?.likeCommaMoney() - - collectionView.reloadData() - } - - override func viewWillDisappear(_ animated: Bool) { - super.viewWillDisappear(animated) - navigationItem.title = "" - } - // MARK: IBActions - - @objc func selectLayout(_ sender: UISegmentedControl) { - setCollectionViewLayout(sender.selectedSegmentIndex) - } - - // MARK: Other Functions - - private func setup() { - // all setup should be done here - setDelegate() - setCollectionViewLayout(0) - addRefreshControlCollectionView() - setMultiLanguage() - - rewardPointContainerView.hero.id = "pointsView" - presenter?.viewIsReady() - - layoutSegment.tintColor = .themeRed - layoutSegment.backgroundColor = .clear - - collectionView.layer.cornerRadius = 5 - } - - private func setDelegate() { - collectionView.dataSource = self - } - - private func setMultiLanguage() { - rewardPointTitleLabel.text = "reward_points_text".localized() - rewardNoteLabel.text = "reward_note_text".localized() - } - - private func setCollectionViewLayout(_ type: Int) { - let width: CGFloat - let height: CGFloat - - switch type { - case 0: - width = (view.frame.width - 30) / 2 - 3.5 - height = (view.frame.width - 30) / 2 - 3.5 + 30 - case 1: - width = (view.frame.width - 30) - height = (( width * 260 ) / 320) + 5 - - default: - width = (view.frame.width - 30) / 2 - 3.5 - height = (view.frame.width - 30) / 2 - 3.5 + 30 - } - - let cellSize = CGSize( - width: width, - height: height - ) - - let layout = UICollectionViewFlowLayout() - layout.scrollDirection = .vertical - layout.itemSize = cellSize - layout.sectionInset = UIEdgeInsets(top: 5, left: 5, bottom: 5, right: 5) - layout.minimumLineSpacing = 5.0 - layout.minimumInteritemSpacing = 5.0 - - collectionView.setCollectionViewLayout(layout, animated: true) - collectionView.reloadData() - collectionView.collectionViewLayout.invalidateLayout() - } - - private func addRefreshControlCollectionView() { - let colorOption = [NSAttributedString.Key.foregroundColor : UIColor.themeWhite] - - let title = NSAttributedString(string: "pull to refresh", attributes: colorOption) - - refreshControl.attributedTitle = title - refreshControl.backgroundColor = .themeBlue - refreshControl.tintColor = .themeWhite - refreshControl.addTarget(self, action: #selector(refresh), for: .valueChanged) - if #available(iOS 10.0, *) { - collectionView.refreshControl = refreshControl - } else { - collectionView.addSubview(refreshControl) - } - } - - @objc - private func refresh() { - self.presenter?.viewIsReady() - - DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {[weak self] in - guard let `self` = self else {return} - - if #available(iOS 10.0, *) { - self.collectionView.refreshControl?.endRefreshing() - } else { - self.refreshControl.endRefreshing() - } - } - } -} - -// MARK: RewardViewInterface -extension RewardViewController: RewardViewInterface { - - func failureRefreshRewardPoint(with error: Error) { - alert(type: .error, message: error.localizedDescription, title: "Alert") {[weak self] in - guard let `self` = self else { return } - self.presenter?.goRewardHome() - } - } - - func successRefreshRewardPoint() { - rewardPoint = GMEDB.shared.user.string(.rewardPoint)?.likeCommaMoney() - collectionView.reloadData() - } - - func submitSuccess() { - alert( - type: .normal, - message: "You can now use free service charge coupon while sending money overseas.", - title: "order_completed_message_title_text".localized() - ) {[weak self] in - guard let `self` = self else {return} - - self.presenter?.refreshRewardPoint() - } - } - - func submitFailure(with error: Error) { - alert(type: .error, message: error.localizedDescription) - } - - func setRewardProducts(models: [RewardProduct]?) { - self.models = models - } - - func failure(error: Error) { - alertWithOk(message: error.localizedDescription) - } - - func goRedeemViewController(with model: RewardProduct?) { - guard - let rewardType = model?.rewardType, - let type = ProductType(rawValue: rewardType) else { return } - - switch type { - case .product: - presenter?.goRedeemViewController(with: model) - case .coupon: - couponModel = model - } - } - - func startLoading() { - showProgressHud() - } - - func endLoading() { - hideProgressHud() - } -} - -// MARK: - UICollectionViewDataSource -extension RewardViewController: UICollectionViewDataSource { - func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { - return models?.count ?? 0 - } - - func collectionView( - _ collectionView: UICollectionView, - cellForItemAt indexPath: IndexPath - ) -> UICollectionViewCell { - guard let cell = collectionView.dequeueReusableCell( - withReuseIdentifier: "RewardItemCollectionViewCell", - for: indexPath - ) as? RewardItemCollectionViewCell else { - return UICollectionViewCell() - } - - cell.setModel(with: models?[indexPath.row], delegate: self) - return cell - } -} - -// MARK: - XLPagerTabStrip's IndicatorInfoProvider -extension RewardViewController: IndicatorInfoProvider { - func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo { - return IndicatorInfo.init(title: "products_text".localized()) - } -} - -// MARK: - ConfirmViewControllerDelegate -extension RewardViewController: ConfirmViewControllerDelegate { - func confirm(_ viewController: ConfirmViewController) { - presenter?.submit(with: couponModel) - } - - func cancel(_ viewController: ConfirmViewController) { - - } -} diff --git a/GME Remit/Modules/RewardModules/Reward/User Interface/View/RewardViewInterface.swift b/GME Remit/Modules/RewardModules/Reward/User Interface/View/RewardViewInterface.swift deleted file mode 100644 index ee2d63df..00000000 --- a/GME Remit/Modules/RewardModules/Reward/User Interface/View/RewardViewInterface.swift +++ /dev/null @@ -1,23 +0,0 @@ -// -// RewardViewInterface.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol RewardViewInterface: class { - func setRewardProducts(models: [RewardProduct]?) - func failure(error: Error) - func goRedeemViewController(with model: RewardProduct?) - - func startLoading() - func endLoading() - - func submitSuccess() - func submitFailure(with error: Error) - - func failureRefreshRewardPoint(with error: Error) - func successRefreshRewardPoint() - -} diff --git a/GME Remit/Modules/RewardModules/Reward/User Interface/Wireframe/RewardWireframe.swift b/GME Remit/Modules/RewardModules/Reward/User Interface/Wireframe/RewardWireframe.swift deleted file mode 100644 index 89aa911e..00000000 --- a/GME Remit/Modules/RewardModules/Reward/User Interface/Wireframe/RewardWireframe.swift +++ /dev/null @@ -1,46 +0,0 @@ -// -// RewardWireframe.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit - -class RewardWireframe { - weak var view: UIViewController! -} - -extension RewardWireframe: RewardWireframeInput { - - var storyboardName: String {return "Reward"} - - func getMainView() -> UIViewController { - let service = RewardService() - let interactor = RewardInteractor(service: service) - let presenter = RewardPresenter() - let viewController = viewControllerFromStoryboard(of: RewardViewController.self) - - viewController.presenter = presenter - interactor.output = presenter - presenter.interactor = interactor - presenter.wireframe = self - presenter.view = viewController - - view = viewController - return viewController - } - - func goRedeemViewController(with model: RewardProduct?) { - let redeemWireframe = RedeemWireframe() - guard let navigationVC = view.navigationController else { return } - redeemWireframe.pushMainViewWithModel(with: model, in: navigationVC) - } - - func goRewardVC() { - view.navigationController?.popToRootViewController(animated: true) - } - - -} diff --git a/GME Remit/Modules/RewardModules/Reward/User Interface/Wireframe/RewardWireframeInput.swift b/GME Remit/Modules/RewardModules/Reward/User Interface/Wireframe/RewardWireframeInput.swift deleted file mode 100644 index fc7088c6..00000000 --- a/GME Remit/Modules/RewardModules/Reward/User Interface/Wireframe/RewardWireframeInput.swift +++ /dev/null @@ -1,14 +0,0 @@ -// -// RewardWireframeInput.swift -// GME Remit -// -// Created by InKwon Devik Kim on 11/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -protocol RewardWireframeInput: WireframeInput { - func goRedeemViewController(with model: RewardProduct?) - func goRewardVC() -} diff --git a/GME Remit/Modules/RewardModules/RewardGroup/Application Logic/Interactor/RewardGroupInteractor.swift b/GME Remit/Modules/RewardModules/RewardGroup/Application Logic/Interactor/RewardGroupInteractor.swift deleted file mode 100644 index e44ab1be..00000000 --- a/GME Remit/Modules/RewardModules/RewardGroup/Application Logic/Interactor/RewardGroupInteractor.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// RewardGroupInteractor.swift -// GME Remit -// -// Created by InKwon Devik Kim on 13/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class RewardGroupInteractor { - - // MARK: Properties - - weak var output: RewardGroupInteractorOutput? - private let service: RewardGroupServiceType - - // MARK: Initialization - - init(service: RewardGroupServiceType) { - self.service = service - } - -} - -// MARK: RewardGroup interactor input interface - -extension RewardGroupInteractor: RewardGroupInteractorInput { - -} diff --git a/GME Remit/Modules/RewardModules/RewardGroup/Application Logic/Interactor/RewardGroupInteractorIO.swift b/GME Remit/Modules/RewardModules/RewardGroup/Application Logic/Interactor/RewardGroupInteractorIO.swift deleted file mode 100644 index cd95437d..00000000 --- a/GME Remit/Modules/RewardModules/RewardGroup/Application Logic/Interactor/RewardGroupInteractorIO.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// RewardGroupInteractorIO.swift -// GME Remit -// -// Created by InKwon Devik Kim on 13/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol RewardGroupInteractorInput: class { - -} - -protocol RewardGroupInteractorOutput: class { - -} diff --git a/GME Remit/Modules/RewardModules/RewardGroup/Application Logic/Service/RewardGroupService.swift b/GME Remit/Modules/RewardModules/RewardGroup/Application Logic/Service/RewardGroupService.swift deleted file mode 100644 index c817c32a..00000000 --- a/GME Remit/Modules/RewardModules/RewardGroup/Application Logic/Service/RewardGroupService.swift +++ /dev/null @@ -1,13 +0,0 @@ -// -// RewardGroupService.swift -// GME Remit -// -// Created by InKwon Devik Kim on 13/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class RewardGroupService: RewardGroupServiceType { - -} diff --git a/GME Remit/Modules/RewardModules/RewardGroup/Application Logic/Service/RewardGroupServiceType.swift b/GME Remit/Modules/RewardModules/RewardGroup/Application Logic/Service/RewardGroupServiceType.swift deleted file mode 100644 index 566e24d2..00000000 --- a/GME Remit/Modules/RewardModules/RewardGroup/Application Logic/Service/RewardGroupServiceType.swift +++ /dev/null @@ -1,11 +0,0 @@ -// -// RewardGroupServiceType.swift -// GME Remit -// -// Created by InKwon Devik Kim on 13/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol RewardGroupServiceType: class { - -} diff --git a/GME Remit/Modules/RewardModules/RewardGroup/Module Interface/RewardGroupModuleInterface.swift b/GME Remit/Modules/RewardModules/RewardGroup/Module Interface/RewardGroupModuleInterface.swift deleted file mode 100644 index fbd02b52..00000000 --- a/GME Remit/Modules/RewardModules/RewardGroup/Module Interface/RewardGroupModuleInterface.swift +++ /dev/null @@ -1,11 +0,0 @@ -// -// RewardGroupModuleInterface.swift -// GME Remit -// -// Created by InKwon Devik Kim on 13/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol RewardGroupModuleInterface: class { - -} diff --git a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/Presenter/RewardGroupPresenter.swift b/GME Remit/Modules/RewardModules/RewardGroup/User Interface/Presenter/RewardGroupPresenter.swift deleted file mode 100644 index 6649886b..00000000 --- a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/Presenter/RewardGroupPresenter.swift +++ /dev/null @@ -1,31 +0,0 @@ -// -// RewardGroupPresenter.swift -// GME Remit -// -// Created by InKwon Devik Kim on 13/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class RewardGroupPresenter { - - // MARK: Properties - - weak var view: RewardGroupViewInterface? - var interactor: RewardGroupInteractorInput? - var wireframe: RewardGroupWireframeInput? - -} - -// MARK: RewardGroup module interface - -extension RewardGroupPresenter: RewardGroupModuleInterface { - -} - -// MARK: RewardGroup interactor output interface - -extension RewardGroupPresenter: RewardGroupInteractorOutput { - -} diff --git a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/.DS_Store b/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/.DS_Store and /dev/null differ diff --git a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroup.storyboard b/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroup.storyboard deleted file mode 100644 index c2673dfe..00000000 --- a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroup.storyboard +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroupViewController.swift b/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroupViewController.swift deleted file mode 100644 index 0211adb0..00000000 --- a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroupViewController.swift +++ /dev/null @@ -1,106 +0,0 @@ -// -// RewardGroupViewController.swift -// GME Remit -// -// Created by InKwon Devik Kim on 13/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit -import XLPagerTabStrip - -class RewardGroupViewController: ButtonBarPagerTabStripViewController { - - // MARK: Properties - - var presenter: RewardGroupModuleInterface? - - // MARK: Computed Properties - - // MARK: IBOutlets - - @IBOutlet weak var closeBarButton: UIBarButtonItem! - - // MARK: VC's Life cycle - - override func viewDidLoad() { - super.viewDidLoad() - setup() - } - - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - title = "reward_group_title_text".localized() - setupNormalNavigation() - } - - override func viewWillDisappear(_ animated: Bool) { - super.viewWillDisappear(animated) - title = "" - } - - override func viewControllers( - for pagerTabStripController: PagerTabStripViewController - ) -> [UIViewController] { - let rewardViewController = RewardWireframe().getMainView() - let orderViewController = OrderHistoryWireframe().getMainView() - - return [rewardViewController, orderViewController] - } - - // MARK: IBActions - - @IBAction func touchCloseButton(_ sender: UIBarButtonItem) { - dismiss(animated: true, completion: nil) - } - -} - -// MARK: RewardGroupViewInterface -extension RewardGroupViewController: RewardGroupViewInterface { - -} - -// MARK: Other Functions -extension RewardGroupViewController { - private func setup() { - // all setup should be done here - initXLPagerTabStrip() - - closeBarButton.title = "penny_test_close_text".localized() - } - - private func initXLPagerTabStrip() { - buttonBarView.backgroundColor = .themeMainBackground - buttonBarView.selectedBar.backgroundColor = .themeRed - - settings.style.selectedBarHeight = 1 - settings.style.selectedBarBackgroundColor = .themeRed - - settings.style.buttonBarItemFont = .sanfrancisco(.bold, size: 17) - - settings.style.buttonBarBackgroundColor = .themeMainBackground - settings.style.buttonBarItemBackgroundColor = .themeMainBackground - - settings.style.buttonBarLeftContentInset = 0 - settings.style.buttonBarRightContentInset = 0 - - settings.style.buttonBarMinimumLineSpacing = 0 - settings.style.buttonBarItemsShouldFillAvailiableWidth = true - - changeCurrentIndexProgressive = {( - oldCell: ButtonBarViewCell?, - newCell: ButtonBarViewCell?, - progressPercentage: CGFloat, - changeCurrentIndex: Bool, - animated: Bool - ) -> Void in - - guard changeCurrentIndex == true else { return } - oldCell?.label.textColor = .init(hex: "#7b7a7a") - newCell?.label.textColor = .themeRed - - } - } - -} diff --git a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroupViewInterface.swift b/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroupViewInterface.swift deleted file mode 100644 index 2fedded3..00000000 --- a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroupViewInterface.swift +++ /dev/null @@ -1,11 +0,0 @@ -// -// RewardGroupViewInterface.swift -// GME Remit -// -// Created by InKwon Devik Kim on 13/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -protocol RewardGroupViewInterface: class { - -} diff --git a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/Wireframe/RewardGroupWireframe.swift b/GME Remit/Modules/RewardModules/RewardGroup/User Interface/Wireframe/RewardGroupWireframe.swift deleted file mode 100644 index eb12cd1e..00000000 --- a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/Wireframe/RewardGroupWireframe.swift +++ /dev/null @@ -1,35 +0,0 @@ -// -// RewardGroupWireframe.swift -// GME Remit -// -// Created by InKwon Devik Kim on 13/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit - -class RewardGroupWireframe { - weak var view: UIViewController! -} - -extension RewardGroupWireframe: RewardGroupWireframeInput { - - var storyboardName: String {return "RewardGroup"} - - func getMainView() -> UIViewController { - let service = RewardGroupService() - let interactor = RewardGroupInteractor(service: service) - let presenter = RewardGroupPresenter() - let viewController = viewControllerFromStoryboard(of: RewardGroupViewController.self) - - viewController.presenter = presenter - interactor.output = presenter - presenter.interactor = interactor - presenter.wireframe = self - presenter.view = viewController - - view = viewController - return viewController - } - -} diff --git a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/Wireframe/RewardGroupWireframeInput.swift b/GME Remit/Modules/RewardModules/RewardGroup/User Interface/Wireframe/RewardGroupWireframeInput.swift deleted file mode 100644 index 49641f3d..00000000 --- a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/Wireframe/RewardGroupWireframeInput.swift +++ /dev/null @@ -1,13 +0,0 @@ -// -// RewardGroupWireframeInput.swift -// GME Remit -// -// Created by InKwon Devik Kim on 13/05/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -protocol RewardGroupWireframeInput: WireframeInput { - -} diff --git a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Model/Branch.swift b/GME Remit/Shared/Models/Branch.swift similarity index 84% rename from GME Remit/Modules/RewardModules/Redeem/Application Logic/Model/Branch.swift rename to GME Remit/Shared/Models/Branch.swift index bb0331e2..d77e2228 100644 --- a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Model/Branch.swift +++ b/GME Remit/Shared/Models/Branch.swift @@ -2,8 +2,8 @@ // Branch.swift // GME Remit // -// Created by InKwon Devik Kim on 03/05/2019. -// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. +// Created by Amrit Giri on 6/29/20. +// Copyright © 2020 Gobal Money Express Co. Ltd. All rights reserved. // import Foundation @@ -31,3 +31,4 @@ struct Branch: Mappable { agentCity <- map["agentCity"] } } + diff --git a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Model/BranchContainer.swift b/GME Remit/Shared/Models/BranchContainer.swift similarity index 81% rename from GME Remit/Modules/RewardModules/Redeem/Application Logic/Model/BranchContainer.swift rename to GME Remit/Shared/Models/BranchContainer.swift index 9b460d81..b849dc34 100644 --- a/GME Remit/Modules/RewardModules/Redeem/Application Logic/Model/BranchContainer.swift +++ b/GME Remit/Shared/Models/BranchContainer.swift @@ -2,8 +2,8 @@ // BranchContainer.swift // GME Remit // -// Created by InKwon Devik Kim on 03/05/2019. -// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. +// Created by Amrit Giri on 6/29/20. +// Copyright © 2020 Gobal Money Express Co. Ltd. All rights reserved. // import Foundation diff --git a/GME Remit/Modules/RewardModules/Reward/Application Logic/Model/RewardProduct.swift b/GME Remit/Shared/Models/RewardProduct.swift similarity index 86% rename from GME Remit/Modules/RewardModules/Reward/Application Logic/Model/RewardProduct.swift rename to GME Remit/Shared/Models/RewardProduct.swift index 4f0020ef..38af231c 100644 --- a/GME Remit/Modules/RewardModules/Reward/Application Logic/Model/RewardProduct.swift +++ b/GME Remit/Shared/Models/RewardProduct.swift @@ -2,8 +2,8 @@ // RewardProduct.swift // GME Remit // -// Created by InKwon Devik Kim on 17/04/2019. -// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. +// Created by Amrit Giri on 6/29/20. +// Copyright © 2020 Gobal Money Express Co. Ltd. All rights reserved. // import Foundation