diff --git a/.version b/.version index e7e42a4b..c0be8a79 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.4.0 \ No newline at end of file diff --git a/.version_code b/.version_code index 7eb5383c..c38d19af 100644 --- a/.version_code +++ b/.version_code @@ -1 +1 @@ -6030000 \ No newline at end of file +6040000 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e2ce247..1a0c3141 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ ### NEXT_VERSION_DESCRIPTION_BEGIN ### NEXT_VERSION_DESCRIPTION_END +## [6.4.0] (25-09-2021) + +* Добалена возможность рекурентных SberPay платежей + ## [6.3.0] (06-09-2021) * Добавлена функциональность сохранения платёжного метода diff --git a/Cartfile b/Cartfile index d3e19ae9..eff0a917 100644 --- a/Cartfile +++ b/Cartfile @@ -1,5 +1,5 @@ -github "yoomoney/functional-swift" ~> 1.6.7 -github "yoomoney/core-api-swift" ~> 1.11.4 +github "yoomoney/functional-swift" ~> 1.7.3 +github "yoomoney/core-api-swift" ~> 2.0.1 github "yoomoney/yookassa-wallet-api-swift" ~> 2.3.1 github "yoomoney/yookassa-payments-api-swift" ~> 2.11.0 binary "https://raw.githubusercontent.com/yoomoney/yooid-sdk-ios/master/MoneyAuth.json" ~> 2.34.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index 82bd4945..e5d6509f 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,9 +1,9 @@ binary "https://raw.githubusercontent.com/yandexmobile/metrica-sdk-ios/master/YandexMobileMetrica.json" "3.17.0" binary "https://raw.githubusercontent.com/yoomoney/yooid-sdk-ios/master/MoneyAuth.json" "2.34.1" -binary "https://raw.githubusercontent.com/yoomoney/yookassa-threat-metrix-adapter-ios/main/ThreatMetrixAdapter.json" "3.3.0" +binary "https://raw.githubusercontent.com/yoomoney/yookassa-threat-metrix-adapter-ios/main/ThreatMetrixAdapter.json" "3.3.3" github "AliSoftware/OHHTTPStubs" "8.0.0" -github "yoomoney/core-api-swift" "1.11.4" -github "yoomoney/functional-swift" "1.6.7" -github "yoomoney/test-instruments-api-swift" "2.2.4" +github "yoomoney/core-api-swift" "2.0.1" +github "yoomoney/functional-swift" "1.7.3" +github "yoomoney/test-instruments-api-swift" "3.0.1" github "yoomoney/yookassa-payments-api-swift" "2.11.0" github "yoomoney/yookassa-wallet-api-swift" "2.3.1" diff --git a/Podfile.lock b/Podfile.lock index a5a0f8ff..7f5d7f95 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,34 +1,34 @@ PODS: - CardIO (5.4.1) - - FunctionalSwift (1.6.7) + - FunctionalSwift (1.7.3) - MoneyAuth (2.34.1): - FunctionalSwift - ThreatMetrixAdapter - YooMoneyCoreApi - - Reveal-SDK (28) - - SwiftLint (0.43.1) - - ThreatMetrixAdapter (3.3.0) + - Reveal-SDK (33) + - SwiftLint (0.45.1) + - ThreatMetrixAdapter (3.3.3) - YandexMobileMetrica/Dynamic (3.17.0): - YandexMobileMetrica/Dynamic/Core (= 3.17.0) - YandexMobileMetrica/Dynamic/Crashes (= 3.17.0) - YandexMobileMetrica/Dynamic/Core (3.17.0) - YandexMobileMetrica/Dynamic/Crashes (3.17.0): - YandexMobileMetrica/Dynamic/Core - - YooKassaPayments (6.3.0): + - YooKassaPayments (6.4.0): - MoneyAuth (~> 2.34.1) - ThreatMetrixAdapter (~> 3.3.0) - YandexMobileMetrica/Dynamic (~> 3.0) - YooKassaPaymentsApi (~> 2.11.0) - YooKassaWalletApi (~> 2.3.1) - - YooMoneyCoreApi (~> 1.11.4) + - YooMoneyCoreApi (~> 2.0.1) - YooKassaPaymentsApi (2.11.0): - - FunctionalSwift (~> 1.6.7) - - YooMoneyCoreApi (~> 1.11.4) + - FunctionalSwift + - YooMoneyCoreApi (~> 2.0.1) - YooKassaWalletApi (2.3.1): - - FunctionalSwift (~> 1.6.7) - - YooMoneyCoreApi (~> 1.11.4) - - YooMoneyCoreApi (1.11.4): - - FunctionalSwift (~> 1.6.7) + - FunctionalSwift + - YooMoneyCoreApi + - YooMoneyCoreApi (2.0.1): + - FunctionalSwift (~> 1.7.3) DEPENDENCIES: - CardIO @@ -38,18 +38,18 @@ DEPENDENCIES: - YooKassaPaymentsApi (~> 2.11.0) SPEC REPOS: - "git@github.com:yoomoney-tech/cocoa-pod-specs.git": + "git@github.com:yoomoney/cocoa-pod-specs.git": - FunctionalSwift - MoneyAuth - ThreatMetrixAdapter + - YooKassaPaymentsApi + - YooKassaWalletApi - YooMoneyCoreApi https://github.com/CocoaPods/Specs.git: - CardIO - Reveal-SDK - SwiftLint - YandexMobileMetrica - - YooKassaPaymentsApi - - YooKassaWalletApi EXTERNAL SOURCES: YooKassaPayments: @@ -57,17 +57,17 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: CardIO: 56983b39b62f495fc6dae9ad7cf875143df06443 - FunctionalSwift: ab5541313a75f3f6b35375ae63e6bc6c7557dfa1 + FunctionalSwift: 856da67cf3fb812341445d4e28f05875904d8da0 MoneyAuth: 6a008f183c29d195704053ff2f98fc181f905074 - Reveal-SDK: 1a2a678648fc4d277bad71c86d15530424324288 - SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52 - ThreatMetrixAdapter: 309bc3d0afff4706c882844203df6d3f89a6bf0c + Reveal-SDK: effba1c940b8337195563c425a6b5862ec875caa + SwiftLint: 06ac37e4d38c7068e0935bb30cda95f093bec761 + ThreatMetrixAdapter: 1b31f0afe02eb68be52945e160cc9c0fd117b06c YandexMobileMetrica: 9e713c16bb6aca0ba63b84c8d7b8b86d32f4ecc4 - YooKassaPayments: 70de07ab77f1cd0ddb99bc3ba409f3c04bd65eb1 - YooKassaPaymentsApi: e967fc3ffbb797e6412e077f0f896a1562c9bdc3 - YooKassaWalletApi: c1916b692ad842ae04917a10ce66d6d2f971c653 - YooMoneyCoreApi: d228ca30d6936bc81642988c93d26eba271261f8 + YooKassaPayments: 41e95ab8d3297816189ba7c64869325df79dc6a6 + YooKassaPaymentsApi: f76c84ec94ace98e8babc6996cf804840d93f8d8 + YooKassaWalletApi: 817d511330332aaec84490f8335ab8c94285d9be + YooMoneyCoreApi: 80f30f988f1dc19a397baf246db64cbbca077fd6 PODFILE CHECKSUM: e3d8979584d168459cceff74a485647132ad28ae -COCOAPODS: 1.10.1 +COCOAPODS: 1.11.2 diff --git a/YooKassaPayments.podspec b/YooKassaPayments.podspec index 9aa692f6..7631f83b 100644 --- a/YooKassaPayments.podspec +++ b/YooKassaPayments.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'YooKassaPayments' - s.version = '6.3.0' + s.version = '6.4.0' s.homepage = 'https://github.com/yoomoney/yookassa-payments-swift' s.license = { :type => "MIT", @@ -29,7 +29,7 @@ Pod::Spec.new do |s| s.ios.framework = 'PassKit' s.ios.library = 'z' - s.ios.dependency 'YooMoneyCoreApi', '~> 1.11.4' + s.ios.dependency 'YooMoneyCoreApi', '~> 2.0.1' s.ios.dependency 'YooKassaPaymentsApi', '~> 2.11.0' s.ios.dependency 'YooKassaWalletApi', '~> 2.3.1' s.ios.dependency 'MoneyAuth', '~> 2.34.1' diff --git a/YooKassaPayments/Info.plist b/YooKassaPayments/Info.plist index 43bf9a13..708515e7 100644 --- a/YooKassaPayments/Info.plist +++ b/YooKassaPayments/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 6.3.0 + 6.4.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass - + diff --git a/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/CscInputPresenterStyle.swift b/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/CscInputPresenterStyle.swift index 32e22c42..e70974f5 100644 --- a/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/CscInputPresenterStyle.swift +++ b/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/CscInputPresenterStyle.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/ExpiryDateInputPresenterStyle.swift b/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/ExpiryDateInputPresenterStyle.swift index 633e3e08..ae02760e 100644 --- a/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/ExpiryDateInputPresenterStyle.swift +++ b/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/ExpiryDateInputPresenterStyle.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/PanInputPresenterStyle.swift b/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/PanInputPresenterStyle.swift index 9471cadf..fc10da38 100644 --- a/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/PanInputPresenterStyle.swift +++ b/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/PanInputPresenterStyle.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/PhoneNumberStyleWithAutoCorrection.swift b/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/PhoneNumberStyleWithAutoCorrection.swift index b38536fb..1d18a915 100644 --- a/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/PhoneNumberStyleWithAutoCorrection.swift +++ b/YooKassaPayments/Private/Atomic Design/Formatters/InputPresenter/InputPresenterStyles/PhoneNumberStyleWithAutoCorrection.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/ActionTextDialog/ActionTextDialog+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/ActionTextDialog/ActionTextDialog+Style.swift index 56a2d0d4..223b0df6 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/ActionTextDialog/ActionTextDialog+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/ActionTextDialog/ActionTextDialog+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicator/ActivityIndicator+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicator/ActivityIndicator+Style.swift index 61c0f982..378758de 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicator/ActivityIndicator+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicator/ActivityIndicator+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicator/ActivityIndicator.swift b/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicator/ActivityIndicator.swift index 8fd886f7..6640ddac 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicator/ActivityIndicator.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicator/ActivityIndicator.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicatorView/ActivityIndicatorView+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicatorView/ActivityIndicatorView+Style.swift index 1d0c41af..308ea2eb 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicatorView/ActivityIndicatorView+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicatorView/ActivityIndicatorView+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicatorView/ActivityIndicatorView.swift b/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicatorView/ActivityIndicatorView.swift index 827b7f45..dd13ebac 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicatorView/ActivityIndicatorView.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/ActivityIndicatorView/ActivityIndicatorView.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/IconView/IconView+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/IconView/IconView+Style.swift index 9f5256e4..38afea85 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/IconView/IconView+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/IconView/IconView+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/NotificationView/NotificationView.swift b/YooKassaPayments/Private/Atomic Design/Molecules/NotificationView/NotificationView.swift index de549fc4..b753c207 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/NotificationView/NotificationView.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/NotificationView/NotificationView.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIBarButtonItem+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIBarButtonItem+Style.swift index a0bd55cf..5fe7f451 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIBarButtonItem+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIBarButtonItem+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIButton+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIButton+Style.swift index fea8fbb8..1875114c 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIButton+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIButton+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIColor+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIColor+Style.swift index c42606d2..34edab30 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIColor+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIColor+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIFont+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIFont+Style.swift index aa73a13e..82905a5f 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIFont+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIFont+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIImage+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIImage+Style.swift index 855d24ef..87354997 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIImage+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIImage+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UILabel+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UILabel+Style.swift index 6283667a..a5a5f29b 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UILabel+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UILabel+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UINavigationBar+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UINavigationBar+Style.swift index cc24ccfd..95aca6a4 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UINavigationBar+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UINavigationBar+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIScrollView+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIScrollView+Style.swift index 61512603..97664b1d 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIScrollView+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIScrollView+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIView+Style.swift b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIView+Style.swift index 30bbd47c..7718016f 100644 --- a/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIView+Style.swift +++ b/YooKassaPayments/Private/Atomic Design/Molecules/UIKit+Styles/UIView+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Pages/WebBrowser/WebBrowserViewIO.swift b/YooKassaPayments/Private/Atomic Design/Pages/WebBrowser/WebBrowserViewIO.swift index 0539a101..5c9b8252 100644 --- a/YooKassaPayments/Private/Atomic Design/Pages/WebBrowser/WebBrowserViewIO.swift +++ b/YooKassaPayments/Private/Atomic Design/Pages/WebBrowser/WebBrowserViewIO.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Protocols/ActivityIndicatorFullViewPresenting.swift b/YooKassaPayments/Private/Atomic Design/Protocols/ActivityIndicatorFullViewPresenting.swift index dd854a14..97e4ea79 100644 --- a/YooKassaPayments/Private/Atomic Design/Protocols/ActivityIndicatorFullViewPresenting.swift +++ b/YooKassaPayments/Private/Atomic Design/Protocols/ActivityIndicatorFullViewPresenting.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Protocols/ActivityIndicatorPresenting.swift b/YooKassaPayments/Private/Atomic Design/Protocols/ActivityIndicatorPresenting.swift index b3b52f1e..fee1ec68 100644 --- a/YooKassaPayments/Private/Atomic Design/Protocols/ActivityIndicatorPresenting.swift +++ b/YooKassaPayments/Private/Atomic Design/Protocols/ActivityIndicatorPresenting.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Protocols/NotificationPresenting.swift b/YooKassaPayments/Private/Atomic Design/Protocols/NotificationPresenting.swift index 938cf244..d4298049 100644 --- a/YooKassaPayments/Private/Atomic Design/Protocols/NotificationPresenting.swift +++ b/YooKassaPayments/Private/Atomic Design/Protocols/NotificationPresenting.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Protocols/PlaceholderPresenting.swift b/YooKassaPayments/Private/Atomic Design/Protocols/PlaceholderPresenting.swift index f3314ef4..6e749929 100644 --- a/YooKassaPayments/Private/Atomic Design/Protocols/PlaceholderPresenting.swift +++ b/YooKassaPayments/Private/Atomic Design/Protocols/PlaceholderPresenting.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Protocols/PlaceholderProvider.swift b/YooKassaPayments/Private/Atomic Design/Protocols/PlaceholderProvider.swift index 0b5aef8f..01aa3fc7 100644 --- a/YooKassaPayments/Private/Atomic Design/Protocols/PlaceholderProvider.swift +++ b/YooKassaPayments/Private/Atomic Design/Protocols/PlaceholderProvider.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Protocols/PresentableError.swift b/YooKassaPayments/Private/Atomic Design/Protocols/PresentableError.swift index f801d453..26dead20 100644 --- a/YooKassaPayments/Private/Atomic Design/Protocols/PresentableError.swift +++ b/YooKassaPayments/Private/Atomic Design/Protocols/PresentableError.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Protocols/PresentableNotification.swift b/YooKassaPayments/Private/Atomic Design/Protocols/PresentableNotification.swift index 1090afb6..2802e28a 100644 --- a/YooKassaPayments/Private/Atomic Design/Protocols/PresentableNotification.swift +++ b/YooKassaPayments/Private/Atomic Design/Protocols/PresentableNotification.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Styles/UITextView+Styles.swift b/YooKassaPayments/Private/Atomic Design/Styles/UITextView+Styles.swift index 5b309561..1b2b4e13 100644 --- a/YooKassaPayments/Private/Atomic Design/Styles/UITextView+Styles.swift +++ b/YooKassaPayments/Private/Atomic Design/Styles/UITextView+Styles.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Stylist/InternalStyle.swift b/YooKassaPayments/Private/Atomic Design/Stylist/InternalStyle.swift index 0203e452..10e86341 100644 --- a/YooKassaPayments/Private/Atomic Design/Stylist/InternalStyle.swift +++ b/YooKassaPayments/Private/Atomic Design/Stylist/InternalStyle.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Stylist/Stylable.swift b/YooKassaPayments/Private/Atomic Design/Stylist/Stylable.swift index 3bef569b..2f6b48d9 100644 --- a/YooKassaPayments/Private/Atomic Design/Stylist/Stylable.swift +++ b/YooKassaPayments/Private/Atomic Design/Stylist/Stylable.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Stylist/StyleStorage.swift b/YooKassaPayments/Private/Atomic Design/Stylist/StyleStorage.swift index 95f60066..a248c1b1 100644 --- a/YooKassaPayments/Private/Atomic Design/Stylist/StyleStorage.swift +++ b/YooKassaPayments/Private/Atomic Design/Stylist/StyleStorage.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Stylist/UIButton+Stylable.swift b/YooKassaPayments/Private/Atomic Design/Stylist/UIButton+Stylable.swift index 6eabd7d8..b8be32f2 100644 --- a/YooKassaPayments/Private/Atomic Design/Stylist/UIButton+Stylable.swift +++ b/YooKassaPayments/Private/Atomic Design/Stylist/UIButton+Stylable.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Stylist/UILabel+Stylable.swift b/YooKassaPayments/Private/Atomic Design/Stylist/UILabel+Stylable.swift index 7549e568..0367461d 100644 --- a/YooKassaPayments/Private/Atomic Design/Stylist/UILabel+Stylable.swift +++ b/YooKassaPayments/Private/Atomic Design/Stylist/UILabel+Stylable.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Views/LinkedTextView.swift b/YooKassaPayments/Private/Atomic Design/Views/LinkedTextView.swift index 7ea84d1f..a97a768d 100644 --- a/YooKassaPayments/Private/Atomic Design/Views/LinkedTextView.swift +++ b/YooKassaPayments/Private/Atomic Design/Views/LinkedTextView.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Atomic Design/Views/PlaceholderView.swift b/YooKassaPayments/Private/Atomic Design/Views/PlaceholderView.swift index 44f677d6..f654fe3d 100644 --- a/YooKassaPayments/Private/Atomic Design/Views/PlaceholderView.swift +++ b/YooKassaPayments/Private/Atomic Design/Views/PlaceholderView.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Helpers/String+Split.swift b/YooKassaPayments/Private/Helpers/String+Split.swift index e6f53c98..81cb0e05 100644 --- a/YooKassaPayments/Private/Helpers/String+Split.swift +++ b/YooKassaPayments/Private/Helpers/String+Split.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Helpers/UIImage+Tools.swift b/YooKassaPayments/Private/Helpers/UIImage+Tools.swift index 0613b25e..ce720919 100644 --- a/YooKassaPayments/Private/Helpers/UIImage+Tools.swift +++ b/YooKassaPayments/Private/Helpers/UIImage+Tools.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Helpers/UIViewController+NotificationPresenting.swift b/YooKassaPayments/Private/Helpers/UIViewController+NotificationPresenting.swift index 4e9557c5..31c7cf06 100644 --- a/YooKassaPayments/Private/Helpers/UIViewController+NotificationPresenting.swift +++ b/YooKassaPayments/Private/Helpers/UIViewController+NotificationPresenting.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Helpers/UIViewController+Tools.swift b/YooKassaPayments/Private/Helpers/UIViewController+Tools.swift index f2ec4e71..f9a1aeaf 100644 --- a/YooKassaPayments/Private/Helpers/UIViewController+Tools.swift +++ b/YooKassaPayments/Private/Helpers/UIViewController+Tools.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Models/CardData.swift b/YooKassaPayments/Private/Models/CardData.swift index 8ce5745a..19f4711a 100644 --- a/YooKassaPayments/Private/Models/CardData.swift +++ b/YooKassaPayments/Private/Models/CardData.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Private/Modules/PaymentMethods/Presenter/PaymentMethodsPresenter.swift b/YooKassaPayments/Private/Modules/PaymentMethods/Presenter/PaymentMethodsPresenter.swift index bbcf8295..ca0aa9ef 100644 --- a/YooKassaPayments/Private/Modules/PaymentMethods/Presenter/PaymentMethodsPresenter.swift +++ b/YooKassaPayments/Private/Modules/PaymentMethods/Presenter/PaymentMethodsPresenter.swift @@ -267,6 +267,7 @@ extension PaymentMethodsPresenter: PaymentMethodsViewOutput { let returnUrl = makeSberpayReturnUrl() { openSberpayModule( paymentOption: paymentOption, + clientSavePaymentMethod: savePaymentMethod, isSafeDeal: isSafeDeal, needReplace: needReplace, returnUrl: returnUrl @@ -496,7 +497,8 @@ extension PaymentMethodsPresenter: PaymentMethodsViewOutput { userPhoneNumber: userPhoneNumber, isBackBarButtonHidden: needReplace, customerId: customerId, - isSafeDeal: isSafeDeal + isSafeDeal: isSafeDeal, + clientSavePaymentMethod: savePaymentMethod ) router.openSberbankModule( inputData: inputData, @@ -506,6 +508,7 @@ extension PaymentMethodsPresenter: PaymentMethodsViewOutput { private func openSberpayModule( paymentOption: PaymentOption, + clientSavePaymentMethod: SavePaymentMethod, isSafeDeal: Bool, needReplace: Bool, returnUrl: String @@ -514,6 +517,7 @@ extension PaymentMethodsPresenter: PaymentMethodsViewOutput { let feeViewModel = priceViewModelFactory.makeFeePriceViewModel(paymentOption) let inputData = SberpayModuleInputData( paymentOption: paymentOption, + clientSavePaymentMethod: clientSavePaymentMethod, clientApplicationKey: clientApplicationKey, tokenizationSettings: tokenizationSettings, testModeSettings: testModeSettings, diff --git a/YooKassaPayments/Private/Modules/Sberbank/Assembly/SberbankAssembly.swift b/YooKassaPayments/Private/Modules/Sberbank/Assembly/SberbankAssembly.swift index b39e584e..8889535a 100644 --- a/YooKassaPayments/Private/Modules/Sberbank/Assembly/SberbankAssembly.swift +++ b/YooKassaPayments/Private/Modules/Sberbank/Assembly/SberbankAssembly.swift @@ -14,7 +14,9 @@ enum SberbankAssembly { termsOfService: inputData.termsOfService, userPhoneNumber: inputData.userPhoneNumber, isBackBarButtonHidden: inputData.isBackBarButtonHidden, - isSafeDeal: inputData.isSafeDeal + isSafeDeal: inputData.isSafeDeal, + clientSavePaymentMethod: inputData.clientSavePaymentMethod, + isSavePaymentMethodAllowed: inputData.paymentOption.savePaymentMethod == .allowed ) let paymentService = PaymentServiceAssembly.makeService( tokenizationSettings: inputData.tokenizationSettings, diff --git a/YooKassaPayments/Private/Modules/Sberbank/Interactor/SberbankInteractor.swift b/YooKassaPayments/Private/Modules/Sberbank/Interactor/SberbankInteractor.swift index 20cb2d0c..9734d252 100644 --- a/YooKassaPayments/Private/Modules/Sberbank/Interactor/SberbankInteractor.swift +++ b/YooKassaPayments/Private/Modules/Sberbank/Interactor/SberbankInteractor.swift @@ -38,9 +38,7 @@ final class SberbankInteractor { // MARK: - SberbankInteractorInput extension SberbankInteractor: SberbankInteractorInput { - func tokenizeSberbank( - phoneNumber: String - ) { + func tokenizeSberbank(phoneNumber: String, savePaymentMethod: Bool) { threatMetrixService.profileApp { [weak self] result in guard let self = self, let output = self.output else { return } @@ -54,7 +52,7 @@ extension SberbankInteractor: SberbankInteractorInput { clientApplicationKey: self.clientApplicationKey, phoneNumber: phoneNumber, confirmation: confirmation, - savePaymentMethod: false, + savePaymentMethod: savePaymentMethod, amount: self.amount, tmxSessionId: tmxSessionId.value, customerId: self.customerId diff --git a/YooKassaPayments/Private/Modules/Sberbank/Presenter/SberbankPresenter.swift b/YooKassaPayments/Private/Modules/Sberbank/Presenter/SberbankPresenter.swift index 901fd5dc..c8510689 100644 --- a/YooKassaPayments/Private/Modules/Sberbank/Presenter/SberbankPresenter.swift +++ b/YooKassaPayments/Private/Modules/Sberbank/Presenter/SberbankPresenter.swift @@ -23,6 +23,10 @@ final class SberbankPresenter { private let userPhoneNumber: String? private let isBackBarButtonHidden: Bool private let isSafeDeal: Bool + private let clientSavePaymentMethod: SavePaymentMethod + + private var recurrencySectionSwitchValue: Bool? + private let isSavePaymentMethodAllowed: Bool init( shopName: String, @@ -32,7 +36,9 @@ final class SberbankPresenter { termsOfService: TermsOfService, userPhoneNumber: String?, isBackBarButtonHidden: Bool, - isSafeDeal: Bool + isSafeDeal: Bool, + clientSavePaymentMethod: SavePaymentMethod, + isSavePaymentMethodAllowed: Bool ) { self.shopName = shopName self.purchaseDescription = purchaseDescription @@ -42,6 +48,8 @@ final class SberbankPresenter { self.userPhoneNumber = userPhoneNumber self.isBackBarButtonHidden = isBackBarButtonHidden self.isSafeDeal = isSafeDeal + self.clientSavePaymentMethod = clientSavePaymentMethod + self.isSavePaymentMethodAllowed = isSavePaymentMethodAllowed } // MARK: - Stored properties @@ -66,13 +74,29 @@ extension SberbankPresenter: SberbankViewOutput { font: UIFont.dynamicCaption2, foregroundColor: UIColor.AdaptiveColors.secondary ) + + var section: PaymentRecurrencyAndDataSavingSection? + if isSavePaymentMethodAllowed { + switch clientSavePaymentMethod { + case .userSelects: + section = PaymentRecurrencyAndDataSavingSectionFactory.make(mode: .allowRecurring, output: self) + recurrencySectionSwitchValue = section?.switchValue + case .on: + section = PaymentRecurrencyAndDataSavingSectionFactory.make(mode: .requiredRecurring, output: self) + recurrencySectionSwitchValue = true + case .off: + section = nil + } + } + let viewModel = SberbankViewModel( shopName: shopName, description: purchaseDescription, priceValue: priceValue, feeValue: feeValue, termsOfService: termsOfServiceValue, - safeDealText: isSafeDeal ? PaymentMethodResources.Localized.safeDealInfoLink : nil + safeDealText: isSafeDeal ? PaymentMethodResources.Localized.safeDealInfoLink : nil, + recurrencyAndDataSavingSection: section ) view.setViewModel(viewModel) @@ -107,7 +131,10 @@ extension SberbankPresenter: SberbankViewOutput { DispatchQueue.global().async { [weak self] in guard let self = self, let interactor = self.interactor else { return } - interactor.tokenizeSberbank(phoneNumber: self.phoneNumber) + interactor.tokenizeSberbank( + phoneNumber: self.phoneNumber, + savePaymentMethod: self.recurrencySectionSwitchValue ?? false + ) } } @@ -176,7 +203,10 @@ extension SberbankPresenter: ActionTitleTextDialogDelegate { DispatchQueue.global().async { [weak self] in guard let self = self, let interactor = self.interactor else { return } - interactor.tokenizeSberbank(phoneNumber: self.phoneNumber) + interactor.tokenizeSberbank( + phoneNumber: self.phoneNumber, + savePaymentMethod: self.recurrencySectionSwitchValue ?? false + ) } } } @@ -190,6 +220,35 @@ extension SberbankPresenter: PhoneNumberInputModuleOutput { } } +// MARK: - PaymentRecurrencyAndDataSavingSectionOutput + +extension SberbankPresenter: PaymentRecurrencyAndDataSavingSectionOutput { + func didChangeSwitchValue(newValue: Bool, mode: PaymentRecurrencyAndDataSavingSection.Mode) { + recurrencySectionSwitchValue = newValue + } + func didTapInfoLink(mode: PaymentRecurrencyAndDataSavingSection.Mode) { + switch mode { + case .allowRecurring, .requiredRecurring: + router.presentSafeDealInfo( + title: CommonLocalized.CardSettingsDetails.autopayInfoTitle, + body: CommonLocalized.CardSettingsDetails.autopayInfoDetails + ) + case .savePaymentData, .requiredSaveData: + router.presentSafeDealInfo( + title: CommonLocalized.RecurrencyAndSavePaymentData.saveDataInfoTitle, + body: CommonLocalized.RecurrencyAndSavePaymentData.saveDataInfoMessage + ) + case .allowRecurringAndSaveData, .requiredRecurringAndSaveData: + router.presentSafeDealInfo( + title: CommonLocalized.RecurrencyAndSavePaymentData.saveDataAndAutopaymentsInfoTitle, + body: CommonLocalized.RecurrencyAndSavePaymentData.saveDataAndAutopaymentsInfoMessage + ) + default: + break + } + } +} + // MARK: - SberbankModuleInput extension SberbankPresenter: SberbankModuleInput {} diff --git a/YooKassaPayments/Private/Modules/Sberbank/SberbankInteractorIO.swift b/YooKassaPayments/Private/Modules/Sberbank/SberbankInteractorIO.swift index 8993304e..383d5a72 100644 --- a/YooKassaPayments/Private/Modules/Sberbank/SberbankInteractorIO.swift +++ b/YooKassaPayments/Private/Modules/Sberbank/SberbankInteractorIO.swift @@ -1,7 +1,5 @@ protocol SberbankInteractorInput: AnalyticsTrack { - func tokenizeSberbank( - phoneNumber: String - ) + func tokenizeSberbank(phoneNumber: String, savePaymentMethod: Bool) func makeTypeAnalyticsParameters() -> ( authType: AnalyticsEvent.AuthType, diff --git a/YooKassaPayments/Private/Modules/Sberbank/SberbankModuleIO.swift b/YooKassaPayments/Private/Modules/Sberbank/SberbankModuleIO.swift index 84ffc328..2d5d5bc2 100644 --- a/YooKassaPayments/Private/Modules/Sberbank/SberbankModuleIO.swift +++ b/YooKassaPayments/Private/Modules/Sberbank/SberbankModuleIO.swift @@ -16,6 +16,7 @@ struct SberbankModuleInputData { let isBackBarButtonHidden: Bool let customerId: String? let isSafeDeal: Bool + let clientSavePaymentMethod: SavePaymentMethod } protocol SberbankModuleOutput: AnyObject { diff --git a/YooKassaPayments/Private/Modules/Sberbank/View/SberbankViewController.swift b/YooKassaPayments/Private/Modules/Sberbank/View/SberbankViewController.swift index 0a25cfca..5ab6f5a2 100644 --- a/YooKassaPayments/Private/Modules/Sberbank/View/SberbankViewController.swift +++ b/YooKassaPayments/Private/Modules/Sberbank/View/SberbankViewController.swift @@ -284,6 +284,10 @@ extension SberbankViewController: SberbankViewInput { safeDealLinkedTextView.isHidden = viewModel.safeDealText?.string.isEmpty ?? true termsOfServiceLinkedTextView.textAlignment = .center safeDealLinkedTextView.textAlignment = .center + + if let section = viewModel.recurrencyAndDataSavingSection { + contentStackView.addArrangedSubview(section) + } } func setSubmitButtonEnabled(_ isEnabled: Bool) { diff --git a/YooKassaPayments/Private/Modules/Sberbank/View/ViewModel/SberbankViewModel.swift b/YooKassaPayments/Private/Modules/Sberbank/View/ViewModel/SberbankViewModel.swift index ded31e27..7de8d137 100644 --- a/YooKassaPayments/Private/Modules/Sberbank/View/ViewModel/SberbankViewModel.swift +++ b/YooKassaPayments/Private/Modules/Sberbank/View/ViewModel/SberbankViewModel.swift @@ -1,3 +1,5 @@ +import UIKit + struct SberbankViewModel { let shopName: String let description: String? @@ -5,4 +7,5 @@ struct SberbankViewModel { let feeValue: String? let termsOfService: NSAttributedString let safeDealText: NSAttributedString? + let recurrencyAndDataSavingSection: UIView? } diff --git a/YooKassaPayments/Private/Modules/Sberpay/Assembly/SberpayAssembly.swift b/YooKassaPayments/Private/Modules/Sberpay/Assembly/SberpayAssembly.swift index 8c01055c..23ac3b2a 100644 --- a/YooKassaPayments/Private/Modules/Sberpay/Assembly/SberpayAssembly.swift +++ b/YooKassaPayments/Private/Modules/Sberpay/Assembly/SberpayAssembly.swift @@ -6,6 +6,7 @@ enum SberpayAssembly { moduleOutput: SberpayModuleOutput? ) -> UIViewController { let view = SberpayViewController() + let presenter = SberpayPresenter( shopName: inputData.shopName, purchaseDescription: inputData.purchaseDescription, @@ -13,7 +14,9 @@ enum SberpayAssembly { feeViewModel: inputData.feeViewModel, termsOfService: inputData.termsOfService, isBackBarButtonHidden: inputData.isBackBarButtonHidden, - isSafeDeal: inputData.isSafeDeal + isSafeDeal: inputData.isSafeDeal, + clientSavePaymentMethod: inputData.clientSavePaymentMethod, + isSavePaymentMethodAllowed: inputData.paymentOption.savePaymentMethod == .allowed ) let paymentService = PaymentServiceAssembly.makeService( tokenizationSettings: inputData.tokenizationSettings, diff --git a/YooKassaPayments/Private/Modules/Sberpay/Interactor/SberpayInteractor.swift b/YooKassaPayments/Private/Modules/Sberpay/Interactor/SberpayInteractor.swift index 1a820756..f97014da 100644 --- a/YooKassaPayments/Private/Modules/Sberpay/Interactor/SberpayInteractor.swift +++ b/YooKassaPayments/Private/Modules/Sberpay/Interactor/SberpayInteractor.swift @@ -41,7 +41,7 @@ final class SberpayInteractor { // MARK: - SberpayInteractorInput extension SberpayInteractor: SberpayInteractorInput { - func tokenizeSberpay() { + func tokenizeSberpay(savePaymentMethod: Bool) { threatMetrixService.profileApp { [weak self] result in guard let self = self, let output = self.output else { return } @@ -55,7 +55,7 @@ extension SberpayInteractor: SberpayInteractorInput { self.paymentService.tokenizeSberpay( clientApplicationKey: self.clientApplicationKey, confirmation: confirmation, - savePaymentMethod: false, + savePaymentMethod: savePaymentMethod, amount: self.amount, tmxSessionId: tmxSessionId.value, customerId: self.customerId diff --git a/YooKassaPayments/Private/Modules/Sberpay/Presenter/SberpayPresenter.swift b/YooKassaPayments/Private/Modules/Sberpay/Presenter/SberpayPresenter.swift index a98ae678..255f86aa 100644 --- a/YooKassaPayments/Private/Modules/Sberpay/Presenter/SberpayPresenter.swift +++ b/YooKassaPayments/Private/Modules/Sberpay/Presenter/SberpayPresenter.swift @@ -18,6 +18,10 @@ final class SberpayPresenter { private let termsOfService: TermsOfService private let isBackBarButtonHidden: Bool private let isSafeDeal: Bool + private let clientSavePaymentMethod: SavePaymentMethod + + private var recurrencySectionSwitchValue: Bool? + private let isSavePaymentMethodAllowed: Bool init( shopName: String, @@ -26,7 +30,9 @@ final class SberpayPresenter { feeViewModel: PriceViewModel?, termsOfService: TermsOfService, isBackBarButtonHidden: Bool, - isSafeDeal: Bool + isSafeDeal: Bool, + clientSavePaymentMethod: SavePaymentMethod, + isSavePaymentMethodAllowed: Bool ) { self.shopName = shopName self.purchaseDescription = purchaseDescription @@ -35,6 +41,8 @@ final class SberpayPresenter { self.termsOfService = termsOfService self.isBackBarButtonHidden = isBackBarButtonHidden self.isSafeDeal = isSafeDeal + self.clientSavePaymentMethod = clientSavePaymentMethod + self.isSavePaymentMethodAllowed = isSavePaymentMethodAllowed } } @@ -55,13 +63,29 @@ extension SberpayPresenter: SberpayViewOutput { font: UIFont.dynamicCaption2, foregroundColor: UIColor.AdaptiveColors.secondary ) + + var section: PaymentRecurrencyAndDataSavingSection? + if isSavePaymentMethodAllowed { + switch clientSavePaymentMethod { + case .userSelects: + section = PaymentRecurrencyAndDataSavingSectionFactory.make(mode: .allowRecurring, output: self) + recurrencySectionSwitchValue = section?.switchValue + case .on: + section = PaymentRecurrencyAndDataSavingSectionFactory.make(mode: .requiredRecurring, output: self) + recurrencySectionSwitchValue = true + case .off: + section = nil + } + } + let viewModel = SberpayViewModel( shopName: shopName, description: purchaseDescription, priceValue: priceValue, feeValue: feeValue, termsOfService: termsOfServiceValue, - safeDealText: isSafeDeal ? PaymentMethodResources.Localized.safeDealInfoLink : nil + safeDealText: isSafeDeal ? PaymentMethodResources.Localized.safeDealInfoLink : nil, + recurrencyAndDataSavingSection: section ) view.setupViewModel(viewModel) @@ -84,9 +108,8 @@ extension SberpayPresenter: SberpayViewOutput { guard let view = view else { return } view.showActivity() DispatchQueue.global().async { [weak self] in - guard let self = self, - let interactor = self.interactor else { return } - interactor.tokenizeSberpay() + guard let self = self, let interactor = self.interactor else { return } + interactor.tokenizeSberpay(savePaymentMethod: self.recurrencySectionSwitchValue ?? false) } } @@ -159,9 +182,37 @@ extension SberpayPresenter: ActionTitleTextDialogDelegate { view.hidePlaceholder() view.showActivity() DispatchQueue.global().async { [weak self] in - guard let self = self, - let interactor = self.interactor else { return } - interactor.tokenizeSberpay() + guard let self = self, let interactor = self.interactor else { return } + interactor.tokenizeSberpay(savePaymentMethod: self.recurrencySectionSwitchValue ?? false) + } + } +} + +// MARK: - PaymentRecurrencyAndDataSavingSectionOutput + +extension SberpayPresenter: PaymentRecurrencyAndDataSavingSectionOutput { + func didChangeSwitchValue(newValue: Bool, mode: PaymentRecurrencyAndDataSavingSection.Mode) { + recurrencySectionSwitchValue = newValue + } + func didTapInfoLink(mode: PaymentRecurrencyAndDataSavingSection.Mode) { + switch mode { + case .allowRecurring, .requiredRecurring: + router.presentSafeDealInfo( + title: CommonLocalized.CardSettingsDetails.autopayInfoTitle, + body: CommonLocalized.CardSettingsDetails.autopayInfoDetails + ) + case .savePaymentData, .requiredSaveData: + router.presentSafeDealInfo( + title: CommonLocalized.RecurrencyAndSavePaymentData.saveDataInfoTitle, + body: CommonLocalized.RecurrencyAndSavePaymentData.saveDataInfoMessage + ) + case .allowRecurringAndSaveData, .requiredRecurringAndSaveData: + router.presentSafeDealInfo( + title: CommonLocalized.RecurrencyAndSavePaymentData.saveDataAndAutopaymentsInfoTitle, + body: CommonLocalized.RecurrencyAndSavePaymentData.saveDataAndAutopaymentsInfoMessage + ) + default: + break } } } diff --git a/YooKassaPayments/Private/Modules/Sberpay/SberpayInteractorIO.swift b/YooKassaPayments/Private/Modules/Sberpay/SberpayInteractorIO.swift index 532ee3ad..79c3ba3a 100644 --- a/YooKassaPayments/Private/Modules/Sberpay/SberpayInteractorIO.swift +++ b/YooKassaPayments/Private/Modules/Sberpay/SberpayInteractorIO.swift @@ -1,5 +1,5 @@ protocol SberpayInteractorInput: AnalyticsTrack { - func tokenizeSberpay() + func tokenizeSberpay(savePaymentMethod: Bool) func makeTypeAnalyticsParameters() -> ( authType: AnalyticsEvent.AuthType, diff --git a/YooKassaPayments/Private/Modules/Sberpay/SberpayModuleIO.swift b/YooKassaPayments/Private/Modules/Sberpay/SberpayModuleIO.swift index fcf58e5b..1d7b28c8 100644 --- a/YooKassaPayments/Private/Modules/Sberpay/SberpayModuleIO.swift +++ b/YooKassaPayments/Private/Modules/Sberpay/SberpayModuleIO.swift @@ -2,6 +2,7 @@ import YooKassaPaymentsApi struct SberpayModuleInputData { let paymentOption: PaymentOption + let clientSavePaymentMethod: SavePaymentMethod let clientApplicationKey: String let tokenizationSettings: TokenizationSettings let testModeSettings: TestModeSettings? diff --git a/YooKassaPayments/Private/Modules/Sberpay/View/SberpayViewController.swift b/YooKassaPayments/Private/Modules/Sberpay/View/SberpayViewController.swift index e3fd6364..13351366 100644 --- a/YooKassaPayments/Private/Modules/Sberpay/View/SberpayViewController.swift +++ b/YooKassaPayments/Private/Modules/Sberpay/View/SberpayViewController.swift @@ -260,6 +260,10 @@ extension SberpayViewController: SberpayViewInput { safeDealLinkedTextView.isHidden = viewModel.safeDealText?.string.isEmpty ?? true termsOfServiceLinkedTextView.textAlignment = .center safeDealLinkedTextView.textAlignment = .center + + if let section = viewModel.recurrencyAndDataSavingSection { + contentStackView.addArrangedSubview(section) + } } func setBackBarButtonHidden(_ isHidden: Bool) { diff --git a/YooKassaPayments/Private/Modules/Sberpay/View/ViewModel/SberpayViewModel.swift b/YooKassaPayments/Private/Modules/Sberpay/View/ViewModel/SberpayViewModel.swift index 46d34b8a..8bb6d53d 100644 --- a/YooKassaPayments/Private/Modules/Sberpay/View/ViewModel/SberpayViewModel.swift +++ b/YooKassaPayments/Private/Modules/Sberpay/View/ViewModel/SberpayViewModel.swift @@ -1,3 +1,5 @@ +import UIKit + struct SberpayViewModel { let shopName: String let description: String? @@ -5,4 +7,5 @@ struct SberpayViewModel { let feeValue: String? let termsOfService: NSAttributedString let safeDealText: NSAttributedString? + let recurrencyAndDataSavingSection: UIView? } diff --git a/YooKassaPayments/Private/Services/CardService.swift b/YooKassaPayments/Private/Services/CardService.swift index 5baa0cfc..f3febbf0 100644 --- a/YooKassaPayments/Private/Services/CardService.swift +++ b/YooKassaPayments/Private/Services/CardService.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPayments/Public/Resources/en.lproj/Localizable.strings b/YooKassaPayments/Public/Resources/en.lproj/Localizable.strings index afec7a4b..21b5e3ba 100644 --- a/YooKassaPayments/Public/Resources/en.lproj/Localizable.strings +++ b/YooKassaPayments/Public/Resources/en.lproj/Localizable.strings @@ -200,7 +200,7 @@ "RecurrencyAndSavePaymentData.info.saveDataAndAutopayments.title" = "Autopayments and saving payment details"; /* Текст со ссылкой информации об опциональном подключении автоплатежа при платеже https://disk.yandex.ru/i/dcZY0utIfx634w */ -"RecurrencyAndSavePaymentData.link.autopayments.optional" = "After the payment, this card will be saved: the store will be able debiting money without your participation"; +"RecurrencyAndSavePaymentData.link.autopayments.optional" = "After the payment, this card will be saved: the store will be able to debit money without your participation"; /* Текст со ссылкой информации об опциональном подключении автоплатежа при платеже https://disk.yandex.ru/i/dcZY0utIfx634w */ "RecurrencyAndSavePaymentData.link.autopayments.required" = "By making this payment, you allow saving the card 
and debiting money without your participation"; diff --git a/YooKassaPaymentsDemoApp.xcodeproj/project.pbxproj b/YooKassaPaymentsDemoApp.xcodeproj/project.pbxproj index ce999457..e5ff9b2f 100644 --- a/YooKassaPaymentsDemoApp.xcodeproj/project.pbxproj +++ b/YooKassaPaymentsDemoApp.xcodeproj/project.pbxproj @@ -10,7 +10,6 @@ 309BD41A265CE9FA00D4804D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 309BD419265CE9FA00D4804D /* AppDelegate.swift */; }; 309BD423265CE9FC00D4804D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 309BD422265CE9FC00D4804D /* Assets.xcassets */; }; 309BD426265CE9FC00D4804D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 309BD424265CE9FC00D4804D /* LaunchScreen.storyboard */; }; - 309BD437265CED7700D4804D /* RootViewController+CardScanning+Pods.swift in Sources */ = {isa = PBXBuildFile; fileRef = 309BD434265CED7700D4804D /* RootViewController+CardScanning+Pods.swift */; }; 309BD438265CED7700D4804D /* RootViewController+TokenizationModuleOutput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 309BD435265CED7700D4804D /* RootViewController+TokenizationModuleOutput.swift */; }; 309BD47C265CED9300D4804D /* TestSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 309BD43B265CED9200D4804D /* TestSettings.swift */; }; 309BD47D265CED9300D4804D /* ProcessConfirmation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 309BD43C265CED9200D4804D /* ProcessConfirmation.swift */; }; @@ -126,8 +125,6 @@ 309BD427265CE9FC00D4804D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 309BD430265CEBAA00D4804D /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/LaunchScreen.strings; sourceTree = ""; }; 309BD432265CECA000D4804D /* YooKassaPaymentsDemoApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = YooKassaPaymentsDemoApp.entitlements; sourceTree = ""; }; - 309BD433265CED7700D4804D /* RootViewController+CardScanning+Carthage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RootViewController+CardScanning+Carthage.swift"; sourceTree = ""; }; - 309BD434265CED7700D4804D /* RootViewController+CardScanning+Pods.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RootViewController+CardScanning+Pods.swift"; sourceTree = ""; }; 309BD435265CED7700D4804D /* RootViewController+TokenizationModuleOutput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RootViewController+TokenizationModuleOutput.swift"; sourceTree = ""; }; 309BD43B265CED9200D4804D /* TestSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestSettings.swift; sourceTree = ""; }; 309BD43C265CED9200D4804D /* ProcessConfirmation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProcessConfirmation.swift; sourceTree = ""; }; @@ -171,7 +168,6 @@ 309BD472265CED9300D4804D /* TextFieldView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldView.swift; sourceTree = ""; }; 309BD473265CED9300D4804D /* ContainerTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContainerTableViewCell.swift; sourceTree = ""; }; 309BD474265CED9300D4804D /* TitledSwitchView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TitledSwitchView.swift; sourceTree = ""; }; - 309BD475265CED9300D4804D /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = ""; }; 309BD477265CED9300D4804D /* DevHostService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DevHostService.swift; sourceTree = ""; }; 309BD479265CED9300D4804D /* UserDefaultsStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDefaultsStorage.swift; sourceTree = ""; }; 309BD47A265CED9300D4804D /* KeyValueStoring.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyValueStoring.swift; sourceTree = ""; }; @@ -260,8 +256,6 @@ isa = PBXGroup; children = ( 309BD419265CE9FA00D4804D /* AppDelegate.swift */, - 309BD433265CED7700D4804D /* RootViewController+CardScanning+Carthage.swift */, - 309BD434265CED7700D4804D /* RootViewController+CardScanning+Pods.swift */, 309BD435265CED7700D4804D /* RootViewController+TokenizationModuleOutput.swift */, 309BD431265CEC2600D4804D /* Resources */, 309BD439265CED9200D4804D /* Source */, @@ -286,7 +280,6 @@ 309BD439265CED9200D4804D /* Source */ = { isa = PBXGroup; children = ( - 309BD475265CED9300D4804D /* Bridging-Header.h */, 309BD4D8265CF2CB00D4804D /* Identifier.swift */, 309BD4DC265CF31700D4804D /* ActionTextDialog */, 309BD457265CED9300D4804D /* AtomicDesign */, @@ -790,7 +783,6 @@ 309BD4BB265CF0E600D4804D /* StyleStorage.swift in Sources */, 309BD4D2265CF11200D4804D /* UILabel+Style.swift in Sources */, 309BD491265CED9300D4804D /* UIImage+Style.swift in Sources */, - 309BD437265CED7700D4804D /* RootViewController+CardScanning+Pods.swift in Sources */, 309BD4F9265CF4F700D4804D /* UILayoutPriority+Constants.swift in Sources */, 309BD490265CED9300D4804D /* PriceInputPresenterStyle.swift in Sources */, 309BD4A0265CED9300D4804D /* TextControl+PlaceholderMode.swift in Sources */, @@ -987,7 +979,6 @@ MARKETING_VERSION = 6.1; PRODUCT_BUNDLE_IDENTIFIER = ru.yoo.sdk.kassa.payments.example.debug; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "YooKassaPaymentsDemoApp/Source/Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1014,7 +1005,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = "YooKassa SDK Payments Example AdHoc"; - SWIFT_OBJC_BRIDGING_HEADER = "YooKassaPaymentsDemoApp/Source/Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1095,7 +1085,6 @@ PRODUCT_BUNDLE_IDENTIFIER = ru.yoo.sdk.kassa.payments.example; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_OBJC_BRIDGING_HEADER = "YooKassaPaymentsDemoApp/Source/Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; diff --git a/YooKassaPaymentsDemoApp/RootViewController+CardScanning+Carthage.swift b/YooKassaPaymentsDemoApp/RootViewController+CardScanning+Carthage.swift deleted file mode 100644 index 171dbb2d..00000000 --- a/YooKassaPaymentsDemoApp/RootViewController+CardScanning+Carthage.swift +++ /dev/null @@ -1,37 +0,0 @@ -import protocol YooKassaPayments.CardScanning -import struct YooKassaPayments.ScannedCardInfo -import CardIO - -// MARK: - CardScanning - -extension RootViewController: CardScanning { - var cardScanningViewController: UIViewController? { - - guard let controller = CardIOPaymentViewController(paymentDelegate: self) else { - return nil - } - - controller.suppressScanConfirmation = true - controller.hideCardIOLogo = true - controller.disableManualEntryButtons = true - controller.collectCVV = false - - return controller - } -} - -// MARK: - CardIOPaymentViewControllerDelegate - -extension RootViewController: CardIOPaymentViewControllerDelegate { - public func userDidProvide(_ cardInfo: CardIOCreditCardInfo!, - in paymentViewController: CardIOPaymentViewController!) { - let scannedCardInfo = ScannedCardInfo(number: cardInfo.cardNumber, - expiryMonth: "\(cardInfo.expiryMonth)", - expiryYear: "\(cardInfo.expiryYear)") - cardScanningDelegate?.cardScannerDidFinish(scannedCardInfo) - } - - public func userDidCancel(_ paymentViewController: CardIOPaymentViewController!) { - cardScanningDelegate?.cardScannerDidFinish(nil) - } -} diff --git a/YooKassaPaymentsDemoApp/RootViewController+CardScanning+Pods.swift b/YooKassaPaymentsDemoApp/RootViewController+CardScanning+Pods.swift deleted file mode 100644 index 813a920c..00000000 --- a/YooKassaPaymentsDemoApp/RootViewController+CardScanning+Pods.swift +++ /dev/null @@ -1,36 +0,0 @@ -import protocol YooKassaPayments.CardScanning -import struct YooKassaPayments.ScannedCardInfo - -// MARK: - CardScanning - -extension RootViewController: CardScanning { - var cardScanningViewController: UIViewController? { - - guard let controller = CardIOPaymentViewController(paymentDelegate: self) else { - return nil - } - - controller.suppressScanConfirmation = true - controller.hideCardIOLogo = true - controller.disableManualEntryButtons = true - controller.collectCVV = false - - return controller - } -} - -// MARK: - CardIOPaymentViewControllerDelegate - -extension RootViewController: CardIOPaymentViewControllerDelegate { - public func userDidProvide(_ cardInfo: CardIOCreditCardInfo!, - in paymentViewController: CardIOPaymentViewController!) { - let scannedCardInfo = ScannedCardInfo(number: cardInfo.cardNumber, - expiryMonth: "\(cardInfo.expiryMonth)", - expiryYear: "\(cardInfo.expiryYear)") - cardScanningDelegate?.cardScannerDidFinish(scannedCardInfo) - } - - public func userDidCancel(_ paymentViewController: CardIOPaymentViewController!) { - cardScanningDelegate?.cardScannerDidFinish(nil) - } -} diff --git a/YooKassaPaymentsDemoApp/RootViewController+TokenizationModuleOutput.swift b/YooKassaPaymentsDemoApp/RootViewController+TokenizationModuleOutput.swift index a3c03731..ac4e7f88 100644 --- a/YooKassaPaymentsDemoApp/RootViewController+TokenizationModuleOutput.swift +++ b/YooKassaPaymentsDemoApp/RootViewController+TokenizationModuleOutput.swift @@ -1,3 +1,4 @@ +import UIKit import YooKassaPayments // MARK: - TokenizationModuleOutput diff --git a/YooKassaPaymentsDemoApp/Source/ActionTextDialog/ActionTextDialog+Style.swift b/YooKassaPaymentsDemoApp/Source/ActionTextDialog/ActionTextDialog+Style.swift index 56a2d0d4..223b0df6 100644 --- a/YooKassaPaymentsDemoApp/Source/ActionTextDialog/ActionTextDialog+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/ActionTextDialog/ActionTextDialog+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/AtomicDesign/Styles/UIImage+Style.swift b/YooKassaPaymentsDemoApp/Source/AtomicDesign/Styles/UIImage+Style.swift index c63e14c6..42d69124 100644 --- a/YooKassaPaymentsDemoApp/Source/AtomicDesign/Styles/UIImage+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/AtomicDesign/Styles/UIImage+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Bridging-Header.h b/YooKassaPaymentsDemoApp/Source/Bridging-Header.h deleted file mode 100644 index 4a350e96..00000000 --- a/YooKassaPaymentsDemoApp/Source/Bridging-Header.h +++ /dev/null @@ -1 +0,0 @@ -#import diff --git a/YooKassaPaymentsDemoApp/Source/Extensions/String+Split.swift b/YooKassaPaymentsDemoApp/Source/Extensions/String+Split.swift index e6f53c98..81cb0e05 100644 --- a/YooKassaPaymentsDemoApp/Source/Extensions/String+Split.swift +++ b/YooKassaPaymentsDemoApp/Source/Extensions/String+Split.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Extensions/UIImage+Tools.swift b/YooKassaPaymentsDemoApp/Source/Extensions/UIImage+Tools.swift index 0613b25e..ce720919 100644 --- a/YooKassaPaymentsDemoApp/Source/Extensions/UIImage+Tools.swift +++ b/YooKassaPaymentsDemoApp/Source/Extensions/UIImage+Tools.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Extensions/UIView+Tools.swift b/YooKassaPaymentsDemoApp/Source/Extensions/UIView+Tools.swift index beb7ef7e..7faad0d5 100644 --- a/YooKassaPaymentsDemoApp/Source/Extensions/UIView+Tools.swift +++ b/YooKassaPaymentsDemoApp/Source/Extensions/UIView+Tools.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenter.swift b/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenter.swift index bad752a6..d1001374 100644 --- a/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenter.swift +++ b/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenter.swift @@ -1,6 +1,4 @@ -import typealias Foundation.NSRange -import class Foundation.NSString -import class ObjectiveC.NSObject +import Foundation /// Interface to define the formatting style of the text field. `InputPresenter` uses an instance that implements this /// interface for confining the length of the input text, and to add and remove the formatting from it. diff --git a/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenterStyles/CscInputPresenterStyle.swift b/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenterStyles/CscInputPresenterStyle.swift index 32e22c42..932a4b3c 100644 --- a/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenterStyles/CscInputPresenterStyle.swift +++ b/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenterStyles/CscInputPresenterStyle.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,6 +22,8 @@ * THE SOFTWARE. */ +import Foundation + struct CscInputPresenterStyle: InputPresenterStyle { func removedFormatting(from string: String) -> String { diff --git a/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenterStyles/ExpiryDateInputPresenterStyle.swift b/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenterStyles/ExpiryDateInputPresenterStyle.swift index 633e3e08..b5d8a514 100644 --- a/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenterStyles/ExpiryDateInputPresenterStyle.swift +++ b/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenterStyles/ExpiryDateInputPresenterStyle.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,6 +22,8 @@ * THE SOFTWARE. */ +import Foundation + struct ExpiryDateInputPresenterStyle: InputPresenterStyle { init() { } diff --git a/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenterStyles/PanInputPresenterStyle.swift b/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenterStyles/PanInputPresenterStyle.swift index 9471cadf..b0ee5af7 100644 --- a/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenterStyles/PanInputPresenterStyle.swift +++ b/YooKassaPaymentsDemoApp/Source/InputPresenter/InputPresenterStyles/PanInputPresenterStyle.swift @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,6 +22,8 @@ * THE SOFTWARE. */ +import Foundation + struct PanInputPresenterStyle: InputPresenterStyle { func removedFormatting(from string: String) -> String { diff --git a/YooKassaPaymentsDemoApp/Source/InputPresenter/InputView.swift b/YooKassaPaymentsDemoApp/Source/InputPresenter/InputView.swift index 94adcd0b..d2e1c0dc 100644 --- a/YooKassaPaymentsDemoApp/Source/InputPresenter/InputView.swift +++ b/YooKassaPaymentsDemoApp/Source/InputPresenter/InputView.swift @@ -1,5 +1,4 @@ -import class UIKit.UITextPosition -import class UIKit.UITextRange +import UIKit protocol InputView: AnyObject { var inputText: String? { get set } diff --git a/YooKassaPaymentsDemoApp/Source/Styles/UISwitch+Style.swift b/YooKassaPaymentsDemoApp/Source/Styles/UISwitch+Style.swift index 8489a309..3344c0f2 100644 --- a/YooKassaPaymentsDemoApp/Source/Styles/UISwitch+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/Styles/UISwitch+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Stylist/InternalStyle.swift b/YooKassaPaymentsDemoApp/Source/Stylist/InternalStyle.swift index 0203e452..10e86341 100644 --- a/YooKassaPaymentsDemoApp/Source/Stylist/InternalStyle.swift +++ b/YooKassaPaymentsDemoApp/Source/Stylist/InternalStyle.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Stylist/Stylable.swift b/YooKassaPaymentsDemoApp/Source/Stylist/Stylable.swift index 3bef569b..2f6b48d9 100644 --- a/YooKassaPaymentsDemoApp/Source/Stylist/Stylable.swift +++ b/YooKassaPaymentsDemoApp/Source/Stylist/Stylable.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Stylist/StyleStorage.swift b/YooKassaPaymentsDemoApp/Source/Stylist/StyleStorage.swift index 95f60066..a248c1b1 100644 --- a/YooKassaPaymentsDemoApp/Source/Stylist/StyleStorage.swift +++ b/YooKassaPaymentsDemoApp/Source/Stylist/StyleStorage.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Stylist/UIButton+Stylable.swift b/YooKassaPaymentsDemoApp/Source/Stylist/UIButton+Stylable.swift index 6eabd7d8..b8be32f2 100644 --- a/YooKassaPaymentsDemoApp/Source/Stylist/UIButton+Stylable.swift +++ b/YooKassaPaymentsDemoApp/Source/Stylist/UIButton+Stylable.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Stylist/UILabel+Stylable.swift b/YooKassaPaymentsDemoApp/Source/Stylist/UILabel+Stylable.swift index 7549e568..0367461d 100644 --- a/YooKassaPaymentsDemoApp/Source/Stylist/UILabel+Stylable.swift +++ b/YooKassaPaymentsDemoApp/Source/Stylist/UILabel+Stylable.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIBarButtonItem+Style.swift b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIBarButtonItem+Style.swift index 7b8c90e7..63a833d8 100644 --- a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIBarButtonItem+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIBarButtonItem+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIButton+Style.swift b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIButton+Style.swift index e5306559..17296ee6 100644 --- a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIButton+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIButton+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIColor+Style.swift b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIColor+Style.swift index 323560a9..dd795c39 100644 --- a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIColor+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIColor+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIFont+Style.swift b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIFont+Style.swift index aa73a13e..82905a5f 100644 --- a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIFont+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIFont+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UILabel+Style.swift b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UILabel+Style.swift index 6283667a..a5a5f29b 100644 --- a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UILabel+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UILabel+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UINavigationBar+Style.swift b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UINavigationBar+Style.swift index a358e252..d49333c1 100644 --- a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UINavigationBar+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UINavigationBar+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UINavigationItem+Style.swift b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UINavigationItem+Style.swift index 8c15003b..da3045a4 100644 --- a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UINavigationItem+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UINavigationItem+Style.swift @@ -1,4 +1,4 @@ -// MARK: - Styles +import UIKit extension UINavigationItem { diff --git a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIScrollView+Style.swift b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIScrollView+Style.swift index 61512603..97664b1d 100644 --- a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIScrollView+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIScrollView+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIView+Style.swift b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIView+Style.swift index 30bbd47c..7718016f 100644 --- a/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIView+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/UIKit+Styles/UIView+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/UserStories/Root/RootViewController.swift b/YooKassaPaymentsDemoApp/Source/UserStories/Root/RootViewController.swift index 10a18c7b..f8052714 100644 --- a/YooKassaPaymentsDemoApp/Source/UserStories/Root/RootViewController.swift +++ b/YooKassaPaymentsDemoApp/Source/UserStories/Root/RootViewController.swift @@ -347,10 +347,6 @@ final class RootViewController: UIViewController { oauthToken = "live_MTkzODU2VY5GiyQq2GMPsCQ0PW7f_RSLtJYOT-mp_CA" } - let cardScanning = settings.isBankCardScanEnabled - ? self - : nil - let inputData: TokenizationFlow = .tokenization(TokenizationModuleInputData( clientApplicationKey: oauthToken, shopName: translate(Localized.name), @@ -358,7 +354,7 @@ final class RootViewController: UIViewController { amount: amount, tokenizationSettings: makeTokenizationSettings(), testModeSettings: testSettings, - cardScanning: cardScanning, + cardScanning: nil, applePayMerchantIdentifier: "merchant.ru.yoo.sdk.kassa.payments", isLoggingEnabled: true, userPhoneNumber: "7", diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+BottomHintMode.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+BottomHintMode.swift index 30b5721e..c49e6546 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+BottomHintMode.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+BottomHintMode.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+ClearMode.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+ClearMode.swift index c523f683..fc098d1c 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+ClearMode.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+ClearMode.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+InputView.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+InputView.swift index b8cd285d..a9736536 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+InputView.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+InputView.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+Layout.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+Layout.swift index d81371d2..6271215f 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+Layout.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+Layout.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LayoutController.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LayoutController.swift index 738a1b27..485495e6 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LayoutController.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LayoutController.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LeftIconMode.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LeftIconMode.swift index 7b151a74..b34eadcb 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LeftIconMode.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LeftIconMode.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LineMode.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LineMode.swift index 899065bf..17efb91e 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LineMode.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LineMode.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LineView.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LineView.swift index 4e99fd97..c7138319 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LineView.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+LineView.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+PlaceholderMode.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+PlaceholderMode.swift index abff62c6..14332bba 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+PlaceholderMode.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+PlaceholderMode.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+RightButtonMode.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+RightButtonMode.swift index 2c7969c2..e1e44fed 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+RightButtonMode.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+RightButtonMode.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+State.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+State.swift index 752dfdb2..814f1a92 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+State.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+State.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+Style.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+Style.swift index 84be61e9..61518545 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+Style.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+Style.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+TopHintMode.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+TopHintMode.swift index 4251596a..49d474ed 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+TopHintMode.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl+TopHintMode.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl.swift b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl.swift index ab899d73..304863ab 100644 --- a/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl.swift +++ b/YooKassaPaymentsDemoApp/Source/Views/TextControl/TextControl.swift @@ -1,6 +1,6 @@ /* The MIT License * - * Copyright © 2020 NBCO YooMoney LLC + * Copyright © 2022 NBCO YooMoney LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal