Merge pull request #12 in DEV-MO/shopware5-module from hotfix/ets-27-…

…ratepay-plugin-prevents-customer-registration to release/5.2.3 * commit '18cb1e2a5e77a168d46b7e46ca2f71c8c3c13bfb': [ETS-27] fix missing method by using AddressWrapper hotfix/ets-27-ratepay-plugin-prevents-customer-registration more tests more tests tests add some tests hotfix/ets-27-ratepay-plugin-prevents-customer-registration add support for proxy classes hotfix/ets-27-ratepay-plugin-prevents-customer-registration
ratepay · Aug 27, 2018 · 2967995 · 2967995
2 parents 11c48da + 18cb1e2
commit 2967995
Show file tree

Hide file tree

Showing 18 changed files with 773 additions and 97 deletions.
diff --git a/Bootstrapping/Events/PaymentFilterSubscriber.php b/Bootstrapping/Events/PaymentFilterSubscriber.php
@@ -8,6 +8,7 @@
 namespace RpayRatePay\Bootstrapping\Events;
 
 use RatePAY\Service\Util;
+use RpayRatePay\Component\Model\ShopwareCustomerWrapper;
 use RpayRatePay\Component\Service\ConfigLoader;
 use RpayRatePay\Component\Service\ValidationLib as ValidationService;
 
@@ -33,7 +34,7 @@ public static function getSubscribedEvents()
      *  - The Country must be germany or austria
      *  - The Currency must be EUR
      *
-     * @param Enlight_Event_EventArgs $arguments
+     * @param \Enlight_Event_EventArgs $arguments
      * @return array|void
      * @throws \Doctrine\ORM\ORMException
      * @throws \Doctrine\ORM\OptimisticLockException
@@ -44,45 +45,33 @@ public function filterPayments(\Enlight_Event_EventArgs $arguments)
         $return = $arguments->getReturn();
         $currency = Shopware()->Config()->get('currency');
         $userId = Shopware()->Session()->sUserId;
-
         if (empty($userId) || empty($currency)) {
             return;
         }
 
