Merge pull request #203 from OXID-eSales/PSPAYPAL-681_AdditionalManda…

…ntoryFieldsExpressPP throw an error if mandantory field is missing
OXID-eSales · Aug 8, 2023 · 48c1c89 · 48c1c89
2 parents 90cc7cf + 4a2cb46
commit 48c1c89
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 20 deletions.
diff --git a/src/Controller/ProxyController.php b/src/Controller/ProxyController.php
@@ -9,14 +9,14 @@
 
 use Exception;
 use OxidEsales\Eshop\Application\Model\Address;
-use OxidEsales\Eshop\Application\Model\PaymentList;
 use OxidEsales\Eshop\Application\Model\DeliverySetList;
 use OxidEsales\Eshop\Application\Controller\FrontendController;
 use OxidEsales\Eshop\Application\Component\UserComponent;
 use OxidEsales\Eshop\Core\Exception\ArticleInputException;
 use OxidEsales\Eshop\Core\Exception\NoArticleException;
 use OxidEsales\Eshop\Core\Exception\OutOfStockException;
 use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\Eshop\Core\Exception\StandardException;
 use OxidSolutionCatalysts\PayPal\Core\Constants;
 use OxidSolutionCatalysts\PayPal\Service\Payment as PaymentService;
 use OxidSolutionCatalysts\PayPal\Traits\ServiceContainer;
@@ -115,18 +115,25 @@ public function approveOrder()
             $userInvoiceAddress = $user->getInvoiceAddress();
             // add PayPal-Address as Delivery-Address
             $deliveryAddress = PayPalAddressResponseToOxidAddress::mapUserDeliveryAddress($response);
-            $user->changeUserData(
-                $user->oxuser__oxusername->value,
-                '',
-                '',
-                $userInvoiceAddress,
-                $deliveryAddress
-            );
-
-            // use a deliveryaddress in oxid-checkout
-            Registry::getSession()->setVariable('blshowshipaddress', false);
-
-            $this->setPayPalPaymentMethod();
+            try {
+                $user->changeUserData(
+                    $user->oxuser__oxusername->value,
+                    '',
+                    '',
+                    $userInvoiceAddress,
+                    $deliveryAddress
+                );
+
+                // use a deliveryaddress in oxid-checkout
+                Registry::getSession()->setVariable('blshowshipaddress', false);
+
+                $this->setPayPalPaymentMethod();
+            } catch (StandardException $exception) {
+                Registry::getUtilsView()->addErrorToDisplay($exception);
+                $response->status = 'ERROR';
+                PayPalSession::unsetPayPalOrderId();
+                Registry::getSession()->getBasket()->setPayment(null);
+            }
         } elseif ($nonGuestAccountDetected && !$isLoggedIn) {
             // PPExpress is actual no possible so we switch to PP-Standard
             $this->setPayPalPaymentMethod(PayPalDefinitions::STANDARD_PAYPAL_PAYMENT_ID);

diff --git a/src/Core/InputValidator.php b/src/Core/InputValidator.php
@@ -8,7 +8,7 @@
 namespace OxidSolutionCatalysts\PayPal\Core;
 
 use OxidEsales\Eshop\Application\Model\User;
-use OxidEsales\Eshop\Core\Exception\UserException;
+use OxidEsales\Eshop\Core\Exception\InputException;
 use OxidEsales\Eshop\Core\Registry;
 
 /**
@@ -25,7 +25,7 @@ public function checkCountries($user, $invAddress, $deliveryAddress)
         $fieldValidationErrors = $this->getFieldValidationErrors();
         if (isset($fieldValidationErrors['oxuser__oxcountryid']) && PayPalSession::getCheckoutOrderId()) {
             $this->_aInputValidationErrors = [];
-            $exception = oxNew(UserException::class);
+            $exception = oxNew(InputException::class);
             $exception->setMessage(
                 Registry::getLang()->translateString(
                     'OSC_PAYPAL_PAY_EXPRESS_ERROR_DELCOUNTRY'
@@ -46,17 +46,17 @@ public function checkCountries($user, $invAddress, $deliveryAddress)
     public function checkRequiredFields($user, $billingAddress, $deliveryAddress)
     {
         parent::checkRequiredFields($user, $billingAddress, $deliveryAddress);
-        $firstValidationError = $this->getFirstValidationError();
-        if ($firstValidationError && PayPalSession::getCheckoutOrderId()) {
+        $allValidationErrors = $this->getFieldValidationErrors();
+        if (count($allValidationErrors) && PayPalSession::getCheckoutOrderId()) {
             $this->_aInputValidationErrors = [];
-            $firstValidationErrorKey = key($firstValidationError);
-            $exception = oxNew(UserException::class);
+            $validationErrorKey = key($allValidationErrors);
+            $exception = oxNew(InputException::class);
             $exception->setMessage(
                 Registry::getLang()->translateString(
                     'OSC_PAYPAL_PAY_EXPRESS_ERROR_INPUTVALIDATION'
                 )
             );
-            $this->_addValidationError($firstValidationErrorKey, $exception);
+            $this->_addValidationError($validationErrorKey, $exception);
         }
     }
 }