Merge pull request #609 from buckaroo-it/develop

version 1.43.1

Author: serpentscode

Controller/Redirect/Process.php

@@ -427,6 +427,8 @@ protected function handleFailed($statusCode)
 
         $this->eventManager->dispatch('buckaroo_process_handle_failed_before');
 
+        $this->removeAmastyGiftcardOnFailed();
+
         if (!$this->getSkipHandleFailedRecreate()) {
             if (!$this->quoteRecreate->recreate($this->quote)) {
                 $this->logging->addError('Could not recreate the quote.');
@@ -711,11 +713,42 @@ private function setCustomerIDIN()
 
     public function getSkipHandleFailedRecreate()
     {
-        return false;
+        return false;  
     }
 
     public function setSkipHandleFailedRecreate($value)
     {
         return true;
     }
+
+    /**
+     * Remove amasty giftcard from failed order
+     *
+     * @return void
+     */
+    protected function removeAmastyGiftcardOnFailed()
+    {
+        $class = \Amasty\GiftCardAccount\Model\GiftCardAccount\Repository::class;
+        if (class_exists($class)) {
+
+            $giftcardAccountRepository = $this->_objectManager->get($class);
+            $giftcardOrderRepository = $this->_objectManager->get(\Amasty\GiftCardAccount\Model\GiftCardExtension\Order\Repository::class);
+
+            try {
+                $giftcardOrder = $giftcardOrderRepository->getByOrderId($this->order->getId());
+
+                foreach ($giftcardOrder->getGiftCards() as $giftcardObj) {
+                    /** @var \Amasty\GiftCardAccount\Api\Data\GiftCardAccountInterface */
+                    $giftcard = $giftcardAccountRepository->getByCode($giftcardObj['code']);
+                    $giftcard->setStatus(1);
+
+                    $giftcard->setCurrentValue($giftcard->getCurrentValue() + (float)$giftcardObj['amount']);
+                    $giftcardAccountRepository->save($giftcard);
+                }
+            } catch (\Throwable $th) {
+                $this->logger->addDebug($th->getMessage());
+                return;
+            }
+        }
+    }
 }

Model/Method/AbstractMethod.php

@@ -386,8 +386,8 @@ protected function assignDataCommon(array $data)
         if (isset($data['additional_data']['customer_gender'])) {
             $this->getInfoInstance()->setAdditionalInformation('customer_gender', $additionalData['customer_gender']);
         }
-        
-        if (isset($data['additional_data']['termsCondition'])) {            
+
+        if (isset($data['additional_data']['termsCondition'])) {
             $this->getInfoInstance()->setAdditionalInformation('termsCondition', $additionalData['termsCondition']);
             $this->getInfoInstance()->setAdditionalInformation('customer_billingName', $additionalData['customer_billingName']);
             $this->getInfoInstance()->setAdditionalInformation('customer_identificationNumber', $additionalData['customer_identificationNumber']);
@@ -715,7 +715,7 @@ public function order(InfoInterface $payment, $amount)
         if (!(isset($response->RequiredAction->Type) && $response->RequiredAction->Type === 'Redirect')) {
             $this->setPaymentInTransit($payment, false);
         }
-     
+
         $order = $payment->getOrder();
         $this->helper->setRestoreQuoteLastOrder($order->getId());
 
@@ -789,6 +789,10 @@ protected function getFailureMessage($response)
         $responseCode        = $transactionResponse->Status->Code->Code;
         $billingCountry      = $this->payment->getOrder()->getBillingAddress()->getCountryId();
 
+        if($responseCode == 491) {
+            return $this->getFirstError($transactionResponse);
+        }
+
         $method = null;
         if ($this->payment->getMethodInstance() && !empty($this->payment->getMethodInstance()->buckarooPaymentMethodCode)) {
             $method = $this->payment->getMethodInstance()->buckarooPaymentMethodCode;
@@ -818,6 +822,34 @@ protected function getFailureMessage($response)
         return $message;
     }
 
+    /**
+     * @param $transactionResponse
+     * @param $errorType
+     * @return bool
+     */
+    public function hasError($transactionResponse, $errorType): bool
+    {
+        return !empty($transactionResponse->RequestErrors) && !empty($transactionResponse->RequestErrors->$errorType);
+    }
+
+    /**
+     * @param $transactionResponse
+     * @return string
+     */
+    public function getFirstError($transactionResponse): string
+    {
+        $errorTypes = ['ChannelError', 'ServiceError', 'ActionError', 'ParameterError', 'CustomParameterError'];
+
+        foreach ($errorTypes as $errorType) {
+            if ($this->hasError($transactionResponse, $errorType)) {
+                return $transactionResponse->RequestErrors->$errorType->_;
+
+            }
+        }
+
+        return '';
+    }
+
     public function getFailureMessageOnFraud($transactionResponse)
     {
         if (
@@ -904,7 +936,7 @@ public function authorize(InfoInterface $payment, $amount)
         if (!(isset($response->RequiredAction->Type) && $response->RequiredAction->Type === 'Redirect')) {
             $this->setPaymentInTransit($payment, false);
         }
-        
+
         $order = $payment->getOrder();
         $this->helper->setRestoreQuoteLastOrder($order->getId());
 
@@ -1167,7 +1199,7 @@ public function refundTransaction(\Buckaroo\Magento2\Gateway\Http\Transaction $t
             $payment->getOrder()->addStatusHistoryComment(
                 __("The refund has been initiated but it is waiting for a approval. Login to the Buckaroo Plaza to finalize the refund by approving it.")
             )->setIsCustomerNotified(false)->save();
-            
+
             $messageManager = $this->objectManager->get('Magento\Framework\Message\ManagerInterface');
             $messageManager->addError(
                 __("Refund has been initiated, but it needs to be approved, so you need to wait for an approval")
@@ -1818,7 +1850,7 @@ public function refundGroupTransactions(InfoInterface $payment, $amount)
 
                     $this->saveTransactionData($response[0], $payment, $this->closeRefundTransaction, false);
 
-                    
+
                     foreach ($groupTransaction as $item) {
                         $prevRefundAmount = $item->getData('refunded_amount');
                         $newRefundAmount = $amount_value;
@@ -2489,14 +2521,14 @@ public function getPaymentRequestParameters($payment)
         // First data to set is the billing address data.
         $requestData = $this->getRequestBillingData($payment);
 
-        
+
         // If the shipping address is not the same as the billing it will be merged inside the data array.
         if (
             $this->isAddressDataDifferent($payment) ||
             is_null($payment->getOrder()->getShippingAddress()) ||
             $payment->getMethod() === Klarna::KLARNA_METHOD_NAME  ||
             $payment->getMethod() === Klarnain::PAYMENT_METHOD_CODE ||
-            $payment->getMethod() === Afterpay20::PAYMENT_METHOD_CODE 
+            $payment->getMethod() === Afterpay20::PAYMENT_METHOD_CODE
         ) {
             $requestData = array_merge($requestData, $this->getRequestShippingData($payment));
         }
@@ -2581,14 +2613,14 @@ public function checkTotalGrossAmount($requestData, $payment)
     }
     public function canUseForCountry($country)
     {
-        
-        
+
+
         if ($this->getConfigData('allowspecific') != 1) {
             return true;
         }
 
         $specificCountries = $this->getConfigData('specificcountry');
-        
+
         //if the country config is null in the store get the config value from the global('default') settings
         if ($specificCountries === null) {
             $specificCountries = $this->_scopeConfig->getValue(
@@ -2598,6 +2630,6 @@ public function canUseForCountry($country)
 
         $availableCountries = explode(',', $specificCountries);
         return in_array($country, $availableCountries);
-        
+
     }
 }

Model/Push.php

@@ -367,7 +367,9 @@ public function receivePush()
         if (isset($this->postData['brq_statusmessage'])) {
             if (
                 $this->order->getState() === Order::STATE_NEW &&
-                !isset($this->postData['add_frompayperemail'])
+                !isset($this->postData['add_frompayperemail']) &&
+                (isset($this->postData['brq_statuscode']) && $this->postData['brq_statuscode'] == 190)
+
             ) {
                 $this->order->setState(Order::STATE_PROCESSING);
                 $this->order->addStatusHistoryComment(

Service/Software/Data.php

@@ -35,7 +35,7 @@ class Data
     const MODULE_CODE = 'Buckaroo_Magento2';
 
     /** Version of Module */
-    const BUCKAROO_VERSION = '1.43.0';
+    const BUCKAROO_VERSION = '1.43.1';
 
     /** @var ProductMetadataInterface */
     private $productMetadata;

composer.json

@@ -22,7 +22,7 @@
         "docs": "https://support.buckaroo.nl"
     },
     "homepage": "https://www.buckaroo.nl",
-    "version" : "v1.43.0",
+    "version" : "v1.43.1",
     "minimum-stability": "stable",
     "autoload": {
         "files": [

etc/module.xml

@@ -20,7 +20,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Buckaroo_Magento2:etc/buckaroo_module.xsd">
-    <module name="Buckaroo_Magento2" setup_version="1.43.0" build_number="1769" stability="stable">
+    <module name="Buckaroo_Magento2" setup_version="1.43.1" build_number="1769" stability="stable">
         <sequence>
             <module name="Magento_Payment"/>
             <module name="Magento_ReleaseNotification"/>