-        $user = Shopware()->Models()->find('Shopware\Models\Customer\Customer', Shopware()->Session()->sUserId);
+        /** @var Shopware\Models\Customer\Customer $user */
+        $user = Shopware()->Models()->find('Shopware\Models\Customer\Customer', $userId);
+        $wrappedUser = new ShopwareCustomerWrapper($user, Shopware()->Models());
 
         //get country of order
         if (Shopware()->Session()->checkoutBillingAddressId > 0) { // From Shopware 5.2 find current address information in default billing address
             $addressModel = Shopware()->Models()->getRepository('Shopware\Models\Customer\Address');
             $customerAddressBilling = $addressModel->findOneBy(array('id' => Shopware()->Session()->checkoutBillingAddressId));
 
-            if (Util::existsAndNotEmpty($customerAddressBilling,'getCountry')) {
-                $countryBilling = $customerAddressBilling->getCountry();
-            } else {
-                if (Util::existsAndNotEmpty($user->getBilling(),'getCountryId')) {
-                    $countryBilling = Shopware()->Models()->find('Shopware\Models\Country\Country', $user->getBilling()->getCountryId());
-                }
-            }
+            $countryBilling = $customerAddressBilling->getCountry();
 
             if (Shopware()->Session()->checkoutShippingAddressId > 0 && Shopware()->Session()->checkoutShippingAddressId != Shopware()->Session()->checkoutBillingAddressId) {
                 $customerAddressShipping = $addressModel->findOneBy(array('id' => Shopware()->Session()->checkoutShippingAddressId));
-
-                if (Util::existsAndNotEmpty($customerAddressShipping, 'getCountry')) {
-                    $countryDelivery = $customerAddressShipping->getCountry();
-                } else {
-                    if (Util::existsAndNotEmpty($user->getShipping(), 'getCountryId')) {
-                        $countryDelivery = Shopware()->Models()->find('Shopware\Models\Country\Country', $user->getShipping()->getCountryId());
-                    }
-                }
-
+                $countryDelivery = $customerAddressShipping->getCountry();
             } else {
                 $countryDelivery = $countryBilling;
             }
         } else {
-            $countryBilling = Shopware()->Models()->find('Shopware\Models\Country\Country', $user->getBilling()->getCountryId());
-            if (!is_null($user->getShipping()) &&$user->getBilling()->getCountryId() != $user->getShipping()->getCountryId()) {
-                $countryDelivery = Shopware()->Models()->find('Shopware\Models\Country\Country', $user->getShipping()->getCountryId());
-            } else {
+
+            $countryBilling = $wrappedUser->getBillingCountry();
+            $countryDelivery = $wrappedUser->getShippingCountry();
+
+            if (is_null($countryDelivery)) {
                 $countryDelivery = $countryBilling;
             }
         }
@@ -95,7 +84,7 @@ public function filterPayments(\Enlight_Event_EventArgs $arguments)
         foreach ($config AS $payment => $data) {
             $show[$payment] = $data['status'] == 2 ? true : false;
 
-            $validation = new \Shopware_Plugins_Frontend_RpayRatePay_Component_Validation($user);
+            $validation = $this->getValidator($user);
 
             $validation->setAllowedCurrencies($data['currency']);
             $validation->setAllowedCountriesBilling($data['country-code-billing']);
@@ -180,11 +169,18 @@ public function filterPayments(\Enlight_Event_EventArgs $arguments)
         return $payments;
     }
 
+    private function getValidator($user)
+    {
+        return new \Shopware_Plugins_Frontend_RpayRatePay_Component_Validation($user);
+    }
+
+
     /**
      * Get ratepay plugin config from rpay_ratepay_config table
      *
      * @param $shopId
      * @param $country
+     * @param bool $backend
      * @return array
      */
     private function getRatePayPluginConfigByCountry($shopId, $country, $backend = false) {
@@ -204,6 +200,4 @@ private function getRatePayPluginConfigByCountry($shopId, $country, $backend = f
 
         return $paymentConfig;
     }
-
-
 }
diff --git a/Bootstrapping/Events/TemplateExtensionSubscriber.php b/Bootstrapping/Events/TemplateExtensionSubscriber.php
@@ -7,6 +7,8 @@
  */
 namespace RpayRatePay\Bootstrapping\Events;
 
+use RpayRatePay\Component\Model\ShopwareCustomerWrapper;
+
 class TemplateExtensionSubscriber implements \Enlight\Event\SubscriberInterface
 {
     /**
@@ -38,7 +40,7 @@ public static function getSubscribedEvents()
      */
     public function extendTemplates(\Enlight_Event_EventArgs $args)
     {
-        /** @var $action Enlight_Controller_Action */
+        /** @var $action \Enlight_Controller_Action */
         $action = $args->getSubject();
         $request = $action->Request();
         $response = $action->Response();
@@ -72,14 +74,9 @@ public function extendTemplates(\Enlight_Event_EventArgs $args)
             'confirm' === $request->getActionName() &&
             strstr($paymentMethod->getName(), 'rpayratepay')
         ) {
-            if (method_exists($user, 'getDefaultBillingAddress')) { // From Shopware 5.2 find current address information in default billing address
-                $view->assign('ratepayPhone', $user->getDefaultBillingAddress()->getPhone());
-                $country = $user->getDefaultBillingAddress()->getCountry()->getIso();
-                $countryCode = $user->getDefaultBillingAddress()->getCountry();
-            } else {
-                $country = Shopware()->Models()->find('Shopware\Models\Country\Country', $user->getBilling()->getCountryId())->getIso();
-                $countryCode = Shopware()->Models()->find('Shopware\Models\Country\Country', $user->getBilling()->getCountryId());
-            }
+            $userWrapped = new ShopwareCustomerWrapper($user, Shopware()->Models());
+            $phone = $userWrapped->getBilling('phone');
+            $view->assign('ratepayPhone', $phone);
 
             $sandbox = true;
             if ($configPlugin['sandbox'] == 0) {

diff --git a/Component/Mapper/BasketArrayBuilder.php b/Component/Mapper/BasketArrayBuilder.php
@@ -71,7 +71,7 @@ public function addItem($item)
     /**
      * @param $item
      */
-    private function addItemFromArray($item)
+    public function addItemFromArray($item)
     {
         if (!$this->requestType && $item['quantity'] == 0) {
             return;

diff --git a/Component/Mapper/ModelFactory.php b/Component/Mapper/ModelFactory.php
@@ -4,6 +4,7 @@
 use RpayRatePay\Component\Mapper\PaymentRequestData;
 use RpayRatePay\Component\Mapper\BankData;
 use RatePAY\Service\Util;
+use RpayRatePay\Component\Model\ShopwareCustomerWrapper;
 use RpayRatePay\Component\Service\SessionLoader;
 
 /**
@@ -76,7 +77,8 @@ private function _getCountryCodesByBillingAddress()
             return $checkoutAddressBilling->getCountry()->getIso();
         } else {
             $shopUser = Shopware()->Models()->find('Shopware\Models\Customer\Customer', $this->getSession()->sUserId);
-            $country = Shopware()->Models()->find('Shopware\Models\Country\Country', $shopUser->getBilling()->getCountryId());
+            $userWrapped = new ShopwareCustomerWrapper($shopUser, Shopware()->Models());
+            $country = $userWrapped->getBillingCountry();
             return $country->getIso();
         }
     }

diff --git a/Component/Mapper/PaymentRequestData.php b/Component/Mapper/PaymentRequestData.php
@@ -9,6 +9,8 @@
 namespace RpayRatePay\Component\Mapper;
 
 use RatePAY\Service\Util;
+use RpayRatePay\Component\Model\ShopwareAddressWrapper;
+use RpayRatePay\Component\Model\ShopwareCustomerWrapper;
 
 class PaymentRequestData
 {
@@ -156,7 +158,9 @@ public function __construct($method,
     public function getBirthday()
     {
         $dateOfBirth = '0000-00-00';
-        $customerBilling = $this->customer->getBilling();
+
+        $customerWrapped = new ShopwareCustomerWrapper($this->customer, Shopware()->Models());
+        $customerBilling = $customerWrapped->getBilling();
 
         if (Util::existsAndNotEmpty($this->customer, 'getBirthday')) {
             $dateOfBirth = $this->customer->getBirthday()->format("Y-m-d"); // From Shopware 5.2 date of birth has moved to customer object
@@ -170,19 +174,14 @@ public function getBirthday()
     }
 
     /**
-     * @param mixed
-     * @return string|null
+     * @param $addressObject
+     * @return string
+     * @throws \Exception
      */
     public static function findCountryISO($addressObject)
     {
-        $iso = null;
-        if (Util::existsAndNotEmpty($addressObject, "getCountry") &&
-            Util::existsAndNotEmpty($addressObject->getCountry(), "getIso")) {
-            $iso = $addressObject->getCountry()->getIso();
-        } elseif (Util::existsAndNotEmpty($addressObject, "getCountryId")) {
-            $country = Shopware()->Models()->find('Shopware\Models\Country\Country', $addressObject->getCountryId());
-            $iso = $country->getIso();
-        }
+        $addressWrapped = new ShopwareAddressWrapper($addressObject, Shopware()->Models());
+        $iso = $addressWrapped->getCountry()->getIso();
         return $iso;
     }
 }
diff --git a/Component/Model/ShopwareAddressWrapper.php b/Component/Model/ShopwareAddressWrapper.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace RpayRatePay\Component\Model;
+
+
+
+/**
+ * Class ShopwareAddressWrapper
+ * @package RpayRatePay\Component\Model
+ */
+class ShopwareAddressWrapper
+{
+    /** @var object */
+    private $address;
+
+    /** @var \Shopware\Components\Model\ModelManager */
+    private $em;
+
+    /** @var string */
+    private $addressClass;
+
+
+    /**
+     * ShopwareAddressWrapper constructor.
+     * @param object $address
+     * @param \Shopware\Components\Model\ModelManager $em
+     */
+    public function __construct($address, $em)
+    {
+        $this->address = $address;
+        $this->em = $em;
+        $this->addressClass = get_class($address);
+    }
+
+    /**
+     * @return \Shopware\Models\Country\Country
+     * @throws \Exception
+     */
+    public function getCountry()
+    {
+        if (method_exists($this->address, 'getCountry')) {
+            return $this->address->getCountry();
+        }
+
+        if (method_exists($this->address, 'getCountryId')) {
+            return $this->em->find('Shopware\Models\Country\Country', $this->address->getCountryId());
+        }
+
+        throw new \Exception('False object type sent to ShopwareAddressWrapper');
+    }
+
+}