Merge pull request #8105 from bakaphp/fix/reverse-payments

Fix/reverse payments

Author: jesusantguerrero

src/Domains/Connectors/Movipass/Actions/ProcessPaymentAction.php

@@ -63,32 +63,46 @@ public function execute(ConsumerAuthentication $consumerData): array
 
         $intentId = $this->order->fresh()->get(CustomFieldEnum::ECHO_PAY_PAYMENT_INTENT_ID->value);
         $bankTransaction = explode(':', $intentId)[1];
-        if ($this->order->get(CustomFieldEnum::ECHO_PAY_SHOULD_CAPTURE->value)) {
-            $paymentProcessor->capturePayment($this->payment, $this->order, $bankTransaction);
-            try {
-                if ($orderStatus = $this->order->orderType?->statuses()->where('slug', PaymentStatusEnum::PAID->value)->first()) {
-                    new TransitionOrderStateAction(
-                        $this->order,
-                        $this->payment->user,
-                        $orderStatus
-                    )->execute(true);
-                }
-                new SendPaymentReceiptAction(
+
+        if (! $this->order->get(CustomFieldEnum::ECHO_PAY_SHOULD_CAPTURE->value)) {
+            return $this->handleReversal($paymentProcessor, $bankTransaction, $result['message']);
+        }
+
+        $captureResult = $paymentProcessor->capturePayment($this->payment, $this->order, $bankTransaction);
+
+        if ($captureResult['status'] === 'error') {
+            return $this->handleReversal($paymentProcessor, $bankTransaction, 'Capture failed: ' . $captureResult['message']);
+        }
+
+        try {
+            if ($orderStatus = $this->order->orderType?->statuses()->where('slug', PaymentStatusEnum::PAID->value)->first()) {
+                new TransitionOrderStateAction(
                     $this->order,
-                    $this->payment,
-                    $this->payment->user
-                )->execute();
-            } catch (Exception $e) {
-                report($e);
+                    $this->payment->user,
+                    $orderStatus
+                )->execute(true);
             }
-        } else {
-            $reason = $result['message'];
-            $response = $paymentProcessor->reversePayment($this->payment, $this->order, $bankTransaction, $reason);
-            $result['status'] = PaymentStatusEnum::FAILED->value;
-            $result['message'] = $response['message'] . ' - ' . $reason;
-            $result['data'] = $response['data'];
+
+            new SendPaymentReceiptAction(
+                $this->order,
+                $this->payment,
+                $this->payment->user
+            )->execute();
+        } catch (Exception $e) {
+            report($e);
         }
 
         return $result;
     }
+
+    private function handleReversal(PortalPaymentProcessor $paymentProcessor, string $bankTransaction, string $reason): array
+    {
+        $response = $paymentProcessor->reversePayment($this->payment, $this->order, $bankTransaction, $reason);
+
+        return [
+            'status' => PaymentStatusEnum::FAILED->value,
+            'message' => $response['message'] . ' - ' . $reason,
+            'data' => $response['data'],
+        ];
+    }
 }

src/Domains/Souk/Payments/Actions/LogPaymentEventAction.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kanvas\Souk\Payments\Actions;
+
+use Kanvas\Souk\Payments\Models\PaymentLogs;
+use Kanvas\Souk\Payments\Models\Payments;
+use Throwable;
+
+class LogPaymentEventAction
+{
+    public function execute(Payments $payment, string $event, array $context = []): void
+    {
+        try {
+            PaymentLogs::create([
+                'payments_id' => $payment->id,
+                'apps_id' => $payment->apps_id,
+                'companies_id' => $payment->companies_id,
+                'users_id' => $payment->users_id,
+                'status' => $event,
+                'metadata' => $context,
+            ]);
+        } catch (Throwable $e) {
+            report($e);
+        }
+    }
+}

src/Domains/Souk/Payments/Models/PaymentLogs.php

@@ -4,10 +4,15 @@
 
 namespace Kanvas\Souk\Payments\Models;
 
+use Baka\Casts\Json;
 use Kanvas\Souk\Models\BaseModel;
 
 class PaymentLogs extends BaseModel
 {
     protected $table = 'payment_logs';
     protected $guarded = [];
+
+    protected $casts = [
+        'metadata' => Json::class,
+    ];
 }

src/Domains/Souk/Payments/Models/Payments.php

@@ -9,6 +9,7 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Kanvas\Payments\Models\PaymentMethods;
 use Kanvas\Souk\Models\BaseModel;
+use Kanvas\Souk\Payments\Actions\LogPaymentEventAction;
 use Kanvas\Souk\Payments\Enums\PaymentStatusEnum;
 use Kanvas\Workflow\Traits\CanUseWorkflow;
 
@@ -66,6 +67,11 @@ public function addMetadata(array $metadata): void
         ];
     }
 
+    public function addLog(string $event, array $context = []): void
+    {
+        app(LogPaymentEventAction::class)->execute($this, $event, $context);
+    }
+
     public function scopePending($query)
     {
         return $query->whereIn('status', [PaymentStatusEnum::PENDING->value, PaymentStatusEnum::PENDING_AUTHORIZATION->value]);