Merge pull request #71 from checkout/bugfix/incorrct_refund_env

Fixed wrong env being picked for refunds
checkout · Nov 4, 2022 · 8a3c065 · 8a3c065
2 parents 64b68c9 + 1dfe6b6
commit 8a3c065
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/checkoutcom.php b/checkoutcom.php
@@ -34,6 +34,7 @@
 use Checkout\CheckoutApi;
 use Checkout\Models\Payments\Capture;
 use Checkout\Models\Payments\Refund;
+use CheckoutCom\PrestaShop\Models\Payments\Method;
 
 class CheckoutCom extends PaymentModule
 {
@@ -47,7 +48,7 @@ public function __construct()
     {
         $this->name = 'checkoutcom';
         $this->tab = 'payments_gateways';
-        $this->version = '2.3.2';
+        $this->version = '2.3.3';
         $this->author = 'Checkout.com';
         $this->need_instance = 1;
 
@@ -444,6 +445,9 @@ public function hookActionOrderSlipAdd($params)
         $order_payment = OrderPayment::getByOrderId($order_id);
         $payment_id = $order_payment[0]->transaction_id;
         $amount  = 0;
+        $currency =  new CurrencyCore($order->id_currency);
+        $currency_code = $currency->iso_code;
+
         if (! $this->active || ($order->module != $this->name)) {
             return;
         }
@@ -456,7 +460,7 @@ public function hookActionOrderSlipAdd($params)
                 $this->context->controller->errors[] = $this->l('An error has occured. No cko payment id found');
                 return false;
             }
-            $checkout = new CheckoutApi( \Configuration::get('CHECKOUTCOM_SECRET_KEY') );  
+            // $checkout = new CheckoutApi( \Configuration::get('CHECKOUTCOM_SECRET_KEY') );  
             if(strlen($payment_id)>0)
             {
                 $returnedQuantity = 0;
@@ -536,9 +540,11 @@ public function hookActionOrderSlipAdd($params)
         }
 
         //Refund the amount using sdk.
-        $refund = $this->_refund($payment_id, $amount);
+        $refund = $this->_refund($payment_id, $amount, $currency_code);
         if(!$refund){
             $this->context->controller->errors[] = $this->l('An error has occured while processing your refund on checkout.com.');
+            $this->errors[] = $this->l('An error has occured while processing your refund on checkout.com.');
+
             $this->logger->error('Refund failure : true');
             // No refund, so get back refunded products quantities, and available products stock quantities.
             $this->_rollbackOrder($order);
@@ -617,22 +623,16 @@ private function _updateOrderState($order){
      * @param $amount
      * @return bool
      */
-    private function _refund($payment_id, $amount){
-        $checkout = new CheckoutApi( \Configuration::get('CHECKOUTCOM_SECRET_KEY') );  
-        try{
-            $amount = (int) round( $amount * 100,0);
-            $request = new Refund($payment_id,$amount);
-            $refund = $checkout->payments()->refund($request);
-            return $refund;
-        }
-        catch (Checkout\Library\Exceptions\CheckoutHttpException $ex) {
-
-            $this->logger->error('Refund error : '.$ex->getBody());
-            $this->context->controller->errors[] = $this->l('An error has occured while processing your refund on checkout.com.');
-            $this->errors[] = $this->l('An error has occured while processing your refund on checkout.com.');
-            return false;
-        }
-       return false;
+    private function _refund($payment_id, $amount, $currency_code){
+
+        $param = array(
+            'payment_id' => $payment_id,
+            'currency_code' => $currency_code,
+            'amount' => $amount
+        );
+
+        $refund = Method::makeRefund($param);
+        return $refund;   
     }
 
 

diff --git a/src/Models/Payments/Method.php b/src/Models/Payments/Method.php
@@ -268,6 +268,7 @@ public static function addThreeDs(Payment $payment)
      */
     public static function makeRefund(array $params)
     {
+
         $cko_payment_id = $params['payment_id'];
 
         // Check if cko_payment_id is empty
@@ -288,12 +289,13 @@ public static function makeRefund(array $params)
             if(isset($params['amount'])){
                 $ckoPayment->amount = static::fixAmount($params['amount'], $params['currency_code']);
             }
-
+           
             $response = CheckoutApiHandler::api()->payments()->refund($ckoPayment);
 
             if (!$response->isSuccessful()) {
                 //@todo return error message
             } else {
+
                 return $response;
             }
         } catch (CheckoutHttpException $ex) {