From fa9931f3412b0f7cc959dfa215868bb9ab88358f Mon Sep 17 00:00:00 2001 From: Freddy Rommel <15031079+rommelfreddy@users.noreply.github.com> Date: Wed, 15 Jan 2020 13:46:09 +0100 Subject: [PATCH] RATEPLUG-33: fix namespaces (#40) * RATEPLUG-33: fix namespaces configservice && dfpservice * RATEPLUG-33: fix namespaces configservice && dfpservice * sw53x-RATEPLUG-33: add changelog --- Bootstrapping/Events/BackendOrderControllerSubscriber.php | 2 +- Bootstrapping/Events/TemplateExtensionSubscriber.php | 4 ++-- Component/Service/SessionLoader.php | 2 +- Controller/frontend/RpayRatepay.php | 5 ++--- README.md | 1 + Services/ConfigService.php | 2 +- Services/DfpService.php | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Bootstrapping/Events/BackendOrderControllerSubscriber.php b/Bootstrapping/Events/BackendOrderControllerSubscriber.php index e8cc4860..f32417ef 100644 --- a/Bootstrapping/Events/BackendOrderControllerSubscriber.php +++ b/Bootstrapping/Events/BackendOrderControllerSubscriber.php @@ -9,7 +9,7 @@ use Shopware\Models\Customer\Customer; use Shopware\Models\Order\Order; use RpayRatePay\Component\Service\ConfigLoader; -use Shopware\Plugins\Community\Frontend\RpayRatePay\Services\DfpService; +use RpayRatePay\Services\DfpService; use SwagBackendOrder\Components\Order\Struct\OrderStruct; class BackendOrderControllerSubscriber implements \Enlight\Event\SubscriberInterface diff --git a/Bootstrapping/Events/TemplateExtensionSubscriber.php b/Bootstrapping/Events/TemplateExtensionSubscriber.php index 8b0f8493..b5516c73 100644 --- a/Bootstrapping/Events/TemplateExtensionSubscriber.php +++ b/Bootstrapping/Events/TemplateExtensionSubscriber.php @@ -3,8 +3,8 @@ namespace RpayRatePay\Bootstrapping\Events; use RpayRatePay\Component\Model\ShopwareCustomerWrapper; -use Shopware\Plugins\Community\Frontend\RpayRatePay\Services\ConfigService; -use Shopware\Plugins\Community\Frontend\RpayRatePay\Services\DfpService; +use RpayRatePay\Services\ConfigService; +use RpayRatePay\Services\DfpService; class TemplateExtensionSubscriber implements \Enlight\Event\SubscriberInterface { diff --git a/Component/Service/SessionLoader.php b/Component/Service/SessionLoader.php index 2c34f8e7..4cbb9b54 100644 --- a/Component/Service/SessionLoader.php +++ b/Component/Service/SessionLoader.php @@ -5,7 +5,7 @@ use RpayRatePay\Component\Mapper\BankData; use RpayRatePay\Component\Mapper\PaymentRequestData; use RpayRatePay\Component\Model\ShopwareCustomerWrapper; -use Shopware\Plugins\Community\Frontend\RpayRatePay\Services\DfpService; +use RpayRatePay\Services\DfpService; class SessionLoader { diff --git a/Controller/frontend/RpayRatepay.php b/Controller/frontend/RpayRatepay.php index 7dbdc5c2..698e2590 100755 --- a/Controller/frontend/RpayRatepay.php +++ b/Controller/frontend/RpayRatepay.php @@ -24,9 +24,8 @@ use RpayRatePay\Component\Service\PaymentProcessor; use RpayRatePay\Component\Model\ShopwareCustomerWrapper; use RpayRatePay\Component\Service\Logger; -use \RpayRatePay\Component\Service\ConfigLoader; -use \Shopware\Plugins\Community\Frontend\RpayRatePay\Services\DfpService; -use Shopware\Plugins\Community\Frontend\RpayRatePay\Services\ProfileConfigService; +use RpayRatePay\Component\Service\ConfigLoader; +use RpayRatePay\Services\DfpService; class Shopware_Controllers_Frontend_RpayRatepay extends Shopware_Controllers_Frontend_Payment implements CSRFWhitelistAware { diff --git a/README.md b/README.md index 2e3fa232..810d37ff 100755 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ * RATEPLUG-24: add support for different stores/subshops * RATEPLUG-27: fix batch processing (admin) * RATEPLUG-28: fix double click on "order now"-button +* RATEPLUG-33: fix namespaces * RATEPLUG-67: set phone number as not required field and apply static phonenumber if no phone number is provided * fix a few bugs with zero percent installment diff --git a/Services/ConfigService.php b/Services/ConfigService.php index 77b89acd..a7a2c646 100644 --- a/Services/ConfigService.php +++ b/Services/ConfigService.php @@ -1,7 +1,7 @@