From b918a06f993b9f95f745f785ad5516750f8f7c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=9D=2E=20=D0=9D=D0=B8?= =?UTF-8?q?=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5=D0=B2?= Date: Thu, 10 Dec 2020 19:17:23 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B1=D1=80=D0=B5=D0=BD=D0=B4?= =?UTF-8?q?=D0=B8=D0=BD=D0=B3=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 204 +-- LICENSE | 2 +- README.md | 38 +- src/install.xml | 182 +-- .../payment/yandex_money_b2b_sberbank.php | 8 - .../{yandex_money.php => yoomoney.php} | 579 ++----- .../payment/yoomoney_b2b_sberbank.php | 8 + .../payment/yandex_money_b2b_sberbank.php | 3 - .../{yandex_money.php => yoomoney.php} | 224 +-- .../payment/yoomoney_b2b_sberbank.php | 3 + .../payment/yandex_money_b2b_sberbank.php | 3 - .../{yandex_money.php => yoomoney.php} | 243 +-- .../payment/yoomoney_b2b_sberbank.php | 3 + .../yandex_money/YandexMoneyBillingModel.php | 44 - .../yandex_money/YandexMoneyMarketModel.php | 1255 --------------- .../yandex_money/YandexMoneyMetrikaModel.php | 100 -- .../payment/yandex_money/opencart-3.map | 11 - .../{yandex_money.php => yoomoney.php} | 161 +- .../Updater/Archive/BackupZip.php | 10 +- .../Updater/Archive/RestoreZip.php | 14 +- .../Updater/GitHubConnector.php | 0 .../ProjectStructure/AbstractEntry.php | 2 +- .../ProjectStructure/DirectoryEntry.php | 2 +- .../DirectoryEntryInterface.php | 2 +- .../ProjectStructure/EntryInterface.php | 2 +- .../Updater/ProjectStructure/FileEntry.php | 2 +- .../ProjectStructure/FileEntryInterface.php | 2 +- .../ProjectStructureReader.php | 4 +- .../ProjectStructureWriter.php | 2 +- .../ProjectStructure/RootDirectory.php | 4 +- .../YooMoneyKassaModel.php} | 21 +- .../YooMoneyWalletModel.php} | 4 +- .../extension/payment/yoomoney/opencart-3.map | 11 + .../payment/yandex_money/billing.twig | 95 -- .../payment/yandex_money/market.twig | 614 -------- .../payment/yandex_money/metrika.twig | 58 - .../{yandex_money.twig => yoomoney.twig} | 44 +- .../{yandex_money => yoomoney}/capture.twig | 0 .../invoice_list.twig | 4 +- .../invoice_message.twig | 20 +- .../{yandex_money => yoomoney}/kassa.twig | 119 +- .../kassa_payments_list.twig | 0 .../{yandex_money => yoomoney}/logs.twig | 4 +- .../{yandex_money => yoomoney}/refund.twig | 4 +- .../{yandex_money => yoomoney}/updater.twig | 0 .../{yandex_money => yoomoney}/wallet.twig | 20 +- .../extension/payment/yandex_money.php | 1163 -------------- .../controller/extension/payment/yoomoney.php | 567 +++++++ ...sberbank.php => yoomoney_b2b_sberbank.php} | 46 +- .../{yandex_money.php => yoomoney.php} | 8 +- .../{yandex_money.php => yoomoney.php} | 8 +- .../yandex_money/Model/BillingModel.php | 70 - .../yandex_money/Model/MarketModel.php | 117 -- .../YandexMarket/ArbitraryYmlBuilder.php | 17 - .../YandexMarket/CategoryTreeBuilder.php | 89 -- .../yandex_money/YandexMarket/Currency.php | 74 - .../YandexMarket/DeliveryOption.php | 110 -- .../YandexMarket/MarketObject.php | 66 - .../yandex_money/YandexMarket/Offer.php | 1244 --------------- .../YandexMarket/ParameterList.php | 64 - .../YandexMarket/ProductCategory.php | 112 -- .../yandex_money/YandexMarket/ShopInfo.php | 436 ------ .../YandexMarket/SimpleYmlBuilder.php | 8 - .../YandexMarket/YandexMarket.php | 104 -- .../yandex_money/YandexMarket/YmlBuilder.php | 302 ---- .../payment/yandex_money/autoload.php | 27 - .../lib/Client/StreamClient.php | 280 ---- .../lib/Client/YandexMoneyApi.php | 39 - .../lib/Common/Exceptions/TechnicalError.php | 16 - .../lib/Common/RequestObjectInterface.php | 9 - .../lib/Model/Order.php | 81 - .../lib/Model/OrderInterface.php | 29 - .../PaymentData/PaymentDataAndroidPay.php | 77 - .../lib/Model/PaymentError.php | 97 -- .../lib/Model/PaymentErrorCode.php | 26 - .../lib/Model/PaymentErrorInterface.php | 24 - .../PaymentMethod/PaymentMethodAndroidPay.php | 42 - .../lib/Model/RefundError.php | 62 - .../lib/Model/RefundErrorInterface.php | 24 - .../lib/Model/Status.php | 48 - .../lib/Request/PaymentOptionsRequest.php | 281 ---- .../Request/PaymentOptionsRequestBuilder.php | 126 -- .../PaymentOptionsRequestInterface.php | 101 -- .../PaymentOptionsRequestSerializer.php | 50 - .../lib/Request/PaymentOptionsResponse.php | 68 - .../Request/PaymentOptionsResponseItem.php | 142 -- .../lib/Request/StateUnknownResponse.php | 71 - .../lib/configuration.json | 3 - .../vendor/psr/log/.gitignore | 1 - .../{yandex_money.php => yoomoney.php} | 93 +- .../Model/AbstractPaymentModel.php | 7 +- .../Model/CBRAgent.php | 6 +- .../Model/KassaModel.php | 35 +- .../Model/KassaSecondReceiptModel.php | 32 +- .../Model/WalletModel.php | 10 +- .../extension/payment/yoomoney/autoload.php | 25 + .../extension/payment/yoomoney/composer.json | 5 + .../payment/yoomoney/vendor/autoload.php | 7 + .../yoomoney/vendor/composer/ClassLoader.php | 445 ++++++ .../payment/yoomoney/vendor/composer/LICENSE | 21 + .../vendor/composer/autoload_classmap.php | 9 + .../vendor/composer/autoload_namespaces.php | 9 + .../vendor/composer/autoload_psr4.php | 11 + .../vendor/composer/autoload_real.php | 55 + .../vendor/composer/autoload_static.php | 39 + .../yoomoney/vendor/composer/installed.json | 106 ++ .../vendor/psr/log/LICENSE | 0 .../vendor/psr/log/Psr/Log/AbstractLogger.php | 0 .../log/Psr/Log/InvalidArgumentException.php | 0 .../vendor/psr/log/Psr/Log/LogLevel.php | 0 .../psr/log/Psr/Log/LoggerAwareInterface.php | 0 .../psr/log/Psr/Log/LoggerAwareTrait.php | 0 .../psr/log/Psr/Log/LoggerInterface.php | 0 .../vendor/psr/log/Psr/Log/LoggerTrait.php | 0 .../vendor/psr/log/Psr/Log/NullLogger.php | 0 .../vendor/psr/log/Psr/Log/Test/DummyTest.php | 18 + .../log/Psr/Log/Test/LoggerInterfaceTest.php | 0 .../psr/log/Psr/Log/Test/TestLogger.php | 147 ++ .../vendor/psr/log/README.md | 0 .../vendor/psr/log/composer.json | 0 .../yoomoney/yookassa-sdk-php/.gitignore | 7 + .../yoomoney/yookassa-sdk-php/.travis.yml | 36 + .../yoomoney/yookassa-sdk-php/CHANGELOG.md | 11 + .../yoomoney/yookassa-sdk-php/LICENSE.md | 22 + .../yoomoney/yookassa-sdk-php/README.en.md | 63 + .../yoomoney/yookassa-sdk-php/README.md | 63 + .../yoomoney/yookassa-sdk-php/composer.json | 37 + .../yoomoney/yookassa-sdk-php}/lib/Client.php | 168 +- .../lib/Client/ApiClientInterface.php | 6 +- .../lib/Client/BaseClient.php | 38 +- .../lib/Client/CurlClient.php | 20 +- .../lib/Client/UserAgent.php | 10 +- .../lib/Common/AbstractEnum.php | 6 +- .../lib/Common/AbstractObject.php | 17 +- .../lib/Common/AbstractPaymentRequest.php | 22 +- .../Common/AbstractPaymentRequestBuilder.php | 53 +- .../lib/Common/AbstractRequest.php | 6 +- .../lib/Common/AbstractRequestBuilder.php | 10 +- .../Exceptions/ApiConnectionException.php | 4 +- .../lib/Common/Exceptions/ApiException.php | 4 +- .../Common/Exceptions/AuthorizeException.php | 4 +- .../Exceptions/BadApiRequestException.php | 4 +- .../EmptyPropertyValueException.php | 4 +- .../Exceptions/ExtensionNotFoundException.php | 4 +- .../Common/Exceptions/ForbiddenException.php | 4 +- .../Common/Exceptions/InternalServerError.php | 4 +- .../Exceptions/InvalidPropertyException.php | 4 +- .../InvalidPropertyValueException.php | 4 +- .../InvalidPropertyValueTypeException.php | 4 +- .../Exceptions/InvalidRequestException.php | 6 +- .../lib/Common/Exceptions/JsonException.php | 4 +- .../Common/Exceptions/NotFoundException.php | 4 +- .../ResponseProcessingException.php | 4 +- .../Exceptions/TooManyRequestsException.php | 4 +- .../Exceptions/UnauthorizedException.php | 4 +- .../yookassa-sdk-php}/lib/Common/HttpVerb.php | 4 +- .../lib/Common/LoggerWrapper.php | 4 +- .../lib/Common/ResponseObject.php | 4 +- .../lib/Common/legacy_json_serializable.php | 2 +- .../Helpers/Config/ConfigurationLoader.php | 4 +- .../Config/ConfigurationLoaderInterface.php | 4 +- .../yookassa-sdk-php}/lib/Helpers/Random.php | 6 +- .../lib/Helpers/RawHeadersParser.php | 4 +- .../lib/Helpers/StringObject.php | 6 +- .../lib/Helpers/TypeCast.php | 6 +- .../yookassa-sdk-php}/lib/Helpers/UUID.php | 2 +- .../yookassa-sdk-php}/lib/Model/Airline.php | 14 +- .../lib/Model/AirlineInterface.php | 4 +- .../lib/Model/AmountInterface.php | 6 +- .../lib/Model/AuthorizationDetails.php | 10 +- .../Model/AuthorizationDetailsInterface.php | 6 +- .../lib/Model/CancellationDetails.php | 13 +- .../Model/CancellationDetailsInterface.php | 6 +- .../Model/CancellationDetailsPartyCode.php | 12 +- .../Model/CancellationDetailsReasonCode.php | 6 +- .../Confirmation/AbstractConfirmation.php | 16 +- .../ConfirmationCodeVerification.php | 8 +- .../Confirmation/ConfirmationDeepLink.php | 8 +- .../Confirmation/ConfirmationEmbedded.php | 10 +- .../Confirmation/ConfirmationExternal.php | 8 +- .../Confirmation/ConfirmationFactory.php | 8 +- .../lib/Model/Confirmation/ConfirmationQr.php | 10 +- .../Confirmation/ConfirmationRedirect.php | 12 +- .../AbstractConfirmationAttributes.php | 16 +- ...ConfirmationAttributesCodeVerification.php | 8 +- .../ConfirmationAttributesDeepLink.php | 8 +- .../ConfirmationAttributesEmbedded.php | 6 +- .../ConfirmationAttributesExternal.php | 8 +- .../ConfirmationAttributesFactory.php | 8 +- .../ConfirmationAttributesQr.php | 6 +- .../ConfirmationAttributesRedirect.php | 10 +- .../lib/Model/ConfirmationType.php | 6 +- .../lib/Model/CurrencyCode.php | 6 +- .../yookassa-sdk-php}/lib/Model/Leg.php | 13 +- .../lib/Model/LegInterface.php | 4 +- .../yookassa-sdk-php}/lib/Model/Metadata.php | 6 +- .../lib/Model/MonetaryAmount.php | 14 +- .../Notification/AbstractNotification.php | 20 +- .../Notification/NotificationCanceled.php | 18 +- .../Notification/NotificationFactory.php | 8 +- .../NotificationRefundSucceeded.php | 18 +- .../Notification/NotificationSucceeded.php | 20 +- .../NotificationWaitingForCapture.php | 20 +- .../lib/Model/NotificationEventType.php | 6 +- .../lib/Model/NotificationType.php | 6 +- .../yookassa-sdk-php}/lib/Model/Passenger.php | 24 +- .../lib/Model/PassengerInterface.php | 4 +- .../yookassa-sdk-php}/lib/Model/Payment.php | 22 +- .../Model/PaymentData/AbstractPaymentData.php | 16 +- .../PaymentData/B2b/Sberbank/VatData.php | 16 +- .../B2b/Sberbank/VatDataInterface.php | 8 +- .../PaymentData/B2b/Sberbank/VatDataRate.php | 6 +- .../PaymentData/B2b/Sberbank/VatDataType.php | 6 +- .../Model/PaymentData/PaymentDataAlfabank.php | 12 +- .../Model/PaymentData/PaymentDataApplePay.php | 12 +- .../PaymentData/PaymentDataB2bSberbank.php | 16 +- .../Model/PaymentData/PaymentDataBankCard.php | 8 +- .../PaymentData/PaymentDataBankCardCard.php | 14 +- .../lib/Model/PaymentData/PaymentDataCash.php | 12 +- .../Model/PaymentData/PaymentDataFactory.php | 8 +- .../PaymentData/PaymentDataGooglePay.php | 12 +- .../PaymentData/PaymentDataInstallments.php | 6 +- .../PaymentData/PaymentDataMobileBalance.php | 14 +- .../lib/Model/PaymentData/PaymentDataQiwi.php | 14 +- .../Model/PaymentData/PaymentDataSberbank.php | 14 +- .../PaymentData/PaymentDataTinkoffBank.php | 6 +- .../Model/PaymentData/PaymentDataWebmoney.php | 6 +- .../Model/PaymentData/PaymentDataWechat.php | 6 +- .../PaymentData/PaymentDataYooMoney.php} | 12 +- .../lib/Model/PaymentInterface.php | 8 +- .../PaymentMethod/AbstractPaymentMethod.php | 16 +- .../B2b/Sberbank/PayerBankDetails.php | 6 +- .../Sberbank/PayerBankDetailsInterface.php | 6 +- .../Model/PaymentMethod/BankCardSource.php | 4 +- .../PaymentMethod/PaymentMethodAlfaBank.php | 10 +- .../PaymentMethod/PaymentMethodApplePay.php | 6 +- .../PaymentMethodB2bSberbank.php | 12 +- .../PaymentMethod/PaymentMethodBankCard.php | 14 +- .../PaymentMethod/PaymentMethodCardType.php | 22 +- .../Model/PaymentMethod/PaymentMethodCash.php | 6 +- .../PaymentMethod/PaymentMethodFactory.php | 8 +- .../PaymentMethod/PaymentMethodGooglePay.php | 6 +- .../PaymentMethodInstallments.php | 6 +- .../PaymentMethodMobileBalance.php | 14 +- .../Model/PaymentMethod/PaymentMethodPsb.php | 6 +- .../Model/PaymentMethod/PaymentMethodQiwi.php | 6 +- .../PaymentMethod/PaymentMethodSberbank.php | 14 +- .../PaymentMethodTinkoffBank.php | 6 +- .../PaymentMethod/PaymentMethodWebmoney.php | 6 +- .../PaymentMethod/PaymentMethodWechat.php | 6 +- .../PaymentMethod/PaymentMethodYooMoney.php} | 38 +- .../lib/Model/PaymentMethodType.php | 16 +- .../lib/Model/PaymentStatus.php | 6 +- .../yookassa-sdk-php}/lib/Model/Receipt.php | 132 +- .../lib/Model/Receipt/AgentType.php | 4 +- .../lib/Model/Receipt/PaymentMode.php | 6 +- .../lib/Model/Receipt/PaymentSubject.php | 6 +- .../lib/Model/Receipt/ReceiptItemAmount.php | 20 +- .../lib/Model/Receipt/SettlementType.php | 6 +- .../lib/Model/ReceiptCustomer.php | 33 +- .../lib/Model/ReceiptCustomerInterface.php | 6 +- .../lib/Model/ReceiptInterface.php | 22 +- .../lib/Model/ReceiptItem.php | 22 +- .../lib/Model/ReceiptItemInterface.php | 6 +- .../lib/Model/ReceiptRegistrationStatus.php | 6 +- .../lib/Model/ReceiptType.php | 6 +- .../yookassa-sdk-php}/lib/Model/Recipient.php | 12 +- .../lib/Model/RecipientInterface.php | 4 +- .../yookassa-sdk-php}/lib/Model/Refund.php | 50 +- .../lib/Model/RefundInterface.php | 19 +- .../lib/Model/RefundStatus.php | 6 +- .../yookassa-sdk-php}/lib/Model/Requestor.php | 10 +- .../lib/Model/RequestorInterface.php | 2 +- .../lib/Model/Settlement.php | 18 +- .../lib/Model/SettlementInterface.php | 6 +- .../yookassa-sdk-php}/lib/Model/Source.php | 57 +- .../lib/Model/SourceInterface.php | 27 +- .../yookassa-sdk-php}/lib/Model/Supplier.php | 14 +- .../lib/Model/SupplierInterface.php | 6 +- .../yookassa-sdk-php}/lib/Model/Transfer.php | 61 +- .../lib/Model/TransferInterface.php | 28 +- .../lib/Model/TransferStatus.php | 6 +- .../lib/Model/Webhook/Webhook.php | 12 +- .../Payments/AbstractPaymentResponse.php | 56 +- .../Request/Payments/CreatePaymentRequest.php | 42 +- .../Payments/CreatePaymentRequestBuilder.php | 38 +- .../CreatePaymentRequestInterface.php | 30 +- .../CreatePaymentRequestSerializer.php | 48 +- .../Payments/CreatePaymentResponse.php | 6 +- .../Payments/Payment/CancelResponse.php | 8 +- .../Payments/Payment/CreateCaptureRequest.php | 16 +- .../Payment/CreateCaptureRequestBuilder.php | 10 +- .../Payment/CreateCaptureRequestInterface.php | 14 +- .../CreateCaptureRequestSerializer.php | 12 +- .../Payment/CreateCaptureResponse.php | 8 +- .../lib/Request/Payments/PaymentResponse.php | 6 +- .../lib/Request/Payments/PaymentsRequest.php | 73 +- .../Payments/PaymentsRequestBuilder.php | 37 +- .../Payments/PaymentsRequestInterface.php | 60 +- .../Payments/PaymentsRequestSerializer.php | 6 +- .../lib/Request/Payments/PaymentsResponse.php | 49 +- .../Receipts/AbstractReceiptResponse.php | 52 +- .../Receipts/CreatePostReceiptRequest.php | 34 +- .../CreatePostReceiptRequestBuilder.php | 24 +- .../CreatePostReceiptRequestInterface.php | 16 +- .../CreatePostReceiptRequestSerializer.php | 13 +- .../Receipts/PaymentReceiptResponse.php | 20 +- .../Receipts/ReceiptResponseFactory.php | 8 +- .../Receipts/ReceiptResponseInterface.php | 22 +- .../Request/Receipts/ReceiptResponseItem.php | 26 +- .../Receipts/ReceiptResponseItemInterface.php | 10 +- .../lib/Request/Receipts/ReceiptsRequest.php | 16 +- .../Receipts/ReceiptsRequestBuilder.php | 20 +- .../Receipts/ReceiptsRequestInterface.php | 6 +- .../Receipts/ReceiptsRequestSerializer.php | 6 +- .../lib/Request/Receipts/ReceiptsResponse.php | 6 +- .../Receipts/RefundReceiptResponse.php | 20 +- .../Receipts/SimpleReceiptResponse.php | 6 +- .../Refunds/AbstractRefundResponse.php | 17 +- .../Request/Refunds/CreateRefundRequest.php | 54 +- .../Refunds/CreateRefundRequestBuilder.php | 39 +- .../Refunds/CreateRefundRequestInterface.php | 27 +- .../Refunds/CreateRefundRequestSerializer.php | 13 +- .../Request/Refunds/CreateRefundResponse.php | 6 +- .../lib/Request/Refunds/RefundResponse.php | 6 +- .../lib/Request/Refunds/RefundsRequest.php | 241 +-- .../Request/Refunds/RefundsRequestBuilder.php | 143 +- .../Refunds/RefundsRequestInterface.php | 42 +- .../Refunds/RefundsRequestSerializer.php | 6 +- .../lib/Request/Refunds/RefundsResponse.php | 25 +- .../Request/Webhook/WebhookListResponse.php | 6 +- .../yookassa-sdk-php}/lib/autoload.php | 18 +- .../yookassa-sdk-php/lib/configuration.json | 3 + .../yookassa-sdk-php/phpunit.xml.dist | 28 + .../yookassa-sdk-php/tests/AutoloadTest.php | 65 + .../tests/Client/ClientTest.php | 1360 +++++++++++++++++ .../tests/Client/CurlClientTest.php | 91 ++ .../tests/Client/UserAgentTest.php | 122 ++ .../fixtures/cancelPaymentFixtures.json | 35 + .../fixtures/capturePaymentFixtures.json | 39 + .../createPaymentErrorsGeneralFixtures.json | 34 + .../fixtures/createPaymentFixtures.json | 39 + .../fixtures/createReceiptFixtures.json | 49 + .../Client/fixtures/createRefundFixtures.json | 17 + .../Client/fixtures/getPaymentsFixtures.json | 52 + .../Client/fixtures/paymentInfoFixtures.json | 36 + .../fixtures/paymentOptionsFixtures.json | 19 + .../Client/fixtures/refundInfoFixtures.json | 17 + .../Client/fixtures/refundsInfoFixtures.json | 27 + .../tests/Common/AbstractEnumTest.php | 67 + .../tests/Common/AbstractObjectTest.php | 236 +++ .../Common/AbstractRequestBuilderTest.php | 139 ++ .../AbstractApiRequestExceptionTest.php | 178 +++ .../Common/Exceptions/ApiExceptionTest.php | 74 + .../Exceptions/AuthorizeExceptionTest.php | 13 + .../Exceptions/BadApiRequestExceptionTest.php | 18 + .../EmptyPropertyValueExceptionTest.php | 18 + .../ExtensionNotFoundExceptionTest.php | 41 + .../Exceptions/ForbiddenExceptionTest.php | 18 + .../Exceptions/InternalServerErrorTest.php | 18 + .../InvalidPropertyExceptionTest.php | 39 + .../InvalidPropertyValueExceptionTest.php | 39 + .../InvalidPropertyValueTypeExceptionTest.php | 49 + .../InvalidRequestExceptionTest.php | 39 + .../Common/Exceptions/JsonExceptionTest.php | 36 + .../Exceptions/NotFoundExceptionTest.php | 18 + .../ResponseProcessingExceptionTest.php | 134 ++ .../TooManyRequestsExceptionTest.php | 18 + .../Exceptions/UnauthorizedExceptionTest.php | 18 + .../tests/Common/LegacyJsonInterfaceTest.php | 21 + .../tests/Common/LoggerWrapperTest.php | 125 ++ .../Config/ConfigurationLoaderTest.php | 33 + .../tests/Helpers/Config/test_config.json | 4 + .../tests/Helpers/RandomTest.php | 192 +++ .../tests/Helpers/RawHeadersParserTest.php | 93 ++ .../tests/Helpers/StringObjectTest.php | 27 + .../tests/Helpers/TypeCastTest.php | 151 ++ .../tests/Helpers/UUIDTest.php | 16 + .../tests/Model/AirlineTest.php | 216 +++ .../tests/Model/AuthorizationDetailsTest.php | 152 ++ .../tests/Model/CancellationDetailsTest.php | 148 ++ .../Confirmation/AbstractConfirmationTest.php | 63 + .../ConfirmationCodeVerificationTest.php | 25 + .../Confirmation/ConfirmationDeepLinkTest.php | 25 + .../Confirmation/ConfirmationEmbeddedTest.php | 71 + .../Confirmation/ConfirmationExternalTest.php | 26 + .../Confirmation/ConfirmationFactoryTest.php | 175 +++ .../Model/Confirmation/ConfirmationQrTest.php | 152 ++ .../Confirmation/ConfirmationRedirectTest.php | 288 ++++ .../AbstractConfirmationAttributesTest.php | 122 ++ ...irmationAttributesCodeVerificationTest.php | 25 + .../ConfirmationAttributesDeepLinkTest.php | 25 + .../ConfirmationAttributesEmbeddedTest.php | 29 + .../ConfirmationAttributesExternalTest.php | 25 + .../ConfirmationAttributesFactoryTest.php | 148 ++ .../ConfirmationAttributesQrTest.php | 25 + .../ConfirmationAttributesRedirectTest.php | 209 +++ .../yookassa-sdk-php/tests/Model/LegTest.php | 109 ++ .../tests/Model/MetadataTest.php | 89 ++ .../tests/Model/MonetaryAmountTest.php | 335 ++++ .../Notification/AbstractNotificationTest.php | 146 ++ .../Notification/NotificationCanceledTest.php | 117 ++ .../Notification/NotificationFactoryTest.php | 214 +++ .../NotificationRefundSucceededTest.php | 90 ++ .../NotificationSucceededTest.php | 117 ++ .../NotificationWaitingForCaptureTest.php | 113 ++ .../tests/Model/PassengerTest.php | 134 ++ .../AbstractPaymentDataApplePayTest.php | 115 ++ .../AbstractPaymentDataGooglePayTest.php | 93 ++ .../AbstractPaymentDataPhoneTest.php | 85 ++ .../PaymentData/AbstractPaymentDataTest.php | 59 + .../PaymentData/B2b/Sberbank/VatDataTest.php | 287 ++++ .../PaymentData/PaymentDataAlfabankTest.php | 90 ++ .../PaymentData/PaymentDataApplePayTest.php | 25 + .../PaymentDataB2bSberbankTest.php | 195 +++ .../PaymentDataBankCardCardTest.php | 384 +++++ .../PaymentData/PaymentDataBankCardTest.php | 119 ++ .../Model/PaymentData/PaymentDataCashTest.php | 56 + .../PaymentData/PaymentDataFactoryTest.php | 180 +++ .../PaymentData/PaymentDataGooglePayTest.php | 25 + .../PaymentDataInstallmentsTest.php | 25 + .../PaymentDataMobileBalanceTest.php | 25 + .../Model/PaymentData/PaymentDataQiwiTest.php | 25 + .../PaymentData/PaymentDataSberbankTest.php | 25 + .../PaymentDataTinkoffBankTest.php | 30 + .../PaymentData/PaymentDataWebmoneyTest.php | 25 + .../PaymentData/PaymentDataWechatTest.php | 25 + .../PaymentData/PaymentDataYooMoneyTest.php | 25 + .../AbstractPaymentMethodPhoneTest.php | 85 ++ .../AbstractPaymentMethodTest.php | 276 ++++ .../B2b/Sberbank/PayerBankDetailsTest.php | 157 ++ .../PaymentMethodAlfaBankTest.php | 90 ++ .../PaymentMethodApplePayTest.php | 25 + .../PaymentMethodBankCardTest.php | 565 +++++++ .../PaymentMethod/PaymentMethodCashTest.php | 25 + .../PaymentMethodFactoryTest.php | 255 ++++ .../PaymentMethodGooglePayTest.php | 25 + .../PaymentMethodInstallmentsTest.php | 25 + .../PaymentMethodMobileBalanceTest.php | 25 + .../PaymentMethod/PaymentMethodQiwiTest.php | 25 + .../PaymentMethodSberbankTest.php | 25 + .../PaymentMethodTinkoffBankTest.php | 29 + .../PaymentMethodWebmoneyTest.php | 25 + .../PaymentMethod/PaymentMethodWechatTest.php | 25 + .../PaymentMethodYooMoneyTest.php | 115 ++ .../tests/Model/PaymentTest.php | 996 ++++++++++++ .../tests/Model/ReceiptCustomerTest.php | 509 ++++++ .../tests/Model/ReceiptItemTest.php | 1206 +++++++++++++++ .../tests/Model/ReceiptTest.php | 734 +++++++++ .../tests/Model/RecipientTest.php | 161 ++ .../tests/Model/RefundTest.php | 598 ++++++++ .../tests/Model/SettlementTest.php | 195 +++ .../tests/Model/SourceTest.php | 279 ++++ .../tests/Model/TransferTest.php | 363 +++++ .../tests/Model/Webhook/WebhookTest.php | 71 + .../Payments/AbstractPaymentResponseTest.php | 409 +++++ .../CreatePaymentRequestBuilderTest.php | 1028 +++++++++++++ .../CreatePaymentRequestSerializerTest.php | 357 +++++ .../Payments/CreatePaymentRequestTest.php | 837 ++++++++++ .../Payments/CreatePaymentResponseTest.php | 13 + .../Payments/Payment/CancelResponseTest.php | 14 + .../CreateCaptureRequestBuilderTest.php | 549 +++++++ .../CreateCaptureRequestSerializerTest.php | 138 ++ .../Payment/CreateCaptureRequestTest.php | 94 ++ .../Payment/CreateCaptureResponseTest.php | 14 + .../Request/Payments/PaymentResponseTest.php | 13 + .../Payments/PaymentsRequestBuilderTest.php | 331 ++++ .../PaymentsRequestSerializerTest.php | 110 ++ .../Request/Payments/PaymentsRequestTest.php | 410 +++++ .../Request/Payments/PaymentsResponseTest.php | 204 +++ .../Receipts/AbstractReceiptResponseTest.php | 183 +++ .../CreatePostReceiptRequestBuilderTest.php | 329 ++++ ...CreatePostReceiptRequestSerializerTest.php | 183 +++ .../Receipts/CreatePostReceiptRequestTest.php | 314 ++++ .../Receipts/PaymentReceiptResponseTest.php | 33 + .../Request/Receipts/ReceiptsResponseTest.php | 133 ++ .../Receipts/RefundReceiptResponseTest.php | 32 + .../Refunds/AbstractRefundResponseTest.php | 148 ++ .../CreateRefundRequestBuilderTest.php | 612 ++++++++ .../CreateRefundRequestSerializerTest.php | 137 ++ .../Refunds/CreateRefundRequestTest.php | 270 ++++ .../Refunds/CreateRefundResponseTest.php | 17 + .../Request/Refunds/RefundResponseTest.php | 17 + .../Refunds/RefundsRequestBuilderTest.php | 233 +++ .../Refunds/RefundsRequestSerializerTest.php | 98 ++ .../Request/Refunds/RefundsRequestTest.php | 639 ++++++++ .../Request/Refunds/RefundsResponseTest.php | 120 ++ ...sberbank.php => yoomoney_b2b_sberbank.php} | 14 +- .../payment/yandex_money/billing_form.twig | 57 - .../kassa_form.twig | 59 +- .../kassa_form_b2b.twig | 28 +- .../wallet_form.twig | 2 +- ...status.tpl => yoomoney_failure_status.tpl} | 0 ...status.tpl => yoomoney_success_status.tpl} | 0 .../kassa_form.twig | 59 +- .../yandex_money/yandex_money_logo.png | Bin 3316 -> 0 bytes .../{yandex_money => yoomoney}/alfabank.png | Bin .../{yandex_money => yoomoney}/bank_card.png | Bin .../{yandex_money => yoomoney}/cash.png | Bin .../installments.png | Bin .../payment/{yandex_money => yoomoney}/ma.png | Bin .../{yandex_money => yoomoney}/mobile.png | Bin .../payment/{yandex_money => yoomoney}/pb.png | Bin .../{yandex_money => yoomoney}/qiwi.png | Bin .../payment/{yandex_money => yoomoney}/qp.png | Bin .../{yandex_money => yoomoney}/sberbank.png | Bin .../tinkoff_bank.png | Bin .../{yandex_money => yoomoney}/webmoney.png | Bin .../{yandex_money => yoomoney}/widget.png | Bin .../yoo_money.png} | Bin .../yoomoney_buttons.png} | Bin .../payment/yoomoney/yoomoney_logo.png | Bin 0 -> 4705 bytes ycms2.oc3x.ocmod.zip | Bin 634268 -> 0 bytes yoomoney.oc3x.ocmod.zip | Bin 0 -> 753857 bytes 514 files changed, 28042 insertions(+), 11590 deletions(-) delete mode 100644 src/upload/admin/controller/extension/payment/yandex_money_b2b_sberbank.php rename src/upload/admin/controller/extension/payment/{yandex_money.php => yoomoney.php} (68%) create mode 100644 src/upload/admin/controller/extension/payment/yoomoney_b2b_sberbank.php delete mode 100644 src/upload/admin/language/en-gb/extension/payment/yandex_money_b2b_sberbank.php rename src/upload/admin/language/en-gb/extension/payment/{yandex_money.php => yoomoney.php} (55%) create mode 100644 src/upload/admin/language/en-gb/extension/payment/yoomoney_b2b_sberbank.php delete mode 100644 src/upload/admin/language/ru-ru/extension/payment/yandex_money_b2b_sberbank.php rename src/upload/admin/language/ru-ru/extension/payment/{yandex_money.php => yoomoney.php} (57%) create mode 100644 src/upload/admin/language/ru-ru/extension/payment/yoomoney_b2b_sberbank.php delete mode 100644 src/upload/admin/model/extension/payment/yandex_money/YandexMoneyBillingModel.php delete mode 100644 src/upload/admin/model/extension/payment/yandex_money/YandexMoneyMarketModel.php delete mode 100644 src/upload/admin/model/extension/payment/yandex_money/YandexMoneyMetrikaModel.php delete mode 100644 src/upload/admin/model/extension/payment/yandex_money/opencart-3.map rename src/upload/admin/model/extension/payment/{yandex_money.php => yoomoney.php} (80%) rename src/upload/admin/model/extension/payment/{yandex_money => yoomoney}/Updater/Archive/BackupZip.php (95%) rename src/upload/admin/model/extension/payment/{yandex_money => yoomoney}/Updater/Archive/RestoreZip.php (96%) rename src/upload/admin/model/extension/payment/{yandex_money => yoomoney}/Updater/GitHubConnector.php (100%) rename src/upload/admin/model/extension/payment/{yandex_money => yoomoney}/Updater/ProjectStructure/AbstractEntry.php (98%) rename src/upload/admin/model/extension/payment/{yandex_money => yoomoney}/Updater/ProjectStructure/DirectoryEntry.php (98%) rename src/upload/admin/model/extension/payment/{yandex_money => yoomoney}/Updater/ProjectStructure/DirectoryEntryInterface.php (92%) rename src/upload/admin/model/extension/payment/{yandex_money => yoomoney}/Updater/ProjectStructure/EntryInterface.php (96%) rename src/upload/admin/model/extension/payment/{yandex_money => yoomoney}/Updater/ProjectStructure/FileEntry.php (94%) rename src/upload/admin/model/extension/payment/{yandex_money => yoomoney}/Updater/ProjectStructure/FileEntryInterface.php (85%) rename src/upload/admin/model/extension/payment/{yandex_money => yoomoney}/Updater/ProjectStructure/ProjectStructureReader.php (97%) rename src/upload/admin/model/extension/payment/{yandex_money => yoomoney}/Updater/ProjectStructure/ProjectStructureWriter.php (91%) rename src/upload/admin/model/extension/payment/{yandex_money => yoomoney}/Updater/ProjectStructure/RootDirectory.php (98%) rename src/upload/admin/model/extension/payment/{yandex_money/YandexMoneyKassaModel.php => yoomoney/YooMoneyKassaModel.php} (87%) rename src/upload/admin/model/extension/payment/{yandex_money/YandexMoneyWalletModel.php => yoomoney/YooMoneyWalletModel.php} (87%) create mode 100644 src/upload/admin/model/extension/payment/yoomoney/opencart-3.map delete mode 100644 src/upload/admin/view/template/extension/payment/yandex_money/billing.twig delete mode 100644 src/upload/admin/view/template/extension/payment/yandex_money/market.twig delete mode 100644 src/upload/admin/view/template/extension/payment/yandex_money/metrika.twig rename src/upload/admin/view/template/extension/payment/{yandex_money.twig => yoomoney.twig} (56%) rename src/upload/admin/view/template/extension/payment/{yandex_money => yoomoney}/capture.twig (100%) rename src/upload/admin/view/template/extension/payment/{yandex_money => yoomoney}/invoice_list.twig (99%) rename src/upload/admin/view/template/extension/payment/{yandex_money => yoomoney}/invoice_message.twig (87%) rename src/upload/admin/view/template/extension/payment/{yandex_money => yoomoney}/kassa.twig (85%) rename src/upload/admin/view/template/extension/payment/{yandex_money => yoomoney}/kassa_payments_list.twig (100%) rename src/upload/admin/view/template/extension/payment/{yandex_money => yoomoney}/logs.twig (89%) rename src/upload/admin/view/template/extension/payment/{yandex_money => yoomoney}/refund.twig (96%) rename src/upload/admin/view/template/extension/payment/{yandex_money => yoomoney}/updater.twig (100%) rename src/upload/admin/view/template/extension/payment/{yandex_money => yoomoney}/wallet.twig (79%) delete mode 100644 src/upload/catalog/controller/extension/payment/yandex_money.php create mode 100644 src/upload/catalog/controller/extension/payment/yoomoney.php rename src/upload/catalog/controller/extension/payment/{yandex_money_b2b_sberbank.php => yoomoney_b2b_sberbank.php} (88%) rename src/upload/catalog/language/en-gb/extension/payment/{yandex_money.php => yoomoney.php} (83%) rename src/upload/catalog/language/ru-ru/extension/payment/{yandex_money.php => yoomoney.php} (83%) delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/Model/BillingModel.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/Model/MarketModel.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/YandexMarket/ArbitraryYmlBuilder.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/YandexMarket/CategoryTreeBuilder.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/YandexMarket/Currency.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/YandexMarket/DeliveryOption.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/YandexMarket/MarketObject.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/YandexMarket/Offer.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/YandexMarket/ParameterList.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/YandexMarket/ProductCategory.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/YandexMarket/ShopInfo.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/YandexMarket/SimpleYmlBuilder.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/YandexMarket/YandexMarket.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/YandexMarket/YmlBuilder.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/autoload.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Client/StreamClient.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Client/YandexMoneyApi.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Common/Exceptions/TechnicalError.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Common/RequestObjectInterface.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Model/Order.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Model/OrderInterface.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Model/PaymentData/PaymentDataAndroidPay.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Model/PaymentError.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Model/PaymentErrorCode.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Model/PaymentErrorInterface.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Model/PaymentMethod/PaymentMethodAndroidPay.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Model/RefundError.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Model/RefundErrorInterface.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Model/Status.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Request/PaymentOptionsRequest.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Request/PaymentOptionsRequestBuilder.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Request/PaymentOptionsRequestInterface.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Request/PaymentOptionsRequestSerializer.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Request/PaymentOptionsResponse.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Request/PaymentOptionsResponseItem.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/Request/StateUnknownResponse.php delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/lib/configuration.json delete mode 100644 src/upload/catalog/model/extension/payment/yandex_money/yandex-checkout-sdk-php/vendor/psr/log/.gitignore rename src/upload/catalog/model/extension/payment/{yandex_money.php => yoomoney.php} (89%) rename src/upload/catalog/model/extension/payment/{yandex_money => yoomoney}/Model/AbstractPaymentModel.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money => yoomoney}/Model/CBRAgent.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money => yoomoney}/Model/KassaModel.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money => yoomoney}/Model/KassaSecondReceiptModel.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money => yoomoney}/Model/WalletModel.php (85%) create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/autoload.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/composer.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/autoload.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/ClassLoader.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/LICENSE create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/autoload_classmap.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/autoload_namespaces.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/autoload_psr4.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/autoload_real.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/autoload_static.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/installed.json rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney}/vendor/psr/log/LICENSE (100%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney}/vendor/psr/log/Psr/Log/AbstractLogger.php (100%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney}/vendor/psr/log/Psr/Log/InvalidArgumentException.php (100%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney}/vendor/psr/log/Psr/Log/LogLevel.php (100%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney}/vendor/psr/log/Psr/Log/LoggerAwareInterface.php (100%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney}/vendor/psr/log/Psr/Log/LoggerAwareTrait.php (100%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney}/vendor/psr/log/Psr/Log/LoggerInterface.php (100%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney}/vendor/psr/log/Psr/Log/LoggerTrait.php (100%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney}/vendor/psr/log/Psr/Log/NullLogger.php (100%) create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/psr/log/Psr/Log/Test/DummyTest.php rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney}/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php (100%) create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/psr/log/Psr/Log/Test/TestLogger.php rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney}/vendor/psr/log/README.md (100%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney}/vendor/psr/log/composer.json (100%) create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/.gitignore create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/.travis.yml create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/CHANGELOG.md create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/LICENSE.md create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/README.en.md create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/README.md create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/composer.json rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Client.php (82%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Client/ApiClientInterface.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Client/BaseClient.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Client/CurlClient.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Client/UserAgent.php (97%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/AbstractEnum.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/AbstractObject.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/AbstractPaymentRequest.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/AbstractPaymentRequestBuilder.php (88%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/AbstractRequest.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/AbstractRequestBuilder.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/ApiConnectionException.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/ApiException.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/AuthorizeException.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/BadApiRequestException.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/EmptyPropertyValueException.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/ExtensionNotFoundException.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/ForbiddenException.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/InternalServerError.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/InvalidPropertyException.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/InvalidPropertyValueException.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/InvalidPropertyValueTypeException.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/InvalidRequestException.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/JsonException.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/NotFoundException.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/ResponseProcessingException.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/TooManyRequestsException.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/Exceptions/UnauthorizedException.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/HttpVerb.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/LoggerWrapper.php (98%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/ResponseObject.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Common/legacy_json_serializable.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Helpers/Config/ConfigurationLoader.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Helpers/Config/ConfigurationLoaderInterface.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Helpers/Random.php (98%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Helpers/RawHeadersParser.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Helpers/StringObject.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Helpers/TypeCast.php (97%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Helpers/UUID.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Airline.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/AirlineInterface.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/AmountInterface.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/AuthorizationDetails.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/AuthorizationDetailsInterface.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/CancellationDetails.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/CancellationDetailsInterface.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/CancellationDetailsPartyCode.php (88%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/CancellationDetailsReasonCode.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Confirmation/AbstractConfirmation.php (85%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Confirmation/ConfirmationCodeVerification.php (89%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Confirmation/ConfirmationDeepLink.php (88%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Confirmation/ConfirmationEmbedded.php (89%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Confirmation/ConfirmationExternal.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Confirmation/ConfirmationFactory.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Confirmation/ConfirmationQr.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Confirmation/ConfirmationRedirect.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ConfirmationAttributes/AbstractConfirmationAttributes.php (88%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ConfirmationAttributes/ConfirmationAttributesCodeVerification.php (88%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ConfirmationAttributes/ConfirmationAttributesDeepLink.php (87%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ConfirmationAttributes/ConfirmationAttributesEmbedded.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ConfirmationAttributes/ConfirmationAttributesExternal.php (89%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ConfirmationAttributes/ConfirmationAttributesFactory.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ConfirmationAttributes/ConfirmationAttributesQr.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ConfirmationAttributes/ConfirmationAttributesRedirect.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ConfirmationType.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/CurrencyCode.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Leg.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/LegInterface.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Metadata.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/MonetaryAmount.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Notification/AbstractNotification.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Notification/NotificationCanceled.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Notification/NotificationFactory.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Notification/NotificationRefundSucceeded.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Notification/NotificationSucceeded.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Notification/NotificationWaitingForCapture.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/NotificationEventType.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/NotificationType.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Passenger.php (77%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PassengerInterface.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Payment.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/AbstractPaymentData.php (84%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/B2b/Sberbank/VatData.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/B2b/Sberbank/VatDataInterface.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/B2b/Sberbank/VatDataRate.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/B2b/Sberbank/VatDataType.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataAlfabank.php (88%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataApplePay.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataB2bSberbank.php (89%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataBankCard.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataBankCardCard.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataCash.php (88%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataFactory.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataGooglePay.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataInstallments.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataMobileBalance.php (87%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataQiwi.php (86%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataSberbank.php (88%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataTinkoffBank.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataWebmoney.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentData/PaymentDataWechat.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php/lib/Model/PaymentData/PaymentDataYandexWallet.php => yoomoney/vendor/yoomoney/yookassa-sdk-php/lib/Model/PaymentData/PaymentDataYooMoney.php} (81%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentInterface.php (97%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/AbstractPaymentMethod.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/B2b/Sberbank/PayerBankDetails.php (97%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/B2b/Sberbank/PayerBankDetailsInterface.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/BankCardSource.php (85%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodAlfaBank.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodApplePay.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodB2bSberbank.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodBankCard.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodCardType.php (80%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodCash.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodFactory.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodGooglePay.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodInstallments.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodMobileBalance.php (87%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodPsb.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodQiwi.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodSberbank.php (88%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodTinkoffBank.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodWebmoney.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethod/PaymentMethodWechat.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php/lib/Model/PaymentMethod/PaymentMethodYandexWallet.php => yoomoney/vendor/yoomoney/yookassa-sdk-php/lib/Model/PaymentMethod/PaymentMethodYooMoney.php} (61%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentMethodType.php (89%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/PaymentStatus.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Receipt.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Receipt/AgentType.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Receipt/PaymentMode.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Receipt/PaymentSubject.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Receipt/ReceiptItemAmount.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Receipt/SettlementType.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ReceiptCustomer.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ReceiptCustomerInterface.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ReceiptInterface.php (87%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ReceiptItem.php (98%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ReceiptItemInterface.php (98%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ReceiptRegistrationStatus.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/ReceiptType.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Recipient.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/RecipientInterface.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Refund.php (88%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/RefundInterface.php (89%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/RefundStatus.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Requestor.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/RequestorInterface.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Settlement.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/SettlementInterface.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Source.php (71%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/SourceInterface.php (65%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Supplier.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/SupplierInterface.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Transfer.php (73%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/TransferInterface.php (66%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/TransferStatus.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Model/Webhook/Webhook.php (86%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/AbstractPaymentResponse.php (84%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/CreatePaymentRequest.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/CreatePaymentRequestBuilder.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/CreatePaymentRequestInterface.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/CreatePaymentRequestSerializer.php (89%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/CreatePaymentResponse.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/Payment/CancelResponse.php (86%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/Payment/CreateCaptureRequest.php (86%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/Payment/CreateCaptureRequestBuilder.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/Payment/CreateCaptureRequestInterface.php (88%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/Payment/CreateCaptureRequestSerializer.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/Payment/CreateCaptureResponse.php (86%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/PaymentResponse.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/PaymentsRequest.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/PaymentsRequestBuilder.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/PaymentsRequestInterface.php (80%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/PaymentsRequestSerializer.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Payments/PaymentsResponse.php (86%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/AbstractReceiptResponse.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/CreatePostReceiptRequest.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/CreatePostReceiptRequestBuilder.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/CreatePostReceiptRequestInterface.php (94%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/CreatePostReceiptRequestSerializer.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/PaymentReceiptResponse.php (86%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/ReceiptResponseFactory.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/ReceiptResponseInterface.php (85%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/ReceiptResponseItem.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/ReceiptResponseItemInterface.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/ReceiptsRequest.php (98%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/ReceiptsRequestBuilder.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/ReceiptsRequestInterface.php (98%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/ReceiptsRequestSerializer.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/ReceiptsResponse.php (96%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/RefundReceiptResponse.php (86%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Receipts/SimpleReceiptResponse.php (92%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Refunds/AbstractRefundResponse.php (86%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Refunds/CreateRefundRequest.php (78%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Refunds/CreateRefundRequestBuilder.php (74%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Refunds/CreateRefundRequestInterface.php (74%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Refunds/CreateRefundRequestSerializer.php (93%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Refunds/CreateRefundResponse.php (90%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Refunds/RefundResponse.php (91%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Refunds/RefundsRequest.php (67%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Refunds/RefundsRequestBuilder.php (51%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Refunds/RefundsRequestInterface.php (79%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Refunds/RefundsRequestSerializer.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Refunds/RefundsResponse.php (83%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/Request/Webhook/WebhookListResponse.php (95%) rename src/upload/catalog/model/extension/payment/{yandex_money/yandex-checkout-sdk-php => yoomoney/vendor/yoomoney/yookassa-sdk-php}/lib/autoload.php (74%) create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/lib/configuration.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/phpunit.xml.dist create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/AutoloadTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/ClientTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/CurlClientTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/UserAgentTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/fixtures/cancelPaymentFixtures.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/fixtures/capturePaymentFixtures.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/fixtures/createPaymentErrorsGeneralFixtures.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/fixtures/createPaymentFixtures.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/fixtures/createReceiptFixtures.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/fixtures/createRefundFixtures.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/fixtures/getPaymentsFixtures.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/fixtures/paymentInfoFixtures.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/fixtures/paymentOptionsFixtures.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/fixtures/refundInfoFixtures.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Client/fixtures/refundsInfoFixtures.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/AbstractEnumTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/AbstractObjectTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/AbstractRequestBuilderTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/AbstractApiRequestExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/ApiExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/AuthorizeExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/BadApiRequestExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/EmptyPropertyValueExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/ExtensionNotFoundExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/ForbiddenExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/InternalServerErrorTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/InvalidPropertyExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/InvalidPropertyValueExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/InvalidPropertyValueTypeExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/InvalidRequestExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/JsonExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/NotFoundExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/ResponseProcessingExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/TooManyRequestsExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/Exceptions/UnauthorizedExceptionTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/LegacyJsonInterfaceTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Common/LoggerWrapperTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Helpers/Config/ConfigurationLoaderTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Helpers/Config/test_config.json create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Helpers/RandomTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Helpers/RawHeadersParserTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Helpers/StringObjectTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Helpers/TypeCastTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Helpers/UUIDTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/AirlineTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/AuthorizationDetailsTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/CancellationDetailsTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Confirmation/AbstractConfirmationTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Confirmation/ConfirmationCodeVerificationTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Confirmation/ConfirmationDeepLinkTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Confirmation/ConfirmationEmbeddedTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Confirmation/ConfirmationExternalTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Confirmation/ConfirmationFactoryTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Confirmation/ConfirmationQrTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Confirmation/ConfirmationRedirectTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/ConfirmationAttributes/AbstractConfirmationAttributesTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/ConfirmationAttributes/ConfirmationAttributesCodeVerificationTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/ConfirmationAttributes/ConfirmationAttributesDeepLinkTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/ConfirmationAttributes/ConfirmationAttributesEmbeddedTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/ConfirmationAttributes/ConfirmationAttributesExternalTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/ConfirmationAttributes/ConfirmationAttributesFactoryTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/ConfirmationAttributes/ConfirmationAttributesQrTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/ConfirmationAttributes/ConfirmationAttributesRedirectTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/LegTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/MetadataTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/MonetaryAmountTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Notification/AbstractNotificationTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Notification/NotificationCanceledTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Notification/NotificationFactoryTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Notification/NotificationRefundSucceededTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Notification/NotificationSucceededTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Notification/NotificationWaitingForCaptureTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PassengerTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/AbstractPaymentDataApplePayTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/AbstractPaymentDataGooglePayTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/AbstractPaymentDataPhoneTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/AbstractPaymentDataTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/B2b/Sberbank/VatDataTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataAlfabankTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataApplePayTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataB2bSberbankTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataBankCardCardTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataBankCardTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataCashTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataFactoryTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataGooglePayTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataInstallmentsTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataMobileBalanceTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataQiwiTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataSberbankTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataTinkoffBankTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataWebmoneyTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataWechatTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentData/PaymentDataYooMoneyTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/AbstractPaymentMethodPhoneTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/AbstractPaymentMethodTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/B2b/Sberbank/PayerBankDetailsTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodAlfaBankTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodApplePayTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodBankCardTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodCashTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodFactoryTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodGooglePayTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodInstallmentsTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodMobileBalanceTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodQiwiTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodSberbankTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodTinkoffBankTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodWebmoneyTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodWechatTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentMethod/PaymentMethodYooMoneyTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/PaymentTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/ReceiptCustomerTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/ReceiptItemTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/ReceiptTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/RecipientTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/RefundTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/SettlementTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/SourceTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/TransferTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Model/Webhook/WebhookTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/AbstractPaymentResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/CreatePaymentRequestBuilderTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/CreatePaymentRequestSerializerTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/CreatePaymentRequestTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/CreatePaymentResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/Payment/CancelResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/Payment/CreateCaptureRequestBuilderTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/Payment/CreateCaptureRequestSerializerTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/Payment/CreateCaptureRequestTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/Payment/CreateCaptureResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/PaymentResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/PaymentsRequestBuilderTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/PaymentsRequestSerializerTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/PaymentsRequestTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Payments/PaymentsResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Receipts/AbstractReceiptResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Receipts/CreatePostReceiptRequestBuilderTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Receipts/CreatePostReceiptRequestSerializerTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Receipts/CreatePostReceiptRequestTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Receipts/PaymentReceiptResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Receipts/ReceiptsResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Receipts/RefundReceiptResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Refunds/AbstractRefundResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Refunds/CreateRefundRequestBuilderTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Refunds/CreateRefundRequestSerializerTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Refunds/CreateRefundRequestTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Refunds/CreateRefundResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Refunds/RefundResponseTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Refunds/RefundsRequestBuilderTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Refunds/RefundsRequestSerializerTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Refunds/RefundsRequestTest.php create mode 100644 src/upload/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/tests/Request/Refunds/RefundsResponseTest.php rename src/upload/catalog/model/extension/payment/{yandex_money_b2b_sberbank.php => yoomoney_b2b_sberbank.php} (73%) delete mode 100644 src/upload/catalog/view/theme/default/template/extension/payment/yandex_money/billing_form.twig rename src/upload/catalog/view/theme/default/template/extension/payment/{yandex_money => yoomoney}/kassa_form.twig (79%) rename src/upload/catalog/view/theme/default/template/extension/payment/{yandex_money => yoomoney}/kassa_form_b2b.twig (81%) rename src/upload/catalog/view/theme/default/template/extension/payment/{yandex_money => yoomoney}/wallet_form.twig (98%) rename src/upload/catalog/view/theme/default/template/extension/payment/{yandex_money_failure_status.tpl => yoomoney_failure_status.tpl} (100%) rename src/upload/catalog/view/theme/default/template/extension/payment/{yandex_money_success_status.tpl => yoomoney_success_status.tpl} (100%) rename src/upload/catalog/view/theme/journal3/template/extension/payment/{yandex_money => yoomoney}/kassa_form.twig (80%) delete mode 100644 src/upload/image/catalog/payment/yandex_money/yandex_money_logo.png rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/alfabank.png (100%) rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/bank_card.png (100%) rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/cash.png (100%) rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/installments.png (100%) rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/ma.png (100%) rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/mobile.png (100%) rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/pb.png (100%) rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/qiwi.png (100%) rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/qp.png (100%) rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/sberbank.png (100%) rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/tinkoff_bank.png (100%) rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/webmoney.png (100%) rename src/upload/image/catalog/payment/{yandex_money => yoomoney}/widget.png (100%) rename src/upload/image/catalog/payment/{yandex_money/yandex_money.png => yoomoney/yoo_money.png} (100%) rename src/upload/image/catalog/payment/{yandex_money/yandex_buttons.png => yoomoney/yoomoney_buttons.png} (100%) create mode 100644 src/upload/image/catalog/payment/yoomoney/yoomoney_logo.png delete mode 100644 ycms2.oc3x.ocmod.zip create mode 100644 yoomoney.oc3x.ocmod.zip diff --git a/CHANGELOG.md b/CHANGELOG.md index 66465f0..999736d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,202 +1,4 @@ -### v1.9.4 от 06.11.2020 -* Изменена ссылка для обновления модуля yandex-money -> yoomoney -* Обновлен SDK до версии 1.6.8 +### v2.0.0 от 10.12.2020 +* Ребрендинг модуля -### v1.9.3 от 16.10.2020 -* Удален файл install.php - -### v1.9.2 от 06.10.2020 -* Добавлена ставка НДС 20% для СББОЛ - -### v1.9.1 от 25.09.2020 -* Изменен принцип подключения внутренних шаблонов -* Фикс шаблона номера телефона для второго чека - -### v1.9.0 от 16.09.2020 -* Добавлен файл apple-developer-merchantid-domain-association для виджета - -### v1.8.1 от 25.08.2020 -* Добавлена константа с версией - -### v1.8.0 от 21.08.2020 -* Добавлено холдирование в виджет - -### v1.7.1 от 10.08.2020 -* Исправлена ошибка отправки второго чека -* Исправлена ошибка конвертации валюты - -### v1.7.0 от 06.08.2020 -* Обновлен SDK до версии 1.6.5 - -### v1.6.1 от 31.07.2020 -* Мелкие правки -* Правки по отправке второго чека - -### v1.6.0 от 07.07.2020 -* Обновлен SDK до версии 1.6.4 -* Сохранение настроек метрики и маркета независимо от платежей - -### v1.5.1 от 17.06.2020 -* Управление тегом name в прайсе -* Убираем ошибки для выключенного компонента - -### v1.5.0 от 03.06.2020 -* Обновлен SDK до версии 1.6.1 -* Исправлена сортировка в списке методов -* Добавлена старая цена для комбинаций в прайс-листе -* Выбор опций по URL из маркета на странице товара - -### v1.4.6 от 29.05.2020 -* Разрешен выбор способа оплаты на стороне кассы для тестовых магазинов -* Исправлен метод оплаты в кредит -* Исправлена работа в теме journal3 - -### v1.4.5 от 22.05.2020 -* Добавлены файлы для темы journal3 -* Исправлены ошибки JS - -### v1.4.4 от 08.05.2020 -* Исправлено формирование прайс-листа для маркета - -### v1.4.3 от 30.04.2020 -* Совместимость с PHP 5.4 - -### v1.4.2 от 23.04.2020 -* Исправлено логирование - -### v1.4.1 от 21.04.2020 -* Изменено название платежного метода(виджет) - -### v1.4.0 от 17.04.2020 -* Обновлен SDK до версии 1.5.8 -* Платеж в выбранной валюте -* Исправлено логирование - -### v1.3.3 от 19.03.2020 -* Исправлены ошибки в модификаторах - -### v1.3.2 от 16.03.2020 -* Добавлен платежный виджет в список платежных методов - -### v1.3.1 от 22.10.2019 -* Исправлена ошибка с доп. условиями в маркете - -### v1.3.0 от 10.10.2019 -* Добавлена поддержка отправки второго чека - -### v1.2.11 от 05.09.2019 -* ускорен процесс генерации прайс-листа при большом количестве товаров. -* добавлено кэширование прайса - -### v1.2.10 от 19.08.2019 -* Добавлен текст ошибки в переводах -* Исправлена ссылка на модуль opencart2 -* Деактивация кнопки «Оплатить» после первого нажатия - -### v1.2.9 от 06.08.2019 -* Исправлен баг с выставлением счета. - -### v1.2.8 от 04.04.2019 -* Изменен лейбл для ставки НДС с 18% на 20% - -### v1.2.7 от 29.03.2019 -* Проверка полей заказа email и telephone для чеков -* Установка статуса нового заказа из настроек - -### v1.2.6 от 22.03.2019 -* Изменен способ получения суммы заказа для передачи в кассу. -* Исправлена проверка на тип платежа в зависимости от платформы. - -### v1.2.5 от 25.02.2019 -* Добавлен метод оплаты ТКС. - -### v1.2.4 от 12.02.2019 -* Правка передачи токена метрики - -### v1.2.3 от 31.01.2019 -* Исправление багов. - -### v1.2.2 от 24.12.2018 -* Добавлены поля ФФД 1.05 - -### v1.2.1 от 24.11.2018 -* Добавлен текст с реквизитами платежа для способа оплаты Сбербанк Бизнес Онлайн - -### v1.2.0 от 06.11.2018 -* Добавлен способ оплаты Сбербанк Бизнес Онлайн - -### v1.1.3 от 27.09.2018 -* Добавлено приглашение пройти опрос -* Исправлена ошибка с установкой модуля - -### v1.1.2 от 19.09.2018 -* Добавлена возможность указания атрибутов тега в Дополнительных условиях - -### v1.1.1 от 11.09.2018 -* Добавлена настройка управления отображением инфоблока "Заплатить по частям" - -### v1.1.0 от 06.09.2018 -* Обновлен раздел выгрузки прайс-листа в Яндекс.Маркет - -### v1.0.16 от 24.08.2018 -* Исправлено отображение статуса для отмены. - -### v1.0.15 от 21.08.2018 -* Убрана отправка taxSystemCode -* Добавлена передача налога по умолчанию (для доставки и товаров без указания налога) -* Изменено сопоставление налоговых ставок на сопоставление ставок для чека в налоговую с налоговыми классами товаров - -### v1.0.14 от 20.07.2018 -* Исправлены ошибки возникающие при установке модуля - -### v1.0.13 от 03.07.2018 -* Платежи через кошелек переведены на API форм и кнопок. - -### v1.0.12 от 29.06.2018 -* Обновлен код для передачи ecommerce-данных в Яндекс.Метрику -* Исправлены мелкие ошибки - -### v1.0.11 от 22.06.2018 -* Добавлено холдирование - -### v1.0.10 от 19.06.2018 -* Удален блок Заказы в Маркете - -### v1.0.9 от 15.06.2018 -* Добавлен функционал автообновления. -* Добавлен description. - -### v1.0.8 от 21.05.2018 -* Исправлен баг с оплатой банковскими картами на кошелек Яндекс.Денег - -### v1.0.7 от 28.04.2018 -* Актуализация PHP SDK до версии 1.0.8 -* Добавлен метод "Заплатить по частям" - -### v1.0.6 от 17.04.2018 -* Исправлен баг с получением авторизационного токена для Яндекс.Маркета - -### v1.0.5 от 09.04.2018 -* Актуализация PHP SDK до версии 1.0.6 -* Добавлена поддержка уведомлений succeeded - -### v1.0.4 от 16.03.2018 -* Исправлено сохранение настроек -* Исправлены мелкие ошибки - -### v1.0.3 от 10.01.2018 -* Добавлен интерфейс ручного подтверждения платежей - -### v1.0.2 от 25.12.2017 -* В настройках оплаты с помощью Яндекс.Кассы добавлена проверка валидности указанных shopId и Секретного ключа -* В настройках интеграции с маркетом исправлен js код для сворачивания и разворачивания категорий -* Исправлен установщик, при установке из архива он снова переустанавливает связанные с модулем модификаторы -* Добавлены настройки создания платежа и очистки корзины перед переходом пользователя на страницу оплаты в Яндекс.Кассе -* В футер добавлена ссылка "Работает Яндекс.Касса", а так же добавлены настройки для отображения этой ссылки - -### v1.0.1 от 20.12.2017 -* Добавлена возможность установки состояния платежа и корзины перед редиректом пользователя на сайт платёжной системы - -### v1.0.0 -* Добавлена возможность оплаты с помощью PHP SDK через API Яндекс.Кассы -* Добавлена отправка информации о имени CMS и версии используемого модуля в параметре metadata платежа +### diff --git a/LICENSE b/LICENSE index 7e1177d..4715701 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,3 @@ Лицензионный договор. -Любое использование Вами программы означает полное и безоговорочное принятие Вами условий лицензионного договора, размещенного по адресу https://money.yandex.ru/doc.xml?id=527132 (далее – «Лицензионный договор»). Если Вы не принимаете условия Лицензионного договора в полном объёме, Вы не имеете права использовать программу в каких-либо целях. \ No newline at end of file +Любое использование Вами программы означает полное и безоговорочное принятие Вами условий лицензионного договора, размещенного по адресу https://yoomoney.ru/doc.xml?id=527132 (далее – «Лицензионный договор»). Если Вы не принимаете условия Лицензионного договора в полном объёме, Вы не имеете права использовать программу в каких-либо целях. \ No newline at end of file diff --git a/README.md b/README.md index c3b4b34..7006443 100644 --- a/README.md +++ b/README.md @@ -1,51 +1,35 @@ -# yandex-money-ycms-opencart3 +# yoomoney-cms-opencart3 -### Что такое Y.CMS -Y.CMS — это универсальный модуль для интеграции интернет-магазина с сервисами Яндекса: Кассой, Деньгами, Метрикой и Маркетом. +### Что такое ЮMoney +ЮMoney — это модуль для интеграции интернет-магазина с сервисами ЮKassa и ЮMoney. #### Инструкция по настройке -[Инструкция по настройке](https://kassa.yandex.ru/manuals/y.cms_opencart2.html) +[Инструкция по настройке](https://yookassa.ru/docs/support/payments/onboarding/integration/cms-module/opencart2) ### Требования к CMS * версия 3.0.х; * PHP 5.4 или выше; * cURL. -#### Яндекс.Касса -Через Кассу можно настроить прием платежей на сайте. Способ подходит юрлицам и ИП: для подключения нужен договор, а деньги приходят на расчетный счет компании. +#### ЮKassa +Через ЮKassa можно настроить прием платежей на сайте. Способ подходит юрлицам и ИП: для подключения нужен договор, а деньги приходят на расчетный счет компании. По договору вы можете выбрать любой набор способов приема платежей: банковские карты, электронные кошельки, интернет-банки, наличные, баланс мобильного, кредитование. Комиссия берется с каждого успешного платежа. Есть дополнительные опции: возвраты, холдирование и другие возможности. -[Сайт Кассы](https://kassa.yandex.ru/) +[Сайт ЮKassa](https://yookassa.ru/) -#### Яндекс.Деньги +#### ЮMoney -Через Яндекс.Деньги можно без договора настроить на сайте прием платежей: клиенты смогут платить с карт и из электронных кошельков, деньги будут приходить в кошелек на Яндексе. Комиссия берется с каждого успешного платежа. +Через ЮMoney можно без договора настроить на сайте прием платежей: клиенты смогут платить с карт и из электронных кошельков, деньги будут приходить в кошелек ЮMoney. Комиссия берется с каждого успешного платежа. -[Подробные условия на сайте Яндекс.Денег](https://money.yandex.ru/quickpay/) - -#### Яндекс.Метрика - -Через Метрику можно настроить сбор статистики по сайту: сколько человек заходят, как и куда «ходят» по сайту, в какой момент бросают корзины и сколько человек доходят до конца. - -Метрикой можно пользоваться бесплатно. - -[Сайт Метрики](https://metrika.yandex.ru/) - -#### Яндекс.Маркет - -С помощью модуля можно выгрузить все товары сайта на Яндекс.Маркет: с ценой, описанием, параметрами и фотографиями. - -Перед настройкой нужно зарегистрировать магазин на Яндекс.Маркете. Это бесплатно. - -[Зарегистрировать магазин на Яндекс.Маркете](https://partner.market.yandex.ru/) +[Подробные условия на сайте ЮMoney](https://yoomoney.ru/quickpay/) ### Контакты -Если у вас есть вопросы или идеи для модуля, напишите нам: cms@yamoney.ru +Если у вас есть вопросы или идеи для модуля, напишите нам: cms@yoomoney.ru В письме укажите: * версию платформы, diff --git a/src/install.xml b/src/install.xml index 7151e96..0fbffdb 100644 --- a/src/install.xml +++ b/src/install.xml @@ -1,19 +1,19 @@ - Y.CMS for Opencart 3.x - ycms.2.0 - 1.9.4 - Yandex.Money + YooMoney for Opencart 3.x + YooMoney + 2.0.0 + YooMoney language->load('extension/payment/yandex_money'); + $this->language->load('extension/payment/yoomoney'); $data['heading_title'] = $this->language->get('text_order'); if ($order_info['payment_method'] == $this->language->get('kassa_title') || $order_info['payment_method'] == $this->language->get('p2p_title')) { $this->session->data['order_id'] = $this->request->get['order_id']; - $data['yandex_money'] = $this->load->controller('extension/payment/yandex_money'); + $data['yoomoney'] = $this->load->controller('extension/payment/yoomoney'); }]]> @@ -21,9 +21,9 @@ ]]> - {{ yandex_money }} + {{ yoomoney }} {% endif %} ]]> @@ -43,19 +43,19 @@ $result = array(); $orderIds = array(); foreach ($query->rows as $record) { - if ($record['payment_code'] === 'yandex_money') { + if ($record['payment_code'] === 'yoomoney') { $orderIds[] = $record['order_id']; } $result[$record['order_id']] = $record; } if (!empty($orderIds)) { - $sql = 'SELECT `order_id`, `payment_id`, `status` FROM `' . DB_PREFIX . 'ya_money_payment` WHERE `order_id` IN (' . implode(',', $orderIds) . ')'; + $sql = 'SELECT `order_id`, `payment_id`, `status` FROM `' . DB_PREFIX . 'yoomoney_payment` WHERE `order_id` IN (' . implode(',', $orderIds) . ')'; $recordSet = $this->db->query($sql); foreach ($recordSet->rows as $record) { - $result[$record['order_id']]['yandex_money_payment_id'] = $record['payment_id']; - $result[$record['order_id']]['yandex_money_payment_status'] = $record['status']; + $result[$record['order_id']]['yoomoney_payment_id'] = $record['payment_id']; + $result[$record['order_id']]['yoomoney_payment_status'] = $record['status']; } - $sql = 'SELECT `order_id`, `refund_id`, `status`, `amount` FROM `' . DB_PREFIX . 'ya_money_refunds` WHERE `order_id` IN (' . implode(',', $orderIds) . ') AND `status` <> \'canceled\''; + $sql = 'SELECT `order_id`, `refund_id`, `status`, `amount` FROM `' . DB_PREFIX . 'yoomoney_refunds` WHERE `order_id` IN (' . implode(',', $orderIds) . ') AND `status` <> \'canceled\''; $recordSet = $this->db->query($sql); foreach ($recordSet->rows as $record) { if (!isset($result[$record['order_id']]['refund_amount'])) { @@ -89,18 +89,18 @@ $result['shipping_code'],]]> (isset($result['payment_code']) && $this->config->get('yandex_money_kassa_enabled') && $this->config->get('yandex_money_kassa_invoice') && $result['order_status_id'] == 1) ? $result['payment_code'] : '', - 'payment_status' => (isset($result['yandex_money_payment_status']) ? $result['yandex_money_payment_status'] : ''), - 'email' => (isset($result['email']) && $this->config->get('yandex_money_kassa_enabled')) ? $result['email'] : '', + 'payment_code' => (isset($result['payment_code']) && $this->config->get('yoomoney_kassa_enabled') && $this->config->get('yoomoney_kassa_invoice') && $result['order_status_id'] == 1) ? $result['payment_code'] : '', + 'payment_status' => (isset($result['yoomoney_payment_status']) ? $result['yoomoney_payment_status'] : ''), + 'email' => (isset($result['email']) && $this->config->get('yoomoney_kassa_enabled')) ? $result['email'] : '', 'refund_amount' => (isset($result['refund_amount']) ? $result['refund_amount'] : ''), - 'refund_url' => (isset($result['payment_code']) && $result['payment_code'] == 'yandex_money') ? $this->url->link('extension/payment/yandex_money/refund', 'order_id='.$result['order_id'].'&user_token='.$this->session->data['user_token'], true) : '', - 'capture_url' => (isset($result['payment_code']) && $result['payment_code'] == 'yandex_money') ? $this->url->link('extension/payment/yandex_money/capture', 'order_id='.$result['order_id'].'&user_token='.$this->session->data['user_token'], true) : '', + 'refund_url' => (isset($result['payment_code']) && $result['payment_code'] == 'yoomoney') ? $this->url->link('extension/payment/yoomoney/refund', 'order_id='.$result['order_id'].'&user_token='.$this->session->data['user_token'], true) : '', + 'capture_url' => (isset($result['payment_code']) && $result['payment_code'] == 'yoomoney') ? $this->url->link('extension/payment/yoomoney/capture', 'order_id='.$result['order_id'].'&user_token='.$this->session->data['user_token'], true) : '', ]]> session->data['user_token'];]]> config->get('yandex_money_kassa_enabled')) { + if ($this->config->get('yoomoney_kassa_enabled')) { $data['button_invoice_kassa'] = $this->language->get('button_invoice_kassa'); $data['store_url'] = $this->request->server['HTTPS'] ? HTTPS_CATALOG : HTTP_CATALOG; } @@ -112,7 +112,7 @@ {{ button_edit }}]]> Выставить счёт {% endif %} {% if order.payment_status is defined and order.payment_status == 'succeeded' %} @@ -131,7 +131,7 @@ var text = 'Вы действительно хотите отправить счёт пользователю ' + node.dataset.customer + ' на адрес ' + node.dataset.email + '?'; if (confirm(text)) { jQuery.ajax({ - url: '{{ store_url }}admin/index.php?route=extension/payment/yandex_money/sendmail&user_token={{ user_token }}&order_id=' + node.dataset.order_id, + url: '{{ store_url }}admin/index.php?route=extension/payment/yoomoney/sendmail&user_token={{ user_token }}&order_id=' + node.dataset.order_id, dataType: 'json', crossDomain: true, beforeSend: function() { @@ -196,10 +196,7 @@ url->link('account/newsletter']]> config->get('yandex_money_metrika_active') && $this->config->get('yandex_money_metrika_code') - ? html_entity_decode($this->config->get('yandex_money_metrika_code'), ENT_QUOTES, 'UTF-8') - : ''; - $data['yandex_money_kassa_show_in_footer'] = $this->config->get('yandex_money_kassa_enabled') && $this->config->get('yandex_money_kassa_show_in_footer'); + $data['yoomoney_kassa_show_in_footer'] = $this->config->get('yoomoney_kassa_enabled') && $this->config->get('yoomoney_kassa_show_in_footer'); ]]> @@ -207,8 +204,8 @@ session->data['order_id'])) {]]> load->model('extension/payment/yandex_money'); - $data['script_order'] = $this->model_extension_payment_yandex_money->getMetricsJavaScript($this->session->data['order_id']); + $this->load->model('extension/payment/yoomoney'); + $data['script_order'] = $this->model_extension_payment_yoomoney->getMetricsJavaScript($this->session->data['order_id']); ]]> @@ -224,44 +221,11 @@ - - - - window.dataLayer = window.dataLayer || []; - function sendEcommerceAdd(id, quantity) { - $.ajax({ - url: 'index.php?route=extension/payment/yandex_money/productInfo', - type: 'post', - data: 'id=' + id, - dataType: 'json', - success: function(json) { - json.quantity = quantity; - dataLayer.push({ecommerce: {add: {products: [json]}}}); - } - }); - } - $(window).on("load", function () { - var opencartCartAdd = cart.add; - cart.add = function (product_id, quantity) { - opencartCartAdd(product_id, quantity); - sendEcommerceAdd(product_id, typeof(quantity) !== 'undefined' ? parseInt(quantity) : 1); - }; - - $('#button-cart').on('click', function() { - var ecommerce_product = new Array(); - sendEcommerceAdd($('#product input[name="product_id"]').val(), parseInt($('#product input[name="quantity"]').val())); - }); - }); - - ]]> - {{ powered }}

]]> Работает Яндекс.Касса

+ {% if yoomoney_kassa_show_in_footer is defined and yoomoney_kassa_show_in_footer %} +

Работает ЮKassa

{% endif %} ]]> @@ -280,7 +244,7 @@ ]]> {% endif %} ]]> @@ -291,19 +255,12 @@ config->get('yandex_money_kassa_enabled') - && $this->config->get('yandex_money_kassa_add_installments_block'); + $showInstallmentsBlock = $this->config->get('yoomoney_kassa_enabled') + && $this->config->get('yoomoney_kassa_add_installments_block'); - $data['yamoney_showInstallmentsBlock'] = $showInstallmentsBlock; - $data['yamoney_shop_id'] = $this->config->get('yandex_money_kassa_shop_id'); - $data['yamoney_language_code'] = $this->language->get('code'); - - $data['ymm_option']['color_enabled'] = $this->config->get('yandex_money_market_option_color_enabled'); - $data['ymm_option']['size_enabled'] = $this->config->get('yandex_money_market_option_size_enabled'); - $color_option = $this->config->get('yandex_money_market_option_color_option_id'); - $data['ymm_option']['color'] = !empty($color_option) ? $color_option : '-'; - $size_option = $this->config->get('yandex_money_market_option_size_option_id'); - $data['ymm_option']['size'] = !empty($size_option) ? $size_option : '-'; + $data['yoomoney_showInstallmentsBlock'] = $showInstallmentsBlock; + $data['yoomoney_shop_id'] = $this->config->get('yoomoney_kassa_shop_id'); + $data['yoomoney_language_code'] = $this->language->get('code'); ]]> @@ -314,8 +271,8 @@ if ($this->currency->has('RUB')) { $data['cost'] = sprintf('%.2f', $this->currency->format($cost, 'RUB', '', false)); } else { - $this->load->model('extension/payment/yandex_money'); - $data['cost'] = $this->model_extension_payment_yandex_money->convertFromCbrf(array('total' => $cost), 'RUB'); + $this->load->model('extension/payment/yoomoney'); + $data['cost'] = $this->model_extension_payment_yoomoney->convertFromCbrf(array('total' => $cost), 'RUB'); } ]]> @@ -325,7 +282,7 @@ {% if options %}]]>
  • {% endif %} ]]>     @@ -334,12 +291,12 @@ - {% if yamoney_showInstallmentsBlock %} + {% if yoomoney_showInstallmentsBlock %} if (typeof YandexCheckoutCreditUI !== "undefined") { const yamoneyCheckoutCreditUI = YandexCheckoutCreditUI({ - shopId: '{{ yamoney_shop_id }}', + shopId: '{{ yoomoney_shop_id }}', sum: parseFloat('{{ cost }}'), - language: '{{ yamoney_language_code }}' + language: '{{ yoomoney_language_code }}' }); yamoneyCheckoutCreditUI({ type: 'info', @@ -360,43 +317,6 @@ ]]>     - - ]]> - ]]> - - - {% for option_value in option.product_option_value %}]]> - {% for option_value in option.product_option_value %}]]> - - - - -     @@ -406,13 +326,13 @@
    - +
    - {% for pmValue,pmTitle in paymentModeEnum %} - + {% endfor %} @@ -420,13 +340,13 @@
    - +
    - {% for psValue,psTitle in paymentSubjectEnum %} - + {% endfor %} @@ -441,11 +361,11 @@ model_design_layout->getLayouts(); if(!empty($this->request->get['product_id'])) { - $res = $this->db->query('SELECT * FROM `'.DB_PREFIX.'ya_money_product_properties` WHERE product_id='.$this->request->get['product_id']); + $res = $this->db->query('SELECT * FROM `'.DB_PREFIX.'yoomoney_product_properties` WHERE product_id='.$this->request->get['product_id']); $productProp = $res->row; } - $data['product_ym_payment_mode'] = !empty($productProp['payment_mode']) ? $productProp['payment_mode'] : ''; - $data['product_ym_payment_subject'] = !empty($productProp['payment_subject']) ? $productProp['payment_subject'] : ''; + $data['product_yoomoney_payment_mode'] = !empty($productProp['payment_mode']) ? $productProp['payment_mode'] : ''; + $data['product_yoomoney_payment_subject'] = !empty($productProp['payment_subject']) ? $productProp['payment_subject'] : ''; $data['paymentModeEnum'] = array( 'full_prepayment' => 'Полная предоплата (\'full_prepayment\')', @@ -480,10 +400,10 @@ model_catalog_product->editProduct($this->request->get['product_id'], $this->request->post);]]> model_catalog_product->editProduct($this->request->get['product_id'], $this->request->post); - if(!empty($this->request->post['ym_payment_mode']) && !empty($this->request->post['ym_payment_subject'])) { - $res = $this->db->query('INSERT INTO `'.DB_PREFIX.'ya_money_product_properties` (product_id, payment_mode, payment_subject) - VALUES('.$this->request->get['product_id'].', "'.$this->request->post['ym_payment_mode'].'", "'.$this->request->post['ym_payment_subject'].'") - ON DUPLICATE KEY UPDATE payment_mode="'.$this->request->post['ym_payment_mode'].'", payment_subject="'.$this->request->post['ym_payment_subject'].'"' + if(!empty($this->request->post['yoomoney_payment_mode']) && !empty($this->request->post['yoomoney_payment_subject'])) { + $res = $this->db->query('INSERT INTO `'.DB_PREFIX.'yoomoney_product_properties` (product_id, payment_mode, payment_subject) + VALUES('.$this->request->get['product_id'].', "'.$this->request->post['yoomoney_payment_mode'].'", "'.$this->request->post['yoomoney_payment_subject'].'") + ON DUPLICATE KEY UPDATE payment_mode="'.$this->request->post['yoomoney_payment_mode'].'", payment_subject="'.$this->request->post['yoomoney_payment_subject'].'"' ); } ]]> diff --git a/src/upload/admin/controller/extension/payment/yandex_money_b2b_sberbank.php b/src/upload/admin/controller/extension/payment/yandex_money_b2b_sberbank.php deleted file mode 100644 index 4f45838..0000000 --- a/src/upload/admin/controller/extension/payment/yandex_money_b2b_sberbank.php +++ /dev/null @@ -1,8 +0,0 @@ -getModel()->getWalletModel()->isEnabled()) { $tab = 'tab-wallet'; - } elseif ($this->getModel()->getBillingModel()->isEnabled()) { - $tab = 'tab-billing'; } else { $tab = 'tab-kassa'; } @@ -76,59 +64,11 @@ public function index() $this->saveValidationErrors(); } - $isUpdatedCounterSettings = $this->isUpdatedCounterSettings($this->request->post); - $settings = $this->model_setting_setting->getSetting(self::MODULE_NAME); - $cache = new Cache('file'); - $newSettings = array_merge(array( - 'yandex_money_metrika_o2auth' => isset($settings['yandex_money_metrika_o2auth']) - ? $settings['yandex_money_metrika_o2auth'] - : '', - 'yandex_money_metrika_code' => isset($settings['yandex_money_metrika_code']) - ? $settings['yandex_money_metrika_code'] - : '', - ), $this->request->post); - - $this->model_setting_setting->editSetting(self::MODULE_NAME, $newSettings); - $this->model_setting_setting->editSetting('payment_'.self::MODULE_NAME, $newSettings); - - if ($cache->get("ym_market_xml")) { - $cache->delete("ym_market_xml"); - } - - if (empty($newSettings['yandex_money_metrika_number']) - || empty($newSettings['yandex_money_metrika_idapp']) - || empty($newSettings['yandex_money_metrika_pw']) - || $isUpdatedCounterSettings - ) { - $settings = $this->model_setting_setting->getSetting(self::MODULE_NAME); + $this->model_setting_setting->editSetting(self::MODULE_NAME, $this->request->post); + $this->model_setting_setting->editSetting('payment_'.self::MODULE_NAME, $this->request->post); - $settings['yandex_money_metrika_o2auth'] = ''; - $settings['yandex_money_metrika_code'] = ''; - $this->model_setting_setting->editSetting(self::MODULE_NAME, $settings); - } $settings = $this->model_setting_setting->getSetting(self::MODULE_NAME); - $metrika_number = $settings['yandex_money_metrika_number']; - $metrika_idapp = $settings['yandex_money_metrika_idapp']; - $metrika_pw = $settings['yandex_money_metrika_pw']; - $metrika_o2auth = $settings['yandex_money_metrika_o2auth']; - - if (!empty($metrika_number) && !empty($metrika_idapp) && !empty($metrika_pw) && empty($metrika_o2auth)) { - $this->response->redirect( - 'https://oauth.yandex.ru/authorize?response_type=code&client_id=' - .$metrika_idapp.'&device_id=' - .md5('metrika'.$metrika_idapp) - .'&client_secret='.$metrika_pw - ); - } - $metrika_code = $settings['yandex_money_metrika_code']; - if (!empty($metrika_o2auth) - && (empty($metrika_code) || !mb_strpos($settings['yandex_money_metrika_code'], - $settings['yandex_money_metrika_number'])) - ) { - $this->updateCounterCode(); - } - $this->session->data['success'] = $this->language->get('kassa_text_success'); $this->session->data['last-active-tab'] = $data['lastActiveTab']; @@ -201,11 +141,6 @@ public function index() if (empty($name)) { $data['wallet']->setDisplayName($this->language->get('wallet_default_display_name')); } - $data['billing'] = $this->getModel()->getBillingModel(); - $name = $data['billing']->getDisplayName(); - if (empty($name)) { - $data['billing']->setDisplayName($this->language->get('billing_default_display_name')); - } $url = new Url(HTTP_CATALOG); $data['notificationUrl'] = str_replace( @@ -215,37 +150,23 @@ public function index() ); $data['callbackUrl'] = $url->link('extension/payment/'.self::MODULE_NAME.'/callback', '', true); - if (isset($this->request->post['yandex_money_kassa_sort_order'])) { - $data['yandex_money_kassa_sort_order'] = $this->request->post['yandex_money_kassa_sort_order']; - } elseif ($this->config->get('yandex_money_kassa_sort_order')) { - $data['yandex_money_kassa_sort_order'] = $this->config->get('yandex_money_kassa_sort_order'); + if (isset($this->request->post['yoomoney_kassa_sort_order'])) { + $data['yoomoney_kassa_sort_order'] = $this->request->post['yoomoney_kassa_sort_order']; + } elseif ($this->config->get('yoomoney_kassa_sort_order')) { + $data['yoomoney_kassa_sort_order'] = $this->config->get('yoomoney_kassa_sort_order'); } else { - $data['yandex_money_kassa_sort_order'] = '0'; + $data['yoomoney_kassa_sort_order'] = '0'; } - if (isset($this->request->post['yandex_money_wallet_sort_order'])) { - $data['yandex_money_wallet_sort_order'] = $this->request->post['yandex_money_wallet_sort_order']; - } elseif ($this->config->get('yandex_money_wallet_sort_order')) { - $data['yandex_money_wallet_sort_order'] = $this->config->get('yandex_money_wallet_sort_order'); + if (isset($this->request->post['yoomoney_wallet_sort_order'])) { + $data['yoomoney_wallet_sort_order'] = $this->request->post['yoomoney_wallet_sort_order']; + } elseif ($this->config->get('yoomoney_wallet_sort_order')) { + $data['yoomoney_wallet_sort_order'] = $this->config->get('yoomoney_wallet_sort_order'); } else { - $data['yandex_money_wallet_sort_order'] = '0'; + $data['yoomoney_wallet_sort_order'] = '0'; } - if (isset($this->request->post['yandex_money_billing_sort_order'])) { - $data['yandex_money_billing_sort_order'] = $this->request->post['yandex_money_billing_sort_order']; - } elseif ($this->config->get('yandex_money_billing_sort_order')) { - $data['yandex_money_billing_sort_order'] = $this->config->get('yandex_money_billing_sort_order'); - } else { - $data['yandex_money_billing_sort_order'] = '0'; - } - -// $this->load->model('setting/setting'); -// $this->load->model('catalog/option'); -// $this->load->model('localisation/order_status'); - - $data['metrika_status'] = ''; - $data['market_status'] = ''; - $array_init = array_merge($this->fields_metrika, $this->getModel()->getMarket()->getFields()); + $array_init = array(); if (isset($this->request->get['err'])) { $data['err_token'] = $this->request->get['err']; @@ -265,27 +186,12 @@ public function index() // kassa $arLang = array( - 'metrika_number', - 'metrika_idapp', - 'metrika_pw', - 'metrika_set', - 'metrika_callback', - 'metrika_set_1', - 'metrika_set_2', - 'metrika_set_5', - 'market_lnk_yml', - 'market_sv_all', - 'market_rv_all', - 'market_ch_all', - 'market_unch_all', 'p2p_os', 'tab_row_sign', 'tab_row_cause', 'tab_row_primary', - 'ya_version', + 'yoomoney_version', 'text_license', - 'market', - 'metrika', 'active', 'active_on', 'active_off', @@ -309,50 +215,19 @@ public function index() $data['stock_statuses'] = $this->model_localisation_stock_status->getStockStatuses(); $this->load->model('catalog/category'); $data['categories'] = $this->model_catalog_category->getCategories(0); - $this->document->setTitle($this->language->get('heading_title_ya')); - if (isset($this->request->post['yandex_money_market_category_list']) - && is_array($this->request->post['yandex_money_market_category_list']) - ) { - $categories = $this->request->post['yandex_money_market_category_list']; - } elseif (is_array($this->config->get('yandex_money_market_category_list'))) { - $categories = $this->config->get('yandex_money_market_category_list'); - } else { - $categories = array(); - } - + $this->document->setTitle($this->language->get('heading_title_yoomoney')); $data = array_merge($data, $this->initForm($array_init)); $data = array_merge($data, $this->initErrors()); - $market = $this->getModel()->getMarket(); - $data['market'] = $market; - $data['market_cat_tree'] = $market->treeCat($categories); - $data['market_currency_list'] = $market->htmlCurrencyList($this->model_localisation_currency->getCurrencies()); - - if (empty($data['yandex_money_market_shopname'])) { - $data['yandex_money_market_shopname'] = mb_substr($this->config->get('config_name'), 0, 20); - } - if (empty($data['yandex_money_market_full_shopname'])) { - $data['yandex_money_market_full_shopname'] = $this->config->get('config_name'); - } - if (empty($data['yandex_money_market_name_template'])) { - $data['yandex_money_market_name_template'] = '%model% %manufacturer% %name%'; - } - if (isset($this->session->data['metrika_status']) && !empty($this->session->data['metrika_status'])) { - $data['metrika_status'] = array_merge($data['metrika_status'], $this->session->data['metrika_status']); - } - if (isset($this->session->data['market_status']) && !empty($this->session->data['market_status'])) { - $data['market_status'] = array_merge($data['market_status'], $this->session->data['market_status']); - } - - $data['yandex_money_nps_prev_vote_time'] = $this->config->get('yandex_money_nps_prev_vote_time'); - $data['yandex_money_nps_current_vote_time'] = time(); + $data['yoomoney_nps_prev_vote_time'] = $this->config->get('yoomoney_nps_prev_vote_time'); + $data['yoomoney_nps_current_vote_time'] = time(); $data['callback_off_nps'] = $this->url->link('extension/payment/'.self::MODULE_NAME.'/vote_nps', 'user_token='.$this->session->data['user_token'], true); $data['nps_block_text'] = sprintf($this->language->get('nps_text'), - '', ''); - $isTimeForVote = $data['yandex_money_nps_current_vote_time'] > (int)$data['yandex_money_nps_prev_vote_time'] + '', ''); + $isTimeForVote = $data['yoomoney_nps_current_vote_time'] > (int)$data['yoomoney_nps_prev_vote_time'] + $this->npsRetryAfterDays * 86400; $data['is_needed_show_nps'] = $isTimeForVote && substr($this->getModel()->getKassaModel()->getPassword(), 0, @@ -361,7 +236,7 @@ public function index() $data['load'] = $this->load; $data['data'] = $data; - $this->response->setOutput($this->load->view('extension/payment/yandex_money', $data)); + $this->response->setOutput($this->load->view('extension/payment/yoomoney', $data)); } /** @@ -370,7 +245,7 @@ public function index() public function vote_nps() { $this->load->model('setting/setting'); - $this->model_setting_setting->editSettingValue('yandex_money', 'yandex_money_nps_prev_vote_time', time()); + $this->model_setting_setting->editSettingValue('yoomoney', 'yoomoney_nps_prev_vote_time', time()); } public function logs() @@ -378,7 +253,7 @@ public function logs() $this->load->language('extension/payment/'.self::MODULE_NAME); $this->document->setTitle($this->language->get('kassa_breadcrumbs_heading_title')); - $fileName = DIR_LOGS.'yandex-money.log'; + $fileName = DIR_LOGS.'yoomoney.log'; if (isset($_POST['clear-logs']) && $_POST['clear-logs'] === '1') { if (file_exists($fileName)) { @@ -391,7 +266,7 @@ public function logs() $this->response->addheader('Expires: 0'); $this->response->addheader('Content-Description: File Transfer'); $this->response->addheader('Content-Type: application/octet-stream'); - $this->response->addheader('Content-Disposition: attachment; filename="yandex-money_'.date('Y-m-d_H-i-s').'.log"'); + $this->response->addheader('Content-Disposition: attachment; filename="yoomoney_'.date('Y-m-d_H-i-s').'.log"'); $this->response->addheader('Content-Transfer-Encoding: binary'); $this->response->setOutput(file_get_contents($fileName)); @@ -416,7 +291,7 @@ public function logs() $data['column_left'] = $this->load->controller('common/column_left'); $data['footer'] = $this->load->controller('common/footer'); - $this->response->setOutput($this->load->view('extension/payment/yandex_money/logs', $data)); + $this->response->setOutput($this->load->view('extension/payment/yoomoney/logs', $data)); } public function payments() @@ -425,7 +300,7 @@ public function payments() $this->load->model('setting/setting'); if (!$this->getModel()->getKassaModel()->isEnabled()) { - $url = $this->url->link('extension/payment/yandex_money', 'user_token='.$this->session->data['user_token'], + $url = $this->url->link('extension/payment/yoomoney', 'user_token='.$this->session->data['user_token'], true); $this->response->redirect($url); } @@ -453,7 +328,7 @@ public function payments() if ($this->request->get['update_statuses'] == 2) { foreach ($paymentObjects as $payment) { $this->getModel()->log('info', 'Check payment#'.$payment->getId()); - if ($payment['status'] === \YandexCheckout\Model\PaymentStatus::WAITING_FOR_CAPTURE) { + if ($payment['status'] === \YooKassa\Model\PaymentStatus::WAITING_FOR_CAPTURE) { $this->getModel()->log('info', 'Capture payment#'.$payment->getId()); if ($this->getModel()->capturePayment($payment, false)) { $orderId = $orderIds[$payment->getId()]; @@ -462,7 +337,7 @@ public function payments() $this->getModel()->log('warning', 'Empty order#'.$orderId.' in notification'); continue; } elseif ($orderInfo['order_status_id'] <= 0) { - $link = $this->url->link('extension/payment/yandex_money/repay', + $link = $this->url->link('extension/payment/yoomoney/repay', 'order_id='.$orderId, true); $anchor = 'Оплатить'; $orderInfo['order_status_id'] = 1; @@ -479,7 +354,7 @@ public function payments() } } } - $link = $this->url->link('extension/payment/yandex_money/payments', + $link = $this->url->link('extension/payment/yoomoney/payments', 'user_token='.$this->session->data['user_token'], true); $this->response->redirect($link); } @@ -495,7 +370,7 @@ public function payments() $pagination->page = $page; $pagination->limit = $limit; $pagination->url = $this->url->link( - 'extension/payment/yandex_money/payments', + 'extension/payment/yoomoney/payments', 'user_token='.$this->session->data['user_token'].'&page={page}', true ); @@ -507,16 +382,16 @@ public function payments() 'href' => 'payments', )); $data['update_link'] = $this->url->link( - 'extension/payment/yandex_money/payments', + 'extension/payment/yoomoney/payments', 'user_token='.$this->session->data['user_token'].'&update_statuses=1', true ); $data['capture_link'] = $this->url->link( - 'extension/payment/yandex_money/payments', + 'extension/payment/yoomoney/payments', 'user_token='.$this->session->data['user_token'].'&update_statuses=2', true ); - $this->response->setOutput($this->load->view('extension/payment/yandex_money/kassa_payments_list', $data)); + $this->response->setOutput($this->load->view('extension/payment/yoomoney/kassa_payments_list', $data)); } public function install() @@ -571,33 +446,23 @@ private function getBreadCrumbs($add = null) private function validate(Request $request) { $this->load->model('localisation/currency'); - if (!$this->user->hasPermission('modify', 'extension/payment/yandex_money')) { + if (!$this->user->hasPermission('modify', 'extension/payment/yoomoney')) { $this->error['warning'] = $this->language->get('error_permission'); } $this->validateKassa($request); $this->validateWallet($request); - $this->validateBilling($request); $enabled = false; if ($this->getModel()->getKassaModel()->isEnabled()) { $enabled = true; - $request->post['payment_yandex_money_sort_order'] = $request->post['yandex_money_kassa_sort_order']; + $request->post['payment_yoomoney_sort_order'] = $request->post['yoomoney_kassa_sort_order']; } elseif ($this->getModel()->getWalletModel()->isEnabled()) { $enabled = true; - $request->post['payment_yandex_money_sort_order'] = $request->post['yandex_money_wallet_sort_order']; - } elseif ($this->getModel()->getBillingModel()->isEnabled()) { - $enabled = true; - $request->post['payment_yandex_money_sort_order'] = $request->post['yandex_money_billing_sort_order']; + $request->post['payment_yoomoney_sort_order'] = $request->post['yoomoney_wallet_sort_order']; } - $request->post['payment_yandex_money_status'] = $enabled; - $properties = array_merge($this->getModel()->getMarket()->getFields(), $this->fields_metrika); - foreach ($properties as $property) { - if (empty($request->post[$property])) { - $request->post[$property] = false; - } - } + $request->post['payment_yoomoney_status'] = $enabled; return empty($this->error); } @@ -606,22 +471,22 @@ private function validateKassa(Request $request) { $kassa = $this->getModel()->getKassaModel(); $enabled = false; - if (isset($request->post['yandex_money_kassa_enabled']) && $this->isTrue($request->post['yandex_money_kassa_enabled'])) { + if (isset($request->post['yoomoney_kassa_enabled']) && $this->isTrue($request->post['yoomoney_kassa_enabled'])) { $enabled = true; } $request->post['kassa_enabled'] = $enabled; $kassa->setIsEnabled($enabled); - $value = isset($request->post['yandex_money_kassa_shop_id']) ? trim($request->post['yandex_money_kassa_shop_id']) : ''; + $value = isset($request->post['yoomoney_kassa_shop_id']) ? trim($request->post['yoomoney_kassa_shop_id']) : ''; $kassa->setShopId($value); - $request->post['yandex_money_kassa_shop_id'] = $value; + $request->post['yoomoney_kassa_shop_id'] = $value; if ($enabled && empty($value)) { $this->error['kassa_shop_id'] = $this->language->get('kassa_shop_id_error_required'); } - $value = isset($request->post['yandex_money_kassa_password']) ? trim($request->post['yandex_money_kassa_password']) : ''; + $value = isset($request->post['yoomoney_kassa_password']) ? trim($request->post['yoomoney_kassa_password']) : ''; $kassa->setPassword($value); - $request->post['yandex_money_kassa_password'] = $value; + $request->post['yoomoney_kassa_password'] = $value; if ($enabled && empty($value)) { $this->error['kassa_password'] = $this->language->get('kassa_password_error_required'); } @@ -632,23 +497,20 @@ private function validateKassa(Request $request) } } - $value = isset($request->post['yandex_money_kassa_payment_mode']) ? $request->post['yandex_money_kassa_payment_mode'] : ''; + $value = isset($request->post['yoomoney_kassa_payment_mode']) ? $request->post['yoomoney_kassa_payment_mode'] : ''; $epl = true; if ($value === 'shop') { $epl = false; } $kassa->setEPL($epl); - $value = isset($request->post['yandex_money_kassa_use_yandex_button']) ? $request->post['yandex_money_kassa_use_yandex_button'] : 'off'; - $kassa->setUseYandexButton($this->isTrue($value)); - $request->post['yandex_money_kassa_use_yandex_button'] = $kassa->useYandexButton(); - $value = isset($request->post['yandex_money_kassa_use_installments_button']) ? $request->post['yandex_money_kassa_use_installments_button'] : 'off'; + $value = isset($request->post['yoomoney_kassa_use_installments_button']) ? $request->post['yoomoney_kassa_use_installments_button'] : 'off'; $kassa->setUseInstallmentsButton($this->isTrue($value)); - $request->post['yandex_money_kassa_use_installments_button'] = $kassa->useInstallmentsButton(); + $request->post['yoomoney_kassa_use_installments_button'] = $kassa->useInstallmentsButton(); $selected = false; foreach ($kassa->getPaymentMethods() as $id => $value) { - $property = 'yandex_money_kassa_payment_method_'.$id; + $property = 'yoomoney_kassa_payment_method_'.$id; $value = isset($request->post[$property]) ? $this->isTrue($request->post[$property]) : false; $kassa->setPaymentMethodFlag($id, $value); $request->post[$property] = $value; @@ -660,87 +522,87 @@ private function validateKassa(Request $request) $this->error['kassa_payment_method'] = $this->language->get('kassa_payment_method_error_required'); } - $value = isset($request->post['yandex_money_kassa_display_name']) ? trim($request->post['yandex_money_kassa_display_name']) : ''; + $value = isset($request->post['yoomoney_kassa_display_name']) ? trim($request->post['yoomoney_kassa_display_name']) : ''; if (empty($value)) { $value = $this->language->get('kassa_default_display_name'); } $kassa->setDisplayName($value); - $request->post['yandex_money_kassa_display_name'] = $kassa->getDisplayName(); + $request->post['yoomoney_kassa_display_name'] = $kassa->getDisplayName(); - $value = isset($request->post['yandex_money_kassa_tax_rate_default']) ? $request->post['yandex_money_kassa_tax_rate_default'] : 1; + $value = isset($request->post['yoomoney_kassa_tax_rate_default']) ? $request->post['yoomoney_kassa_tax_rate_default'] : 1; $kassa->setDefaultTaxRate($value); - $request->post['yandex_money_kassa_tax_rate_default'] = $kassa->getDefaultTaxRate(); + $request->post['yoomoney_kassa_tax_rate_default'] = $kassa->getDefaultTaxRate(); - $value = isset($request->post['yandex_money_kassa_tax_rates']) ? $request->post['yandex_money_kassa_tax_rates'] : array(); + $value = isset($request->post['yoomoney_kassa_tax_rates']) ? $request->post['yoomoney_kassa_tax_rates'] : array(); if (is_array($value)) { $kassa->setTaxRates($value); - $request->post['yandex_money_kassa_tax_rates'] = $kassa->getTaxRates(); + $request->post['yoomoney_kassa_tax_rates'] = $kassa->getTaxRates(); } - $value = isset($request->post['yandex_money_kassa_success_order_status']) ? $request->post['yandex_money_kassa_success_order_status'] : array(); + $value = isset($request->post['yoomoney_kassa_success_order_status']) ? $request->post['yoomoney_kassa_success_order_status'] : array(); $kassa->setSuccessOrderStatusId($value); - $request->post['yandex_money_kassa_success_order_status'] = $kassa->getSuccessOrderStatusId(); + $request->post['yoomoney_kassa_success_order_status'] = $kassa->getSuccessOrderStatusId(); - $value = isset($request->post['yandex_money_kassa_minimum_payment_amount']) ? $request->post['yandex_money_kassa_minimum_payment_amount'] : array(); + $value = isset($request->post['yoomoney_kassa_minimum_payment_amount']) ? $request->post['yoomoney_kassa_minimum_payment_amount'] : array(); $kassa->setMinPaymentAmount($value); - $request->post['yandex_money_kassa_minimum_payment_amount'] = $kassa->getMinPaymentAmount(); + $request->post['yoomoney_kassa_minimum_payment_amount'] = $kassa->getMinPaymentAmount(); - $value = isset($request->post['yandex_money_kassa_geo_zone']) ? $request->post['yandex_money_kassa_geo_zone'] : array(); + $value = isset($request->post['yoomoney_kassa_geo_zone']) ? $request->post['yoomoney_kassa_geo_zone'] : array(); $kassa->setGeoZoneId($value); - $request->post['yandex_money_kassa_geo_zone'] = $kassa->getGeoZoneId(); + $request->post['yoomoney_kassa_geo_zone'] = $kassa->getGeoZoneId(); - $value = isset($request->post['yandex_money_kassa_debug_log']) ? $this->isTrue($request->post['yandex_money_kassa_debug_log']) : false; + $value = isset($request->post['yoomoney_kassa_debug_log']) ? $this->isTrue($request->post['yoomoney_kassa_debug_log']) : false; $kassa->setDebugLog($value); - $request->post['yandex_money_kassa_debug_log'] = $kassa->getDebugLog(); + $request->post['yoomoney_kassa_debug_log'] = $kassa->getDebugLog(); - $value = isset($request->post['yandex_money_kassa_invoice']) ? $this->isTrue($request->post['yandex_money_kassa_invoice']) : false; + $value = isset($request->post['yoomoney_kassa_invoice']) ? $this->isTrue($request->post['yoomoney_kassa_invoice']) : false; $kassa->setInvoicesEnabled($value); - $request->post['yandex_money_kassa_invoice'] = $kassa->isInvoicesEnabled(); + $request->post['yoomoney_kassa_invoice'] = $kassa->isInvoicesEnabled(); - $value = isset($request->post['yandex_money_kassa_invoice_subject']) ? trim($request->post['yandex_money_kassa_invoice_subject']) : ''; + $value = isset($request->post['yoomoney_kassa_invoice_subject']) ? trim($request->post['yoomoney_kassa_invoice_subject']) : ''; if (empty($value)) { $value = $this->language->get('kassa_invoice_subject_default'); } $kassa->setInvoiceSubject($value); - $request->post['yandex_money_kassa_invoice_subject'] = $kassa->getInvoiceSubject(); + $request->post['yoomoney_kassa_invoice_subject'] = $kassa->getInvoiceSubject(); - $value = isset($request->post['yandex_money_kassa_invoice_message']) ? trim($request->post['yandex_money_kassa_invoice_message']) : ''; + $value = isset($request->post['yoomoney_kassa_invoice_message']) ? trim($request->post['yoomoney_kassa_invoice_message']) : ''; $kassa->setInvoiceMessage($value); - $request->post['yandex_money_kassa_invoice_message'] = $kassa->getInvoiceMessage(); + $request->post['yoomoney_kassa_invoice_message'] = $kassa->getInvoiceMessage(); - $value = isset($request->post['yandex_money_kassa_invoice_logo']) ? $this->isTrue($request->post['yandex_money_kassa_invoice_logo']) : false; + $value = isset($request->post['yoomoney_kassa_invoice_logo']) ? $this->isTrue($request->post['yoomoney_kassa_invoice_logo']) : false; $kassa->setSendInvoiceLogo($value); - $request->post['yandex_money_kassa_invoice_logo'] = $kassa->getSendInvoiceLogo(); + $request->post['yoomoney_kassa_invoice_logo'] = $kassa->getSendInvoiceLogo(); $value = false; - if (isset($request->post['yandex_money_kassa_create_order_before_redirect']) && $this->isTrue($request->post['yandex_money_kassa_create_order_before_redirect'])) { + if (isset($request->post['yoomoney_kassa_create_order_before_redirect']) && $this->isTrue($request->post['yoomoney_kassa_create_order_before_redirect'])) { $value = true; } - $request->post['yandex_money_kassa_create_order_before_redirect'] = $value; + $request->post['yoomoney_kassa_create_order_before_redirect'] = $value; $kassa->setCreateOrderBeforeRedirect($value); $value = false; - if (isset($request->post['yandex_money_kassa_clear_cart_before_redirect']) && $this->isTrue($request->post['yandex_money_kassa_clear_cart_before_redirect'])) { + if (isset($request->post['yoomoney_kassa_clear_cart_before_redirect']) && $this->isTrue($request->post['yoomoney_kassa_clear_cart_before_redirect'])) { $value = true; } - $request->post['yandex_money_kassa_clear_cart_before_redirect'] = $value; + $request->post['yoomoney_kassa_clear_cart_before_redirect'] = $value; $kassa->setClearCartBeforeRedirect($value); - $value = isset($request->post['yandex_money_kassa_show_in_footer']) ? $request->post['yandex_money_kassa_show_in_footer'] : 'off'; + $value = isset($request->post['yoomoney_kassa_show_in_footer']) ? $request->post['yoomoney_kassa_show_in_footer'] : 'off'; $kassa->setShowLinkInFooter($this->isTrue($value)); - $request->post['yandex_money_kassa_show_in_footer'] = $kassa->getShowLinkInFooter(); + $request->post['yoomoney_kassa_show_in_footer'] = $kassa->getShowLinkInFooter(); - $value = isset($request->post['yandex_money_kassa_b2b_sberbank_enabled']) ? $request->post['yandex_money_kassa_b2b_sberbank_enabled'] : 'off'; + $value = isset($request->post['yoomoney_kassa_b2b_sberbank_enabled']) ? $request->post['yoomoney_kassa_b2b_sberbank_enabled'] : 'off'; $kassa->setB2bSberbankEnabled($this->isTrue($value)); - $value = isset($request->post['yandex_money_kassa_b2b_tax_rate_default']) ? $request->post['yandex_money_kassa_b2b_tax_rate_default'] : VatDataType::UNTAXED; + $value = isset($request->post['yoomoney_kassa_b2b_tax_rate_default']) ? $request->post['yoomoney_kassa_b2b_tax_rate_default'] : VatDataType::UNTAXED; $kassa->setB2bSberbankDefaultTaxRate($value); - $request->post['yandex_money_kassa_tax_rate_default'] = $kassa->getDefaultTaxRate(); + $request->post['yoomoney_kassa_tax_rate_default'] = $kassa->getDefaultTaxRate(); - $value = isset($request->post['yandex_money_kassa_b2b_tax_rates']) ? $request->post['yandex_money_kassa_b2b_tax_rates'] : array(); + $value = isset($request->post['yoomoney_kassa_b2b_tax_rates']) ? $request->post['yoomoney_kassa_b2b_tax_rates'] : array(); if (is_array($value)) { $kassa->setB2bTaxRates($value); - $request->post['yandex_money_kassa_b2b_tax_rates'] = $kassa->getB2bTaxRates(); + $request->post['yoomoney_kassa_b2b_tax_rates'] = $kassa->getB2bTaxRates(); } $this->getModel()->log('debug', print_r($request->post, true)); } @@ -749,104 +611,60 @@ private function validateWallet(Request $request) { $wallet = $this->getModel()->getWalletModel(); $enabled = false; - if (isset($request->post['yandex_money_wallet_enabled']) && $this->isTrue($request->post['yandex_money_wallet_enabled'])) { + if (isset($request->post['yoomoney_wallet_enabled']) && $this->isTrue($request->post['yoomoney_wallet_enabled'])) { $enabled = true; } $request->post['wallet_enabled'] = $enabled; $wallet->setIsEnabled($enabled); - $value = isset($request->post['yandex_money_wallet_account_id']) ? trim($request->post['yandex_money_wallet_account_id']) : ''; + $value = isset($request->post['yoomoney_wallet_account_id']) ? trim($request->post['yoomoney_wallet_account_id']) : ''; $wallet->setAccountId($value); - $request->post['yandex_money_wallet_account_id'] = $value; + $request->post['yoomoney_wallet_account_id'] = $value; if ($enabled && empty($value)) { $this->error['wallet_account_id'] = $this->language->get('wallet_account_id_error_required'); } - $value = isset($request->post['yandex_money_wallet_password']) ? trim($request->post['yandex_money_wallet_password']) : ''; + $value = isset($request->post['yoomoney_wallet_password']) ? trim($request->post['yoomoney_wallet_password']) : ''; $wallet->setPassword($value); - $request->post['yandex_money_wallet_password'] = $value; + $request->post['yoomoney_wallet_password'] = $value; if ($enabled && empty($value)) { $this->error['wallet_password'] = $this->language->get('wallet_password_error_required'); } - $value = isset($request->post['yandex_money_wallet_display_name']) ? trim($request->post['yandex_money_wallet_display_name']) : ''; + $value = isset($request->post['yoomoney_wallet_display_name']) ? trim($request->post['yoomoney_wallet_display_name']) : ''; if (empty($value)) { $value = $this->language->get('wallet_default_display_name'); } $wallet->setDisplayName($value); - $request->post['yandex_money_wallet_display_name'] = $wallet->getDisplayName(); + $request->post['yoomoney_wallet_display_name'] = $wallet->getDisplayName(); - $value = isset($request->post['yandex_money_wallet_success_order_status']) ? $request->post['yandex_money_wallet_success_order_status'] : array(); + $value = isset($request->post['yoomoney_wallet_success_order_status']) ? $request->post['yoomoney_wallet_success_order_status'] : array(); $wallet->setSuccessOrderStatusId($value); - $request->post['yandex_money_wallet_success_order_status'] = $wallet->getSuccessOrderStatusId(); + $request->post['yoomoney_wallet_success_order_status'] = $wallet->getSuccessOrderStatusId(); - $value = isset($request->post['yandex_money_wallet_minimum_payment_amount']) ? $request->post['yandex_money_wallet_minimum_payment_amount'] : array(); + $value = isset($request->post['yoomoney_wallet_minimum_payment_amount']) ? $request->post['yoomoney_wallet_minimum_payment_amount'] : array(); $wallet->setMinPaymentAmount($value); - $request->post['yandex_money_wallet_minimum_payment_amount'] = $wallet->getMinPaymentAmount(); + $request->post['yoomoney_wallet_minimum_payment_amount'] = $wallet->getMinPaymentAmount(); - $value = isset($request->post['yandex_money_wallet_geo_zone']) ? $request->post['yandex_money_wallet_geo_zone'] : array(); + $value = isset($request->post['yoomoney_wallet_geo_zone']) ? $request->post['yoomoney_wallet_geo_zone'] : array(); $wallet->setGeoZoneId($value); - $request->post['yandex_money_wallet_geo_zone'] = $wallet->getGeoZoneId(); + $request->post['yoomoney_wallet_geo_zone'] = $wallet->getGeoZoneId(); $value = false; - if (isset($request->post['yandex_money_wallet_create_order_before_redirect']) && $this->isTrue($request->post['yandex_money_wallet_create_order_before_redirect'])) { + if (isset($request->post['yoomoney_wallet_create_order_before_redirect']) && $this->isTrue($request->post['yoomoney_wallet_create_order_before_redirect'])) { $value = true; } - $request->post['yandex_money_wallet_create_order_before_redirect'] = $value; + $request->post['yoomoney_wallet_create_order_before_redirect'] = $value; $wallet->setCreateOrderBeforeRedirect($value); $value = false; - if (isset($request->post['yandex_money_wallet_clear_cart_before_redirect']) && $this->isTrue($request->post['yandex_money_wallet_clear_cart_before_redirect'])) { + if (isset($request->post['yoomoney_wallet_clear_cart_before_redirect']) && $this->isTrue($request->post['yoomoney_wallet_clear_cart_before_redirect'])) { $value = true; } - $request->post['yandex_money_wallet_clear_cart_before_redirect'] = $value; + $request->post['yoomoney_wallet_clear_cart_before_redirect'] = $value; $wallet->setClearCartBeforeRedirect($value); } - private function validateBilling(Request $request) - { - $billing = $this->getModel()->getBillingModel(); - $enabled = false; - if (isset($request->post['yandex_money_billing_enabled']) && $this->isTrue($request->post['yandex_money_billing_enabled'])) { - $enabled = true; - } - $request->post['billing_enabled'] = $enabled; - $billing->setIsEnabled($enabled); - - $value = isset($request->post['yandex_money_billing_form_id']) ? trim($request->post['yandex_money_billing_form_id']) : ''; - $billing->setFormId($value); - $request->post['yandex_money_billing_form_id'] = $value; - if ($enabled && empty($value)) { - $this->error['billing_form_id'] = $this->language->get('billing_form_id_error_required'); - } - - $value = isset($request->post['yandex_money_billing_purpose']) ? trim($request->post['yandex_money_billing_purpose']) : ''; - if (empty($value)) { - $value = $this->language->get('billing_default_purpose'); - } - $billing->setPurpose($value); - $request->post['yandex_money_billing_purpose'] = $billing->getPurpose(); - - $value = isset($request->post['yandex_money_billing_display_name']) ? trim($request->post['yandex_money_billing_display_name']) : ''; - if (empty($value)) { - $value = $this->language->get('billing_default_display_name'); - } - $billing->setDisplayName($value); - $request->post['yandex_money_billing_display_name'] = $billing->getDisplayName(); - - $value = isset($request->post['yandex_money_billing_success_order_status']) ? $request->post['yandex_money_billing_success_order_status'] : array(); - $billing->setSuccessOrderStatusId($value); - $request->post['yandex_money_billing_success_order_status'] = $billing->getSuccessOrderStatusId(); - - $value = isset($request->post['yandex_money_billing_minimum_payment_amount']) ? $request->post['yandex_money_billing_minimum_payment_amount'] : array(); - $billing->setMinPaymentAmount($value); - $request->post['yandex_money_billing_minimum_payment_amount'] = $billing->getMinPaymentAmount(); - - $value = isset($request->post['yandex_money_billing_geo_zone']) ? $request->post['yandex_money_billing_geo_zone'] : array(); - $billing->setGeoZoneId($value); - $request->post['yandex_money_billing_geo_zone'] = $billing->getGeoZoneId(); - } - private function saveValidationErrors() { $this->session->data['errors_settings'] = array(); @@ -931,118 +749,18 @@ private function initForm($array) } if ($this->config->get('config_secure')) { - $data['ya_kassa_fail'] = HTTPS_CATALOG.'index.php?route=checkout/failure'; - $data['ya_kassa_success'] = HTTPS_CATALOG.'index.php?route=checkout/success'; - $data['ya_p2p_linkapp'] = HTTPS_CATALOG.'index.php?route=extension/payment/yandex_money/inside'; - $data['yandex_money_market_lnk_yml'] = HTTPS_CATALOG.'index.php?route=extension/payment/yandex_money/market'; + $data['yoomoney_kassa_fail'] = HTTPS_CATALOG.'index.php?route=checkout/failure'; + $data['yoomoney_kassa_success'] = HTTPS_CATALOG.'index.php?route=checkout/success'; + $data['yoomoney_p2p_linkapp'] = HTTPS_CATALOG.'index.php?route=extension/payment/yoomoney/inside'; } else { - $data['ya_kassa_fail'] = HTTP_CATALOG.'index.php?route=checkout/failure'; - $data['ya_kassa_success'] = HTTP_CATALOG.'index.php?route=checkout/success'; - $data['ya_p2p_linkapp'] = HTTP_CATALOG.'index.php?route=extension/payment/yandex_money/inside'; - $data['yandex_money_market_lnk_yml'] = HTTP_CATALOG.'index.php?route=extension/payment/yandex_money/market'; + $data['yoomoney_kassa_fail'] = HTTP_CATALOG.'index.php?route=checkout/failure'; + $data['yoomoney_kassa_success'] = HTTP_CATALOG.'index.php?route=checkout/success'; + $data['yoomoney_p2p_linkapp'] = HTTP_CATALOG.'index.php?route=extension/payment/yoomoney/inside'; } - $data['yandex_money_metrika_callback'] = $this->url->link('extension/payment/yandex_money/checkOAuth', - 'user_token='.$this->session->data['user_token'], true); - $data['yandex_money_metrika_o2auth'] = $this->config->get('yandex_money_metrika_o2auth'); - $data['token_url'] = 'https://oauth.yandex.ru/token?'; - return $data; } - public function checkOAuth() - { - $accessToken = $this->goCurl( - 'grant_type=authorization_code&code='.$this->request->get['code'] - .'&client_id='.$this->config->get('yandex_money_metrika_idapp') - .'&client_secret='.$this->config->get('yandex_money_metrika_pw') - ); - - $this->saveAccessToken($accessToken); - - $this->updateCounterCode(); - } - - /** - * @param array $post - * - * @return bool - */ - private function isUpdatedCounterSettings($post) - { - $settings = $this->model_setting_setting->getSetting(self::MODULE_NAME); - $counterParams = array( - 'yandex_money_metrika_number', - 'yandex_money_metrika_idapp', - 'yandex_money_metrika_pw', - 'yandex_money_metrika_clickmap', - 'yandex_money_metrika_webvizor', - 'yandex_money_metrika_hash', - ); - foreach ($counterParams as $param) { - if (!isset($settings[$param])) { - continue; - } - if (isset($post[$param]) && $post[$param] != $settings[$param]) { - return true; - } - } - - return false; - } - - /** - * @param string $accessToken - */ - private function saveAccessToken($accessToken) - { - $this->load->model('setting/setting'); - $settings = $this->model_setting_setting->getSetting(self::MODULE_NAME); - - $settings['yandex_money_metrika_o2auth'] = $accessToken; - $this->model_setting_setting->editSetting(self::MODULE_NAME, $settings); - } - - /** - * @return void - */ - private function updateCounterCode() - { - $this->load->model('setting/setting'); - $settings = $this->model_setting_setting->getSetting(self::MODULE_NAME); - - $accessToken = $settings['yandex_money_metrika_o2auth']; - $counterNumber = $settings['yandex_money_metrika_number']; - - $response = $this->getModel()->getMetrikaModel()->saveCounterOptions($counterNumber, $accessToken, array( - 'clickmap' => $settings['yandex_money_metrika_clickmap'], - 'visor' => $settings['yandex_money_metrika_webvizor'], - 'track_hash' => $settings['yandex_money_metrika_hash'], - )); - $this->getModel()->log('error', 'json_encode($response): '.json_encode($response)); - if (empty($response['counter'])) { - $this->getModel()->log('error', 'Failed to save counter settings: '.json_encode($response)); - $this->response->redirect($this->url->link('extension/payment/yandex_money', - 'err='.json_encode($response).'&user_token='.$this->session->data['user_token'], true)); - } - - $counter = $this->getModel()->getMetrikaModel()->getCounterCode($counterNumber, $accessToken); - - if (empty($counter['counter']) || empty($counter['counter']['code'])) { - $this->getModel()->log('error', 'Failed to get counter code: '.json_encode($response)); - $this->response->redirect($this->url->link('extension/payment/yandex_money', - 'err='.json_encode($counter).'&user_token='.$this->session->data['user_token'], true)); - } - - $settings['yandex_money_metrika_code'] = $counter['counter']['code']; - $this->model_setting_setting->editSetting(self::MODULE_NAME, $settings); - - $this->response->redirect($this->url->link('extension/payment/yandex_money', - 'user_token='.$this->session->data['user_token'], true - )); - - } - /** * @param string $post * @@ -1066,7 +784,7 @@ public function goCurl($post) $data = json_decode($result); if ($status !== 200 && empty($data->access_token)) { $this->getModel()->log('error', 'Failed to get OAuth token:'.$data->error_description); - $this->response->redirect($this->url->link('extension/payment/yandex_money', + $this->response->redirect($this->url->link('extension/payment/yoomoney', 'err='.$data->error_description.'&user_token='.$this->session->data['user_token'], true)); } @@ -1075,45 +793,18 @@ public function goCurl($post) private function initErrors() { - $data = array(); - $data['market_status'] = array(); - - if ($this->config->get('yandex_money_market_active') == 1) { - foreach ($this->getModel()->getMarket()->checkConfig() as $errorMessage) { - $data['market_status'][] = $this->errors_alert($this->language->get($errorMessage)); - } - } - - if ($this->config->get('yandex_money_metrika_active') == 1) { - if ($this->config->get('yandex_money_metrika_number') == '') { - $data['metrika_status'][] = $this->errors_alert('Не заполнен номер счётчика'); - } - if ($this->config->get('yandex_money_metrika_idapp') == '') { - $data['metrika_status'][] = $this->errors_alert('ID Приложения не заполнено'); - } - if ($this->config->get('yandex_money_metrika_pw') == '') { - $data['metrika_status'][] = $this->errors_alert('Пароль приложения не заполнено'); - } - if ($this->config->get('yandex_money_metrika_o2auth') == '') { - $data['metrika_status'][] = $this->errors_alert('Получите токен OAuth'); - } - } + $data = array(); - if (empty($data['market_status'])) { - $data['market_status'][] = ''; - }//$this->success_alert('Все необходимые настроки заполнены!'); if (empty($data['kassa_status'])) { $data['kassa_status'][] = ''; - }//$this->success_alert('Все необходимые настроки заполнены!'); - if (empty($data['metrika_status'])) { - $data['metrika_status'][] = ''; - }//$this->success_alert('Все необходимые настроки заполнены!'); + } + return $data; } public function sendmail() { - $this->language->load('extension/payment/yandex_money'); + $this->language->load('extension/payment/yoomoney'); $json = array(); $order_id = (isset($this->request->get['order_id'])) ? $this->request->get['order_id'] : 0; @@ -1157,7 +848,7 @@ public function sendmail() 2, '.', '' ); $urlHelper = new Url(HTTPS_CATALOG); - $url = $urlHelper->link('extension/payment/yandex_money/simplepayment', 'order_id='.$order_id, true); + $url = $urlHelper->link('extension/payment/yoomoney/simplepayment', 'order_id='.$order_id, true); $logo = (is_file(DIR_IMAGE.$this->config->get('config_logo'))) ? DIR_IMAGE.$this->config->get('config_logo') : ''; $replaceMap = array( @@ -1184,13 +875,13 @@ public function sendmail() 'order_id' => $order_id, 'sum' => $amount, 'link' => $url, - 'yandex_button' => $link_img . 'image/catalog/payment/yandex_money/yandex_buttons.png', + 'yoomoney_button' => $link_img . 'image/catalog/payment/yoomoney/yoomoney_buttons.png', 'total' => $order_info['total'], 'shipping' => $order_info['shipping_method'], 'products' => $products, 'instruction' => $text_instruction, ); - $message = $this->load->view('extension/payment/yandex_money/invoice_message', $data); + $message = $this->load->view('extension/payment/yoomoney/invoice_message', $data); try { $mail = new Mail(); @@ -1249,7 +940,7 @@ public function capture() if (empty($paymentId)) { $this->response->redirect($returnUrl, 'SSL'); } - /** @var \YandexCheckout\Request\Payments\PaymentResponse $payment */ + /** @var \YooKassa\Request\Payments\PaymentResponse $payment */ $payment = $this->getModel()->fetchPaymentInfo($paymentId); if ($payment === null) { $this->response->redirect($returnUrl); @@ -1271,7 +962,7 @@ public function capture() } $this->response->redirect($this->url->link( - 'extension/payment/yandex_money/capture', + 'extension/payment/yoomoney/capture', 'user_token='.$this->session->data['user_token'].'&order_id='.$orderId, true )); @@ -1343,11 +1034,11 @@ public function capture() $data['breadcrumbs'][] = array( 'text' => 'Подтверждение заказа №'.$orderId, - 'href' => $this->url->link('extension/payment/yandex_money/capture', + 'href' => $this->url->link('extension/payment/yoomoney/capture', 'user_token='.$this->session->data['user_token'].'&order_id='.$orderId, true), ); - $this->response->setOutput($this->load->view('extension/payment/yandex_money/capture', $data)); + $this->response->setOutput($this->load->view('extension/payment/yoomoney/capture', $data)); } /** @@ -1447,7 +1138,7 @@ public function refund() $this->session->data['error'] = 'Не удалось провести возврат'; } else { $this->response->redirect( - $this->url->link('extension/payment/yandex_money/refund', + $this->url->link('extension/payment/yoomoney/refund', 'user_token='.$this->session->data['user_token'].'&order_id='.$orderId, true) ); } @@ -1471,7 +1162,7 @@ public function refund() $data['refunds'] = $this->getModel()->getOrderRefunds($orderInfo['order_id']); $data['refundable_amount'] = $amount; foreach ($data['refunds'] as $refund) { - if ($refund['status'] !== \YandexCheckout\Model\RefundStatus::CANCELED) { + if ($refund['status'] !== \YooKassa\Model\RefundStatus::CANCELED) { $data['refundable_amount'] -= $refund['amount']; if ($data['refundable_amount'] < 0) { $data['refundable_amount'] = 0; @@ -1500,11 +1191,11 @@ public function refund() $data['breadcrumbs'][] = array( 'text' => 'Возвраты заказа №'.$orderId, - 'href' => $this->url->link('extension/payment/yandex_money/refund', + 'href' => $this->url->link('extension/payment/yoomoney/refund', 'user_token='.$this->session->data['user_token'].'&order_id='.$orderId, true), ); - $this->response->setOutput($this->load->view('extension/payment/yandex_money/refund', $data)); + $this->response->setOutput($this->load->view('extension/payment/yoomoney/refund', $data)); } public function installWidget() @@ -1555,7 +1246,7 @@ private function enableApplePayForWidget() } /** - * @param \YandexCheckout\Model\PaymentInterface $payment + * @param \YooKassa\Model\PaymentInterface $payment * @param array $order * @param float $amount * @param string $comment @@ -1686,7 +1377,7 @@ private function setUpdaterData($data) $version_info = $this->getModel()->checkModuleVersion(false); $data['kassa_payments_link'] = $this->url->link('extension/payment/'.self::MODULE_NAME.'/payments', 'user_token='.$this->session->data['user_token'], true); - if (version_compare($version_info['version'], self::MODULE_VERSION) > 0) { + if (!empty($version_info) && version_compare($version_info['version'], self::MODULE_VERSION) > 0) { $data['new_version_available'] = true; $data['changelog'] = $this->getModel()->getChangeLog(self::MODULE_VERSION, $version_info['version']); @@ -1704,17 +1395,17 @@ private function setUpdaterData($data) private function enableB2bSberbank() { - if ($this->request->post['payment_yandex_money_status'] - && isset($this->request->post['yandex_money_kassa_b2b_sberbank_enabled']) - && $this->request->post['yandex_money_kassa_b2b_sberbank_enabled'] == 'on' + if ($this->request->post['payment_yoomoney_status'] + && isset($this->request->post['yoomoney_kassa_b2b_sberbank_enabled']) + && $this->request->post['yoomoney_kassa_b2b_sberbank_enabled'] == 'on' ) { - $this->model_setting_setting->editSetting('payment_yandex_money_b2b_sberbank', array( - 'payment_yandex_money_b2b_sberbank_status' => true, - 'payment_yandex_money_sort_order' => 0, + $this->model_setting_setting->editSetting('payment_yoomoney_b2b_sberbank', array( + 'payment_yoomoney_b2b_sberbank_status' => true, + 'payment_yoomoney_sort_order' => 0, )); } else { - $this->model_setting_setting->editSetting('payment_yandex_money_b2b_sberbank', array( - 'payment_yandex_money_b2b_sberbank_status' => false, + $this->model_setting_setting->editSetting('payment_yoomoney_b2b_sberbank', array( + 'payment_yoomoney_b2b_sberbank_status' => false, )); } } diff --git a/src/upload/admin/controller/extension/payment/yoomoney_b2b_sberbank.php b/src/upload/admin/controller/extension/payment/yoomoney_b2b_sberbank.php new file mode 100644 index 0000000..c75b4e5 --- /dev/null +++ b/src/upload/admin/controller/extension/payment/yoomoney_b2b_sberbank.php @@ -0,0 +1,8 @@ +Sberbank Business Online'; \ No newline at end of file diff --git a/src/upload/admin/language/en-gb/extension/payment/yandex_money.php b/src/upload/admin/language/en-gb/extension/payment/yoomoney.php similarity index 55% rename from src/upload/admin/language/en-gb/extension/payment/yandex_money.php rename to src/upload/admin/language/en-gb/extension/payment/yoomoney.php index d0fcb68..8cf2710 100644 --- a/src/upload/admin/language/en-gb/extension/payment/yandex_money.php +++ b/src/upload/admin/language/en-gb/extension/payment/yoomoney.php @@ -1,33 +1,32 @@ Y.CMS 2.0 от Яндекс.Кассы'; -$_['kassa_header_description'] = 'Работая с модулем, вы автоматически соглашаетесь с условиями его использования.'; +$_['text_yoomoney'] = 'YooMoney from YooKassa'; +$_['kassa_header_description'] = 'Работая с модулем, вы автоматически соглашаетесь с условиями его использования.'; $_['kassa_version_string'] = 'Версия модуля'; $_['kassa_breadcrumbs_extension'] = 'Расширения'; $_['kassa_breadcrumbs_home'] = 'Главная'; $_['kassa_breadcrumbs_logs'] = 'Журнал сообщений'; $_['kassa_text_success'] = 'Success'; -$_['kassa_page_title'] = 'Настройки Яндекс.Кассы'; -$_['kassa_breadcrumbs_heading_title'] = 'Журнал сообщений платежного модуля Яндекс.Деньги'; -$_['kassa_test_mode_description'] = 'Вы включили тестовый режим приема платежей. Проверьте, как проходит оплата, и напишите менеджеру Кассы. Он выдаст рабочие shopId и Секретный ключ. Инструкция'; +$_['kassa_page_title'] = 'Настройки ЮKassa'; +$_['kassa_breadcrumbs_heading_title'] = 'Журнал сообщений платежного модуля ЮMoney'; +$_['kassa_test_mode_description'] = 'Вы включили тестовый режим приема платежей. Проверьте, как проходит оплата, и напишите менеджеру ЮKassa. Он выдаст рабочие shopId и Секретный ключ. Инструкция'; -$_['kassa_enable_label'] = 'Включить приём платежей через Яндекс.Кассу'; +$_['kassa_enable_label'] = 'Включить приём платежей через ЮKassa'; $_['kassa_shop_id_label'] = 'shopId'; -$_['kassa_shop_id_description'] = 'Скопируйте shopId из личного кабинета Яндекс.Кассы'; -$_['kassa_shop_id_error_required'] = 'Необходимо указать shopId из личного кабинета Яндекс.Кассы'; +$_['kassa_shop_id_description'] = 'Скопируйте shopId из личного кабинета ЮKassa'; +$_['kassa_shop_id_error_required'] = 'Необходимо указать shopId из личного кабинета ЮKassa'; $_['kassa_password_label'] = 'Секретный ключ'; -$_['kassa_password_description'] = 'Выпустите и активируйте секретный ключ в личном кабинете Яндекс.Кассы. Потом скопируйте его сюда.'; -$_['kassa_password_error_required'] = 'Необходимо указать секретный ключ из личного кабинета Яндекс.Кассы'; -$_['kassa_error_invalid_credentials'] = 'Проверьте shopId и Секретный ключ — где-то есть ошибка. А лучше скопируйте их прямо из личного кабинета Яндекс.Кассы'; +$_['kassa_password_description'] = 'Выпустите и активируйте секретный ключ в личном кабинете ЮKassa. Потом скопируйте его сюда.'; +$_['kassa_password_error_required'] = 'Необходимо указать секретный ключ из личного кабинета ЮKassa'; +$_['kassa_error_invalid_credentials'] = 'Проверьте shopId и Секретный ключ — где-то есть ошибка. А лучше скопируйте их прямо из личного кабинета ЮKassa'; $_['kassa_payment_mode_label'] = 'Выбор способа оплаты'; -$_['kassa_payment_mode_kassa_label'] = 'На стороне Кассы'; -$_['kassa_use_yandex_button_label'] = 'Назвать кнопку оплаты «Заплатить через Яндекс»'; +$_['kassa_payment_mode_kassa_label'] = 'На стороне ЮKassa'; $_['kassa_use_installments_button_label'] = 'Add the Installments payment method to checkout page'; $_['kassa_add_installments_block_label'] = 'Add the information block about Installments to product descriptions'; $_['kassa_payment_mode_shop_label'] = 'На стороне магазина'; @@ -38,24 +37,24 @@ $_['kassa_payment_method_qiwi'] = 'QIWI Wallet'; $_['kassa_payment_method_alfabank'] = 'Альфа-Клик'; $_['kassa_payment_method_webmoney'] = 'Webmoney'; -$_['kassa_payment_method_yandex_money'] = 'Яндекс.Деньги'; +$_['kassa_payment_method_yoo_money'] = 'YooMoney'; $_['kassa_payment_method_mobile'] = 'Баланс мобильного'; $_['kassa_payment_method_installments'] = 'Installments'; $_['kassa_payment_method_tinkoff_bank'] = 'Tinkoff online banking'; -$_['kassa_payment_method_widget'] = 'Payment widget from Yandex.Checkout (cards, Apple Pay and Google Play)'; +$_['kassa_payment_method_widget'] = 'Payment widget from YooKassa (cards, Apple Pay and Google Play)'; $_['kassa_payment_method_error_required'] = 'Пожалуйста, выберите хотя бы один способ из списка'; $_['kassa_display_name_label'] = 'Название платежного сервиса'; $_['kassa_display_name_description'] = 'Это название увидит пользователь'; -$_['kassa_default_display_name'] = 'Яндекс.Касса (банковские карты, электронные деньги и другое)'; +$_['kassa_default_display_name'] = 'ЮKassa (банковские карты, электронные деньги и другое)'; -$_['kassa_currency'] = 'Валюта платежа в Яндекс.Кассе'; +$_['kassa_currency'] = 'Валюта платежа в ЮKassa'; $_['kassa_currency_convert'] = 'Конвертировать сумму из текущей валюты магазина'; -$_['kassa_currency_help'] = 'Валюты в Яндекс.Кассе и в магазине должны совпадать'; +$_['kassa_currency_help'] = 'Валюты в ЮKassa и в магазине должны совпадать'; $_['kassa_currency_convert_help'] = 'Используется значение из списка валют магазина. Если валюты нет в списке – курс ЦБ РФ.'; -$_['kassa_send_receipt_label'] = 'Отправлять в Яндекс.Кассу данные для чеков (54-ФЗ)'; +$_['kassa_send_receipt_label'] = 'Отправлять в ЮKassa данные для чеков (54-ФЗ)'; $_['kassa_send_receipt_tax_rate_title'] = 'НДС'; $_['kassa_second_receipt_header'] = 'Второй чек'; $_['kassa_second_receipt_enable'] = 'Включен'; @@ -77,7 +76,7 @@ $_['kassa_kassa_tax_rate_header'] = 'Ставка для чека в налоговую'; $_['kassa_notification_url_label'] = 'Адрес для уведомлений'; -$_['kassa_notification_url_description'] = 'Этот адрес понадобится, только если его попросят специалисты Яндекс.Кассы'; +$_['kassa_notification_url_description'] = 'Этот адрес понадобится, только если его попросят специалисты ЮKassa'; $_['kassa_before_redirect_label'] = 'Когда пользователь переходит к оплате'; $_['kassa_create_order_label'] = 'Создать неоплаченный заказ в панели управления'; @@ -87,7 +86,7 @@ $_['kassa_success_order_status_description'] = ''; $_['kassa_minimum_payment_amount_label'] = 'Минимальная сумма заказа'; -$_['kassa_minimum_payment_amount_description'] = 'Сумма заказа при которой можно провести платёж с помощью Яндекс.Кассы'; +$_['kassa_minimum_payment_amount_description'] = 'Сумма заказа при которой можно провести платёж с помощью ЮKassa'; $_['kassa_geo_zone_label'] = 'Регион отображения'; $_['kassa_geo_zone_description'] = 'Геозона в которой будет отображаться способ оплаты'; @@ -113,8 +112,8 @@ $_['kassa_invoice_logo_label'] = 'Добавить к письму логотип магазина'; -$_['kassa_invoices_kassa_disabled'] = 'Этот функционал доступен только для оплаты через Яндекс.Кассу'; -$_['kassa_invoices_disabled'] = 'Этот функционал отключен в настройках модуля Яндекс.Кассы'; +$_['kassa_invoices_kassa_disabled'] = 'Этот функционал доступен только для оплаты через ЮKassa'; +$_['kassa_invoices_disabled'] = 'Этот функционал отключен в настройках модуля ЮKassa'; $_['kassa_invoices_invalid_order_id'] = 'Идентификатор заказа не был передан или не валиден'; $_['kassa_invoices_order_not_exists'] = 'Указанный заказ не найден'; @@ -122,43 +121,40 @@ $_['kassa_refund_status_succeeded_label'] = 'Проведён'; $_['kassa_refund_status_canceled_label'] = 'Отменён'; -$_['kassa_breadcrumbs_payments'] = 'Список платежей через модуль Кассы'; -$_['kassa_payments_page_title'] = 'Список платежей через модуль Кассы'; +$_['kassa_breadcrumbs_payments'] = 'Список платежей через модуль ЮKassa'; +$_['kassa_payments_page_title'] = 'Список платежей через модуль ЮKassa'; $_['kassa_payments_update_button'] = 'Обновить список'; $_['kassa_payments_capture_button'] = 'Провести все платежи'; -$_['kassa_payment_list_label'] = 'Список платежей через модуль Кассы'; +$_['kassa_payment_list_label'] = 'Список платежей через модуль ЮKassa'; $_['kassa_payment_list_link'] = 'Открыть список'; -$_['kassa_tab_header'] = 'Яндекс.Касса'; -$_['wallet_tab_header'] = 'Яндекс.Деньги'; -$_['billing_tab_header'] = 'Платёжка'; -$_['metrika_tab_header'] = 'Яндекс.Метрика'; -$_['market_tab_header'] = 'Яндекс.Маркет'; +$_['kassa_tab_header'] = 'ЮKassa'; +$_['wallet_tab_header'] = 'ЮMoney'; $_['kassa_payment_description_label'] = 'Transaction data'; -$_['kassa_payment_description_description'] = 'Full description of the transaction that the user will see during the checkout process. You can find it in your Yandex.Checkout Merchant Profile. For example, "Payment for order No. 72 by user@yandex.ru". +$_['kassa_payment_description_description'] = 'Full description of the transaction that the user will see during the checkout process. You can find it in your YooKassa Merchant Profile. For example, "Payment for order No. 72 by user@yoomoney.ru". Limitations: no more than 128 symbols'; $_['kassa_default_payment_description'] = 'Payment for order No. %order_id%'; -$_['wallet_page_title'] = 'Настройки Яндекс.Денег'; -$_['wallet_header_description'] = 'Для работы с модулем нужно открыть кошелек на Яндексе.'; +$_['wallet_page_title'] = 'Настройки ЮMoney'; +$_['wallet_header_description'] = 'Для работы с модулем нужно открыть кошелек ЮMoney.'; $_['wallet_version_string'] = 'Версия модуля'; -$_['wallet_enable_label'] = 'Включить прием платежей в кошелек на Яндексе'; +$_['wallet_enable_label'] = 'Включить прием платежей в кошелек ЮMoney'; $_['wallet_account_id_label'] = 'Номер кошелька'; $_['wallet_account_id_description'] = ''; $_['wallet_account_id_error_required'] = 'Укажите номер кошелька'; $_['wallet_password_label'] = 'Секретное слово'; -$_['wallet_password_description'] = 'Секретное слово нужно скопировать со страницы настройки уведомлений на сайте Яндекс.Денег'; +$_['wallet_password_description'] = 'Секретное слово нужно скопировать со страницы настройки уведомлений на сайте ЮMoney'; $_['wallet_password_error_required'] = 'Укажите секретное слово'; $_['wallet_display_name_label'] = 'Название платежного сервиса'; $_['wallet_display_name_description'] = 'Это название увидит пользователь'; -$_['wallet_default_display_name'] = 'Яндекс.Деньги (банковские карты, кошелек)'; +$_['wallet_default_display_name'] = 'ЮMoney (банковские карты, кошелек)'; $_['wallet_notification_url_label'] = 'RedirectURL'; -$_['wallet_notification_url_description'] = 'Скопируйте эту ссылку в поле Redirect URI со страницы настройки уведомлений на сайте Яндекс.Денег'; +$_['wallet_notification_url_description'] = 'Скопируйте эту ссылку в поле Redirect URI со страницы настройки уведомлений на сайте ЮMoney'; $_['wallet_success_order_status_label'] = 'Статус заказа после оплаты'; $_['wallet_success_order_status_description'] = ''; @@ -177,154 +173,14 @@ $_['wallet_sort_order_label'] = 'Сортировка'; $_['wallet_sort_order_description'] = ''; -$_['billing_page_title'] = 'Настройки Платёжки'; -$_['billing_header_description'] = ''; -$_['billing_version_string'] = 'Версия модуля'; - -$_['billing_enable_label'] = 'Включить прием платежей через Платёжку'; -$_['billing_form_id_label'] = 'ID формы'; -$_['billing_form_id_description'] = ''; -$_['billing_form_id_error_required'] = 'Укажите идентификатор формы'; - -$_['billing_purpose_label'] = 'Назначение платежа'; -$_['billing_purpose_description'] = 'Назначение будет в платежном поручении: напишите в нем всё, что поможет отличить заказ, который оплатили через Платежку'; -$_['billing_default_purpose'] = 'Номер заказа %order_id% Оплата через Платежку'; - -$_['billing_display_name_label'] = 'Название платежного сервиса'; -$_['billing_display_name_description'] = 'Это название увидит пользователь'; -$_['billing_default_display_name'] = 'Платежка (банковские карты, кошелек)'; - -$_['billing_success_order_status_label'] = 'Статус заказа'; -$_['billing_success_order_status_description'] = 'Статус должен показать, что результат платежа неизвестен: заплатил клиент или нет, вы можете узнать только из уведомления на электронной почте или в своем банке'; - -$_['billing_minimum_payment_amount_label'] = 'Минимальная сумма заказа'; -$_['billing_minimum_payment_amount_description'] = 'Сумма заказа при которой можно провести платёж с помощью Яндекс.Кассы'; - -$_['billing_geo_zone_label'] = 'Регион отображения'; -$_['billing_geo_zone_description'] = 'Геозона в которой будет отображаться способ оплаты'; -$_['billing_any_geo_zone'] = 'Любая зона'; - -$_['billing_sort_order_label'] = 'Сортировка'; -$_['billing_sort_order_description'] = ''; - - -// market_ -$_['market_lnk_yml'] = 'Link for uploading products to Yandex.Market'; -$_['market_sv_all'] = 'Fold all'; -$_['market_rv_all'] = 'Show all'; -$_['market_ch_all'] = 'Cancel all'; -$_['market_unch_all'] = 'Uncheck all boxes'; -$_['text_success'] = 'Settings saved'; - -$_['market_header_offer_settings'] = 'Настройка предложений'; -$_['market_header_param_settings'] = 'Параметры для Яндекс.Маркета'; -$_['market_short_name'] = 'Короткое название магазина'; -$_['market_full_name'] = 'Полное наименование организации'; -$_['market_currencies'] = 'Валюта'; -$_['market_categories'] = 'Выгружаем категории'; -$_['market_categories_all'] = 'Все'; -$_['market_categories_selected'] = 'Выбранные'; -$_['market_format'] = 'Формат предложений'; -$_['market_format_vendor_model'] = 'Произвольный'; -$_['market_format_simple'] = 'Упрощенный с шаблоном названия предложения'; -$_['market_currencies_rate_1'] = 'основная валюта'; -$_['market_currencies_rate_CBRF'] = 'по курсу ЦБ РФ'; -$_['market_currencies_rate_NBU'] = 'по курсу НБ Украины'; -$_['market_currencies_rate_NBK'] = 'по курсу НБ Казахстана'; -$_['market_currencies_rate_CB'] = 'по курсу банка страны из личного кабинета'; -$_['market_currencies_rate___cms'] = 'по курсу из Opencart'; $_['ok'] = 'OK'; $_['cancel'] = 'Cancel'; $_['delete'] = 'Удалить'; -$_['market_currencies_plus'] = 'надбавка'; -$_['market_error_message_empty_shop_name'] = 'Не введено название магазина'; -$_['market_error_message_none_delivery_cost'] = 'Введите стоимость доставки в домашнем регионе'; -$_['market_error_message_none_delivery_time'] = 'Введите срок доставки в домашнем регионе'; -$_['market_copy_url_to_clipboard'] = 'Скопировать ссылку'; -$_['market_url_copied_to_clipboard'] = 'Ссылка скопирована'; -$_['market_offer_name_template'] = 'Шаблон названия'; -$_['market_delivery_label'] = 'Курьерская доставка для домашнего региона'; -$_['market_delivery_cost'] = 'Стоимость'; -$_['market_delivery_days'] = 'Срок доставки'; -$_['market_delivery_days_from'] = 'от'; -$_['market_delivery_days_to'] = 'до'; -$_['market_delivery_more'] = 'ещё'; -$_['market_delivery_days_order_before'] = 'При заказе до'; -$_['market_delivery_days_measurement_unit'] = 'дн.'; -$_['market_delivery_use_default'] = 'Использовать значение по умолчанию'; -$_['market_delivery_text'] = 'доставка'; -$_['market_delivery_order_before'] = 'при заказе до'; -$_['market_delivery_default_value'] = '13:00 (по умолчанию для Маркета)'; -$_['market_available_non_zero_count_goods'] = 'Для товаров в наличии'; -$_['market_available_if_zero_count_goods'] = 'Для товаров отсутствующих на складе'; -$_['market_available_label'] = 'Статус товара и способы получения'; -$_['market_available_delivery'] = 'доставка'; -$_['market_available_delivery_description'] = 'доставка до места'; -$_['market_available_pickup'] = 'самовывоз'; -$_['market_available_pickup_description'] = 'самовывоз из пункта заказа'; -$_['market_available_store'] = 'в магазине'; -$_['market_available_store_description'] = 'покупка без предварительного заказа'; -$_['market_available_dont_unload'] = 'Не выгружать'; -$_['market_available_ready'] = 'Готов к отправке'; -$_['market_available_to_order'] = 'На заказ'; -$_['market_available_view_order_label'] = 'Товары со статусом'; -$_['market_available_view_dont_upload'] = 'не будут выгружены'; -$_['market_available_view_will_upload'] = 'будут выгружены со статусом'; -$_['market_available_view_ready'] = 'готов к отправке'; -$_['market_available_view_to_order'] = 'на заказ'; -$_['market_available_view_with_available'] = 'и доступны'; -$_['market_available_view_delivery'] = 'доставкой'; -$_['market_available_view_pickup'] = 'самовывозом'; -$_['market_available_view_store'] = 'покупкой на месте'; -$_['market_option_label'] = 'Варианты предложений с опциями'; -$_['market_option_color_label'] = 'цвет товара задается опцией'; -$_['market_option_name_color_label'] = 'включить цвет в название товара'; -$_['market_option_prefix_color_label'] = 'префикс (например, «цвет:»)'; -$_['market_option_size_label'] = 'размер товара задается опцией'; -$_['market_option_name_size_label'] = 'включить размер в название товара'; -$_['market_option_prefix_size_label'] = 'префикс (например, «размер:»)'; -$_['market_offer_options_label'] = 'Опции предложений'; -$_['market_offer_options_export_attributes'] = 'Выгружать все атрибуты товаров'; -$_['market_offer_options_export_dimensions'] = 'Выгружать размеры товаров'; -$_['market_vat_label'] = 'Налоговые ставки'; -$_['market_vat_enable_label'] = 'Добавить налоговые ставки в предложения'; -$_['market_vat_rate_VAT_18_label'] = '18%'; -$_['market_vat_rate_VAT_18_118_label'] = '18/118'; -$_['market_vat_rate_VAT_10_label'] = '10%'; -$_['market_vat_rate_VAT_10_110_label'] = '10/110'; -$_['market_vat_rate_VAT_0_label'] = '0%'; -$_['market_vat_rate_NO_VAT_label'] = 'НДС не облагается'; -$_['market_additional_condition_label'] = 'Дополнительные условия'; -$_['market_additional_condition_name_label'] = 'Название условия'; -$_['market_additional_condition_tag_label'] = 'Тег'; -$_['market_additional_condition_static_value_label'] = 'Постоянное значение'; -$_['market_additional_condition_data_value_label'] = 'Значение из карточки товара'; -$_['market_additional_condition_for_categories_label'] = 'Для категорий'; -$_['market_additional_condition_more'] = 'Добавить условие'; -$_['market_additional_condition_make_tag_label'] = 'задает параметру'; -$_['market_additional_condition_with_value_label'] = 'значение'; -$_['market_additional_condition_for_category_label'] = 'для'; -$_['market_additional_condition_for_all_category_label'] = 'всех категорий'; -$_['market_additional_condition_for_selected_category_label'] = 'выбранных категорий'; -$_['market_additional_condition_for_more_category_label'] = 'и еще %s кат.'; -$_['market_additional_condition_join_label'] = 'Одинаковые теги в предложении'; -$_['market_additional_condition_join_text'] = 'объединять в один тег'; -$_['market_additional_condition_dont_join_text'] = 'оставить в нескольких тегах'; - -// metrika -$_['metrika_number'] = 'Counter number'; -$_['metrika_pw'] = 'App password'; -$_['metrika_idapp'] = 'ID of the app'; -$_['metrika_set'] = 'Settings'; -$_['metrika_set_1'] = 'Webvisor'; -$_['metrika_set_2'] = 'Heatmap'; -$_['metrika_set_5'] = 'Tracking hash in browser\'s URL bar'; -$_['metrika_callback'] = 'Link for the app'; +$_['text_success'] = 'Settings saved'; // Error $_['error_permission'] = 'You do not have the right to manage the module!'; -$_['error_install_widget'] = 'Чтобы покупатели могли заплатить вам через Apple Pay, скачайте файл apple-developer-merchantid-domain-association и добавьте его в папку ./well-known на вашем сайте. Если не знаете, как это сделать, обратитесь к администратору сайта или в поддержку хостинга. Не забудьте также подключить оплату через Apple Pay в личном кабинете Кассы. Почитать о подключении Apple Pay в документации Кассы'; - +$_['error_install_widget'] = 'Чтобы покупатели могли заплатить вам через Apple Pay, скачайте файл apple-developer-merchantid-domain-association и добавьте его в папку ./well-known на вашем сайте. Если не знаете, как это сделать, обратитесь к администратору сайта или в поддержку хостинга. Не забудьте также подключить оплату через Apple Pay в личном кабинете ЮKassa. Почитать о подключении Apple Pay в документации ЮKassa'; $_['active_on'] = 'Activated'; $_['active_off'] = 'Disabled'; @@ -376,7 +232,7 @@ $_['captures_expires_date'] = 'Подтвердить до'; $_['captures_new'] = 'Подтверждение платежа'; $_['captures_payment_data'] = 'Данные платежа'; -$_['captures_payment_id'] = 'Номер транзакции в Яндекс.Кассе'; +$_['captures_payment_id'] = 'Номер транзакции в ЮKassa'; $_['captures_order_id'] = 'Номер заказа'; $_['captures_payment_method'] = 'Способ оплаты'; $_['captures_payment_sum'] = 'Сумма платежа'; @@ -397,7 +253,7 @@ $_['nps_text'] = ''; $_['b2b_sberbank_label'] = 'Enable payments via Sberbank Business Online'; -$_['b2b_sberbank_on_label'] = 'If you enable this option, you will be able to accept online payments from legal entities. Learn more at the Yandex.Checkout website.'; +$_['b2b_sberbank_on_label'] = 'If you enable this option, you will be able to accept online payments from legal entities. Learn more at the YooKassa website.'; $_['b2b_sberbank_template_label'] = 'Template for payment details'; $_['b2b_sberbank_vat_default_label'] = 'Default VAT rate'; $_['b2b_sberbank_template_help'] = 'These payment details will be shown in the payment order.'; @@ -414,6 +270,6 @@ $_['kassa_payment_mode_default_label'] = 'Признак способа расчета'; $_['kassa_payment_subject_default_label'] = 'Признак предмета расчета'; -$_['kassa_payment_subject_default_description'] = 'Признаки предмета расчёта и способа расчёта берутся из атрибутов товара payment_mode и payment_subject . Их значения можно задать отдельно в карточке товара, если это потребуется. Подробнее. +$_['kassa_payment_subject_default_description'] = 'Признаки предмета расчёта и способа расчёта берутся из атрибутов товара payment_mode и payment_subject . Их значения можно задать отдельно в карточке товара, если это потребуется. Подробнее. Для товаров, у которых значения этих атрибутов не заданы, будем применять значения по умолчанию:'; \ No newline at end of file diff --git a/src/upload/admin/language/en-gb/extension/payment/yoomoney_b2b_sberbank.php b/src/upload/admin/language/en-gb/extension/payment/yoomoney_b2b_sberbank.php new file mode 100644 index 0000000..868f843 --- /dev/null +++ b/src/upload/admin/language/en-gb/extension/payment/yoomoney_b2b_sberbank.php @@ -0,0 +1,3 @@ +YooKassa: Sberbank Business Online'; \ No newline at end of file diff --git a/src/upload/admin/language/ru-ru/extension/payment/yandex_money_b2b_sberbank.php b/src/upload/admin/language/ru-ru/extension/payment/yandex_money_b2b_sberbank.php deleted file mode 100644 index aa79bb7..0000000 --- a/src/upload/admin/language/ru-ru/extension/payment/yandex_money_b2b_sberbank.php +++ /dev/null @@ -1,3 +0,0 @@ -Sberbank Business Online'; \ No newline at end of file diff --git a/src/upload/admin/language/ru-ru/extension/payment/yandex_money.php b/src/upload/admin/language/ru-ru/extension/payment/yoomoney.php similarity index 57% rename from src/upload/admin/language/ru-ru/extension/payment/yandex_money.php rename to src/upload/admin/language/ru-ru/extension/payment/yoomoney.php index fa680b4..eceed4f 100644 --- a/src/upload/admin/language/ru-ru/extension/payment/yandex_money.php +++ b/src/upload/admin/language/ru-ru/extension/payment/yoomoney.php @@ -1,33 +1,32 @@ Y.CMS 2.0 от Яндекс.Кассы'; -$_['kassa_header_description'] = 'Работая с модулем, вы автоматически соглашаетесь с условиями его использования.'; +$_['text_yoomoney'] = 'ЮMoney от ЮKassa'; +$_['kassa_header_description'] = 'Работая с модулем, вы автоматически соглашаетесь с условиями его использования.'; $_['kassa_version_string'] = 'Версия модуля'; $_['kassa_breadcrumbs_extension'] = 'Расширения'; $_['kassa_breadcrumbs_home'] = 'Главная'; $_['kassa_breadcrumbs_logs'] = 'Журнал сообщений'; $_['kassa_text_success'] = 'Success'; -$_['kassa_page_title'] = 'Настройки Яндекс.Кассы'; -$_['kassa_breadcrumbs_heading_title'] = 'Журнал сообщений платежного модуля Яндекс.Деньги'; -$_['kassa_test_mode_description'] = 'Вы включили тестовый режим приема платежей. Проверьте, как проходит оплата, и напишите менеджеру Кассы. Он выдаст рабочие shopId и Секретный ключ. Инструкция'; +$_['kassa_page_title'] = 'Настройки ЮKassa'; +$_['kassa_breadcrumbs_heading_title'] = 'Журнал сообщений платежного модуля ЮMoney'; +$_['kassa_test_mode_description'] = 'Вы включили тестовый режим приема платежей. Проверьте, как проходит оплата, и напишите менеджеру ЮKassa. Он выдаст рабочие shopId и Секретный ключ. Инструкция'; -$_['kassa_enable_label'] = 'Включить приём платежей через Яндекс.Кассу'; +$_['kassa_enable_label'] = 'Включить приём платежей через ЮKassa'; $_['kassa_shop_id_label'] = 'shopId'; -$_['kassa_shop_id_description'] = 'Скопируйте shopId из личного кабинета Яндекс.Кассы'; -$_['kassa_shop_id_error_required'] = 'Необходимо указать shopId из личного кабинета Яндекс.Кассы'; +$_['kassa_shop_id_description'] = 'Скопируйте shopId из личного кабинета ЮKassa'; +$_['kassa_shop_id_error_required'] = 'Необходимо указать shopId из личного кабинета ЮKassa'; $_['kassa_password_label'] = 'Секретный ключ'; -$_['kassa_password_description'] = 'Выпустите и активируйте секретный ключ в личном кабинете Яндекс.Кассы. Потом скопируйте его сюда.'; -$_['kassa_password_error_required'] = 'Необходимо указать секретный ключ из личного кабинета Яндекс.Кассы'; -$_['kassa_error_invalid_credentials'] = 'Проверьте shopId и Секретный ключ — где-то есть ошибка. А лучше скопируйте их прямо из личного кабинета Яндекс.Кассы'; +$_['kassa_password_description'] = 'Выпустите и активируйте секретный ключ в личном кабинете ЮKassa. Потом скопируйте его сюда.'; +$_['kassa_password_error_required'] = 'Необходимо указать секретный ключ из личного кабинета ЮKassa'; +$_['kassa_error_invalid_credentials'] = 'Проверьте shopId и Секретный ключ — где-то есть ошибка. А лучше скопируйте их прямо из личного кабинета ЮKassa'; $_['kassa_payment_mode_label'] = 'Выбор способа оплаты'; -$_['kassa_payment_mode_kassa_label'] = 'На стороне Кассы'; -$_['kassa_use_yandex_button_label'] = 'Назвать кнопку оплаты «Заплатить через Яндекс»'; +$_['kassa_payment_mode_kassa_label'] = 'На стороне ЮKassa'; $_['kassa_use_installments_button_label'] = 'Добавить кнопку «Заплатить по частям» на страницу оформления заказа'; $_['kassa_add_installments_block_label'] = 'Добавить блок «Заплатить по частям» в карточки товаров'; $_['kassa_payment_mode_shop_label'] = 'На стороне магазина'; @@ -38,24 +37,24 @@ $_['kassa_payment_method_qiwi'] = 'QIWI Wallet'; $_['kassa_payment_method_alfabank'] = 'Альфа-Клик'; $_['kassa_payment_method_webmoney'] = 'Webmoney'; -$_['kassa_payment_method_yandex_money'] = 'Яндекс.Деньги'; +$_['kassa_payment_method_yoo_money'] = 'ЮMoney'; $_['kassa_payment_method_mobile'] = 'Баланс мобильного'; $_['kassa_payment_method_installments'] = 'Заплатить по частям'; $_['kassa_payment_method_tinkoff_bank'] = 'Интернет-банк Тинькофф'; -$_['kassa_payment_method_widget'] = 'Платёжный виджет Кассы (карты, Apple Pay и Google Pay)'; +$_['kassa_payment_method_widget'] = 'Платёжный виджет ЮKassa (карты, Apple Pay и Google Pay)'; $_['kassa_payment_method_error_required'] = 'Пожалуйста, выберите хотя бы один способ из списка'; $_['kassa_display_name_label'] = 'Название платежного сервиса'; $_['kassa_display_name_description'] = 'Это название увидит пользователь'; -$_['kassa_default_display_name'] = 'Яндекс.Касса (банковские карты, электронные деньги и другое)'; +$_['kassa_default_display_name'] = 'ЮKassa (банковские карты, электронные деньги и другое)'; -$_['kassa_currency'] = 'Валюта платежа в Яндекс.Кассе'; +$_['kassa_currency'] = 'Валюта платежа в ЮKassa'; $_['kassa_currency_convert'] = 'Конвертировать сумму из текущей валюты магазина'; -$_['kassa_currency_help'] = 'Валюты в Яндекс.Кассе и в магазине должны совпадать'; +$_['kassa_currency_help'] = 'Валюты в ЮKassa и в магазине должны совпадать'; $_['kassa_currency_convert_help'] = 'Используется значение из списка валют магазина. Если валюты нет в списке – курс ЦБ РФ.'; -$_['kassa_send_receipt_label'] = 'Отправлять в Яндекс.Кассу данные для чеков (54-ФЗ)'; +$_['kassa_send_receipt_label'] = 'Отправлять в ЮKassa данные для чеков (54-ФЗ)'; $_['kassa_send_receipt_tax_rate_title'] = 'НДС'; $_['kassa_second_receipt_header'] = 'Второй чек'; $_['kassa_second_receipt_enable'] = 'Включен'; @@ -77,7 +76,7 @@ $_['kassa_kassa_tax_rate_header'] = 'Ставка для чека в налоговую'; $_['kassa_notification_url_label'] = 'Адрес для уведомлений'; -$_['kassa_notification_url_description'] = 'Этот адрес понадобится, только если его попросят специалисты Яндекс.Кассы'; +$_['kassa_notification_url_description'] = 'Этот адрес понадобится, только если его попросят специалисты ЮKassa'; $_['kassa_before_redirect_label'] = 'Когда пользователь переходит к оплате'; $_['kassa_create_order_label'] = 'Создать неоплаченный заказ в панели управления'; @@ -87,7 +86,7 @@ $_['kassa_success_order_status_description'] = ''; $_['kassa_minimum_payment_amount_label'] = 'Минимальная сумма заказа'; -$_['kassa_minimum_payment_amount_description'] = 'Сумма заказа при которой можно провести платёж с помощью Яндекс.Кассы'; +$_['kassa_minimum_payment_amount_description'] = 'Сумма заказа при которой можно провести платёж с помощью ЮKassa'; $_['kassa_geo_zone_label'] = 'Регион отображения'; $_['kassa_geo_zone_description'] = 'Геозона в которой будет отображаться способ оплаты'; @@ -113,8 +112,8 @@ $_['kassa_invoice_logo_label'] = 'Добавить к письму логотип магазина'; -$_['kassa_invoices_kassa_disabled'] = 'Этот функционал доступен только для оплаты через Яндекс.Кассу'; -$_['kassa_invoices_disabled'] = 'Этот функционал отключен в настройках модуля Яндекс.Кассы'; +$_['kassa_invoices_kassa_disabled'] = 'Этот функционал доступен только для оплаты через ЮKassa'; +$_['kassa_invoices_disabled'] = 'Этот функционал отключен в настройках модуля ЮKassa'; $_['kassa_invoices_invalid_order_id'] = 'Идентификатор заказа не был передан или не валиден'; $_['kassa_invoices_order_not_exists'] = 'Указанный заказ не найден'; @@ -122,42 +121,39 @@ $_['kassa_refund_status_succeeded_label'] = 'Проведён'; $_['kassa_refund_status_canceled_label'] = 'Отменён'; -$_['kassa_breadcrumbs_payments'] = 'Список платежей через модуль Кассы'; -$_['kassa_payments_page_title'] = 'Список платежей через модуль Кассы'; +$_['kassa_breadcrumbs_payments'] = 'Список платежей через модуль ЮKassa'; +$_['kassa_payments_page_title'] = 'Список платежей через модуль ЮKassa'; $_['kassa_payments_update_button'] = 'Обновить список'; $_['kassa_payments_capture_button'] = 'Провести все платежи'; -$_['kassa_payment_list_label'] = 'Список платежей через модуль Кассы'; +$_['kassa_payment_list_label'] = 'Список платежей через модуль ЮKassa'; $_['kassa_payment_list_link'] = 'Открыть список'; $_['kassa_payment_description_label'] = 'Описание платежа'; -$_['kassa_payment_description_description'] = 'Это описание транзакции, которое пользователь увидит при оплате, а вы — в личном кабинете Яндекс.Кассы. Например, «Оплата заказа №72». Чтобы в описание подставлялся номер заказа (как в примере), поставьте на его месте %order_id% (Оплата заказа %order_id%). Ограничение для описания — 128 символов.'; +$_['kassa_payment_description_description'] = 'Это описание транзакции, которое пользователь увидит при оплате, а вы — в личном кабинете ЮKassa. Например, «Оплата заказа №72». Чтобы в описание подставлялся номер заказа (как в примере), поставьте на его месте %order_id% (Оплата заказа %order_id%). Ограничение для описания — 128 символов.'; $_['kassa_default_payment_description'] = 'Оплата заказа №%order_id%'; -$_['kassa_tab_header'] = 'Яндекс.Касса'; -$_['wallet_tab_header'] = 'Яндекс.Деньги'; -$_['billing_tab_header'] = 'Платёжка'; -$_['metrika_tab_header'] = 'Яндекс.Метрика'; -$_['market_tab_header'] = 'Яндекс.Маркет'; +$_['kassa_tab_header'] = 'ЮKassa'; +$_['wallet_tab_header'] = 'ЮMoney'; -$_['wallet_page_title'] = 'Настройки Яндекс.Денег'; -$_['wallet_header_description'] = 'Для работы с модулем нужно открыть кошелек на Яндексе.'; +$_['wallet_page_title'] = 'Настройки ЮMoney'; +$_['wallet_header_description'] = 'Для работы с модулем нужно открыть кошелек ЮMoney.'; $_['wallet_version_string'] = 'Версия модуля'; -$_['wallet_enable_label'] = 'Включить прием платежей в кошелек на Яндексе'; +$_['wallet_enable_label'] = 'Включить прием платежей в кошелек ЮMoney'; $_['wallet_account_id_label'] = 'Номер кошелька'; $_['wallet_account_id_description'] = ''; $_['wallet_account_id_error_required'] = 'Укажите номер кошелька'; $_['wallet_password_label'] = 'Секретное слово'; -$_['wallet_password_description'] = 'Секретное слово нужно скопировать со страницы настройки уведомлений на сайте Яндекс.Денег'; +$_['wallet_password_description'] = 'Секретное слово нужно скопировать со страницы настройки уведомлений на сайте ЮMoney'; $_['wallet_password_error_required'] = 'Укажите секретное слово'; $_['wallet_display_name_label'] = 'Название платежного сервиса'; $_['wallet_display_name_description'] = 'Это название увидит пользователь'; -$_['wallet_default_display_name'] = 'Яндекс.Деньги (банковские карты, кошелек)'; +$_['wallet_default_display_name'] = 'ЮMoney (банковские карты, кошелек)'; $_['wallet_notification_url_label'] = 'RedirectURL'; -$_['wallet_notification_url_description'] = 'Скопируйте эту ссылку в поле Redirect URI со страницы настройки уведомлений на сайте Яндекс.Денег'; +$_['wallet_notification_url_description'] = 'Скопируйте эту ссылку в поле Redirect URI со страницы настройки уведомлений на сайте ЮMoney'; $_['wallet_success_order_status_label'] = 'Статус заказа после оплаты'; $_['wallet_success_order_status_description'] = ''; @@ -176,173 +172,34 @@ $_['wallet_sort_order_label'] = 'Сортировка'; $_['wallet_sort_order_description'] = ''; -$_['billing_page_title'] = 'Настройки Платёжки'; -$_['billing_header_description'] = ''; -$_['billing_version_string'] = 'Версия модуля'; - -$_['billing_enable_label'] = 'Включить прием платежей через Платёжку'; -$_['billing_form_id_label'] = 'ID формы'; -$_['billing_form_id_description'] = ''; -$_['billing_form_id_error_required'] = 'Укажите идентификатор формы'; - -$_['billing_purpose_label'] = 'Назначение платежа'; -$_['billing_purpose_description'] = 'Назначение будет в платежном поручении: напишите в нем всё, что поможет отличить заказ, который оплатили через Платежку'; -$_['billing_default_purpose'] = 'Номер заказа %order_id% Оплата через Платежку'; - -$_['billing_display_name_label'] = 'Название платежного сервиса'; -$_['billing_display_name_description'] = 'Это название увидит пользователь'; -$_['billing_default_display_name'] = 'Платежка (банковские карты, кошелек)'; - -$_['billing_success_order_status_label'] = 'Статус заказа'; -$_['billing_success_order_status_description'] = 'Статус должен показать, что результат платежа неизвестен: заплатил клиент или нет, вы можете узнать только из уведомления на электронной почте или в своем банке'; - -$_['billing_minimum_payment_amount_label'] = 'Минимальная сумма заказа'; -$_['billing_minimum_payment_amount_description'] = 'Сумма заказа при которой можно провести платёж с помощью Яндекс.Кассы'; - -$_['billing_geo_zone_label'] = 'Регион отображения'; -$_['billing_geo_zone_description'] = 'Геозона в которой будет отображаться способ оплаты'; -$_['billing_any_geo_zone'] = 'Любая зона'; - -$_['billing_sort_order_label'] = 'Сортировка'; -$_['billing_sort_order_description'] = ''; - -// market_ -$_['market_lnk_yml'] = 'Ссылка для выгрузки товаров на Маркет'; - -$_['market_sv_all'] = 'Свернуть всё'; -$_['market_rv_all'] = 'Развернуть всё'; -$_['market_ch_all'] = 'Отметить всё'; -$_['market_unch_all'] = 'Убрать все отметки'; $_['text_success'] = 'Настройки сохранены'; - -$_['market_header_offer_settings'] = 'Настройка предложений'; -$_['market_header_param_settings'] = 'Параметры для Яндекс.Маркета'; -$_['market_short_name'] = 'Короткое название магазина'; -$_['market_full_name'] = 'Полное наименование организации'; -$_['market_currencies'] = 'Валюта'; -$_['market_categories'] = 'Выгружаем категории'; -$_['market_categories_all'] = 'Все'; -$_['market_categories_selected'] = 'Выбранные'; -$_['market_format'] = 'Формат предложений'; -$_['market_format_vendor_model'] = 'Произвольный'; -$_['market_format_simple'] = 'Упрощенный с шаблоном названия предложения'; -$_['market_currencies_rate_1'] = 'основная валюта'; -$_['market_currencies_rate_CBRF'] = 'по курсу ЦБ РФ'; -$_['market_currencies_rate_NBU'] = 'по курсу НБ Украины'; -$_['market_currencies_rate_NBK'] = 'по курсу НБ Казахстана'; -$_['market_currencies_rate_CB'] = 'по курсу банка страны из личного кабинета'; -$_['market_currencies_rate___cms'] = 'по курсу из Opencart'; $_['ok'] = 'OK'; $_['cancel'] = 'Отмена'; $_['delete'] = 'Удалить'; -$_['market_currencies_plus'] = 'надбавка'; -$_['market_error_message_empty_shop_name'] = 'Не введено название магазина'; -$_['market_error_message_none_delivery_cost'] = 'Введите стоимость доставки в домашнем регионе'; -$_['market_error_message_none_delivery_time'] = 'Введите срок доставки в домашнем регионе'; -$_['market_copy_url_to_clipboard'] = 'Скопировать ссылку'; -$_['market_url_copied_to_clipboard'] = 'Ссылка скопирована'; -$_['market_offer_name_template'] = 'Шаблон названия'; -$_['market_delivery_label'] = 'Курьерская доставка для домашнего региона'; -$_['market_delivery_cost'] = 'Стоимость'; -$_['market_delivery_days'] = 'Срок доставки'; -$_['market_delivery_days_from'] = 'от'; -$_['market_delivery_days_to'] = 'до'; -$_['market_delivery_more'] = 'ещё'; -$_['market_delivery_days_order_before'] = 'При заказе до'; -$_['market_delivery_days_measurement_unit'] = 'дн.'; -$_['market_delivery_use_default'] = 'Использовать значение по умолчанию'; -$_['market_delivery_text'] = 'доставка'; -$_['market_delivery_order_before'] = 'при заказе до'; -$_['market_delivery_default_value'] = '13:00 (по умолчанию для Маркета)'; -$_['market_available_non_zero_count_goods'] = 'Для товаров в наличии'; -$_['market_available_if_zero_count_goods'] = 'Для товаров отсутствующих на складе'; -$_['market_available_label'] = 'Статус товара и способы получения'; -$_['market_available_delivery'] = 'доставка'; -$_['market_available_delivery_description'] = 'доставка до места'; -$_['market_available_pickup'] = 'самовывоз'; -$_['market_available_pickup_description'] = 'самовывоз из пункта заказа'; -$_['market_available_store'] = 'в магазине'; -$_['market_available_store_description'] = 'покупка без предварительного заказа'; -$_['market_available_dont_unload'] = 'Не выгружать'; -$_['market_available_ready'] = 'Готов к отправке'; -$_['market_available_to_order'] = 'На заказ'; -$_['market_available_view_order_label'] = 'Товары со статусом'; -$_['market_available_view_dont_upload'] = 'не будут выгружены'; -$_['market_available_view_will_upload'] = 'будут выгружены со статусом'; -$_['market_available_view_ready'] = 'готов к отправке'; -$_['market_available_view_to_order'] = 'на заказ'; -$_['market_available_view_with_available'] = 'и доступны'; -$_['market_available_view_delivery'] = 'доставкой'; -$_['market_available_view_pickup'] = 'самовывозом'; -$_['market_available_view_store'] = 'покупкой на месте'; -$_['market_option_label'] = 'Варианты предложений с опциями'; -$_['market_option_color_label'] = 'цвет товара задается опцией'; -$_['market_option_name_color_label'] = 'включить цвет в название товара'; -$_['market_option_prefix_color_label'] = 'префикс (например, «цвет:»)'; -$_['market_option_size_label'] = 'размер товара задается опцией'; -$_['market_option_name_size_label'] = 'включить размер в название товара'; -$_['market_option_prefix_size_label'] = 'префикс (например, «размер:»)'; -$_['market_offer_options_label'] = 'Опции предложений'; -$_['market_offer_options_export_attributes'] = 'Выгружать все атрибуты товаров'; -$_['market_offer_options_export_dimensions'] = 'Выгружать размеры товаров'; -$_['market_vat_label'] = 'Налоговые ставки'; -$_['market_vat_enable_label'] = 'Добавить налоговые ставки в предложения'; -$_['market_vat_rate_VAT_18_label'] = '18%'; -$_['market_vat_rate_VAT_18_118_label'] = '18/118'; -$_['market_vat_rate_VAT_10_label'] = '10%'; -$_['market_vat_rate_VAT_10_110_label'] = '10/110'; -$_['market_vat_rate_VAT_0_label'] = '0%'; -$_['market_vat_rate_NO_VAT_label'] = 'НДС не облагается'; -$_['market_additional_condition_label'] = 'Дополнительные условия'; -$_['market_additional_condition_name_label'] = 'Название условия'; -$_['market_additional_condition_tag_label'] = 'Тег'; -$_['market_additional_condition_static_value_label'] = 'Постоянное значение'; -$_['market_additional_condition_data_value_label'] = 'Значение из карточки товара'; -$_['market_additional_condition_for_categories_label'] = 'Для категорий'; -$_['market_additional_condition_more'] = 'Добавить условие'; -$_['market_additional_condition_make_tag_label'] = 'задает параметру'; -$_['market_additional_condition_with_value_label'] = 'значение'; -$_['market_additional_condition_for_category_label'] = 'для'; -$_['market_additional_condition_for_all_category_label'] = 'всех категорий'; -$_['market_additional_condition_for_selected_category_label'] = 'выбранных категорий'; -$_['market_additional_condition_for_more_category_label'] = 'и еще %s кат.'; -$_['market_additional_condition_join_label'] = 'Одинаковые теги в предложении'; -$_['market_additional_condition_join_text'] = 'объединять в один тег'; -$_['market_additional_condition_dont_join_text'] = 'оставить в нескольких тегах'; - -// metrika -$_['metrika_number'] = 'Номер счётчика'; -$_['metrika_pw'] = 'Пароль приложения'; -$_['metrika_idapp'] = 'ID Приложения'; -$_['metrika_set'] = 'Настройки'; -$_['metrika_set_1'] = 'Вебвизор'; -$_['metrika_set_2'] = 'Карта кликов'; -$_['metrika_set_5'] = 'Отслеживание хеша в адресной строке браузера'; -$_['metrika_callback'] = 'Ссылка для приложения'; -// market + $_['p2p_sv'] = 'Сохранить'; -$_['p2p_text_connect'] = "Для работы с модулем нужно открыть кошелек на Яндексе и зарегистрировать приложение на сайте Яндекс.Денег "; -$_['p2p_text_enable'] = "Включить прием платежей в кошелек на Яндексе"; -$_['p2p_text_url_help'] = "Скопируйте эту ссылку в поле Redirect URI на странице регистрации приложения"; +$_['p2p_text_connect'] = "Для работы с модулем нужно открыть кошелек ЮMoney и зарегистрировать приложение на сайте ЮMoney "; +$_['p2p_text_enable'] = "Включить прием платежей в кошелек ЮMoney"; +$_['p2p_text_url_help'] = "Скопируйте эту ссылку в поле Redirect URI на странице регистрации приложения"; $_['p2p_text_setting_head'] = "Настройки приема платежей"; $_['p2p_text_account'] = "Номер кошелька"; $_['p2p_text_appId'] = "Id приложения"; $_['p2p_text_appWord'] = "Секретное слово"; -$_['p2p_text_app_help'] = "ID и секретное слово вы получите после регистрации приложения на сайте Яндекс.Денег"; +$_['p2p_text_app_help'] = "ID и секретное слово вы получите после регистрации приложения на сайте ЮMoney"; $_['p2p_text_extra_head'] = "Дополнительные настройки для администратора"; $_['p2p_text_debug'] = "Запись отладочной информации"; $_['p2p_text_off'] = "Отключена"; $_['p2p_text_on'] = "Включена"; -$_['p2p_text_debug_help'] = "Настройку нужно будет поменять, только если попросят специалисты Яндекс.Денег"; +$_['p2p_text_debug_help'] = "Настройку нужно будет поменять, только если попросят специалисты ЮMoney"; $_['p2p_text_status'] = "Статус заказа после оплаты"; // MWS -$_['lbl_mws_main'] = 'Настройка взаимодействия по протоколу MWS (Merchant Web Services)'; -$_['txt_mws_main'] = 'Для работы с MWS необходимо получить в Яндекс.Деньгах специальный сертификат и загрузить его в приложении.'; +$_['lbl_mws_main'] = 'Настройка взаимодействия по протоколу MWS (Merchant Web Services)'; +$_['txt_mws_main'] = 'Для работы с MWS необходимо получить в ЮMoney специальный сертификат и загрузить его в приложении.'; $_['lbl_mws_crt'] = 'Сертификат'; $_['lbl_mws_connect'] = 'Как получить сертификат'; $_['txt_mws_connect'] = 'Скачайте готовый запрос на сертификат (файл в формате .csr).'; $_['lbl_mws_doc'] = 'Данные для заполнения заявки'; -$_['txt_mws_doc'] = 'Скачайте заявку на сертификат. Ее нужно заполнить, распечатать, поставить подпись и печать. Внизу страницы — таблица с данными для заявки, просто скопируйте их. Отправьте файл запроса вместе со сканом готовой заявки менеджеру Яндекс.Денег на merchants@yamoney.ru.'; +$_['txt_mws_doc'] = 'Скачайте заявку на сертификат. Ее нужно заполнить, распечатать, поставить подпись и печать. Внизу страницы — таблица с данными для заявки, просто скопируйте их. Отправьте файл запроса вместе со сканом готовой заявки менеджеру ЮMoney на merchants@yoomoney.ru.'; $_['txt_mws_cer'] = 'Загрузите сертификат, который пришлет вам менеджер, наверху этой страницы.'; $_['lbl_mws_cn'] = 'CN'; @@ -365,13 +222,13 @@

    Сбросить настройки

    "; $_['lbl_mws_alert'] = "Все настройки для работы с MWS будут стерты. Сертификат нужно будет запросить повторно. Вы действительно хотите сбросить настройки MWS?"; $_['ext_mws_openssl'] = 'Отсутствует расширения openssl'; -$_['err_mws_kassa'] = 'Отключен модуль Яндекс.Кассы'; +$_['err_mws_kassa'] = 'Отключен модуль ЮKassa'; $_['err_mws_shopid'] = 'Отсутствует идентификатор магазина (shopId)'; // Error $_['error_permission'] = 'У Вас нет прав для управления этим модулем!'; -$_['error_install_widget'] = 'Чтобы покупатели могли заплатить вам через Apple Pay, скачайте файл apple-developer-merchantid-domain-association и добавьте его в папку ./well-known на вашем сайте. Если не знаете, как это сделать, обратитесь к администратору сайта или в поддержку хостинга. Не забудьте также подключить оплату через Apple Pay в личном кабинете Кассы. Почитать о подключении Apple Pay в документации Кассы'; +$_['error_install_widget'] = 'Чтобы покупатели могли заплатить вам через Apple Pay, скачайте файл apple-developer-merchantid-domain-association и добавьте его в папку ./well-known на вашем сайте. Если не знаете, как это сделать, обратитесь к администратору сайта или в поддержку хостинга. Не забудьте также подключить оплату через Apple Pay в личном кабинете ЮKassa. Почитать о подключении Apple Pay в документации ЮKassa'; $_['active_on'] = 'Включено'; @@ -424,7 +281,7 @@ $_['captures_expires_date'] = 'Подтвердить до'; $_['captures_new'] = 'Подтверждение платежа'; $_['captures_payment_data'] = 'Данные платежа'; -$_['captures_payment_id'] = 'Номер транзакции в Яндекс.Кассе'; +$_['captures_payment_id'] = 'Номер транзакции в ЮKassa'; $_['captures_order_id'] = 'Номер заказа'; $_['captures_payment_method'] = 'Способ оплаты'; $_['captures_payment_sum'] = 'Сумма платежа'; @@ -442,12 +299,12 @@ $_['column_price'] = 'Цена товара'; $_['column_total'] = 'Итого'; -$_['nps_text'] = 'Помогите нам улучшить модуль Яндекс.Кассы — ответьте на %s один вопрос %s'; +$_['nps_text'] = 'Помогите нам улучшить модуль ЮKassa — ответьте на %s один вопрос %s'; // Sbbol labels $_['b2b_sberbank_label'] = 'Включить платежи через Сбербанк Бизнес Онлайн'; -$_['b2b_sberbank_on_label'] = 'Если эта опция включена, вы можете принимать онлайн-платежи от юрлиц. Подробнее — на сайте Кассы.'; +$_['b2b_sberbank_on_label'] = 'Если эта опция включена, вы можете принимать онлайн-платежи от юрлиц. Подробнее — на сайте ЮKassa.'; $_['b2b_sberbank_template_label'] = 'Шаблон для назначения платежа'; $_['b2b_sberbank_vat_default_label'] = 'Ставка НДС по умолчанию'; $_['b2b_sberbank_template_help'] = 'Это назначение платежа будет в платёжном поручении.'; @@ -464,6 +321,6 @@ $_['kassa_payment_mode_default_label'] = 'Признак способа расчета'; $_['kassa_payment_subject_default_label'] = 'Признак предмета расчета'; -$_['kassa_payment_subject_default_description'] = 'Признаки предмета расчёта и способа расчёта берутся из атрибутов товара Признак предмета расчета и Признак способа расчета . Их значения можно задать отдельно в карточке товара, если это потребуется. Подробнее. +$_['kassa_payment_subject_default_description'] = 'Признаки предмета расчёта и способа расчёта берутся из атрибутов товара Признак предмета расчета и Признак способа расчета . Их значения можно задать отдельно в карточке товара, если это потребуется. Подробнее. Для товаров, у которых значения этих атрибутов не заданы, будем применять значения по умолчанию.'; \ No newline at end of file diff --git a/src/upload/admin/language/ru-ru/extension/payment/yoomoney_b2b_sberbank.php b/src/upload/admin/language/ru-ru/extension/payment/yoomoney_b2b_sberbank.php new file mode 100644 index 0000000..3a34255 --- /dev/null +++ b/src/upload/admin/language/ru-ru/extension/payment/yoomoney_b2b_sberbank.php @@ -0,0 +1,3 @@ +ЮKassa: Сбербанк Бизнес Онлайн'; \ No newline at end of file diff --git a/src/upload/admin/model/extension/payment/yandex_money/YandexMoneyBillingModel.php b/src/upload/admin/model/extension/payment/yandex_money/YandexMoneyBillingModel.php deleted file mode 100644 index 76caade..0000000 --- a/src/upload/admin/model/extension/payment/yandex_money/YandexMoneyBillingModel.php +++ /dev/null @@ -1,44 +0,0 @@ -enabled = $value ? true : false; - } - - public function setFormId($value) - { - $this->formId = $value; - } - - public function setPurpose($value) - { - $this->purpose = $value; - } - - public function setSuccessOrderStatusId($value) - { - $this->successOrderStatus = (int)$value; - } - - public function setMinPaymentAmount($value) - { - if ($value < 0) { - $value = 0; - } - $this->minPaymentAmount = (int)$value; - } - - public function setGeoZoneId($value) - { - $this->geoZone = $value; - } - - public function setDisplayName($value) - { - $this->displayName = $value; - } -} \ No newline at end of file diff --git a/src/upload/admin/model/extension/payment/yandex_money/YandexMoneyMarketModel.php b/src/upload/admin/model/extension/payment/yandex_money/YandexMoneyMarketModel.php deleted file mode 100644 index d60a42f..0000000 --- a/src/upload/admin/model/extension/payment/yandex_money/YandexMoneyMarketModel.php +++ /dev/null @@ -1,1255 +0,0 @@ -db = $db; - $this->config = $config; - $this->language = $language; - $this->stock_status = $stock_status; - $this->defaultCurrency = $this->config->get('config_currency'); - $this->option = $option; - $this->tax_class = $tax_class; - $this->catalog_category = $catalog_category; - - $this->taxClasses = $this->tax_class->getTaxClasses(); - $this->vatRates = (array)$this->config->get('yandex_money_market_vat'); - } - - /** - * @return string[] - */ - public function getFields() - { - return $this->fields; - } - - /** - * @return string[] - */ - public function getCurrencyIds() - { - return $this->currencyIds; - } - - /** - * @return array - */ - public function getTaxClasses() - { - return $this->taxClasses; - } - - /** - * @param $taxClassId - * @return array - */ - public function getTaxClass($taxClassId) - { - if (isset($this->taxClasses[$taxClassId])) { - return $this->taxClasses[$taxClassId]; - } - - return array(); - } - - /** - * @return array - */ - public function getVatList() - { - $result = array(); - foreach ($this->vatIds as $vatId) { - $result[$vatId] = $this->language->get('market_vat_rate_'.$vatId.'_label'); - } - - return $result; - } - - /** - * @param $taxClassId - * @return string - */ - public function getVatRateId($taxClassId) - { - if (isset($this->vatRates[$taxClassId])) { - return $this->vatRates[$taxClassId]; - } - - return ''; - } - - /** - * @return array - */ - public function checkConfig() - { - $errors = array(); - if (empty($this->config->get('yandex_money_market_shopname'))) { - $errors[] = 'market_error_message_empty_shop_name'; - } - - return $errors; - } - - - /** - * @return array - */ - public function getCategories() - { - if (empty($this->categories)) { - $categories = array(); - foreach ($this->catalog_category->getCategories(array('sort' => 'name')) as $category) { - $names = explode('  >  ', $category['name']); - $category['name'] = end($names); - $categories[$category['parent_id']][] = $category; - } - $this->categories = $categories; - } - - return $this->categories; - } - - /** - * @param array $checkedList - * @param string $inputName - * @return string - */ - public function treeCat(array $checkedList, $inputName = ' name="yandex_money_market_category_list[]"') - { - $html = $this->treeFolder($this->getCategories(), 0, $checkedList, $inputName); - - return $html; - } - - /** - * @param array $categories - * @param string $id - * @param array $checkedList - * @param string $inputAttr - * @return string - */ - private function treeFolder($categories, $id, $checkedList, $inputAttr) - { - if (!isset($categories[$id])) { - return ''; - } - $html = ''; - foreach ($categories[$id] as $category) { - $checked = in_array($category['category_id'], $checkedList) ? ' checked' : ''; - $html .= '
  • - - - '; - if (isset($categories[$category['category_id']])) { - $html .= '
      ' - .$this->treeFolder($categories, $category['category_id'], $checkedList, $inputAttr) - .'
    '; - } - $html .= '
    • '; - } - - return $html; - } - - /** - * @param array $cmsCurrencies - * @return string - */ - public function htmlCurrencyList($cmsCurrencies) - { - $html = ''; - - $cmsCurrencyIds = array_keys($cmsCurrencies); - - foreach ($this->currencyIds as $currencyId) { - $html .= $this->htmlCurrency($currencyId, $cmsCurrencyIds); - } - - return $html; - } - - private function htmlCurrency($id, $cmsCurrencyIds) - { - if (!in_array($id, $cmsCurrencyIds)) { - return ' -
    '; - } - - $enabled = $this->getConfig("currency_enabled", $id); - $rate = $this->getConfig("currency_rate", $id); - $plus = (float)$this->getConfig("currency_plus", $id, 0); - if ($id === $this->defaultCurrency) { - $rate = self::RATE_MAIN_CURRENCY; - $plus = ''; - } - - $htmlView = $this->htmlCurrencyView($rate, $plus); - $htmlEdit = $this->htmlCurrencyEdit($id, $rate, $plus); - - $checked = $enabled === 'on' ? 'checked="checked"' : ''; - - $jsEditableClass = $rate !== self::RATE_MAIN_CURRENCY ? 'yandex-money-market-js-editable' : ''; - $saveRate = $rate !== self::RATE_MAIN_CURRENCY ? $rate : ''; - - $html = << - - {$id} - - - {$htmlView} - - {$htmlEdit} -
    -HTML; - return $html; - } - - private function htmlCurrencyView($rate, $plus) - { - $rateText = $this->language->get('market_currencies_rate_'.$rate); - if ($rateText === 'market_currencies_rate_') { - $rateText = ''; - } - $plusText = $this->language->get('market_currencies_plus'); - $hidden = $rate === self::RATE_MAIN_CURRENCY ? ' style="display:none;"' : ''; - - $html = <<< HTML - - - {$rateText} - - - ({$plusText} - {$plus}%) - - -HTML; - return $html; - } - - private function htmlCurrencyEdit($id, $rate, $plus) - { - $select = $this->htmlCurrencySelect($id, $rate); - $okText = $this->language->get('ok'); - $cancelText = $this->language->get('cancel'); - $plusText = $this->language->get('market_currencies_plus'); - - $html = << -
    -
    - -
    - {$select} -
    -
    -
    - -
    - - -
    -
    -
    - -
    - - -
    -
    -
    -
    -HTML; - return $html; - } - - private function htmlCurrencySelect($id, $rate) - { - $html = << -HTML; - foreach ($this->currencyRates as $rateKey) { - $html .= $this->htmlCurrencyOption($rateKey, $rate); - } - $html .= ''; - - return $html; - } - - private function htmlCurrencyOption($rateKey, $rate) - { - $selected = $rate === $rateKey ? 'selected="selected"' : ''; - $rateText = $this->language->get('market_currencies_rate_'.$rateKey); - - return <<{$rateText} -HTML; - } - - /** - * @return string - */ - public function htmlDeliveryList() - { - $html = ''; - - for ($index = 1; $index <= 5; $index++) { - $html .= $this->htmlDelivery($index); - } - - return $html; - } - - private function htmlDelivery($index) - { - $enabled = $this->getConfig("delivery_enabled", $index); - $cost = $this->getConfig("delivery_cost", $index); - $daysFrom = $this->getConfig("delivery_days_from", $index); - $daysTo = $this->getConfig("delivery_days_to", $index); - $orderBefore = $this->getConfig("delivery_order_before", $index); - - $htmlView = $this->htmlDeliveryView($cost, $daysFrom, $daysTo, $orderBefore); - $htmlEdit = $this->htmlDeliveryEdit($cost, $daysFrom, $daysTo, $orderBefore); - - $checked = $enabled === 'on' ? 'checked="checked"' : ''; - - $html = << -
    - {$htmlEdit} -
    -HTML; - return $html; - } - - private function htmlDeliveryView($cost, $daysFrom, $daysTo, $orderBefore) - { - $daysText = $this->language->get('market_delivery_text'); - $daysLabelText = $this->language->get('market_delivery_days_measurement_unit'); - $orderBeforeText = $this->language->get('market_delivery_order_before'); - $defaultValueText = $this->language->get('market_delivery_default_value'); - - $costValue = (int)$cost; - $daysValue = empty($daysTo) || $daysFrom === $daysTo ? (int)$daysFrom : $daysFrom.'-'.$daysTo; - $orderBeforeValue = $orderBefore ?: $useDefaultValue = $defaultValueText; - - $html = <<< HTML - - {$costValue} - {$this->defaultCurrency} - {$daysText} - {$daysValue} - {$daysLabelText} - {$orderBeforeText} - {$orderBeforeValue} - -HTML; - return $html; - } - - /** - * @param string $cost - * @param string $daysFrom - * @param string $daysTo - * @param int $orderBefore - * @return string - */ - private function htmlDeliveryEdit($cost, $daysFrom, $daysTo, $orderBefore) - { - $costText = $this->language->get('market_delivery_cost'); - $daysText = $this->language->get('market_delivery_days'); - $daysFromText = $this->language->get('market_delivery_days_from'); - $daysToText = $this->language->get('market_delivery_days_to'); - $orderBeforeText = $this->language->get('market_delivery_days_order_before'); - $daysLabelText = $this->language->get('market_delivery_days_measurement_unit'); - $okText = $this->language->get('ok'); - $cancelText = $this->language->get('cancel'); - - $orderBeforeSelect = $this->htmlDeliveryOrderBeforeSelect($orderBefore); - - $html = << -
    -
    - -
    - -
    -
    -
    - -
    - {$daysFromText} - - {$daysToText} - - {$daysLabelText} -
    -
    -
    - -
    - {$orderBeforeSelect} -
    -
    -
    - -
    - - -
    -
    -
    - -HTML; - return $html; - } - - /** - * @param int $selectedTime - * @return string - */ - private function htmlDeliveryOrderBeforeSelect($selectedTime) - { - $useDefaultValue = $this->language->get('market_delivery_use_default'); - - $html = ''; - - return $html; - } - - /** - * @param int $time - * @param int $selectedTime - * @param string $useDefaultValue - * @return string - */ - private function htmlDeliveryOrderBeforeOption($time, $selectedTime, $useDefaultValue) - { - $selected = $time === (int)$selectedTime ? 'selected="selected"' : ''; - $timeText = $time === 0 ? $useDefaultValue : $time.':00'; - - return <<{$timeText} -HTML; - } - - /** - * @return string - */ - public function htmlAvailableList() - { - $nonZeroCountText = $this->language->get('market_available_non_zero_count_goods'); - $ifZeroCountText = $this->language->get('market_available_if_zero_count_goods'); - - $html = ''; - $statuses = $this->stock_status->getStockStatuses(); - $html .= $this->htmlAvailable('non-zero-quantity', $nonZeroCountText); - $html .= '
    '.$ifZeroCountText; - foreach ($statuses as $status) { - $html .= $this->htmlAvailable($status['stock_status_id'], $status['name']); - } - $html .= '
    '; - - return $html; - } - - /** - * @param $statusId - * @param $statusName - * @return string - */ - public function htmlAvailable($statusId, $statusName) - { - $enabled = $this->getConfig("available_enabled", $statusId); - $available = $this->getConfig("available_available", $statusId); - $delivery = $this->getConfig("available_delivery", $statusId); - $pickup = $this->getConfig("available_pickup", $statusId); - $store = $this->getConfig("available_store", $statusId); - - $enabledCheckbox = $this->htmlAvailableCheckbox($statusId, 'enabled', $enabled, ''); - - $htmlView = $this->htmlAvailableView($statusId, $statusName); - $htmlEdit = $this->htmlAvailableEdit($statusId, $statusName, $available, $delivery, $pickup, $store); - - $html = << - {$enabledCheckbox} - - - - - {$htmlView} - {$htmlEdit} - - -HTML; - return $html; - } - - - /** - * @param $statusId - * @param $statusName - * @return string - */ - private function htmlAvailableView($statusId, $statusName) - { - $availableProductStatusText = $statusId === 'non-zero-quantity' - ? '' - : $this->language->get('market_available_view_order_label'); - $availableDontUploadText = $this->language->get('market_available_view_dont_upload'); - $availableWillUploadText = $this->language->get('market_available_view_will_upload'); - $availableReadyText = $this->language->get('market_available_view_ready'); - $availableToOrderText = $this->language->get('market_available_view_to_order'); - $availableWithAvailableText = $this->language->get('market_available_view_with_available'); - $availableDeliveryText = $this->language->get('market_available_view_delivery'); - $availablePickupText = $this->language->get('market_available_view_pickup'); - $availableStoreText = $this->language->get('market_available_view_store'); - - $html = <<< HTML - - {$availableProductStatusText} - {$statusName} - {$availableDontUploadText} - - {$availableWillUploadText} - {$availableReadyText} - {$availableToOrderText} - - {$availableWithAvailableText} - {$availableDeliveryText} - {$availablePickupText} - {$availableStoreText} - - - -HTML; - return $html; - } - - /** - * @param string $statusId - * @param $statusName - * @param string $available - * @param string $delivery - * @param string $pickup - * @param string $store - * @return string - */ - private function htmlAvailableEdit($statusId, $statusName, $available, $delivery, $pickup, $store) - { - $cancelText = $this->language->get('cancel'); - $okText = $this->language->get('ok'); - - $deliveryLabel = $this->language->get('market_available_delivery'); - $pickupLabel = $this->language->get('market_available_pickup'); - $storeLabel = $this->language->get('market_available_store'); - - $availableSelect = $this->htmlAvailableSelect($statusId, $available); - $deliveryCheckbox = $this->htmlAvailableCheckbox($statusId, 'delivery', $delivery, - $this->language->get('market_available_delivery_description')); - $pickupCheckbox = $this->htmlAvailableCheckbox($statusId, 'pickup', $pickup, - $this->language->get('market_available_pickup_description')); - $storeCheckbox = $this->htmlAvailableCheckbox($statusId, 'store', $store, - $this->language->get('market_available_store_description')); - - $html = << - {$statusName} -
    -
    - -
    - {$availableSelect} -
    -
    -
    - -
    - {$deliveryCheckbox} -
    -
    -
    - -
    - {$pickupCheckbox} -
    -
    -
    - -
    - {$storeCheckbox} -
    -
    -
    - -
    - - -
    -
    -
    - -HTML; - return $html; - } - - /** - * @param string $statusId - * @param string $available - * @return string - */ - private function htmlAvailableSelect($statusId, $available) - { - $options = array( - 'none' => $this->language->get('market_available_dont_unload'), - 'true' => $this->language->get('market_available_ready'), - 'false' => $this->language->get('market_available_to_order'), - ); - - $html = ''; - - return $html; - } - - /** - * @param string $value - * @param string $text - * @param string $available - * @return string - */ - private function htmlAvailableOption($value, $text, $available) - { - $selected = $value === $available ? 'selected="selected"' : ''; - - return <<{$text} -HTML; - } - - /** - * @param $statusId - * @param $field - * @param string $value - * @param string $text - * @return string - */ - private function htmlAvailableCheckbox($statusId, $field, $value, $text) - { - $checked = $value === 'on' ? 'checked="checked"' : ''; - - return << - - {$text} - -HTML; - } - - /** - * @return string - */ - public function htmlOptionList() - { - return $this->htmlOptionItem('color') - .$this->htmlOptionItem('size'); - } - - /** - * @param $option - * @return string - */ - public function htmlOptionItem($option) - { - $text = $this->language->get("market_option_{$option}_label"); - $enabled = $this->config->get("yandex_money_market_option_{$option}_enabled"); - $checked = $enabled === 'on' ? 'checked="checked"' : ''; - $select = $this->htmlOptionSelect($option); - - $text_name = $this->language->get("market_option_name_{$option}_label"); - $enabled_name = $this->config->get("yandex_money_market_option_name_{$option}_enabled"); - $checked_name = $enabled_name === 'on' ? 'checked="checked"' : ''; - - $placeholder_prefix = $this->language->get("market_option_prefix_{$option}_label"); - $text_prefix = $this->config->get("yandex_money_market_option_prefix_{$option}_text"); - - $html = << - -
    - {$select} -
    -
    -
    - -
    - -
    -
    -
    - -HTML; - - return $html; - } - - /** - * @param string $option - * @return string - */ - private function htmlOptionSelect($option) - { - $optionId = (int)$this->config->get("yandex_money_market_option_{$option}_option_id"); - $options = array(); - foreach ($this->option->getOptions() as $oneOption) { - $options[$oneOption['option_id']] = $oneOption['name']; - } - - $html = ''; - - return $html; - } - - /** - * @return string - */ - public function htmlAdditionalConditionList() - { - $typeValues = (array)$this->config->get("yandex_money_market_additional_condition_type_value"); - $maxIndex = empty($typeValues) ? 0 : max(array_keys($typeValues)); - - $html = '
    '; - for ($index = 1; $index <= $maxIndex; $index++) { - $html .= $this->htmlAdditionalConditionItem($index); - } - $html .= $this->htmlAdditionalConditionItem(''); - - $html .= << -
    - - {$this->language->get("market_additional_condition_more")} - -
    -HTML; - - return $html; - } - - private function htmlAdditionalConditionItem($index) - { - if ($index === '') { - $enabled = ''; - $name = ''; - $tag = ''; - $typeValue = 'static'; - $staticValue = ''; - $dataValue = ''; - $addTemplate = 'yandex-money-market-additional-condition-template'; - $fieldName = 'data-name'; - $forAllCat = 'on'; - $join = ''; - $checkedList = array(); - } else { - $enabled = $this->getConfig("additional_condition_enabled", $index); - $name = $this->getConfig("additional_condition_name", $index); - $tag = $this->getConfig("additional_condition_tag", $index); - $typeValue = $this->getConfig("additional_condition_type_value", $index); - $staticValue = $this->getConfig("additional_condition_static_value", $index); - $dataValue = $this->getConfig("additional_condition_data_value", $index); - $forAllCat = $this->getConfig("additional_condition_for_all_cat", $index); - $join = $this->getConfig("additional_condition_join", $index); - $checkedList = (array)$this->getConfig("additional_condition_categories", $index); - $addTemplate = ''; - $fieldName = 'name'; - } - - if (empty($typeValue)) { - return ''; - } - - $categoriesInput = array(); - foreach ($this->getCategories() as $categoryGroup) { - foreach ($categoryGroup as $category) { - $checked = in_array($category['category_id'], $checkedList) ? 'checked="checked" ' : ''; - $categoriesInput[] = ''; - } - } - $htmlCategoriesInput = implode('', $categoriesInput); - - $htmlView = $this->htmlAdditionalConditionItemView($name, $tag, $typeValue, $staticValue, $dataValue, - $forAllCat, $checkedList); - $htmlEdit = $this->htmlAdditionalConditionItemEdit($name, $tag, $typeValue, $staticValue, $dataValue, - $forAllCat, $checkedList, $join); - - $checked = $enabled === 'on' ? 'checked="checked"' : ''; - - $html = << -
    - {$htmlEdit} -
    -HTML; - return $html; - } - - /** - * @param string $name - * @param string $tag - * @param string $typeValue - * @param string $staticValue - * @param string $dataValue - * @param string $forAllCat - * @param array $checkedList - * @return string - */ - private function htmlAdditionalConditionItemView( - $name, - $tag, - $typeValue, - $staticValue, - $dataValue, - $forAllCat, - array $checkedList - ) { - $makeTag = $this->language->get('market_additional_condition_make_tag_label'); - $withValue = $this->language->get('market_additional_condition_with_value_label'); - $forCategory = $this->language->get('market_additional_condition_for_category_label'); - $forAllCategories = $this->language->get('market_additional_condition_for_all_category_label'); - $forMoreCategories = $this->language->get('market_additional_condition_for_more_category_label'); - - $value = $typeValue === 'static' - ? $staticValue - : $this->language->get('entry_'.$dataValue); - - if ($forAllCat === 'on') { - $categoryList = $forAllCategories; - } else { - $categories = array(); - foreach ($this->getCategories() as $categoryGroup) { - foreach ($categoryGroup as $category) { - if (in_array($category['category_id'], $checkedList)) { - $categories[] = $category['name']; - } - } - } - $count = count($categories); - if ($count <= self::MAX_CATEGORY_NUMBER) { - $categoryList = implode(', ', $categories); - } else { - $categoryList = implode(', ', array_slice($categories, 0, self::MAX_CATEGORY_NUMBER)); - $categoryList .= ' '.sprintf($forMoreCategories, $count - self::MAX_CATEGORY_NUMBER); - } - } - - $html = <<< HTML - - {$name} - {$makeTag} - <{$tag}> - {$withValue} - {$value} - {$forCategory} - {$categoryList} - -HTML; - return $html; - } - - /** - * @param $name - * @param $tag - * @param $typeValue - * @param $staticValue - * @param $dataValue - * @param $forAllCat - * @param array $checkedList - * @param string $join - * @return string - */ - private function htmlAdditionalConditionItemEdit( - $name, - $tag, - $typeValue, - $staticValue, - $dataValue, - $forAllCat, - array $checkedList, - $join - ) { - $nameText = $this->language->get('market_additional_condition_name_label'); - $tagText = $this->language->get('market_additional_condition_tag_label'); - $staticValueText = $this->language->get('market_additional_condition_static_value_label'); - $dataValueText = $this->language->get('market_additional_condition_data_value_label'); - $categoriesText = $this->language->get('market_additional_condition_for_categories_label'); - $allCategoriesText = $this->language->get('market_categories_all'); - $selectedCategoriesText = $this->language->get('market_categories_selected'); - $joinLabel = $this->language->get('market_additional_condition_join_label'); - $joinText = $this->language->get('market_additional_condition_join_text'); - $dontJoinText = $this->language->get('market_additional_condition_dont_join_text'); - $okText = $this->language->get('ok'); - $cancelText = $this->language->get('cancel'); - $deleteText = $this->language->get('delete'); - $hideAllText = $this->language->get('market_sv_all'); - $showAllText = $this->language->get('market_rv_all'); - $checkAllText = $this->language->get('market_ch_all'); - $uncheckAllText = $this->language->get('market_unch_all'); - - $dataValueSelect = $this->htmlAdditionalConditionProductDataSelect($dataValue); - - if ($typeValue === 'static') { - $staticValueChecked = ' checked="checked"'; - $dataValueChecked = ''; - } else { - $staticValueChecked = ''; - $dataValueChecked = ' checked="checked"'; - } - - if ($forAllCat === 'on') { - $allCategoriesChecked = ' checked="checked"'; - $selectedCategoriesChecked = ''; - $classCategoryTree = ' yandex-money-market-hidden-element'; - } else { - $allCategoriesChecked = ''; - $selectedCategoriesChecked = ' checked="checked"'; - $classCategoryTree = ''; - } - - if ($join === 'on') { - $joinChecked = ' checked="checked"'; - $dontJoinChecked = ''; - } else { - $joinChecked = ''; - $dontJoinChecked = ' checked="checked"'; - } - - $html = << -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    - -
    - -
    - -
    -
    -
    - - - {$dataValueSelect} - -
    - -
    - -
    -
    - -
    -
    - -
    -
    -
    - - -
    - -
    -
    - -
    -
    - -
    -
    -
    - -
    -
    -
    - - {$hideAllText} - - - {$showAllText} - - - {$checkAllText} - - - {$uncheckAllText} - -
    -
    -
      - {$this->treeCat($checkedList, ' class="additional_condition_categories"')} -
    -
    - -
    - -
    - - - -
    -
    -
    - -HTML; - return $html; - } - - /** - * @param int $selectedField - * @return string - */ - private function htmlAdditionalConditionProductDataSelect($selectedField) - { - $html = ''; - - return $html; - } - - /** - * @param array $array - * @param string $key - * @param null $default - * @return null - */ - private function array_get($array, $key, $default = null) - { - return isset($array[$key]) ? $array[$key] : $default; - } - - /** - * @param $key - * @param $index - * @param null $default - * @return null - */ - private function getConfig($key, $index = null, $default = null) - { - return $index === null - ? $this->config->get("yandex_money_market_".$key) - : $this->array_get( - $this->config->get("yandex_money_market_".$key), - $index, - $default - ); - } - -} \ No newline at end of file diff --git a/src/upload/admin/model/extension/payment/yandex_money/YandexMoneyMetrikaModel.php b/src/upload/admin/model/extension/payment/yandex_money/YandexMoneyMetrikaModel.php deleted file mode 100644 index 5d106bf..0000000 --- a/src/upload/admin/model/extension/payment/yandex_money/YandexMoneyMetrikaModel.php +++ /dev/null @@ -1,100 +0,0 @@ -SendResponse('counter/'.$number, $token, array(), array(), 'GET'); - } - - /** - * @param int $number - * @param string $token - * @param array $options - * @return mixed - */ - public function saveCounterOptions($number, $token, $options) - { - $params = array( - 'counter' => array( - 'code_options' => array( - 'clickmap' => (int)$options['clickmap'], - 'visor' => (int)$options['visor'], - 'track_hash' => (int)$options['track_hash'], - 'ecommerce' => 1, - 'informer' => array( - 'enabled' => 0, - ), - ), - ), - ); - - return $this->SendResponse('counter/'.$number, $token, array(), $params, 'PUT'); - } - - /** - * @param string $to - * @param string $token - * @param array $headers - * @param array $params - * @param string $type - * @return mixed - */ - private function SendResponse($to, $token, $headers, $params, $type) - { - $headers[] = 'Authorization: OAuth '.$token; - return $this->post(self::URL.$to, $headers, $params, $type); - } - - /** - * @param string $url - * @param array $headers - * @param array $params - * @param string $type - * @return stdClass - */ - private static function post($url, $headers, $params, $type) - { - $curlOpt = array( - CURLOPT_RETURNTRANSFER => true, - CURLINFO_HEADER_OUT => true, - CURLOPT_MAXREDIRS => 3, - CURLOPT_CONNECTTIMEOUT => 10, - CURLOPT_TIMEOUT => 10, - CURLOPT_SSL_VERIFYPEER => true, - ); - - switch (strtoupper($type)) { - case 'GET': - if (!empty($params)) { - $url .= (strpos($url, '?') === false ? '?' : '&').http_build_query($params); - } - break; - case 'PUT': - $json = json_encode($params); - $headers[] = 'Content-Type: application/json'; - $headers[] = 'Content-Length: '.strlen($json); - - $curlOpt[CURLOPT_CUSTOMREQUEST] = 'PUT'; - $curlOpt[CURLOPT_POSTFIELDS] = $json; - break; - } - - $curlOpt[CURLOPT_HTTPHEADER] = $headers; - $curl = curl_init($url); - curl_setopt_array($curl, $curlOpt); - $response = curl_exec($curl); - curl_close($curl); - - return json_decode($response, true); - } -} \ No newline at end of file diff --git a/src/upload/admin/model/extension/payment/yandex_money/opencart-3.map b/src/upload/admin/model/extension/payment/yandex_money/opencart-3.map deleted file mode 100644 index c1bf8e6..0000000 --- a/src/upload/admin/model/extension/payment/yandex_money/opencart-3.map +++ /dev/null @@ -1,11 +0,0 @@ -f:src/upload/admin/controller/extension/payment/yandex_money.php:admin/controller/extension/payment/yandex_money.php -f:src/upload/{admin,catalog}/language/{en-gb,ru-ru}/extension/payment/yandex_money.php:{admin,catalog}/language/{en-gb,ru-ru}/extension/payment/yandex_money.php -d:src/upload/{admin,catalog}/model/extension/payment/yandex_money:{admin,catalog}/model/extension/payment/yandex_money -f:src/upload/admin/model/extension/payment/yandex_money.php:admin/model/extension/payment/yandex_money.php -d:src/upload/admin/view/template/extension/payment/yandex_money:admin/view/template/extension/payment/yandex_money -f:src/upload/admin/view/template/extension/payment/yandex_money.twig:admin/view/template/extension/payment/yandex_money.twig -f:src/upload/catalog/{controller,model}/extension/payment/yandex_money.php:catalog/{controller,model}/extension/payment/yandex_money.php -f:src/upload/catalog/view/theme/default/template/extension/payment/yandex_money_failure_status.tpl:catalog/view/theme/default/template/extension/payment/yandex_money_failure_status.tpl -f:src/upload/catalog/view/theme/default/template/extension/payment/yandex_money_success_status.tpl:catalog/view/theme/default/template/extension/payment/yandex_money_success_status.tpl -d:src/upload/catalog/view/theme/default/template/extension/payment/yandex_money:catalog/view/theme/default/template/extension/payment/yandex_money -d:src/upload/image/catalog/payment/yandex_money:image/catalog/payment/yandex_money \ No newline at end of file diff --git a/src/upload/admin/model/extension/payment/yandex_money.php b/src/upload/admin/model/extension/payment/yoomoney.php similarity index 80% rename from src/upload/admin/model/extension/payment/yandex_money.php rename to src/upload/admin/model/extension/payment/yoomoney.php index 84cc3d6..ce0d2b9 100644 --- a/src/upload/admin/model/extension/payment/yandex_money.php +++ b/src/upload/admin/model/extension/payment/yoomoney.php @@ -1,29 +1,26 @@ log('info', 'install yandex_money module'); + $this->log('info', 'install yoomoney module'); $this->db->query(' - CREATE TABLE IF NOT EXISTS `'.DB_PREFIX.'ya_money_payment` ( + CREATE TABLE IF NOT EXISTS `'.DB_PREFIX.'yoomoney_payment` ( `order_id` INTEGER NOT NULL, `payment_id` CHAR(36) NOT NULL, `status` ENUM(\'pending\', \'waiting_for_capture\', \'succeeded\', \'canceled\') NOT NULL, @@ -35,12 +32,12 @@ public function install() `captured_at` DATETIME NOT NULL DEFAULT \'0000-00-00 00:00:00\', `receipt` TEXT DEFAULT NULL, - CONSTRAINT `'.DB_PREFIX.'ya_money_payment_pk` PRIMARY KEY (`order_id`), - CONSTRAINT `'.DB_PREFIX.'ya_money_payment_unq_payment_id` UNIQUE (`payment_id`) + CONSTRAINT `'.DB_PREFIX.'yoomoney_payment_pk` PRIMARY KEY (`order_id`), + CONSTRAINT `'.DB_PREFIX.'yoomoney_payment_unq_payment_id` UNIQUE (`payment_id`) ) ENGINE=InnoDB DEFAULT CHARSET=UTF8 COLLATE=utf8_general_ci; '); $this->db->query(' - CREATE TABLE IF NOT EXISTS `'.DB_PREFIX.'ya_money_refunds` ( + CREATE TABLE IF NOT EXISTS `'.DB_PREFIX.'yoomoney_refunds` ( `refund_id` CHAR(36) NOT NULL, `order_id` INTEGER NOT NULL, `payment_id` CHAR(36) NOT NULL, @@ -49,32 +46,32 @@ public function install() `currency` CHAR(3) NOT NULL, `created_at` DATETIME NOT NULL, `authorized_at` DATETIME NOT NULL DEFAULT \'0000-00-00 00:00:00\', - INDEX `'.DB_PREFIX.'ya_money_refunds_idx_order_id` (`order_id`), - INDEX `'.DB_PREFIX.'ya_money_refunds_idx_payment_id` (`payment_id`), - CONSTRAINT `'.DB_PREFIX.'ya_money_refunds_pk` PRIMARY KEY (`refund_id`) + INDEX `'.DB_PREFIX.'yoomoney_refunds_idx_order_id` (`order_id`), + INDEX `'.DB_PREFIX.'yoomoney_refunds_idx_payment_id` (`payment_id`), + CONSTRAINT `'.DB_PREFIX.'yoomoney_refunds_pk` PRIMARY KEY (`refund_id`) ) ENGINE=InnoDB DEFAULT CHARSET=UTF8 COLLATE=utf8_general_ci; '); $this->db->query(' - CREATE TABLE IF NOT EXISTS `'.DB_PREFIX.'ya_money_product_properties` ( + CREATE TABLE IF NOT EXISTS `'.DB_PREFIX.'yoomoney_product_properties` ( `product_id` INTEGER NOT NULL, `payment_subject` VARCHAR(256), `payment_mode` VARCHAR(256), - CONSTRAINT `'.DB_PREFIX.'ya_money_payment_pk` PRIMARY KEY (`product_id`) + CONSTRAINT `'.DB_PREFIX.'yoomoney_payment_pk` PRIMARY KEY (`product_id`) ) ENGINE=InnoDB DEFAULT CHARSET=UTF8 COLLATE=utf8_general_ci; '); } public function uninstall() { - $this->log('info', 'uninstall yandex_money module'); + $this->log('info', 'uninstall yoomoney module'); } public function log($level, $message, $context = null) { if ($this->getKassaModel()->getDebugLog()) { - $log = new Log('yandex-money.log'); + $log = new Log('yoomoney.log'); $search = array(); $replace = array(); if (!empty($context)) { @@ -112,11 +109,11 @@ public function installEventForSecondReceipt() { $this->load->model('setting/event'); - $this->model_setting_event->deleteEventByCode(self::YCMS_EVENT_SECOND_RECEIPT_CODE); + $this->model_setting_event->deleteEventByCode(self::YOOMONEY_EVENT_SECOND_RECEIPT_CODE); $this->model_setting_event->addEvent( - self::YCMS_EVENT_SECOND_RECEIPT_CODE, + self::YOOMONEY_EVENT_SECOND_RECEIPT_CODE, "catalog/model/checkout/order/addOrderHistory/after", - "extension/payment/yandex_money/hookOrderStatusChange" + "extension/payment/yoomoney/hookOrderStatusChange" ); } @@ -127,7 +124,7 @@ public function installEventForSecondReceipt() */ public function findPaymentIdByOrderId($orderId) { - $sql = 'SELECT `payment_id` FROM `'.DB_PREFIX.'ya_money_payment` WHERE `order_id` = '.(int)$orderId; + $sql = 'SELECT `payment_id` FROM `'.DB_PREFIX.'yoomoney_payment` WHERE `order_id` = '.(int)$orderId; $resultSet = $this->db->query($sql); if (empty($resultSet) || empty($resultSet->num_rows)) { return null; @@ -144,7 +141,7 @@ public function findPaymentIdByOrderId($orderId) */ public function findPayments($offset = 0, $limit = 0) { - $res = $this->db->query('SELECT * FROM `'.DB_PREFIX.'ya_money_payment` ORDER BY `order_id` DESC LIMIT '.(int)$offset.', '.(int)$limit); + $res = $this->db->query('SELECT * FROM `'.DB_PREFIX.'yoomoney_payment` ORDER BY `order_id` DESC LIMIT '.(int)$offset.', '.(int)$limit); if ($res->num_rows) { return $res->rows; } @@ -157,7 +154,7 @@ public function findPayments($offset = 0, $limit = 0) */ public function countPayments() { - $res = $this->db->query('SELECT COUNT(*) AS `count` FROM `'.DB_PREFIX.'ya_money_payment`'); + $res = $this->db->query('SELECT COUNT(*) AS `count` FROM `'.DB_PREFIX.'yoomoney_payment`'); if ($res->num_rows) { return $res->row['count']; } @@ -168,7 +165,7 @@ public function countPayments() /** * @param $payments * - * @return \YandexCheckout\Model\PaymentInterface[] + * @return \YooKassa\Model\PaymentInterface[] */ public function updatePaymentsStatuses($payments) { @@ -176,8 +173,8 @@ public function updatePaymentsStatuses($payments) $client = $this->getClient(); $statuses = array( - \YandexCheckout\Model\PaymentStatus::PENDING, - \YandexCheckout\Model\PaymentStatus::WAITING_FOR_CAPTURE, + \YooKassa\Model\PaymentStatus::PENDING, + \YooKassa\Model\PaymentStatus::WAITING_FOR_CAPTURE, ); foreach ($payments as $payment) { if (in_array($payment['status'], $statuses)) { @@ -185,7 +182,7 @@ public function updatePaymentsStatuses($payments) $paymentObject = $client->getPaymentInfo($payment['payment_id']); if ($paymentObject === null) { $this->updatePaymentStatus($payment['payment_id'], - \YandexCheckout\Model\PaymentStatus::CANCELED); + \YooKassa\Model\PaymentStatus::CANCELED); } else { $result[] = $paymentObject; if ($paymentObject->getStatus() !== $payment['status']) { @@ -203,7 +200,7 @@ public function updatePaymentsStatuses($payments) } /** - * @param \YandexCheckout\Model\PaymentInterface $payment + * @param \YooKassa\Model\PaymentInterface $payment * @param bool $fetchPayment * * @return bool @@ -221,13 +218,13 @@ public function capturePayment($payment, $fetchPayment = true) } } - if ($payment->getStatus() !== \YandexCheckout\Model\PaymentStatus::WAITING_FOR_CAPTURE) { - return $payment->getStatus() === \YandexCheckout\Model\PaymentStatus::SUCCEEDED; + if ($payment->getStatus() !== \YooKassa\Model\PaymentStatus::WAITING_FOR_CAPTURE) { + return $payment->getStatus() === \YooKassa\Model\PaymentStatus::SUCCEEDED; } $client = $this->getClient(); try { - $builder = \YandexCheckout\Request\Payments\Payment\CreateCaptureRequest::builder(); + $builder = \YooKassa\Request\Payments\Payment\CreateCaptureRequest::builder(); $builder->setAmount($payment->getAmount()); $request = $builder->build(); $result = $client->capturePayment($request, $payment->getId()); @@ -265,7 +262,7 @@ public function cancelPayment($payment) /** * @param int $orderId * @param array $orderInfo - * @param \YandexCheckout\Model\PaymentInterface $payment + * @param \YooKassa\Model\PaymentInterface $payment * @param int $statusId */ public function confirmOrderPayment($orderId, $orderInfo, $payment, $statusId) @@ -296,11 +293,11 @@ public function updateOrderStatus($order_id, $order_info, $comment = '') private function updatePaymentStatus($paymentId, $status, $capturedAt = null) { - $sql = 'UPDATE `'.DB_PREFIX.'ya_money_payment` SET `status` = \''.$status.'\''; + $sql = 'UPDATE `'.DB_PREFIX.'yoomoney_payment` SET `status` = \''.$status.'\''; if ($capturedAt !== null) { $sql .= ', `captured_at`=\''.$capturedAt->format('Y-m-d H:i:s').'\''; } - if ($status !== \YandexCheckout\Model\PaymentStatus::CANCELED && $status !== \YandexCheckout\Model\PaymentStatus::PENDING) { + if ($status !== \YooKassa\Model\PaymentStatus::CANCELED && $status !== \YooKassa\Model\PaymentStatus::PENDING) { $sql .= ', `paid`=\'Y\''; } $sql .= ' WHERE `payment_id`=\''.$paymentId.'\''; @@ -314,11 +311,11 @@ private function updatePaymentStatus($paymentId, $status, $capturedAt = null) */ public function getOrderRefunds($orderId) { - $sql = 'SELECT * FROM `'.DB_PREFIX.'ya_money_refunds` WHERE `order_id` = '.(int)$orderId; + $sql = 'SELECT * FROM `'.DB_PREFIX.'yoomoney_refunds` WHERE `order_id` = '.(int)$orderId; $recordSet = $this->db->query($sql); $result = array(); foreach ($recordSet->rows as $record) { - if ($record['status'] === \YandexCheckout\Model\RefundStatus::PENDING) { + if ($record['status'] === \YooKassa\Model\RefundStatus::PENDING) { $this->checkRefundStatus($record['refund_id']); } $result[] = $record; @@ -334,7 +331,7 @@ private function checkRefundStatus($refundId) } catch (\Exception $e) { return; } - $sql = 'UPDATE `'.DB_PREFIX.'ya_money_payment` SET `status` = \'' + $sql = 'UPDATE `'.DB_PREFIX.'yoomoney_payment` SET `status` = \'' .$this->db->escape($refund->getStatus()).'\''; $sql .= ' WHERE `refund_id` = \''.$this->db->escape($refund->getId()).'\''; $this->db->escape($sql); @@ -343,7 +340,7 @@ private function checkRefundStatus($refundId) /** * @param string $paymentId * - * @return \YandexCheckout\Model\PaymentInterface|null + * @return \YooKassa\Model\PaymentInterface|null */ public function fetchPaymentInfo($paymentId) { @@ -360,8 +357,8 @@ public function fetchPaymentInfo($paymentId) public function getKassaModel() { if ($this->kassaModel === null) { - require_once __DIR__.'/yandex_money/YandexMoneyKassaModel.php'; - $this->kassaModel = new YandexMoneyKassaModel($this->config); + require_once __DIR__.'/yoomoney/YooMoneyKassaModel.php'; + $this->kassaModel = new YooMoneyKassaModel($this->config); $this->kassaModel->setApiClient($this->getClient()); } @@ -371,65 +368,19 @@ public function getKassaModel() public function getWalletModel() { if ($this->walletModel === null) { - require_once __DIR__.'/yandex_money/YandexMoneyWalletModel.php'; - $this->walletModel = new YandexMoneyWalletModel($this->config); + require_once __DIR__.'/yoomoney/YooMoneyWalletModel.php'; + $this->walletModel = new YooMoneyWalletModel($this->config); } return $this->walletModel; } - public function getBillingModel() - { - if ($this->billingModel === null) { - require_once __DIR__.'/yandex_money/YandexMoneyBillingModel.php'; - $this->billingModel = new YandexMoneyBillingModel($this->config); - } - - return $this->billingModel; - } - - /** - * @return YandexMoneyMetrikaModel - */ - public function getMetrikaModel() - { - if ($this->metrikaModel === null) { - require_once dirname(__FILE__).DIRECTORY_SEPARATOR.'yandex_money'.DIRECTORY_SEPARATOR.'YandexMoneyMetrikaModel.php'; - $this->metrikaModel = new YandexMoneyMetrikaModel(); - } - - return $this->metrikaModel; - } - - /** - * @return YandexMoneyMarketModel - */ - public function getMarket() - { - if ($this->market === null) { - require_once dirname(__FILE__).DIRECTORY_SEPARATOR.'yandex_money'.DIRECTORY_SEPARATOR.'YandexMoneyMarketModel.php'; - $this->load->model('localisation/stock_status'); - $this->load->model('localisation/tax_class'); - $this->load->model('catalog/category'); - $this->load->model('catalog/option'); - $this->load->language('catalog/product'); - $this->market = new YandexMoneyMarketModel($this->config, $this->db, $this->language, - $this->model_localisation_stock_status, - $this->model_catalog_option, - $this->model_localisation_tax_class, - $this->model_catalog_category - ); - } - - return $this->market; - } - public function refundPayment($payment, $order, $amount, $comment) { try { - $builder = \YandexCheckout\Request\Refunds\CreateRefundRequest::builder(); + $builder = \YooKassa\Request\Refunds\CreateRefundRequest::builder(); $builder->setAmount($amount) - ->setCurrency(\YandexCheckout\Model\CurrencyCode::RUB) + ->setCurrency(\YooKassa\Model\CurrencyCode::RUB) ->setPaymentId($payment->getId()) ->setDescription($comment); $request = $builder->build(); @@ -455,12 +406,12 @@ public function refundPayment($payment, $order, $amount, $comment) } /** - * @param \YandexCheckout\Model\RefundInterface $refund + * @param \YooKassa\Model\RefundInterface $refund * @param int $orderId */ private function insertRefund($refund, $orderId) { - $sql = 'INSERT INTO `'.DB_PREFIX.'ya_money_refunds`(' + $sql = 'INSERT INTO `'.DB_PREFIX.'yoomoney_refunds`(' .'`refund_id`, `order_id`, `payment_id`, `status`, `amount`, `currency`, `created_at`' .') VALUES (' ."'".$this->db->escape($refund->getId())."'," @@ -477,7 +428,7 @@ private function insertRefund($refund, $orderId) protected function getClient() { if ($this->client === null) { - $this->client = new \YandexCheckout\Client(); + $this->client = new \YooKassa\Client(); $this->client->setAuth( $this->getKassaModel()->getShopId(), $this->getKassaModel()->getPassword() @@ -485,7 +436,7 @@ protected function getClient() $this->client->setLogger($this); $userAgent = $this->client->getApiClient()->getUserAgent(); $userAgent->setCms('OpenCart', VERSION); - $userAgent->setModule('Y.CMS',self::MODULE_VERSION); + $userAgent->setModule('YooMoney',self::MODULE_VERSION); } return $this->client; @@ -527,8 +478,8 @@ public function createBackup($version) $this->preventDirectories(); $sourceDirectory = dirname(realpath(DIR_CATALOG)); - $reader = new \YandexMoney\Updater\ProjectStructure\ProjectStructureReader(); - $root = $reader->readFile(dirname(__FILE__).'/yandex_money/'.$this->getMapFileName(), + $reader = new \YooMoney\Updater\ProjectStructure\ProjectStructureReader(); + $root = $reader->readFile(dirname(__FILE__).'/yoomoney/'.$this->getMapFileName(), $sourceDirectory); $rootDir = $version.'-'.time(); @@ -545,7 +496,7 @@ public function createBackup($version) try { $fileName = $dir.'/'.$fileName; - $archive = new \YandexMoney\Updater\Archive\BackupZip($fileName, $rootDir); + $archive = new \YooMoney\Updater\Archive\BackupZip($fileName, $rootDir); $archive->backup($root); } catch (Exception $e) { $this->log('error', 'Failed to create backup: '.$e->getMessage()); @@ -570,7 +521,7 @@ public function restoreBackup($fileName) try { $sourceDirectory = dirname(realpath(DIR_CATALOG)); - $archive = new \YandexMoney\Updater\Archive\RestoreZip($fileName); + $archive = new \YooMoney\Updater\Archive\RestoreZip($fileName); $archive->restore('file_map.map', $sourceDirectory); } catch (Exception $e) { $this->log('error', $e->getMessage()); @@ -687,7 +638,7 @@ public function unpackLastVersion($fileName) try { $sourceDirectory = dirname(realpath(DIR_CATALOG)); - $archive = new \YandexMoney\Updater\Archive\RestoreZip($fileName); + $archive = new \YooMoney\Updater\Archive\RestoreZip($fileName); $archive->restore($this->getMapFileName(), $sourceDirectory); } catch (Exception $e) { $this->log('error', $e->getMessage()); @@ -752,7 +703,7 @@ private function formatSize($size) private function loadClasses() { if (!class_exists('GitHubConnector')) { - $path = dirname(__FILE__).DIRECTORY_SEPARATOR.'yandex_money'.DIRECTORY_SEPARATOR.'Updater'.DIRECTORY_SEPARATOR; + $path = dirname(__FILE__).DIRECTORY_SEPARATOR.'yoomoney'.DIRECTORY_SEPARATOR.'Updater'.DIRECTORY_SEPARATOR; require_once $path.'GitHubConnector.php'; require_once $path.'ProjectStructure/EntryInterface.php'; require_once $path.'ProjectStructure/DirectoryEntryInterface.php'; diff --git a/src/upload/admin/model/extension/payment/yandex_money/Updater/Archive/BackupZip.php b/src/upload/admin/model/extension/payment/yoomoney/Updater/Archive/BackupZip.php similarity index 95% rename from src/upload/admin/model/extension/payment/yandex_money/Updater/Archive/BackupZip.php rename to src/upload/admin/model/extension/payment/yoomoney/Updater/Archive/BackupZip.php index 5d87b0d..66e4d00 100644 --- a/src/upload/admin/model/extension/payment/yandex_money/Updater/Archive/BackupZip.php +++ b/src/upload/admin/model/extension/payment/yoomoney/Updater/Archive/BackupZip.php @@ -1,17 +1,17 @@ invoiceEnable = (bool)$config->get('yandex_money_kassa_invoice'); - $this->invoiceSubject = $config->get('yandex_money_kassa_invoice_subject'); - $this->invoiceMessage = $config->get('yandex_money_kassa_invoice_message'); - $this->invoiceLogo = (bool)$config->get('yandex_money_kassa_invoice_logo'); + $this->invoiceEnable = (bool)$config->get('yoomoney_kassa_invoice'); + $this->invoiceSubject = $config->get('yoomoney_kassa_invoice_subject'); + $this->invoiceMessage = $config->get('yoomoney_kassa_invoice_message'); + $this->invoiceLogo = (bool)$config->get('yoomoney_kassa_invoice_logo'); } /** @@ -51,11 +51,6 @@ public function setEpl($value) $this->epl = $value ? true : false; } - public function setUseYandexButton($value) - { - $this->useYandexButton = $value ? true : false; - } - public function setUseInstallmentsButton($value) { $this->useInstallmentsButton = (bool)$value; @@ -207,7 +202,7 @@ public function checkConnection() { try { $this->apiClient->getPaymentInfo('00000000-0000-0000-0000-000000000001'); - } catch (\YandexCheckout\Common\Exceptions\NotFoundException $e) { + } catch (\YooKassa\Common\Exceptions\NotFoundException $e) { return true; } catch (Exception $e) { return false; diff --git a/src/upload/admin/model/extension/payment/yandex_money/YandexMoneyWalletModel.php b/src/upload/admin/model/extension/payment/yoomoney/YooMoneyWalletModel.php similarity index 87% rename from src/upload/admin/model/extension/payment/yandex_money/YandexMoneyWalletModel.php rename to src/upload/admin/model/extension/payment/yoomoney/YooMoneyWalletModel.php index 52cbf80..e247d44 100644 --- a/src/upload/admin/model/extension/payment/yandex_money/YandexMoneyWalletModel.php +++ b/src/upload/admin/model/extension/payment/yoomoney/YooMoneyWalletModel.php @@ -1,8 +1,8 @@ -
    -

    {{ language.get('billing_page_title') }}

    -
    -
    -
    -

    {{ language.get('billing_header_description') }}

    -

    {{ language.get('billing_version_string') }} {{ module_version }}

    -
    - -
    -
    - -
    -
    - -
    - -
    - - {% if error_billing_form_id is defined and error_billing_form_id %} -
    {{ error_billing_form_id }}
    - {% else %} -

    {{ language.get('billing_form_id_description') }}

    - {% endif %} -
    -
    - -
    - -
    - -

    {{ language.get('billing_purpose_description') }}

    -
    -
    - -
    - -
    - -

    {{ language.get('billing_display_name_description') }}

    -
    -
    - -
    - -
    - -

    {{ language.get('billing_success_order_status_description') }}

    -
    -
    -
    - -
    - -

    {{ language.get('billing_minimum_payment_amount_description') }}

    -
    -
    -
    - -
    - -

    {{ language.get('billing_geo_zone_description') }}

    -
    -
    -
    - -
    - -

    {{ language.get('billing_sort_order_description') }}

    -
    -
    -
    - diff --git a/src/upload/admin/view/template/extension/payment/yandex_money/market.twig b/src/upload/admin/view/template/extension/payment/yandex_money/market.twig deleted file mode 100644 index 741a62b..0000000 --- a/src/upload/admin/view/template/extension/payment/yandex_money/market.twig +++ /dev/null @@ -1,614 +0,0 @@ -{% for m in market_status %} - {{ m }} -{% endfor %} - -
    -
    -
    -

    {{ language.get('kassa_header_description') }}

    -

    {{ language.get('kassa_version_string') }} {{ module_version }}

    -
    -
    - -
    - - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - {{ market_currency_list }} -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - - {{ market_sv_all }} - - - {{ market_rv_all }} - - - {{ market_ch_all }} - - - {{ market_unch_all }} - -
    -
    -
      - {{ market_cat_tree }} -
    -
    -
    -
    -
    - -
    - {{ market.htmlDeliveryList() }} - {{ language.get('market_delivery_more') }} -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    - -
    - -
    -
    -
    -
    -
    -
    - -
    - {{ market.htmlAvailableList() }} -
    -
    -
    - -
    - - {% for taxClass in market.getTaxClasses %} -
    - - - - -
    - {% endfor %} -
    -
    -
    - -
    - {{ market.htmlOptionList() }} -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - - {{ market.htmlAdditionalConditionList }} -
    - -
    - -
    -
    - -
    - - -
    -
    -
    -
    - - \ No newline at end of file diff --git a/src/upload/admin/view/template/extension/payment/yandex_money/metrika.twig b/src/upload/admin/view/template/extension/payment/yandex_money/metrika.twig deleted file mode 100644 index dcc7eb3..0000000 --- a/src/upload/admin/view/template/extension/payment/yandex_money/metrika.twig +++ /dev/null @@ -1,58 +0,0 @@ -{% for me in metrika_status %} -{{ me }} -{% endfor %} -
    -
    -
    -

    {{ language.get('kassa_header_description') }}

    -

    {{ language.get('kassa_version_string') }} {{ module_version }}

    -
    -
    - -
    - - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    - -
    -
    -
    -
    \ No newline at end of file diff --git a/src/upload/admin/view/template/extension/payment/yandex_money.twig b/src/upload/admin/view/template/extension/payment/yoomoney.twig similarity index 56% rename from src/upload/admin/view/template/extension/payment/yandex_money.twig rename to src/upload/admin/view/template/extension/payment/yoomoney.twig index 54d230b..5c618eb 100644 --- a/src/upload/admin/view/template/extension/payment/yandex_money.twig +++ b/src/upload/admin/view/template/extension/payment/yoomoney.twig @@ -3,7 +3,7 @@
    - +

    {{ language.get('module_title') }}

    @@ -22,43 +22,31 @@
    {% endif %} {% if is_needed_show_nps %} -
    +
    {{ nps_block_text }} -
    {% endif %} -
    - + +
    - {{ load.view('extension/payment/yandex_money/kassa', data) }} + {{ load.view('extension/payment/yoomoney/kassa', data) }}
    - {{ load.view('extension/payment/yandex_money/wallet', data) }} -
    -
    - {{ load.view('extension/payment/yandex_money/billing', data) }} -
    -
    - {{ load.view('extension/payment/yandex_money/metrika', data) }} -
    -
    - {{ load.view('extension/payment/yandex_money/market', data) }} + {{ load.view('extension/payment/yoomoney/wallet', data) }}
    - {{ load.view('extension/payment/yandex_money/updater', data) }} + {{ load.view('extension/payment/yoomoney/updater', data) }}
    @@ -82,21 +70,21 @@ jQuery(document).ready(function () { currentTabInput.value = e.target.getAttribute('href').substr(1); }); - function yandex_money_nps_close() { - $.ajax({url: $('.yandex_money_nps_close').data('link')}) + function yoomoney_nps_close() { + $.ajax({url: $('.yoomoney_nps_close').data('link')}) .done(function () { - $('.yandex_money_nps_block').slideUp(); - $('input[name=yandex_money_nps_prev_vote_time]').val('{{ yandex_money_nps_current_vote_time }}'); + $('.yoomoney_nps_block').slideUp(); + $('input[name=yoomoney_nps_prev_vote_time]').val('{{ yoomoney_nps_current_vote_time }}'); }); } - function yandex_money_nps_goto() { + function yoomoney_nps_goto() { window.open('https://yandex.ru/poll/5YnSCJumJDKHPi4hLiMDyZ'); - yandex_money_nps_close(); + yoomoney_nps_close(); } - $('.yandex_money_nps_link').on('click', yandex_money_nps_goto); - $('.yandex_money_nps_close').on('click', yandex_money_nps_close); + $('.yoomoney_nps_link').on('click', yoomoney_nps_goto); + $('.yoomoney_nps_close').on('click', yoomoney_nps_close); }); diff --git a/src/upload/admin/view/template/extension/payment/yandex_money/capture.twig b/src/upload/admin/view/template/extension/payment/yoomoney/capture.twig similarity index 100% rename from src/upload/admin/view/template/extension/payment/yandex_money/capture.twig rename to src/upload/admin/view/template/extension/payment/yoomoney/capture.twig diff --git a/src/upload/admin/view/template/extension/payment/yandex_money/invoice_list.twig b/src/upload/admin/view/template/extension/payment/yoomoney/invoice_list.twig similarity index 99% rename from src/upload/admin/view/template/extension/payment/yandex_money/invoice_list.twig rename to src/upload/admin/view/template/extension/payment/yoomoney/invoice_list.twig index 3fc8d44..22ebea2 100644 --- a/src/upload/admin/view/template/extension/payment/yandex_money/invoice_list.twig +++ b/src/upload/admin/view/template/extension/payment/yoomoney/invoice_list.twig @@ -159,7 +159,7 @@
    - - {% if fullView is defined and fullView %} - {{ content_bottom }} -
    -{{ footer }} -{% endif %} \ No newline at end of file diff --git a/src/upload/catalog/view/theme/default/template/extension/payment/yandex_money/kassa_form.twig b/src/upload/catalog/view/theme/default/template/extension/payment/yoomoney/kassa_form.twig similarity index 79% rename from src/upload/catalog/view/theme/default/template/extension/payment/yandex_money/kassa_form.twig rename to src/upload/catalog/view/theme/default/template/extension/payment/yoomoney/kassa_form.twig index 398563f..71a6b97 100644 --- a/src/upload/catalog/view/theme/default/template/extension/payment/yandex_money/kassa_form.twig +++ b/src/upload/catalog/view/theme/default/template/extension/payment/yoomoney/kassa_form.twig @@ -8,16 +8,16 @@

    {{ kassa.getDisplayName() }}

    {% endif %} -
    + {% if kassa.getEPL() %} -
    +
    {% if kassa.useInstallmentsButton() %} -
    - {% endif %} - {% if kassa.useYandexButton() %} -
    - -
    +
    {% endif %}
    {% else %} {% for method in kassa.getEnabledPaymentMethods() %} - {% if (method == 'installments') and (amount < constant('YandexMoneyModule\\Model\\KassaModel::MIN_INSTALLMENTS_AMOUNT')) %} + {% if (method == 'installments') and (amount < constant('YooMoneyModule\\Model\\KassaModel::MIN_INSTALLMENTS_AMOUNT')) %} {% else %}