From 93f1a0401a560f8ea7e878bfc81eab280feed95a Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Thu, 15 Jan 2026 08:26:42 +0000
Subject: [PATCH 01/41] implemented initial razorpay payments

---
 .../DomainObjects/Enums/PaymentProviders.php  |   1 +
 .../RazorpayOrderDomainObjectAbstract.php     | 174 +++++++++++++++
 .../app/DomainObjects/OrderDomainObject.php   |  25 ++-
 .../RazorpayOrderDomainObject.php             |  25 +++
 .../Razorpay/CreateOrderFailedException.php   |   8 +
 .../Razorpay/InvalidSignatureException.php    |  13 ++
 .../PaymentVerificationFailedException.php    |   8 +
 .../Exceptions/Razorpay/RazorpayException.php |  10 +
 .../CreateRazorpayOrderActionPublic.php       |  34 +++
 .../VerifyRazorpayPaymentActionPublic.php     |  35 +++
 backend/app/Models/Order.php                  |   5 +
 backend/app/Models/RazorpayOrder.php          |  33 +++
 .../Providers/RepositoryServiceProvider.php   |   3 +
 .../Eloquent/RazorpayOrdersRepository.php     |  64 ++++++
 .../Interfaces/RazorpayOrderInterface.php     |  28 +++
 .../RazorpayOrdersRepositoryInterface.php     |  29 +++
 .../Razorpay/CreateRazorpayOrderHandler.php   | 105 +++++++++
 .../Razorpay/VerifyRazorpayPaymentHandler.php |  73 ++++++
 .../DTOs/CreateRazorpayOrderRequestDTO.php    |  48 ++++
 .../DTOs/CreateRazorpayOrderResponseDTO.php   |  14 ++
 .../Razorpay/RazorpayOrderCreationService.php | 118 ++++++++++
 .../RazorpayPaymentVerificationService.php    |  75 +++++++
 .../Razorpay/RazorpayClientFactory.php        |  27 +++
 backend/composer.json                         |   1 +
 backend/composer.lock                         | 157 ++++++++++++-
 backend/config/services.php                   |   7 +
 ...14_074419_create_razorpay_orders_table.php |  37 ++++
 backend/routes/api.php                        |   6 +
 frontend/src/api/order.client.ts              |  26 +++
 .../Sections/PaymentSettings/index.tsx        | 100 +++++++--
 .../Payment/PaymentMethods/Razorpay/index.tsx | 208 ++++++++++++++++++
 .../routes/product-widget/Payment/index.tsx   |  38 ++--
 .../src/queries/useCreateRazorpayOrder.ts     |  23 ++
 frontend/src/types.ts                         |   2 +-
 34 files changed, 1518 insertions(+), 42 deletions(-)
 create mode 100644 backend/app/DomainObjects/Generated/RazorpayOrderDomainObjectAbstract.php
 create mode 100644 backend/app/DomainObjects/RazorpayOrderDomainObject.php
 create mode 100644 backend/app/Exceptions/Razorpay/CreateOrderFailedException.php
 create mode 100644 backend/app/Exceptions/Razorpay/InvalidSignatureException.php
 create mode 100644 backend/app/Exceptions/Razorpay/PaymentVerificationFailedException.php
 create mode 100644 backend/app/Exceptions/Razorpay/RazorpayException.php
 create mode 100644 backend/app/Http/Actions/Orders/Payment/Razorpay/CreateRazorpayOrderActionPublic.php
 create mode 100644 backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
 create mode 100644 backend/app/Models/RazorpayOrder.php
 create mode 100644 backend/app/Repository/Eloquent/RazorpayOrdersRepository.php
 create mode 100644 backend/app/Repository/Interfaces/RazorpayOrderInterface.php
 create mode 100644 backend/app/Repository/Interfaces/RazorpayOrdersRepositoryInterface.php
 create mode 100644 backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php
 create mode 100644 backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/DTOs/CreateRazorpayOrderRequestDTO.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/DTOs/CreateRazorpayOrderResponseDTO.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
 create mode 100644 backend/app/Services/Infrastructure/Razorpay/RazorpayClientFactory.php
 create mode 100644 backend/database/migrations/2026_01_14_074419_create_razorpay_orders_table.php
 create mode 100644 frontend/src/components/routes/product-widget/Payment/PaymentMethods/Razorpay/index.tsx
 create mode 100644 frontend/src/queries/useCreateRazorpayOrder.ts

diff --git a/backend/app/DomainObjects/Enums/PaymentProviders.php b/backend/app/DomainObjects/Enums/PaymentProviders.php
index 8eb53645c..46f42bce1 100644
--- a/backend/app/DomainObjects/Enums/PaymentProviders.php
+++ b/backend/app/DomainObjects/Enums/PaymentProviders.php
@@ -7,5 +7,6 @@ enum PaymentProviders: string
     use BaseEnum;
 
     case STRIPE = 'STRIPE';
+    case RAZORPAY = 'RAZORPAY';
     case OFFLINE = 'OFFLINE';
 }
diff --git a/backend/app/DomainObjects/Generated/RazorpayOrderDomainObjectAbstract.php b/backend/app/DomainObjects/Generated/RazorpayOrderDomainObjectAbstract.php
new file mode 100644
index 000000000..c0a5b3406
--- /dev/null
+++ b/backend/app/DomainObjects/Generated/RazorpayOrderDomainObjectAbstract.php
@@ -0,0 +1,174 @@
+<?php
+
+namespace HiEvents\DomainObjects\Generated;
+
+/**
+ * THIS FILE IS AUTOGENERATED - DO NOT EDIT IT DIRECTLY.
+ * @package HiEvents\DomainObjects\Generated
+ */
+abstract class RazorpayOrderDomainObjectAbstract extends \HiEvents\DomainObjects\AbstractDomainObject
+{
+    final public const SINGULAR_NAME = 'razorpay_order';
+    final public const PLURAL_NAME = 'razorpay_orders';
+    final public const ID = 'id';
+    final public const ORDER_ID = 'order_id';
+    final public const RAZORPAY_ORDER_ID = 'razorpay_order_id';
+    final public const RAZORPAY_PAYMENT_ID = 'razorpay_payment_id';
+    final public const RAZORPAY_SIGNATURE = 'razorpay_signature';
+    final public const AMOUNT = 'amount';
+    final public const CURRENCY = 'currency';
+    final public const RECEIPT = 'receipt';
+    final public const PAYMENT_STATUS = 'payment_status';
+    final public const CREATED_AT = 'created_at';
+    final public const UPDATED_AT = 'updated_at';
+
+    protected int $id;
+    protected int $order_id;
+    protected string $razorpay_order_id;
+    protected ?string $razorpay_payment_id = null;
+    protected ?string $razorpay_signature = null;
+    protected int $amount;
+    protected string $currency;
+    protected ?string $receipt = null;
+    protected string $payment_status = 'created';
+    protected ?string $created_at = null;
+    protected ?string $updated_at = null;
+
+    public function toArray(): array
+    {
+        return [
+                    'id' => $this->id ?? null,
+                    'order_id' => $this->order_id ?? null,
+                    'razorpay_order_id' => $this->razorpay_order_id ?? null,
+                    'razorpay_payment_id' => $this->razorpay_payment_id ?? null,
+                    'razorpay_signature' => $this->razorpay_signature ?? null,
+                    'amount' => $this->amount ?? null,
+                    'currency' => $this->currency ?? null,
+                    'receipt' => $this->receipt ?? null,
+                    'payment_status' => $this->payment_status ?? null,
+                    'created_at' => $this->created_at ?? null,
+                    'updated_at' => $this->updated_at ?? null,
+                ];
+    }
+
+    public function setId(int $id): self
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function setOrderId(int $order_id): self
+    {
+        $this->order_id = $order_id;
+        return $this;
+    }
+
+    public function getOrderId(): int
+    {
+        return $this->order_id;
+    }
+
+    public function setRazorpayOrderId(string $razorpay_order_id): self
+    {
+        $this->razorpay_order_id = $razorpay_order_id;
+        return $this;
+    }
+
+    public function getRazorpayOrderId(): string
+    {
+        return $this->razorpay_order_id;
+    }
+
+    public function setRazorpayPaymentId(?string $razorpay_payment_id): self
+    {
+        $this->razorpay_payment_id = $razorpay_payment_id;
+        return $this;
+    }
+
+    public function getRazorpayPaymentId(): ?string
+    {
+        return $this->razorpay_payment_id;
+    }
+
+    public function setRazorpaySignature(?string $razorpay_signature): self
+    {
+        $this->razorpay_signature = $razorpay_signature;
+        return $this;
+    }
+
+    public function getRazorpaySignature(): ?string
+    {
+        return $this->razorpay_signature;
+    }
+
+    public function setAmount(int $amount): self
+    {
+        $this->amount = $amount;
+        return $this;
+    }
+
+    public function getAmount(): int
+    {
+        return $this->amount;
+    }
+
+    public function setCurrency(string $currency): self
+    {
+        $this->currency = $currency;
+        return $this;
+    }
+
+    public function getCurrency(): string
+    {
+        return $this->currency;
+    }
+
+    public function setReceipt(?string $receipt): self
+    {
+        $this->receipt = $receipt;
+        return $this;
+    }
+
+    public function getReceipt(): ?string
+    {
+        return $this->receipt;
+    }
+
+    public function setPaymentStatus(string $payment_status): self
+    {
+        $this->payment_status = $payment_status;
+        return $this;
+    }
+
+    public function getPaymentStatus(): string
+    {
+        return $this->payment_status;
+    }
+
+    public function setCreatedAt(?string $created_at): self
+    {
+        $this->created_at = $created_at;
+        return $this;
+    }
+
+    public function getCreatedAt(): ?string
+    {
+        return $this->created_at;
+    }
+
+    public function setUpdatedAt(?string $updated_at): self
+    {
+        $this->updated_at = $updated_at;
+        return $this;
+    }
+
+    public function getUpdatedAt(): ?string
+    {
+        return $this->updated_at;
+    }
+}
diff --git a/backend/app/DomainObjects/OrderDomainObject.php b/backend/app/DomainObjects/OrderDomainObject.php
index 723e98b90..e2492d7a0 100644
--- a/backend/app/DomainObjects/OrderDomainObject.php
+++ b/backend/app/DomainObjects/OrderDomainObject.php
@@ -24,6 +24,8 @@ class OrderDomainObject extends Generated\OrderDomainObjectAbstract implements I
     public ?Collection $attendees = null;
 
     public ?StripePaymentDomainObject $stripePayment = null;
+    
+    public ?RazorpayOrderDomainObject $razorpayOrder = null;
 
     /** @var Collection<QuestionAndAnswerViewDomainObject>|null */
     public ?Collection $questionAndAnswerViews = null;
@@ -180,6 +182,12 @@ public function setStripePayment(?StripePaymentDomainObject $stripePayment): Ord
         $this->stripePayment = $stripePayment;
         return $this;
     }
+    
+    public function setRazorpayOrder(?RazorpayOrderDomainObject $razorpayOrder): OrderDomainObject
+    {
+        $this->razorpayOrder = $razorpayOrder;
+        return $this;
+    }
 
     public function isPartiallyRefunded(): bool
     {
@@ -220,6 +228,11 @@ public function getStripePayment(): ?StripePaymentDomainObject
     {
         return $this->stripePayment;
     }
+    
+    public function getRazorpayOrder(): ?RazorpayOrderDomainObject
+    {
+        return $this->razorpayOrder;
+    }
 
     public function isFreeOrder(): bool
     {
@@ -286,4 +299,14 @@ public function isRefundable(): bool
             && $this->getPaymentProvider() === PaymentProviders::STRIPE->name
             && $this->getRefundStatus() !== OrderRefundStatus::REFUNDED->name;
     }
-}
+    
+    public function isRazorpayOrder(): bool
+    {
+        return $this->getPaymentProvider() === PaymentProviders::RAZORPAY->name;
+    }
+    
+    public function hasRazorpayOrder(): bool
+    {
+        return $this->razorpayOrder !== null;
+    }
+}
\ No newline at end of file
diff --git a/backend/app/DomainObjects/RazorpayOrderDomainObject.php b/backend/app/DomainObjects/RazorpayOrderDomainObject.php
new file mode 100644
index 000000000..3dda29370
--- /dev/null
+++ b/backend/app/DomainObjects/RazorpayOrderDomainObject.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace HiEvents\DomainObjects;
+
+use HiEvents\DomainObjects\Generated\RazorpayOrderDomainObjectAbstract;
+
+class RazorpayOrderDomainObject extends RazorpayOrderDomainObjectAbstract
+{
+    // Additional methods or overrides can be added here
+    
+    public function isPaid(): bool
+    {
+        return in_array($this->payment_status, ['captured', 'paid']);
+    }
+    
+    public function isFailed(): bool
+    {
+        return $this->payment_status === 'failed';
+    }
+    
+    public function isPending(): bool
+    {
+        return $this->payment_status === 'created';
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Exceptions/Razorpay/CreateOrderFailedException.php b/backend/app/Exceptions/Razorpay/CreateOrderFailedException.php
new file mode 100644
index 000000000..77e08ed0a
--- /dev/null
+++ b/backend/app/Exceptions/Razorpay/CreateOrderFailedException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace HiEvents\Exceptions\Razorpay;
+
+class CreateOrderFailedException extends RazorpayException
+{
+    protected $code = 422;
+}
\ No newline at end of file
diff --git a/backend/app/Exceptions/Razorpay/InvalidSignatureException.php b/backend/app/Exceptions/Razorpay/InvalidSignatureException.php
new file mode 100644
index 000000000..3c73ea1c3
--- /dev/null
+++ b/backend/app/Exceptions/Razorpay/InvalidSignatureException.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace HiEvents\Exceptions\Razorpay;
+
+class InvalidSignatureException extends RazorpayException
+{
+    protected $code = 400;
+    
+    public function __construct(string $message = 'Invalid payment signature')
+    {
+        parent::__construct($message);
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Exceptions/Razorpay/PaymentVerificationFailedException.php b/backend/app/Exceptions/Razorpay/PaymentVerificationFailedException.php
new file mode 100644
index 000000000..4ff4dfc32
--- /dev/null
+++ b/backend/app/Exceptions/Razorpay/PaymentVerificationFailedException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace HiEvents\Exceptions\Razorpay;
+
+class PaymentVerificationFailedException extends RazorpayException
+{
+    protected $code = 422;
+}
\ No newline at end of file
diff --git a/backend/app/Exceptions/Razorpay/RazorpayException.php b/backend/app/Exceptions/Razorpay/RazorpayException.php
new file mode 100644
index 000000000..7befe0071
--- /dev/null
+++ b/backend/app/Exceptions/Razorpay/RazorpayException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace HiEvents\Exceptions\Razorpay;
+
+use Exception;
+
+class RazorpayException extends Exception
+{
+    protected $code = 500;
+}
\ No newline at end of file
diff --git a/backend/app/Http/Actions/Orders/Payment/Razorpay/CreateRazorpayOrderActionPublic.php b/backend/app/Http/Actions/Orders/Payment/Razorpay/CreateRazorpayOrderActionPublic.php
new file mode 100644
index 000000000..5f93cdff4
--- /dev/null
+++ b/backend/app/Http/Actions/Orders/Payment/Razorpay/CreateRazorpayOrderActionPublic.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace HiEvents\Http\Actions\Orders\Payment\Razorpay;
+
+use HiEvents\Exceptions\Razorpay\CreateOrderFailedException;
+use HiEvents\Http\Actions\BaseAction;
+use HiEvents\Services\Application\Handlers\Order\Payment\Razorpay\CreateRazorpayOrderHandler;
+use Illuminate\Http\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+
+class CreateRazorpayOrderActionPublic extends BaseAction
+{
+    public function __construct(
+        private readonly CreateRazorpayOrderHandler $createRazorpayOrderHandler,
+    )
+    {
+    }
+
+    public function __invoke(int $eventId, string $orderShortId): JsonResponse
+    {
+        try {
+            $razorpayOrder = $this->createRazorpayOrderHandler->handle($orderShortId);
+        } catch (CreateOrderFailedException $e) {
+            return $this->errorResponse($e->getMessage(), Response::HTTP_UNPROCESSABLE_ENTITY);
+        }
+
+        return $this->jsonResponse([
+            'razorpay_order_id' => $razorpayOrder->id,
+            'key_id' => $razorpayOrder->keyId,
+            'amount' => $razorpayOrder->amount,
+            'currency' => $razorpayOrder->currency,
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php b/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
new file mode 100644
index 000000000..85935aa0c
--- /dev/null
+++ b/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace HiEvents\Http\Actions\Orders\Payment\Razorpay;
+
+use HiEvents\Exceptions\Razorpay\PaymentVerificationFailedException;
+use HiEvents\Http\Actions\BaseAction;
+use HiEvents\Services\Application\Handlers\Order\Payment\Razorpay\VerifyRazorpayPaymentHandler;
+use Illuminate\Http\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+
+class VerifyRazorpayPaymentActionPublic extends BaseAction
+{
+    public function __construct(
+        private readonly VerifyRazorpayPaymentHandler $verifyRazorpayPaymentHandler,
+    )
+    {
+    }
+
+    public function __invoke(int $eventId, string $orderShortId): JsonResponse
+    {
+        try {
+            $order = $this->verifyRazorpayPaymentHandler->handle(
+                $orderShortId,
+                request()->all()
+            );
+        } catch (PaymentVerificationFailedException $e) {
+            return $this->errorResponse($e->getMessage(), Response::HTTP_UNPROCESSABLE_ENTITY);
+        }
+
+        return $this->jsonResponse([
+            'message' => __('Payment verified successfully'),
+            'order' => $order->toArray(),
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Models/Order.php b/backend/app/Models/Order.php
index e69cdad97..0508cf9d3 100644
--- a/backend/app/Models/Order.php
+++ b/backend/app/Models/Order.php
@@ -21,6 +21,11 @@ public function stripe_payment(): HasOne
         return $this->hasOne(StripePayment::class);
     }
 
+    public function razorpay_order(): HasOne
+    {
+        return $this->hasOne(RazorpayOrder::class);
+    }
+
     public function order_items(): HasMany
     {
         return $this->hasMany(OrderItem::class);
diff --git a/backend/app/Models/RazorpayOrder.php b/backend/app/Models/RazorpayOrder.php
new file mode 100644
index 000000000..923a19976
--- /dev/null
+++ b/backend/app/Models/RazorpayOrder.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace HiEvents\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class RazorpayOrder extends BaseModel
+{
+    protected $table = 'razorpay_orders';
+
+    protected $fillable = [
+        'order_id',
+        'razorpay_order_id',
+        'razorpay_payment_id',
+        'razorpay_signature',
+        'amount',
+        'currency',
+        'receipt',
+        'payment_status',
+    ];
+
+    protected $casts = [
+        'amount' => 'integer',
+        'created_at' => 'datetime',
+        'updated_at' => 'datetime',
+    ];
+
+    public function order(): BelongsTo
+    {
+        return $this->belongsTo(Order::class);
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Providers/RepositoryServiceProvider.php b/backend/app/Providers/RepositoryServiceProvider.php
index 712839ee3..11fd05d50 100644
--- a/backend/app/Providers/RepositoryServiceProvider.php
+++ b/backend/app/Providers/RepositoryServiceProvider.php
@@ -42,6 +42,7 @@
 use HiEvents\Repository\Eloquent\QuestionAndAnswerViewRepository;
 use HiEvents\Repository\Eloquent\QuestionAnswerRepository;
 use HiEvents\Repository\Eloquent\QuestionRepository;
+use HiEvents\Repository\Eloquent\RazorpayOrdersRepository;
 use HiEvents\Repository\Eloquent\StripeCustomerRepository;
 use HiEvents\Repository\Eloquent\StripePaymentsRepository;
 use HiEvents\Repository\Eloquent\StripePayoutsRepository;
@@ -88,6 +89,7 @@
 use HiEvents\Repository\Interfaces\QuestionAndAnswerViewRepositoryInterface;
 use HiEvents\Repository\Interfaces\QuestionAnswerRepositoryInterface;
 use HiEvents\Repository\Interfaces\QuestionRepositoryInterface;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
 use HiEvents\Repository\Interfaces\StripeCustomerRepositoryInterface;
 use HiEvents\Repository\Interfaces\StripePaymentsRepositoryInterface;
 use HiEvents\Repository\Interfaces\StripePayoutsRepositoryInterface;
@@ -116,6 +118,7 @@ class RepositoryServiceProvider extends ServiceProvider
         QuestionRepositoryInterface::class => QuestionRepository::class,
         QuestionAnswerRepositoryInterface::class => QuestionAnswerRepository::class,
         StripePaymentsRepositoryInterface::class => StripePaymentsRepository::class,
+        RazorpayOrdersRepositoryInterface::class => RazorpayOrdersRepository::class,
         PromoCodeRepositoryInterface::class => PromoCodeRepository::class,
         MessageRepositoryInterface::class => MessageRepository::class,
         PasswordResetTokenRepositoryInterface::class => PasswordResetTokenRepository::class,
diff --git a/backend/app/Repository/Eloquent/RazorpayOrdersRepository.php b/backend/app/Repository/Eloquent/RazorpayOrdersRepository.php
new file mode 100644
index 000000000..2ea6036ea
--- /dev/null
+++ b/backend/app/Repository/Eloquent/RazorpayOrdersRepository.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace HiEvents\Repository\Eloquent;
+
+use HiEvents\DomainObjects\Generated\RazorpayOrderDomainObjectAbstract;
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\Models\RazorpayOrder;
+use HiEvents\Repository\Eloquent\BaseRepository;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+
+class RazorpayOrdersRepository extends BaseRepository implements RazorpayOrdersRepositoryInterface
+{
+    protected function getModel(): string
+    {
+        return RazorpayOrder::class;
+    }
+
+    public function getDomainObject(): string
+    {
+        return RazorpayOrderDomainObject::class;
+    }
+
+    public function findByRazorpayOrderId(string $razorpayOrderId): ?RazorpayOrderDomainObject
+    {
+        return $this->findFirstWhere([
+            'razorpay_order_id' => $razorpayOrderId,
+        ]);
+    }
+
+    public function findByOrderId(int $orderId): ?RazorpayOrderDomainObject
+    {
+        return $this->findFirstWhere([
+            'order_id' => $orderId,
+        ]);
+    }
+
+    public function updateByOrderId(int $orderId, array $data): bool
+    {
+        $model = $this->model
+            ->where('order_id', $orderId)
+            ->first();
+
+        if (!$model) {
+            return false;
+        }
+
+        return $model->update($data);
+    }
+
+    public function findByPaymentId(string $paymentId): ?RazorpayOrderDomainObject
+    {
+        return $this->findFirstWhere([
+            'razorpay_payment_id' => $paymentId,
+        ]);
+    }
+
+    protected function applySoftDeleteFilter(Builder $query): Builder
+    {
+        // Razorpay orders are not soft deleted
+        return $query;
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Repository/Interfaces/RazorpayOrderInterface.php b/backend/app/Repository/Interfaces/RazorpayOrderInterface.php
new file mode 100644
index 000000000..e0b13cab0
--- /dev/null
+++ b/backend/app/Repository/Interfaces/RazorpayOrderInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace HiEvents\DomainObjects\Interfaces;
+
+interface RazorpayOrderInterface
+{
+    public function getId(): int;
+    
+    public function getOrderId(): int;
+    
+    public function getRazorpayOrderId(): string;
+    
+    public function getRazorpayPaymentId(): ?string;
+    
+    public function getRazorpaySignature(): ?string;
+    
+    public function getAmount(): int;
+    
+    public function getCurrency(): string;
+    
+    public function getReceipt(): ?string;
+    
+    public function getPaymentStatus(): string;
+    
+    public function getCreatedAt(): \DateTimeInterface;
+    
+    public function getUpdatedAt(): \DateTimeInterface;
+}
\ No newline at end of file
diff --git a/backend/app/Repository/Interfaces/RazorpayOrdersRepositoryInterface.php b/backend/app/Repository/Interfaces/RazorpayOrdersRepositoryInterface.php
new file mode 100644
index 000000000..338e17644
--- /dev/null
+++ b/backend/app/Repository/Interfaces/RazorpayOrdersRepositoryInterface.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace HiEvents\Repository\Interfaces;
+
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\Repository\Interfaces\RepositoryInterface;
+
+interface RazorpayOrdersRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Find Razorpay order by Razorpay order ID
+     */
+    public function findByRazorpayOrderId(string $razorpayOrderId): ?RazorpayOrderDomainObject;
+
+    /**
+     * Find Razorpay order by order ID
+     */
+    public function findByOrderId(int $orderId): ?RazorpayOrderDomainObject;
+
+    /**
+     * Update Razorpay order by order ID
+     */
+    public function updateByOrderId(int $orderId, array $data): bool;
+
+    /**
+     * Find Razorpay order by payment ID
+     */
+    public function findByPaymentId(string $paymentId): ?RazorpayOrderDomainObject;
+}
\ No newline at end of file
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php
new file mode 100644
index 000000000..2f203b1ca
--- /dev/null
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace HiEvents\Services\Application\Handlers\Order\Payment\Razorpay;
+
+use Brick\Math\Exception\MathException;
+use Brick\Math\Exception\NumberFormatException;
+use Brick\Math\Exception\RoundingNecessaryException;
+use Brick\Money\Exception\UnknownCurrencyException;
+use HiEvents\DomainObjects\AccountConfigurationDomainObject;
+use HiEvents\DomainObjects\OrderItemDomainObject;
+use HiEvents\DomainObjects\Status\OrderStatus;
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\Exceptions\ResourceConflictException;
+use HiEvents\Exceptions\Razorpay\CreateOrderFailedException;
+use HiEvents\Exceptions\UnauthorizedException;
+use HiEvents\Repository\Eloquent\Value\Relationship;
+use HiEvents\Repository\Interfaces\AccountRepositoryInterface;
+use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\CreateRazorpayOrderRequestDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\CreateRazorpayOrderResponseDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\RazorpayOrderCreationService;
+use HiEvents\Services\Infrastructure\Session\CheckoutSessionManagementService;
+use HiEvents\Values\MoneyValue;
+use Razorpay\Api\Errors\Error;
+use Throwable;
+
+readonly class CreateRazorpayOrderHandler
+{
+    public function __construct(
+        private OrderRepositoryInterface         $orderRepository,
+        private RazorpayOrderCreationService    $razorpayOrderService,
+        private CheckoutSessionManagementService $sessionIdentifierService,
+        private RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
+        private AccountRepositoryInterface      $accountRepository,
+    )
+    {
+    }
+
+    /**
+     * @throws CreateOrderFailedException
+     * @throws MathException
+     * @throws NumberFormatException
+     * @throws RoundingNecessaryException
+     * @throws UnknownCurrencyException
+     * @throws Throwable
+     */
+    public function handle(string $orderShortId): CreateRazorpayOrderResponseDTO
+    {
+        $order = $this->orderRepository
+            ->loadRelation(new Relationship(OrderItemDomainObject::class))
+            ->loadRelation(new Relationship(RazorpayOrderDomainObject::class, name: 'razorpay_order'))
+            ->findByShortId($orderShortId);
+
+        if (!$order || !$this->sessionIdentifierService->verifySession($order->getSessionId())) {
+            throw new UnauthorizedException(__('Sorry, we could not verify your session. Please create a new order.'));
+        }
+
+        if ($order->getStatus() !== OrderStatus::RESERVED->name || $order->isReservedOrderExpired()) {
+            throw new ResourceConflictException(__('Sorry, is expired or not in a valid state.'));
+        }
+
+        $account = $this->accountRepository
+            ->loadRelation(new Relationship(
+                domainObject: AccountConfigurationDomainObject::class,
+                name: 'configuration',
+            ))
+            ->findByEventId($order->getEventId());
+
+        // Check if we already have a Razorpay order
+        if ($order->getRazorpayOrder() !== null) {
+            return new CreateRazorpayOrderResponseDTO(
+                id: $order->getRazorpayOrder()->getRazorpayOrderId(),
+                keyId: config('services.razorpay.key_id'),
+                amount: $order->getRazorpayOrder()->getAmount(),
+                currency: $order->getRazorpayOrder()->getCurrency(),
+            );
+        }
+
+        $razorpayOrder = $this->razorpayOrderService->createOrder(
+            CreateRazorpayOrderRequestDTO::fromArray([
+                'amount' => MoneyValue::fromFloat($order->getTotalGross(), $order->getCurrency()),
+                'currencyCode' => $order->getCurrency(),
+                'account' => $account,
+                'order' => $order,
+            ])
+        );
+
+        // Store Razorpay order in database
+        $this->razorpayOrdersRepository->create([
+            'order_id' => $order->getId(),
+            'razorpay_order_id' => $razorpayOrder->id,
+            'amount' => $razorpayOrder->amount,
+            'currency' => strtoupper($order->getCurrency()),
+            'receipt' => $order->getShortId(),
+        ]);
+
+        return new CreateRazorpayOrderResponseDTO(
+            id: $razorpayOrder->id,
+            keyId: config('services.razorpay.key_id'),
+            amount: $razorpayOrder->amount,
+            currency: $razorpayOrder->currency,
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
new file mode 100644
index 000000000..df78d9c56
--- /dev/null
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace HiEvents\Services\Application\Handlers\Order\Payment\Razorpay;
+
+use HiEvents\DomainObjects\OrderDomainObject;
+use HiEvents\DomainObjects\OrderItemDomainObject;
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\DomainObjects\Status\OrderStatus;
+use HiEvents\Exceptions\Razorpay\PaymentVerificationFailedException;
+use HiEvents\Exceptions\ResourceConflictException;
+use HiEvents\Exceptions\UnauthorizedException;
+use HiEvents\Repository\Eloquent\Value\Relationship;
+use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentVerificationService;
+use HiEvents\Services\Infrastructure\Session\CheckoutSessionManagementService;
+use Throwable;
+
+readonly class VerifyRazorpayPaymentHandler
+{
+    public function __construct(
+        private OrderRepositoryInterface          $orderRepository,
+        private RazorpayPaymentVerificationService $razorpayPaymentService,
+        private CheckoutSessionManagementService  $sessionIdentifierService,
+        private RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
+    )
+    {
+    }
+
+    /**
+     * @throws PaymentVerificationFailedException
+     * @throws Throwable
+     */
+    public function handle(string $orderShortId, array $paymentData): OrderDomainObject
+    {
+        $order = $this->orderRepository
+            ->loadRelation(new Relationship(OrderItemDomainObject::class))
+            ->loadRelation(new Relationship(RazorpayOrderDomainObject::class, name: 'razorpay_order'))
+            ->findByShortId($orderShortId);
+
+        if (!$order || !$this->sessionIdentifierService->verifySession($order->getSessionId())) {
+            throw new UnauthorizedException(__('Sorry, we could not verify your session. Please create a new order.'));
+        }
+
+        if ($order->getStatus() !== OrderStatus::RESERVED->name || $order->isReservedOrderExpired()) {
+            throw new ResourceConflictException(__('Sorry, is expired or not in a valid state.'));
+        }
+
+        // Verify the payment signature
+        $isValid = $this->razorpayPaymentService->verifyPaymentSignature($paymentData);
+
+        if (!$isValid) {
+            throw new PaymentVerificationFailedException(__('Payment verification failed. Please try again.'));
+        }
+
+        // Update Razorpay order with payment details
+        $this->razorpayOrdersRepository->updateByOrderId($order->getId(), [
+            'razorpay_payment_id' => $paymentData['razorpay_payment_id'],
+            'razorpay_signature' => $paymentData['razorpay_signature'],
+            'payment_status' => 'captured',
+        ]);
+
+        // Update order status to completed
+        $order->setStatus(OrderStatus::COMPLETED->name);
+        $order->setPaymentStatus('PAYMENT_RECEIVED');
+        $this->orderRepository->updateFromArray($order->getId(), [
+            'status' => $order->getStatus(),
+            'payment_status' => $order->getPaymentStatus(),
+        ]);
+
+        return $order;
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/CreateRazorpayOrderRequestDTO.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/CreateRazorpayOrderRequestDTO.php
new file mode 100644
index 000000000..ee12b8af3
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/CreateRazorpayOrderRequestDTO.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
+
+use HiEvents\DomainObjects\AccountDomainObject;
+use HiEvents\DomainObjects\OrderDomainObject;
+use HiEvents\DomainObjects\AccountVatSettingDomainObject;
+use HiEvents\Values\MoneyValue;
+use Illuminate\Contracts\Support\Arrayable;
+
+class CreateRazorpayOrderRequestDTO implements Arrayable
+{
+    public function __construct(
+        public readonly MoneyValue $amount,
+        public readonly string $currencyCode,
+        public readonly AccountDomainObject $account,
+        public readonly OrderDomainObject $order,
+        public readonly ?AccountVatSettingDomainObject $vatSettings = null,
+    ) {}
+
+    public static function fromArray(array $data): self
+    {
+        return new self(
+            amount: $data['amount'],
+            currencyCode: $data['currencyCode'],
+            account: $data['account'],
+            order: $data['order'],
+            vatSettings: $data['vatSettings'] ?? null,
+        );
+    }
+
+    public function toArray(array $except = []): array
+    {
+        $data = [
+            'amount' => $this->amount,
+            'currencyCode' => $this->currencyCode,
+            'account' => in_array('account', $except) ? '[object]' : $this->account->toArray(),
+            'order' => in_array('order', $except) ? '[object]' : $this->order->toArray(),
+            'vatSettings' => $this->vatSettings?->toArray(),
+        ];
+
+        foreach ($except as $key) {
+            unset($data[$key]);
+        }
+
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/CreateRazorpayOrderResponseDTO.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/CreateRazorpayOrderResponseDTO.php
new file mode 100644
index 000000000..9a2475f56
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/CreateRazorpayOrderResponseDTO.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
+
+class CreateRazorpayOrderResponseDTO
+{
+    public function __construct(
+        public readonly string $id,
+        public readonly string $keyId,
+        public readonly int $amount,
+        public readonly string $currency,
+        public readonly ?string $receipt = null,
+    ) {}
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
new file mode 100644
index 000000000..27605f218
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay;
+
+use HiEvents\DomainObjects\AccountConfigurationDomainObject;
+use HiEvents\Exceptions\Razorpay\CreateOrderFailedException;
+use HiEvents\Repository\Interfaces\AccountRepositoryInterface;
+use HiEvents\Services\Domain\Order\DTO\ApplicationFeeValuesDTO;
+use HiEvents\Services\Domain\Order\OrderApplicationFeeCalculationService;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\CreateRazorpayOrderRequestDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\CreateRazorpayOrderResponseDTO;
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
+use Illuminate\Config\Repository;
+use Illuminate\Database\DatabaseManager;
+use Psr\Log\LoggerInterface;
+use Razorpay\Api\Errors\Error;
+use Throwable;
+
+class RazorpayOrderCreationService
+{
+    public function __construct(
+        private readonly LoggerInterface                       $logger,
+        private readonly Repository                            $config,
+        private readonly DatabaseManager                       $databaseManager,
+        private readonly OrderApplicationFeeCalculationService $orderApplicationFeeCalculationService,
+        private readonly RazorpayClientFactory                $razorpayClientFactory,
+    )
+    {
+    }
+
+    /**
+     * @throws CreateOrderFailedException
+     * @throws Throwable
+     */
+    public function createOrder(CreateRazorpayOrderRequestDTO $orderDTO): CreateRazorpayOrderResponseDTO
+    {
+        try {
+            $this->databaseManager->beginTransaction();
+
+            $razorpayClient = $this->razorpayClientFactory->create();
+
+            // Calculate application fee for Razorpay
+            $applicationFee = $this->orderApplicationFeeCalculationService->calculateApplicationFee(
+                accountConfiguration: $orderDTO->account->getConfiguration(),
+                order: $orderDTO->order,
+                vatSettings: $orderDTO->account->getAccountVatSetting(),
+            );
+
+            // Razorpay amount is in paise (Indian) or smallest currency unit
+            $amountInSmallestUnit = $orderDTO->amount->toMinorUnit();
+            
+            // For INR, amount is in paise
+            // For other currencies, check Razorpay documentation for conversion
+            if ($orderDTO->currencyCode !== 'INR') {
+                // Razorpay supports multiple currencies but amounts might need different handling
+                // This depends on Razorpay's currency requirements
+                $amountInSmallestUnit = $orderDTO->amount->toFloat() * 100; // Default conversion
+            }
+
+            $orderData = [
+                'amount' => $amountInSmallestUnit,
+                'currency' => $orderDTO->currencyCode,
+                'receipt' => $orderDTO->order->getShortId(),
+                'payment_capture' => 1, // Auto-capture payment
+                'notes' => [
+                    'order_id' => $orderDTO->order->getId(),
+                    'event_id' => $orderDTO->order->getEventId(),
+                    'order_short_id' => $orderDTO->order->getShortId(),
+                    'account_id' => $orderDTO->account->getId(),
+                ],
+            ];
+
+            // Add application fee if applicable (Razorpay handles fees differently)
+            if ($applicationFee && $this->config->get('services.razorpay.application_fee_enabled')) {
+                $orderData['transfers'] = [
+                    [
+                        'account' => $this->config->get('services.razorpay.platform_account_id'),
+                        'amount' => $applicationFee->grossApplicationFee->toMinorUnit(),
+                        'currency' => $orderDTO->currencyCode,
+                    ]
+                ];
+            }
+
+            $razorpayOrder = $razorpayClient->order->create($orderData);
+
+            $this->logger->debug('Razorpay order created', [
+                'razorpayOrderId' => $razorpayOrder->id,
+                'orderDTO' => $orderDTO->toArray(['account']),
+            ]);
+
+            $this->databaseManager->commit();
+
+            return new CreateRazorpayOrderResponseDTO(
+                id: $razorpayOrder->id,
+                keyId: $this->config->get('services.razorpay.key_id'),
+                amount: $razorpayOrder->amount,
+                currency: $razorpayOrder->currency,
+                receipt: $razorpayOrder->receipt,
+            );
+        } catch (Error $exception) {
+            dd($exception);
+            $this->logger->error("Razorpay order creation failed: {$exception->getMessage()}", [
+                'exception' => $exception,
+                'orderDTO' => $orderDTO->toArray(['account']),
+            ]);
+
+            $this->databaseManager->rollBack();
+
+            throw new CreateOrderFailedException(
+                __('There was an error communicating with the payment provider. Please try again later.')
+            );
+        } catch (Throwable $exception) {
+            $this->databaseManager->rollBack();
+
+            throw $exception;
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
new file mode 100644
index 000000000..501d5cb69
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay;
+
+use HiEvents\Exceptions\Razorpay\InvalidSignatureException;
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
+use Illuminate\Config\Repository;
+use Psr\Log\LoggerInterface;
+
+class RazorpayPaymentVerificationService
+{
+    public function __construct(
+        private readonly LoggerInterface $logger,
+        private readonly Repository $config,
+        private readonly RazorpayClientFactory $razorpayClientFactory,
+    ) {}
+
+    public function verifyPaymentSignature(array $paymentData): bool
+    {
+        $expectedSignature = hash_hmac(
+            'sha256',
+            $paymentData['razorpay_order_id'] . '|' . $paymentData['razorpay_payment_id'],
+            $this->config->get('services.razorpay.key_secret')
+        );
+
+        if ($expectedSignature !== $paymentData['razorpay_signature']) {
+            $this->logger->error('Razorpay signature verification failed', [
+                'expected' => $expectedSignature,
+                'received' => $paymentData['razorpay_signature'],
+                'order_id' => $paymentData['razorpay_order_id'],
+                'payment_id' => $paymentData['razorpay_payment_id'],
+            ]);
+
+            throw new InvalidSignatureException();
+        }
+
+        return true;
+    }
+
+    public function verifyWebhookSignature(string $payload, string $signature): bool
+    {
+        $expectedSignature = hash_hmac(
+            'sha256',
+            $payload,
+            $this->config->get('services.razorpay.webhook_secret')
+        );
+
+        return hash_equals($expectedSignature, $signature);
+    }
+
+    public function fetchPaymentDetails(string $paymentId): array
+    {
+        try {
+            $razorpayClient = $this->razorpayClientFactory->create();
+            $payment = $razorpayClient->payment->fetch($paymentId);
+            
+            return [
+                'id' => $payment->id,
+                'amount' => $payment->amount,
+                'currency' => $payment->currency,
+                'status' => $payment->status,
+                'order_id' => $payment->order_id,
+                'method' => $payment->method,
+                'created_at' => $payment->created_at,
+            ];
+        } catch (\Exception $e) {
+            $this->logger->error('Failed to fetch Razorpay payment details', [
+                'payment_id' => $paymentId,
+                'error' => $e->getMessage(),
+            ]);
+            
+            throw $e;
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Infrastructure/Razorpay/RazorpayClientFactory.php b/backend/app/Services/Infrastructure/Razorpay/RazorpayClientFactory.php
new file mode 100644
index 000000000..ab2284676
--- /dev/null
+++ b/backend/app/Services/Infrastructure/Razorpay/RazorpayClientFactory.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace HiEvents\Services\Infrastructure\Razorpay;
+
+use Razorpay\Api\Api;
+use Illuminate\Config\Repository;
+
+class RazorpayClientFactory
+{
+    public function __construct(
+        private readonly Repository $config,
+    ) {}
+
+    public function create(): Api
+    {
+        $keyId = $this->config->get('services.razorpay.key_id');
+        $keySecret = $this->config->get('services.razorpay.key_secret');
+
+        if (!$keyId || !$keySecret) {
+            throw new \RuntimeException('Razorpay credentials not configured');
+        }
+
+        $api = new Api($keyId, $keySecret);
+
+        return $api;
+    }
+}
\ No newline at end of file
diff --git a/backend/composer.json b/backend/composer.json
index 8dbd2ad25..f5f1b4ba2 100644
--- a/backend/composer.json
+++ b/backend/composer.json
@@ -24,6 +24,7 @@
         "maatwebsite/excel": "^3.1",
         "nette/php-generator": "^4.0",
         "php-open-source-saver/jwt-auth": "^2.1",
+        "razorpay/razorpay": "2.*",
         "sentry/sentry-laravel": "^4.13",
         "spatie/icalendar-generator": "^3.0",
         "spatie/laravel-data": "^4.15",
diff --git a/backend/composer.lock b/backend/composer.lock
index c6c34f098..0c0913950 100644
--- a/backend/composer.lock
+++ b/backend/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7649da1e3e0f8fad888953eb259e42b7",
+    "content-hash": "002f0dfe334a637d98a2799bd351e784",
     "packages": [
         {
             "name": "amphp/amp",
@@ -6863,6 +6863,71 @@
             },
             "time": "2025-09-04T20:59:21+00:00"
         },
+        {
+            "name": "razorpay/razorpay",
+            "version": "2.9.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/razorpay/razorpay-php.git",
+                "reference": "c5cf59941eb2d888e80371328d932e6e8266d352"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/razorpay/razorpay-php/zipball/c5cf59941eb2d888e80371328d932e6e8266d352",
+                "reference": "c5cf59941eb2d888e80371328d932e6e8266d352",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=7.3",
+                "rmccue/requests": "^2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9",
+                "raveren/kint": "1.*"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Deprecated.php"
+                ],
+                "psr-4": {
+                    "Razorpay\\Api\\": "src/",
+                    "Razorpay\\Tests\\": "tests/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Abhay Rana",
+                    "email": "nemo@razorpay.com",
+                    "homepage": "https://captnemo.in",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Shashank Kumar",
+                    "email": "shashank@razorpay.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Razorpay PHP Client Library",
+            "homepage": "https://docs.razorpay.com",
+            "keywords": [
+                "api",
+                "client",
+                "php",
+                "razorpay"
+            ],
+            "support": {
+                "email": "contact@razorpay.com",
+                "issues": "https://github.com/Razorpay/razorpay-php/issues",
+                "source": "https://github.com/Razorpay/razorpay-php"
+            },
+            "time": "2025-08-05T07:13:20+00:00"
+        },
         {
             "name": "revolt/event-loop",
             "version": "v1.0.7",
@@ -6991,6 +7056,92 @@
             },
             "time": "2025-04-29T08:38:14+00:00"
         },
+        {
+            "name": "rmccue/requests",
+            "version": "v2.0.17",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/WordPress/Requests.git",
+                "reference": "74d1648cc34e16a42ea25d548fc73ec107a90421"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/WordPress/Requests/zipball/74d1648cc34e16a42ea25d548fc73ec107a90421",
+                "reference": "74d1648cc34e16a42ea25d548fc73ec107a90421",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.0",
+                "php-parallel-lint/php-console-highlighter": "^0.5.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.1",
+                "phpcompatibility/php-compatibility": "^10.0.0@dev",
+                "requests/test-server": "dev-main",
+                "squizlabs/php_codesniffer": "^3.6",
+                "wp-coding-standards/wpcs": "^2.0",
+                "yoast/phpunit-polyfills": "^1.1.5"
+            },
+            "suggest": {
+                "art4/requests-psr18-adapter": "For using Requests as a PSR-18 HTTP Client",
+                "ext-curl": "For improved performance",
+                "ext-openssl": "For secure transport support",
+                "ext-zlib": "For improved performance when decompressing encoded streams"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "library/Deprecated.php"
+                ],
+                "psr-4": {
+                    "WpOrg\\Requests\\": "src/"
+                },
+                "classmap": [
+                    "library/Requests.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Ryan McCue",
+                    "homepage": "https://rmccue.io/"
+                },
+                {
+                    "name": "Alain Schlesser",
+                    "homepage": "https://github.com/schlessera"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/WordPress/Requests/graphs/contributors"
+                }
+            ],
+            "description": "A HTTP library written in PHP, for human beings.",
+            "homepage": "https://requests.ryanmccue.info/",
+            "keywords": [
+                "curl",
+                "fsockopen",
+                "http",
+                "idna",
+                "ipv6",
+                "iri",
+                "sockets"
+            ],
+            "support": {
+                "docs": "https://requests.ryanmccue.info/",
+                "issues": "https://github.com/WordPress/Requests/issues",
+                "source": "https://github.com/WordPress/Requests"
+            },
+            "time": "2025-12-12T17:47:19+00:00"
+        },
         {
             "name": "sabberworm/php-css-parser",
             "version": "v8.8.0",
@@ -13701,6 +13852,6 @@
         "ext-intl": "*",
         "ext-xmlwriter": "*"
     },
-    "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "platform-dev": [],
+    "plugin-api-version": "2.2.0"
 }
diff --git a/backend/config/services.php b/backend/config/services.php
index 44f123a1e..d675543d7 100644
--- a/backend/config/services.php
+++ b/backend/config/services.php
@@ -52,4 +52,11 @@
     'open_exchange_rates' => [
         'app_id' => env('OPEN_EXCHANGE_RATES_APP_ID'),
     ],
+
+    'razorpay' => [
+        'key_id' => env('RAZORPAY_KEY_ID'),
+        'key_secret' => env('RAZORPAY_KEY_SECRET'),
+        'application_fee_enabled' => env('RAZORPAY_APPLICATION_FEE_ENABLED', true),
+        'platform_account_id' => env('RAZORPAY_PLATFORM_ACCOUNT_ID'),
+    ],
 ];
diff --git a/backend/database/migrations/2026_01_14_074419_create_razorpay_orders_table.php b/backend/database/migrations/2026_01_14_074419_create_razorpay_orders_table.php
new file mode 100644
index 000000000..ad1671b82
--- /dev/null
+++ b/backend/database/migrations/2026_01_14_074419_create_razorpay_orders_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('razorpay_orders', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('order_id')->constrained()->onDelete('cascade');
+            $table->string('razorpay_order_id')->unique();
+            $table->string('razorpay_payment_id')->nullable();
+            $table->string('razorpay_signature')->nullable();
+            $table->integer('amount');
+            $table->string('currency', 3);
+            $table->string('receipt')->nullable();
+            $table->string('payment_status')->default('created');
+            $table->timestamps();
+            
+            $table->index(['order_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('razorpay_orders');
+    }
+};
diff --git a/backend/routes/api.php b/backend/routes/api.php
index c84c87fe9..e60d95a60 100644
--- a/backend/routes/api.php
+++ b/backend/routes/api.php
@@ -86,6 +86,8 @@
 use HiEvents\Http\Actions\Orders\GetOrdersAction;
 use HiEvents\Http\Actions\Orders\MarkOrderAsPaidAction;
 use HiEvents\Http\Actions\Orders\MessageOrderAction;
+use HiEvents\Http\Actions\Orders\Payment\Razorpay\CreateRazorpayOrderActionPublic;
+use HiEvents\Http\Actions\Orders\Payment\Razorpay\VerifyRazorpayPaymentActionPublic;
 use HiEvents\Http\Actions\Orders\Payment\RefundOrderAction;
 use HiEvents\Http\Actions\Orders\Payment\Stripe\CreatePaymentIntentActionPublic;
 use HiEvents\Http\Actions\Orders\Payment\Stripe\GetPaymentIntentActionPublic;
@@ -478,6 +480,10 @@ function (Router $router): void {
         // Stripe payment gateway
         $router->post('/events/{event_id}/order/{order_short_id}/stripe/payment_intent', CreatePaymentIntentActionPublic::class);
         $router->get('/events/{event_id}/order/{order_short_id}/stripe/payment_intent', GetPaymentIntentActionPublic::class);
+        
+        // Razorpay payment gateway
+        $router->post('/events/{event_id}/order/{order_short_id}/razorpay/order', CreateRazorpayOrderActionPublic::class);
+        $router->post('/events/{event_id}/order/{order_short_id}/razorpay/verify', VerifyRazorpayPaymentActionPublic::class);
 
         // Questions
         $router->get('/events/{event_id}/questions', GetQuestionsPublicAction::class);
diff --git a/frontend/src/api/order.client.ts b/frontend/src/api/order.client.ts
index c54d8e5a0..75ad4cdb0 100644
--- a/frontend/src/api/order.client.ts
+++ b/frontend/src/api/order.client.ts
@@ -154,6 +154,32 @@ export const orderClientPublic = {
         return response.data;
     },
 
+    createRazorpayOrder: async (eventId: number, orderShortId: string) => {
+        const response = await publicApi.post<{
+            razorpay_order_id: string,
+            key_id: string,
+            amount: number,
+            currency: string,
+        }>(`events/${eventId}/order/${orderShortId}/razorpay/order`);
+        return response.data;
+    },
+
+    verifyRazorpayPayment: async (
+        eventId: number, 
+        orderShortId: string, 
+        payload: {
+            razorpay_payment_id: string,
+            razorpay_order_id: string,
+            razorpay_signature: string,
+        }
+    ) => {
+        const response = await publicApi.post<GenericDataResponse<Order>>(
+            `events/${eventId}/order/${orderShortId}/razorpay/verify`,
+            payload
+        );
+        return response.data;
+    },
+
     finaliseOrder: async (
         eventId: number,
         orderShortId: string,
diff --git a/frontend/src/components/routes/event/Settings/Sections/PaymentSettings/index.tsx b/frontend/src/components/routes/event/Settings/Sections/PaymentSettings/index.tsx
index 98bd27bab..6fc5cdf3c 100644
--- a/frontend/src/components/routes/event/Settings/Sections/PaymentSettings/index.tsx
+++ b/frontend/src/components/routes/event/Settings/Sections/PaymentSettings/index.tsx
@@ -81,17 +81,24 @@ export const PaymentAndInvoicingSettings = () => {
 
     const paymentOptions = [
         {
-            value: "STRIPE",
+            value: 'STRIPE',
             label: t`Stripe`,
-            description: t`Accept credit card payments with Stripe`
+            description: t`Accept credit card payments with Stripe`,
+            group: 'ONLINE',
         },
         {
-            value: "OFFLINE",
+            value: 'RAZORPAY',
+            label: t`Razorpay`,
+            description: t`Accept credit card payments with Razorpay`,
+            group: 'ONLINE',
+        },
+        {
+            value: 'OFFLINE',
             label: t`Offline Payments`,
-            description: t`Accept bank transfers, checks, or other offline payment methods`
+            description: t`Accept bank transfers, checks, or other offline payment methods`,
+            group: 'OFFLINE',
         },
     ];
-
     return (
         <Card>
             <HeadingWithDescription
@@ -103,25 +110,70 @@ export const PaymentAndInvoicingSettings = () => {
                     <Stack gap="xl">
                         <Paper withBorder p="md" radius="md">
                             <Text size="lg" fw={500} mb="md">{t`Payment Methods`}</Text>
-                            {paymentOptions.map((option) => (
-                                <Checkbox
-                                    key={option.value}
-                                    label={option.label}
-                                    description={option.description}
-                                    checked={form.values.payment_providers?.includes(option.value as PaymentProvider)}
-                                    onChange={(event) => {
-                                        const checked = event.currentTarget.checked;
-                                        const currentValues = form.values.payment_providers || [];
-                                        form.setFieldValue(
-                                            'payment_providers',
-                                            checked
-                                                ? [...currentValues, option.value as PaymentProvider]
-                                                : currentValues.filter(v => v !== option.value)
-                                        );
-                                    }}
-                                    mb="sm"
-                                />
-                            ))}
+                            <Stack gap="xl">
+                                {/* Online Payments Section */}
+                                <Paper withBorder p="md" radius="md">
+                                    <Text fw={600} mb={4}>{t`Online Payments`}</Text>
+                                    <Text size="sm" c="dimmed" mb="md">
+                                        {t`Accept online payments via third-party payment providers`}
+                                    </Text>
+                                    
+                                    <Stack gap="xs">
+                                        {paymentOptions
+                                            .filter(option => option.group === "ONLINE")
+                                            .map((option) => (
+                                                <Checkbox
+                                                    key={option.value}
+                                                    label={option.label}
+                                                    description={option.description}
+                                                    checked={form.values.payment_providers?.includes(option.value as PaymentProvider)}
+                                                    onChange={(event) => {
+                                                        const checked = event.currentTarget.checked;
+                                                        const currentValues = form.values.payment_providers || [];
+                                                        
+                                                        if (checked) {
+                                                            const filtered = currentValues.filter(
+                                                                v => v !== "STRIPE" && v !== "RAZORPAY"
+                                                            );
+                                                            form.setFieldValue('payment_providers', [...filtered, option.value as PaymentProvider]);
+                                                        } else {
+                                                            form.setFieldValue(
+                                                                'payment_providers',
+                                                                currentValues.filter(v => v !== option.value)
+                                                            );
+                                                        }
+                                                    }}
+                                                />
+                                            ))
+                                        }
+                                    </Stack>
+                                </Paper>
+                                
+                                {/* Offline Payments Section */}
+                                <Paper withBorder p="md" radius="md">
+                                    <Checkbox
+                                        label={
+                                            <div>
+                                                <Text fw={600}>{t`Offline Payments`}</Text>
+                                                <Text size="sm" c="dimmed">
+                                                    {t`Accept bank transfers, checks, or other offline payment methods`}
+                                                </Text>
+                                            </div>
+                                        }
+                                        checked={form.values.payment_providers?.includes("OFFLINE")}
+                                        onChange={(event) => {
+                                            const checked = event.currentTarget.checked;
+                                            const currentValues = form.values.payment_providers || [];
+                                            form.setFieldValue(
+                                                'payment_providers',
+                                                checked
+                                                    ? [...currentValues, "OFFLINE"]
+                                                    : currentValues.filter(v => v !== "OFFLINE")
+                                            );
+                                        }}
+                                    />
+                                </Paper>
+                            </Stack>
                             {form.errors["payment_providers"] && (
                                 <Text c="red">{form.errors["payment_providers"]}</Text>
                             )}
diff --git a/frontend/src/components/routes/product-widget/Payment/PaymentMethods/Razorpay/index.tsx b/frontend/src/components/routes/product-widget/Payment/PaymentMethods/Razorpay/index.tsx
new file mode 100644
index 000000000..790f6121b
--- /dev/null
+++ b/frontend/src/components/routes/product-widget/Payment/PaymentMethods/Razorpay/index.tsx
@@ -0,0 +1,208 @@
+import {useEffect, useState} from "react";
+import {useNavigate, useParams} from "react-router";
+import {useCreateRazorpayOrder} from "../../../../../../queries/useCreateRazorpayOrder.ts";
+import {useGetEventPublic} from "../../../../../../queries/useGetEventPublic.ts";
+import {CheckoutContent} from "../../../../../layouts/Checkout/CheckoutContent";
+import {HomepageInfoMessage} from "../../../../../common/HomepageInfoMessage";
+import {t} from "@lingui/macro";
+import {eventHomepagePath} from "../../../../../../utilites/urlHelper.ts";
+import {LoadingMask} from "../../../../../common/LoadingMask";
+import {Event} from "../../../../../../types.ts";
+import {useGetOrderPublic} from "../../../../../../queries/useGetOrderPublic.ts";
+import {eventCheckoutPath} from "../../../../../../utilites/urlHelper.ts";
+import { useMutation } from "@tanstack/react-query";
+import { orderClientPublic } from "../../../../../../api/order.client.ts";
+
+declare global {
+    interface Window {
+        Razorpay: any;
+    }
+}
+
+interface RazorpayPaymentMethodProps {
+    enabled: boolean;
+    setSubmitHandler: (submitHandler: () => () => Promise<void>) => void;
+}
+
+export const RazorpayPaymentMethod = ({enabled, setSubmitHandler}: RazorpayPaymentMethodProps) => {
+    const navigate = useNavigate();
+    const {eventId, orderShortId} = useParams();
+    const {
+        data: razorpayData,
+        isFetched: isRazorpayFetched,
+        error: razorpayOrderError
+    } = useCreateRazorpayOrder(eventId, orderShortId);
+    const {data: event} = useGetEventPublic(eventId);
+    const {data: order} = useGetOrderPublic(eventId, orderShortId, ['event']);
+    const [isLoading, setIsLoading] = useState(false);
+
+    const verifyMutation = useMutation({
+        mutationFn: (payload: {
+            razorpay_payment_id: string,
+            razorpay_order_id: string,
+            razorpay_signature: string,
+        }) => {
+            if (!eventId || !orderShortId) {
+                throw new Error('Missing event ID or order ID');
+            }
+            return orderClientPublic.verifyRazorpayPayment(Number(eventId), orderShortId, payload);
+        },
+        onSuccess: () => navigate(eventCheckoutPath(eventId, orderShortId, 'summary'))
+    });
+
+    const loadRazorpayScript = () => {
+        return new Promise((resolve, reject) => {
+            if (window.Razorpay) {
+                resolve(true);
+                return;
+            }
+
+            const script = document.createElement('script');
+            script.src = 'https://checkout.razorpay.com/v1/checkout.js';
+            script.async = true;
+            script.onload = () => resolve(true);
+            script.onerror = () => reject(new Error('Failed to load Razorpay script'));
+            document.body.appendChild(script);
+        });
+    };
+
+    const handleRazorpayPayment = async () => {
+        if (!razorpayData || !order || !event) return;
+
+        setIsLoading(true);
+        try {
+            await loadRazorpayScript();
+
+            const options = {
+                key: razorpayData.key_id,
+                amount: razorpayData.amount,
+                currency: razorpayData.currency,
+                name: event.title,
+                description: `Order ${order.short_id}`,
+                order_id: razorpayData.razorpay_order_id,
+                handler: async (response: any) => {
+                    try {
+                        await verifyMutation.mutate({
+                            razorpay_payment_id: response.razorpay_payment_id,
+                            razorpay_order_id: response.razorpay_order_id,
+                            razorpay_signature: response.razorpay_signature,
+                        });
+
+                    } catch (error) {
+                        console.error('Payment verification error:', error);
+                    } finally {
+                        setIsLoading(false);
+                    }
+                },
+                prefill: {
+                    name: `${order.first_name} ${order.last_name}`,
+                    email: order.email,
+                    contact: '', // Optional: Could collect phone number in earlier step
+                },
+                notes: {
+                    order_short_id: order.short_id,
+                    event_id: eventId,
+                },
+                theme: {
+                    color: '#10B981', // Use theme accent color
+                },
+                modal: {
+                    ondismiss: () => {
+                        setIsLoading(false);
+                    },
+                },
+            };
+
+            const razorpayInstance = new window.Razorpay(options);
+            razorpayInstance.open();
+        } catch (error) {
+            console.error('Razorpay payment error:', error);
+            setIsLoading(false);
+            // Handle error
+        }
+    };
+
+    useEffect(() => {
+        if (setSubmitHandler) {
+            setSubmitHandler(() => handleRazorpayPayment);
+        }
+    }, [setSubmitHandler, razorpayData, order, event]);
+
+    if (!enabled) {
+        return (
+            <CheckoutContent>
+                <HomepageInfoMessage
+                    status="warning"
+                    message={t`Payments not available`}
+                    subtitle={t`Razorpay payments are not enabled for this event.`}
+                    link={eventHomepagePath(event as Event)}
+                    linkText={t`Return to Event`}
+                />
+            </CheckoutContent>
+        );
+    }
+
+    if (razorpayOrderError && event) {
+        return (
+            <CheckoutContent>
+                <HomepageInfoMessage
+                    status="error"
+                    message={razorpayOrderError.response?.data?.message || t`Something went wrong`}
+                    subtitle={t`Please restart the checkout process.`}
+                    link={eventHomepagePath(event)}
+                    linkText={t`Return to Event`}
+                />
+            </CheckoutContent>
+        );
+    }
+
+    if (!isRazorpayFetched) {
+        return <LoadingMask/>;
+    }
+
+    return (
+        <div>
+            <h2>{t`Payment`}</h2>
+            <p className="text-gray-600 mb-6">
+                {t`You will be redirected to Razorpay's secure payment page to complete your transaction.`}
+            </p>
+            
+            {isLoading && <LoadingMask/>}
+            
+            {/* Payment method details display */}
+            <div className="p-4 border rounded-lg bg-gray-50">
+                <div className="flex items-center gap-3 mb-2">
+                    <div className="w-10 h-10 bg-blue-100 rounded-lg flex items-center justify-center">
+                        <svg className="w-6 h-6 text-blue-600" fill="currentColor" viewBox="0 0 24 24">
+                            <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/>
+                        </svg>
+                    </div>
+                    <div>
+                        <h3 className="font-medium">{t`Secure Payment`}</h3>
+                        <p className="text-sm text-gray-600">
+                            {t`Powered by Razorpay`}
+                        </p>
+                    </div>
+                </div>
+                
+                {razorpayData && (
+                    <div className="mt-4 text-sm text-gray-600">
+                        <div className="flex justify-between">
+                            <span>{t`Order ID:`}</span>
+                            <span className="font-mono">{order?.short_id}</span>
+                        </div>
+                        <div className="flex justify-between mt-1">
+                            <span>{t`Amount:`}</span>
+                            <span className="font-medium">
+                                {new Intl.NumberFormat('en-IN', {
+                                    style: 'currency',
+                                    currency: razorpayData.currency
+                                }).format(razorpayData.amount / 100)}
+                            </span>
+                        </div>
+                    </div>
+                )}
+            </div>
+        </div>
+    );
+};
\ No newline at end of file
diff --git a/frontend/src/components/routes/product-widget/Payment/index.tsx b/frontend/src/components/routes/product-widget/Payment/index.tsx
index a5fe67c28..4d9915e29 100644
--- a/frontend/src/components/routes/product-widget/Payment/index.tsx
+++ b/frontend/src/components/routes/product-widget/Payment/index.tsx
@@ -19,6 +19,7 @@ import {showError} from "../../../../utilites/notifications.tsx";
 import {getConfig} from "../../../../utilites/config.ts";
 import classes from "./Payment.module.scss";
 import {trackEvent, AnalyticsEvents} from "../../../../utilites/analytics.ts";
+import { RazorpayPaymentMethod } from "./PaymentMethods/Razorpay/index.tsx";
 
 const Payment = () => {
     const navigate = useNavigate();
@@ -27,23 +28,26 @@ const Payment = () => {
     const {data: order, isFetched: isOrderFetched} = useGetOrderPublic(eventId, orderShortId, ['event']);
     const isLoading = !isOrderFetched;
     const [isPaymentLoading, setIsPaymentLoading] = useState(false);
-    const [activePaymentMethod, setActivePaymentMethod] = useState<'STRIPE' | 'OFFLINE' | null>(null);
+    const [activePaymentMethod, setActivePaymentMethod] = useState<'STRIPE' | 'RAZORPAY' | 'OFFLINE' | null>(null);
     const [submitHandler, setSubmitHandler] = useState<(() => Promise<void>) | null>(null);
     const transitionOrderToOfflinePaymentMutation = useTransitionOrderToOfflinePaymentPublic();
 
     const isStripeEnabled = event?.settings?.payment_providers?.includes('STRIPE');
+    const isRazorpayEnabled = event?.settings?.payment_providers?.includes('RAZORPAY');
     const isOfflineEnabled = event?.settings?.payment_providers?.includes('OFFLINE');
 
     React.useEffect(() => {
         // Automatically set the first available payment method
         if (isStripeEnabled) {
             setActivePaymentMethod('STRIPE');
+        } else if (isRazorpayEnabled) {
+            setActivePaymentMethod('RAZORPAY');
         } else if (isOfflineEnabled) {
             setActivePaymentMethod('OFFLINE');
         } else {
             setActivePaymentMethod(null); // No methods available
         }
-    }, [isStripeEnabled, isOfflineEnabled]);
+    }, [isStripeEnabled, isRazorpayEnabled, isOfflineEnabled]);
 
     React.useEffect(() => {
         // Scroll to top when payment page loads
@@ -58,7 +62,7 @@ const Payment = () => {
     };
 
     const handleSubmit = async () => {
-        if (activePaymentMethod === 'STRIPE') {
+        if (activePaymentMethod === 'STRIPE' || activePaymentMethod === 'RAZORPAY') {
             handleParentSubmit();
         } else if (activePaymentMethod === 'OFFLINE') {
             setIsPaymentLoading(true);
@@ -80,7 +84,7 @@ const Payment = () => {
         }
     };
 
-    if (!isStripeEnabled && !isOfflineEnabled && isOrderFetched && isEventFetched) {
+    if (!isStripeEnabled && !isRazorpayEnabled && !isOfflineEnabled && isOrderFetched && isEventFetched) {
         return (
             <CheckoutContent>
                 <Card>
@@ -102,26 +106,34 @@ const Payment = () => {
                     </div>
                 )}
 
+                {isRazorpayEnabled && (
+                    <div style={{display: activePaymentMethod === 'RAZORPAY' ? 'block' : 'none'}}>
+                        <RazorpayPaymentMethod enabled={true} setSubmitHandler={setSubmitHandler}/>
+                    </div>
+                )}
+
                 {isOfflineEnabled && (
                     <div style={{display: activePaymentMethod === 'OFFLINE' ? 'block' : 'none'}}>
                         <OfflinePaymentMethod event={event as Event}/>
                     </div>
                 )}
 
-                {(isStripeEnabled && isOfflineEnabled) && (
+                {((isStripeEnabled || isRazorpayEnabled) && isOfflineEnabled) && (
                     <div className={classes.paymentMethodSelector}>
                         <Text size="sm" c="dimmed" className={classes.paymentMethodLabel}>
                             {t`Payment method`}
                         </Text>
                         <div className={classes.paymentMethodTabs}>
-                            <button
-                                type="button"
-                                className={`${classes.paymentMethodTab} ${activePaymentMethod === 'STRIPE' ? classes.active : ''}`}
-                                onClick={() => setActivePaymentMethod('STRIPE')}
-                            >
-                                <IconWallet size={18}/>
-                                <span>{t`Online`}</span>
-                            </button>
+                            {(isStripeEnabled || isRazorpayEnabled) && (
+                                <button
+                                    type="button"
+                                    className={`${classes.paymentMethodTab} ${activePaymentMethod === 'STRIPE' || activePaymentMethod === 'RAZORPAY' ? classes.active : ''}`}
+                                    onClick={() => setActivePaymentMethod(isStripeEnabled ? 'STRIPE' : 'RAZORPAY')}
+                                >
+                                    <IconWallet size={18}/>
+                                    <span>{t`Online`}</span>
+                                </button>
+                            )}
                             <button
                                 type="button"
                                 className={`${classes.paymentMethodTab} ${activePaymentMethod === 'OFFLINE' ? classes.active : ''}`}
diff --git a/frontend/src/queries/useCreateRazorpayOrder.ts b/frontend/src/queries/useCreateRazorpayOrder.ts
new file mode 100644
index 000000000..1e4392627
--- /dev/null
+++ b/frontend/src/queries/useCreateRazorpayOrder.ts
@@ -0,0 +1,23 @@
+import {useQuery} from "@tanstack/react-query";
+import {orderClientPublic} from "../api/order.client.ts";
+import {IdParam} from "../types.ts";
+
+export const GET_RAZORPAY_ORDER_PUBLIC_QUERY_KEY = 'getRazorpayOrderPublic';
+
+export const useCreateRazorpayOrder = (eventId: IdParam, orderShortId: IdParam) => {
+    return useQuery({
+        queryKey: [GET_RAZORPAY_ORDER_PUBLIC_QUERY_KEY, eventId, orderShortId],
+
+        queryFn: async () => {
+            const {razorpay_order_id, key_id, amount, currency} = await orderClientPublic.createRazorpayOrder(
+                Number(eventId),
+                String(orderShortId),
+            );
+            return {razorpay_order_id, key_id, amount, currency};
+        },
+
+        retry: false,
+        staleTime: 0,
+        gcTime: 0
+    });
+}
\ No newline at end of file
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index 2c14a9d25..30de52bec 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -180,7 +180,7 @@ export interface Image {
 
 export type ImageType = 'EVENT_COVER' | 'EDITOR_IMAGE' | 'ORGANIZER_LOGO' | 'ORGANIZER_COVER' | 'ORGANIZER_IMAGE' | 'TICKET_LOGO';
 
-export type PaymentProvider = 'STRIPE' | 'OFFLINE';
+export type PaymentProvider = 'STRIPE' | 'RAZORPAY' | 'OFFLINE';
 
 export type AttendeeDetailsCollectionMethod = 'PER_TICKET' | 'PER_ORDER';
 

From b7ec9bb4ed4a0c9ab1936ce988028ebcaaa4aba4 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Thu, 15 Jan 2026 09:46:56 +0000
Subject: [PATCH 02/41] better razorpay checkout UI

---
 .../Payment/PaymentMethods/Razorpay/index.tsx | 113 +++++++++++-------
 1 file changed, 73 insertions(+), 40 deletions(-)

diff --git a/frontend/src/components/routes/product-widget/Payment/PaymentMethods/Razorpay/index.tsx b/frontend/src/components/routes/product-widget/Payment/PaymentMethods/Razorpay/index.tsx
index 790f6121b..e7e77454c 100644
--- a/frontend/src/components/routes/product-widget/Payment/PaymentMethods/Razorpay/index.tsx
+++ b/frontend/src/components/routes/product-widget/Payment/PaymentMethods/Razorpay/index.tsx
@@ -12,6 +12,9 @@ import {useGetOrderPublic} from "../../../../../../queries/useGetOrderPublic.ts"
 import {eventCheckoutPath} from "../../../../../../utilites/urlHelper.ts";
 import { useMutation } from "@tanstack/react-query";
 import { orderClientPublic } from "../../../../../../api/order.client.ts";
+import { Badge, Card, Divider, Group, Stack, Text, Title } from "@mantine/core";
+import { Image } from "@mantine/core";
+import { AxiosError } from "axios";
 
 declare global {
     interface Window {
@@ -143,11 +146,13 @@ export const RazorpayPaymentMethod = ({enabled, setSubmitHandler}: RazorpayPayme
     }
 
     if (razorpayOrderError && event) {
+        const errorMessage = (razorpayOrderError as AxiosError<any>)?.response?.data?.message ?? t`Something went wrong`;
+
         return (
             <CheckoutContent>
                 <HomepageInfoMessage
                     status="error"
-                    message={razorpayOrderError.response?.data?.message || t`Something went wrong`}
+                    message={ errorMessage || t`Something went wrong`}
                     subtitle={t`Please restart the checkout process.`}
                     link={eventHomepagePath(event)}
                     linkText={t`Return to Event`}
@@ -161,48 +166,76 @@ export const RazorpayPaymentMethod = ({enabled, setSubmitHandler}: RazorpayPayme
     }
 
     return (
-        <div>
-            <h2>{t`Payment`}</h2>
-            <p className="text-gray-600 mb-6">
-                {t`You will be redirected to Razorpay's secure payment page to complete your transaction.`}
-            </p>
-            
-            {isLoading && <LoadingMask/>}
-            
-            {/* Payment method details display */}
-            <div className="p-4 border rounded-lg bg-gray-50">
-                <div className="flex items-center gap-3 mb-2">
-                    <div className="w-10 h-10 bg-blue-100 rounded-lg flex items-center justify-center">
-                        <svg className="w-6 h-6 text-blue-600" fill="currentColor" viewBox="0 0 24 24">
-                            <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/>
-                        </svg>
-                    </div>
-                    <div>
-                        <h3 className="font-medium">{t`Secure Payment`}</h3>
-                        <p className="text-sm text-gray-600">
-                            {t`Powered by Razorpay`}
-                        </p>
-                    </div>
-                </div>
-                
-                {razorpayData && (
-                    <div className="mt-4 text-sm text-gray-600">
-                        <div className="flex justify-between">
-                            <span>{t`Order ID:`}</span>
-                            <span className="font-mono">{order?.short_id}</span>
+    <>
+        <Stack gap="xs" mb="lg">
+            <Title order={3}>{t`Payment`}</Title>
+            <Text size="sm" c="dimmed">
+                {t`You will be redirected to Razorpay to securely complete your payment.`}
+            </Text>
+        </Stack>
+
+        {isLoading && <LoadingMask />}
+
+        {/* Payment Method Card */}
+        <Card withBorder radius="md" padding="lg">
+            <Stack gap="md">
+                {/* Method Header */}
+                <Group justify="space-between">
+                    <Group gap="sm">
+                        <Image
+                            src="https://razorpay.com/favicon.png"
+                            alt="Razorpay"
+                            w={32}
+                            h={32}
+                            fit="contain"
+                        />
+                        <div>
+                            <Text fw={500}>Razorpay</Text>
+                            <Text size="xs" c="dimmed">
+                                Cards • UPI • NetBanking • Wallets
+                            </Text>
                         </div>
-                        <div className="flex justify-between mt-1">
-                            <span>{t`Amount:`}</span>
-                            <span className="font-medium">
+                    </Group>
+
+                    <Badge color="green" variant="light">
+                        {t`Secure`}
+                    </Badge>
+                </Group>
+
+                <Divider />
+
+                {/* Order Summary */}
+                {razorpayData && (
+                    <Stack gap={6}>
+                        <Group justify="space-between">
+                            <Text size="sm" c="dimmed">
+                                {t`Order ID`}
+                            </Text>
+                            <Text size="sm" ff="monospace">
+                                {order?.short_id}
+                            </Text>
+                        </Group>
+
+                        <Group justify="space-between">
+                            <Text size="sm" c="dimmed">
+                                {t`Amount`}
+                            </Text>
+                            <Text size="sm" fw={500}>
                                 {new Intl.NumberFormat('en-IN', {
                                     style: 'currency',
-                                    currency: razorpayData.currency
+                                    currency: razorpayData.currency,
                                 }).format(razorpayData.amount / 100)}
-                            </span>
-                        </div>
-                    </div>
+                            </Text>
+                        </Group>
+                    </Stack>
                 )}
-            </div>
-        </div>
-    );
+            </Stack>
+        </Card>
+
+        {/* Footer Hint */}
+        <Text size="xs" c="dimmed" ta="center" mt="md">
+            {t`Payments are processed securely by Razorpay using industry-standard encryption.`}
+        </Text>
+    </>
+);
 };
\ No newline at end of file

From 1950563bae56c327d420a2ad6c14797372af0686 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Fri, 23 Jan 2026 08:34:11 +0000
Subject: [PATCH 03/41] refactored razorpay payment flow to better match stripe
 implementation

---
 .../RazorpayIncomingWebhookAction.php         |  29 +++
 .../Razorpay/RazorpayWebhookHandler.php       | 126 +++++++++++
 .../Razorpay/VerifyRazorpayPaymentHandler.php | 207 +++++++++++++++---
 .../RazorpayPaymentCapturedHandler.php        | 198 +++++++++++++++++
 .../EventHandlers/RazorpayRefundHandler.php   | 186 ++++++++++++++++
 backend/routes/api.php                        |   2 +
 6 files changed, 717 insertions(+), 31 deletions(-)
 create mode 100644 backend/app/Http/Actions/Common/Webhooks/RazorpayIncomingWebhookAction.php
 create mode 100644 backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php

diff --git a/backend/app/Http/Actions/Common/Webhooks/RazorpayIncomingWebhookAction.php b/backend/app/Http/Actions/Common/Webhooks/RazorpayIncomingWebhookAction.php
new file mode 100644
index 000000000..b2850ef58
--- /dev/null
+++ b/backend/app/Http/Actions/Common/Webhooks/RazorpayIncomingWebhookAction.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace HiEvents\Http\Actions\Common\Webhooks;
+
+use HiEvents\Http\Actions\BaseAction;
+use HiEvents\Http\ResponseCodes;
+use HiEvents\Services\Application\Handlers\Order\Payment\Razorpay\RazorpayWebhookHandler;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class RazorpayIncomingWebhookAction extends BaseAction
+{
+    public function __invoke(Request $request): Response
+    {
+        $payload = $request->getContent();
+        $signature = $request->header('X-Razorpay-Signature');
+        
+        dispatch(static function (RazorpayWebhookHandler $handler) use ($payload, $signature) {
+            $handler->handle($payload, $signature);
+        })->catch(function (\Throwable $exception) use ($payload) {
+            logger()->error(__('Failed to handle incoming Razorpay webhook'), [
+                'exception' => $exception,
+                'payload' => $payload,
+            ]);
+        });
+
+        return $this->noContentResponse();
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
new file mode 100644
index 000000000..4fb248674
--- /dev/null
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace HiEvents\Services\Application\Handlers\Order\Payment\Razorpay;
+
+use HiEvents\Exceptions\Razorpay\InvalidSignatureException;
+use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentVerificationService;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentCapturedHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayRefundHandler;
+use Illuminate\Cache\Repository;
+use Illuminate\Log\Logger;
+use JsonException;
+use Throwable;
+
+class RazorpayWebhookHandler
+{
+    private static array $validEvents = [
+        'payment.captured',
+        'refund.processed',
+        'payment.failed',
+        'order.paid',
+    ];
+
+    public function __construct(
+        private readonly RazorpayPaymentCapturedHandler $paymentCapturedHandler,
+        private readonly RazorpayRefundHandler          $refundHandler,
+        private readonly RazorpayPaymentVerificationService $razorpayPaymentService,
+        private readonly Logger                         $logger,
+        private readonly Repository                     $cache,
+    ) {
+    }
+
+    /**
+     * @throws InvalidSignatureException
+     * @throws JsonException
+     * @throws Throwable
+     */
+    public function handle(string $payload, string $signature): void
+    {
+        try {
+            // Verify webhook signature
+            if (!$this->razorpayPaymentService->verifyWebhookSignature($payload, $signature)) {
+                throw new InvalidSignatureException('Invalid Razorpay webhook signature');
+            }
+
+            $data = json_decode($payload, true, 512, JSON_THROW_ON_ERROR);
+            $event = $data['event'] ?? null;
+            $eventId = $data['id'] ?? null;
+
+            if (!$event || !$eventId) {
+                $this->logger->error('Invalid Razorpay webhook payload', ['payload' => $payload]);
+                return;
+            }
+
+            if (!in_array($event, self::$validEvents, true)) {
+                $this->logger->debug(__('Received a :event Razorpay event, which has no handler', [
+                    'event' => $event,
+                ]), [
+                    'event_id' => $eventId,
+                    'event_type' => $event,
+                ]);
+
+                return;
+            }
+
+            if ($this->hasEventBeenHandled($eventId)) {
+                $this->logger->debug('Razorpay webhook event already handled', [
+                    'event_id' => $eventId,
+                    'type' => $event,
+                    'data' => $data,
+                ]);
+
+                return;
+            }
+
+            $this->logger->debug('Razorpay webhook received: ' . $event, $data);
+
+            switch ($event) {
+                case 'payment.captured':
+                case 'order.paid':
+                    $this->paymentCapturedHandler->handleEvent($data['payload']['payment']['entity']);
+                    break;
+                case 'refund.processed':
+                    $this->refundHandler->handleEvent($data['payload']['refund']['entity']);
+                    break;
+                case 'payment.failed':
+                    // Handle failed payments if needed
+                    $this->logger->info('Razorpay payment failed', $data['payload']['payment']['entity']);
+                    break;
+            }
+
+            $this->markEventAsHandled($eventId);
+        } catch (InvalidSignatureException $exception) {
+            $this->logger->error(
+                'Unable to verify Razorpay webhook signature: ' . $exception->getMessage(), [
+                    'payload' => $payload,
+                ]
+            );
+            throw $exception;
+        } catch (JsonException $exception) {
+            $this->logger->error(
+                'Invalid JSON in Razorpay webhook payload: ' . $exception->getMessage(), [
+                    'payload' => $payload,
+                ]
+            );
+            throw $exception;
+        } catch (Throwable $exception) {
+            $this->logger->error('Unhandled Razorpay webhook error: ' . $exception->getMessage(), [
+                'payload' => $payload,
+            ]);
+            throw $exception;
+        }
+    }
+
+    private function hasEventBeenHandled(string $eventId): bool
+    {
+        return $this->cache->has('razorpay_webhook_' . $eventId);
+    }
+
+    private function markEventAsHandled(string $eventId): void
+    {
+        $this->logger->info('Marking Razorpay webhook event as handled', [
+            'event_id' => $eventId,
+        ]);
+        $this->cache->put('razorpay_webhook_' . $eventId, true, now()->addMinutes(60));
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
index df78d9c56..f239a131f 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
@@ -2,29 +2,52 @@
 
 namespace HiEvents\Services\Application\Handlers\Order\Payment\Razorpay;
 
+use HiEvents\DomainObjects\Enums\PaymentProviders;
+use HiEvents\DomainObjects\Generated\OrderDomainObjectAbstract;
 use HiEvents\DomainObjects\OrderDomainObject;
 use HiEvents\DomainObjects\OrderItemDomainObject;
 use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\DomainObjects\Status\AttendeeStatus;
+use HiEvents\DomainObjects\Status\OrderApplicationFeeStatus;
+use HiEvents\DomainObjects\Status\OrderPaymentStatus;
 use HiEvents\DomainObjects\Status\OrderStatus;
+use HiEvents\Events\OrderStatusChangedEvent;
 use HiEvents\Exceptions\Razorpay\PaymentVerificationFailedException;
 use HiEvents\Exceptions\ResourceConflictException;
 use HiEvents\Exceptions\UnauthorizedException;
 use HiEvents\Repository\Eloquent\Value\Relationship;
+use HiEvents\Repository\Interfaces\AffiliateRepositoryInterface;
+use HiEvents\Repository\Interfaces\AttendeeRepositoryInterface;
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\Order\OrderApplicationFeeService;
 use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentVerificationService;
+use HiEvents\Services\Domain\Product\ProductQuantityUpdateService;
+use HiEvents\Services\Infrastructure\DomainEvents\DomainEventDispatcherService;
+use HiEvents\Services\Infrastructure\DomainEvents\Enums\DomainEventType;
+use HiEvents\Services\Infrastructure\DomainEvents\Events\OrderEvent;
 use HiEvents\Services\Infrastructure\Session\CheckoutSessionManagementService;
+use Illuminate\Cache\Repository;
+use Illuminate\Database\DatabaseManager;
+use Illuminate\Log\Logger;
 use Throwable;
 
 readonly class VerifyRazorpayPaymentHandler
 {
     public function __construct(
-        private OrderRepositoryInterface          $orderRepository,
+        private OrderRepositoryInterface           $orderRepository,
         private RazorpayPaymentVerificationService $razorpayPaymentService,
-        private CheckoutSessionManagementService  $sessionIdentifierService,
-        private RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
-    )
-    {
+        private CheckoutSessionManagementService   $sessionIdentifierService,
+        private RazorpayOrdersRepositoryInterface  $razorpayOrdersRepository,
+        private AttendeeRepositoryInterface        $attendeeRepository,
+        private ProductQuantityUpdateService       $quantityUpdateService,
+        private AffiliateRepositoryInterface       $affiliateRepository,
+        private DatabaseManager                    $databaseManager,
+        private Logger                             $logger,
+        private Repository                         $cache,
+        private DomainEventDispatcherService       $domainEventDispatcherService,
+        private OrderApplicationFeeService         $orderApplicationFeeService,
+    ) {
     }
 
     /**
@@ -33,41 +56,163 @@ public function __construct(
      */
     public function handle(string $orderShortId, array $paymentData): OrderDomainObject
     {
-        $order = $this->orderRepository
-            ->loadRelation(new Relationship(OrderItemDomainObject::class))
-            ->loadRelation(new Relationship(RazorpayOrderDomainObject::class, name: 'razorpay_order'))
-            ->findByShortId($orderShortId);
-
-        if (!$order || !$this->sessionIdentifierService->verifySession($order->getSessionId())) {
-            throw new UnauthorizedException(__('Sorry, we could not verify your session. Please create a new order.'));
+        // Check for duplicate processing
+        if ($this->hasPaymentBeenHandled($paymentData)) {
+            $this->logger->info('Razorpay payment already handled', [
+                'razorpay_payment_id' => $paymentData['razorpay_payment_id'],
+                'order_short_id' => $orderShortId,
+            ]);
+            
+            // Still return the order for user feedback
+            return $this->orderRepository
+                ->loadRelation(new Relationship(OrderItemDomainObject::class))
+                ->findByShortId($orderShortId);
         }
 
-        if ($order->getStatus() !== OrderStatus::RESERVED->name || $order->isReservedOrderExpired()) {
-            throw new ResourceConflictException(__('Sorry, is expired or not in a valid state.'));
+        return $this->databaseManager->transaction(function () use ($orderShortId, $paymentData) {
+            // Load order with necessary relations
+            $order = $this->orderRepository
+                ->loadRelation(new Relationship(OrderItemDomainObject::class))
+                ->loadRelation(new Relationship(RazorpayOrderDomainObject::class, name: 'razorpay_order'))
+                ->findByShortId($orderShortId);
+
+            if (!$order || !$this->sessionIdentifierService->verifySession($order->getSessionId())) {
+                throw new UnauthorizedException(__('Sorry, we could not verify your session. Please create a new order.'));
+            }
+
+            if ($order->getStatus() !== OrderStatus::RESERVED->name || $order->isReservedOrderExpired()) {
+                throw new ResourceConflictException(__('Sorry, is expired or not in a valid state.'));
+            }
+
+            // Verify the payment signature
+            $isValid = $this->razorpayPaymentService->verifyPaymentSignature($paymentData);
+
+            if (!$isValid) {
+                throw new PaymentVerificationFailedException(__('Payment verification failed. Please try again.'));
+            }
+
+            // Update Razorpay order with payment details
+            $this->razorpayOrdersRepository->updateByOrderId($order->getId(), [
+                'razorpay_payment_id' => $paymentData['razorpay_payment_id'],
+                'razorpay_signature' => $paymentData['razorpay_signature'],
+                'payment_status' => 'captured',
+            ]);
+
+            // Fetch complete payment details from Razorpay API
+            $paymentDetails = $this->razorpayPaymentService->fetchPaymentDetails(
+                $paymentData['razorpay_payment_id']
+            );
+
+            // Update order status to completed - THIS RETURNS THE UPDATED ORDER WITH ITEMS LOADED
+            $updatedOrder = $this->updateOrderStatuses($order);
+            
+            // Update attendee statuses
+            $this->updateAttendeeStatuses($updatedOrder);
+            
+            // Update product quantities - USE THE UPDATED ORDER WITH ITEMS LOADED
+            $this->quantityUpdateService->updateQuantitiesFromOrder($updatedOrder);
+            
+            // Update affiliate sales
+            $this->updateAffiliateSales($updatedOrder);
+            
+            // Store application fee
+            $this->storeApplicationFeePayment($updatedOrder, $paymentDetails);
+            
+            // Dispatch events
+            $this->dispatchEvents($updatedOrder, $paymentData);
+            
+            // Mark payment as handled
+            $this->markPaymentAsHandled($paymentData, $updatedOrder);
+
+            return $updatedOrder;
+        });
+    }
+
+    private function updateOrderStatuses(OrderDomainObject $order): OrderDomainObject
+    {
+        // IMPORTANT: Load OrderItemDomainObject relation when updating, just like Stripe handler does
+        return $this->orderRepository
+            ->loadRelation(OrderItemDomainObject::class)
+            ->updateFromArray($order->getId(), [
+                OrderDomainObjectAbstract::STATUS => OrderStatus::COMPLETED->name,
+                OrderDomainObjectAbstract::PAYMENT_STATUS => OrderPaymentStatus::PAYMENT_RECEIVED->name,
+                OrderDomainObjectAbstract::PAYMENT_PROVIDER => PaymentProviders::RAZORPAY->value,
+            ]);
+    }
+
+    private function updateAttendeeStatuses(OrderDomainObject $order): void
+    {
+        $this->attendeeRepository->updateWhere(
+            attributes: [
+                'status' => AttendeeStatus::ACTIVE->name,
+            ],
+            where: [
+                'order_id' => $order->getId(),
+                'status' => AttendeeStatus::AWAITING_PAYMENT->name,
+            ],
+        );
+    }
+
+    private function updateAffiliateSales(OrderDomainObject $order): void
+    {
+        if ($order->getAffiliateId()) {
+            $this->affiliateRepository->incrementSales(
+                affiliateId: $order->getAffiliateId(),
+                amount: $order->getTotalGross()
+            );
         }
+    }
 
-        // Verify the payment signature
-        $isValid = $this->razorpayPaymentService->verifyPaymentSignature($paymentData);
+    private function storeApplicationFeePayment(OrderDomainObject $order, array $paymentDetails): void
+    {
+        $feeAmount = $paymentDetails['fee'] ?? 0; // Fee in paise
+        
+        $this->orderApplicationFeeService->createOrderApplicationFee(
+            orderId: $order->getId(),
+            applicationFeeAmountMinorUnit: $feeAmount,
+            orderApplicationFeeStatus: OrderApplicationFeeStatus::PAID,
+            paymentMethod: PaymentProviders::RAZORPAY,
+            currency: $order->getCurrency(),
+        );
+    }
+
+    private function dispatchEvents(OrderDomainObject $order, array $paymentData): void
+    {
+        // Dispatch Laravel event
+        OrderStatusChangedEvent::dispatch($order);
 
-        if (!$isValid) {
-            throw new PaymentVerificationFailedException(__('Payment verification failed. Please try again.'));
+        // Dispatch domain event
+        $this->domainEventDispatcherService->dispatch(
+            new OrderEvent(
+                type: DomainEventType::ORDER_CREATED,
+                orderId: $order->getId()
+            )
+        );
+    }
+
+    private function hasPaymentBeenHandled(array $paymentData): bool
+    {
+        $paymentId = $paymentData['razorpay_payment_id'] ?? null;
+        if (!$paymentId) {
+            return false;
         }
+        
+        return $this->cache->has('razorpay_payment_handled_' . $paymentId);
+    }
 
-        // Update Razorpay order with payment details
-        $this->razorpayOrdersRepository->updateByOrderId($order->getId(), [
+    private function markPaymentAsHandled(array $paymentData, OrderDomainObject $order): void
+    {
+        $this->logger->info('Razorpay payment verification handled', [
             'razorpay_payment_id' => $paymentData['razorpay_payment_id'],
-            'razorpay_signature' => $paymentData['razorpay_signature'],
-            'payment_status' => 'captured',
-        ]);
-
-        // Update order status to completed
-        $order->setStatus(OrderStatus::COMPLETED->name);
-        $order->setPaymentStatus('PAYMENT_RECEIVED');
-        $this->orderRepository->updateFromArray($order->getId(), [
-            'status' => $order->getStatus(),
-            'payment_status' => $order->getPaymentStatus(),
+            'order_id' => $order->getId(),
+            'amount' => $order->getTotalGross(),
+            'currency' => $order->getCurrency(),
         ]);
 
-        return $order;
+        $this->cache->put(
+            'razorpay_payment_handled_' . $paymentData['razorpay_payment_id'],
+            true,
+            now()->addHours(24)
+        );
     }
 }
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php
new file mode 100644
index 000000000..a3df5a3da
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php
@@ -0,0 +1,198 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\EventHandlers;
+
+use HiEvents\DomainObjects\Enums\PaymentProviders;
+use HiEvents\DomainObjects\Generated\OrderDomainObjectAbstract;
+use HiEvents\DomainObjects\OrderDomainObject;
+use HiEvents\DomainObjects\OrderItemDomainObject;
+use HiEvents\DomainObjects\Status\AttendeeStatus;
+use HiEvents\DomainObjects\Status\OrderPaymentStatus;
+use HiEvents\DomainObjects\Status\OrderStatus;
+use HiEvents\Events\OrderStatusChangedEvent;
+use HiEvents\Repository\Eloquent\Value\Relationship;
+use HiEvents\Repository\Interfaces\AffiliateRepositoryInterface;
+use HiEvents\Repository\Interfaces\AttendeeRepositoryInterface;
+use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\Order\OrderApplicationFeeService;
+use HiEvents\Services\Domain\Product\ProductQuantityUpdateService;
+use HiEvents\Services\Infrastructure\DomainEvents\DomainEventDispatcherService;
+use HiEvents\Services\Infrastructure\DomainEvents\Enums\DomainEventType;
+use HiEvents\Services\Infrastructure\DomainEvents\Events\OrderEvent;
+use Illuminate\Cache\Repository;
+use Illuminate\Database\DatabaseManager;
+use Illuminate\Log\Logger;
+use Throwable;
+
+class RazorpayPaymentCapturedHandler
+{
+    public function __construct(
+        private readonly OrderRepositoryInterface          $orderRepository,
+        private readonly RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
+        private readonly AffiliateRepositoryInterface      $affiliateRepository,
+        private readonly ProductQuantityUpdateService      $quantityUpdateService,
+        private readonly AttendeeRepositoryInterface       $attendeeRepository,
+        private readonly DatabaseManager                   $databaseManager,
+        private readonly Logger                            $logger,
+        private readonly Repository                        $cache,
+        private readonly DomainEventDispatcherService      $domainEventDispatcherService,
+        private readonly OrderApplicationFeeService        $orderApplicationFeeService,
+    ) {
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function handleEvent(array $paymentData): void
+    {
+        if ($this->isPaymentAlreadyHandled($paymentData['id'])) {
+            $this->logger->info('Razorpay payment already handled via webhook', [
+                'razorpay_payment_id' => $paymentData['id'],
+            ]);
+            return;
+        }
+
+        $this->databaseManager->transaction(function () use ($paymentData) {
+            // Find by razorpay_payment_id (stored in razorpay_order table)
+            $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($paymentData['id']);
+
+            if (!$razorpayOrder) {
+                $this->logger->warning('Razorpay order not found for webhook', [
+                    'razorpay_payment_id' => $paymentData['id'],
+                ]);
+                return;
+            }
+
+            // Get the order ID from the razorpay order object
+            // Try toArray() method first, then check for getters
+            $razorpayOrderArray = $razorpayOrder->toArray();
+            $orderId = $razorpayOrderArray['order_id'] ?? null;
+            
+            if (!$orderId) {
+                $this->logger->error('Could not get order ID from Razorpay order', [
+                    'razorpay_order' => $razorpayOrderArray,
+                ]);
+                return;
+            }
+
+            // Load the order with items
+            $order = $this->orderRepository
+                ->loadRelation(new Relationship(OrderItemDomainObject::class))
+                ->findById($orderId);
+
+            if (!$order) {
+                $this->logger->warning('Order not found for Razorpay payment', [
+                    'razorpay_payment_id' => $paymentData['id'],
+                    'order_id' => $orderId,
+                ]);
+                return;
+            }
+
+            // Update Razorpay order info with webhook data
+            $this->razorpayOrdersRepository->updateByOrderId($orderId, [
+                'razorpay_payment_id' => $paymentData['id'],
+                'status' => $paymentData['status'],
+                'method' => $paymentData['method'],
+                'amount' => $paymentData['amount'] / 100, // Convert from paise to rupees
+                'currency' => $paymentData['currency'],
+                'fee' => $paymentData['fee'] ?? 0,
+                'tax' => $paymentData['tax'] ?? 0,
+            ]);
+
+            // Update order if not already completed (in case callback failed)
+            // Get payment status from order array
+            $orderArray = $order->toArray();
+            $paymentStatus = $orderArray['payment_status'] ?? null;
+            
+            if ($paymentStatus !== OrderPaymentStatus::PAYMENT_RECEIVED->name) {
+                $updatedOrder = $this->updateOrderStatuses($order);
+                
+                $this->updateAttendeeStatuses($updatedOrder);
+                $this->quantityUpdateService->updateQuantitiesFromOrder($updatedOrder);
+                $this->updateAffiliateSales($updatedOrder);
+                
+                OrderStatusChangedEvent::dispatch($updatedOrder);
+                
+                $this->domainEventDispatcherService->dispatch(
+                    new OrderEvent(
+                        type: DomainEventType::ORDER_CREATED,
+                        orderId: $updatedOrder->getId()
+                    )
+                );
+            }
+
+            // Store application fee
+            $this->storeApplicationFeePayment($order, $paymentData);
+            
+            $this->markPaymentAsHandled($paymentData['id'], $order);
+        });
+    }
+
+    private function updateOrderStatuses(OrderDomainObject $order): OrderDomainObject
+    {
+        return $this->orderRepository
+            ->updateFromArray($order->getId(), [
+                OrderDomainObjectAbstract::PAYMENT_STATUS => OrderPaymentStatus::PAYMENT_RECEIVED->name,
+                OrderDomainObjectAbstract::STATUS => OrderStatus::COMPLETED->name,
+                OrderDomainObjectAbstract::PAYMENT_PROVIDER => PaymentProviders::RAZORPAY->value,
+            ]);
+    }
+
+    private function updateAttendeeStatuses(OrderDomainObject $order): void
+    {
+        $this->attendeeRepository->updateWhere(
+            attributes: [
+                'status' => AttendeeStatus::ACTIVE->name,
+            ],
+            where: [
+                'order_id' => $order->getId(),
+                'status' => AttendeeStatus::AWAITING_PAYMENT->name,
+            ],
+        );
+    }
+
+    private function updateAffiliateSales(OrderDomainObject $order): void
+    {
+        // Get affiliate ID from order array
+        $orderArray = $order->toArray();
+        $affiliateId = $orderArray['affiliate_id'] ?? null;
+        
+        if ($affiliateId) {
+            $this->affiliateRepository->incrementSales(
+                affiliateId: $affiliateId,
+                amount: $order->getTotalGross()
+            );
+        }
+    }
+
+    private function storeApplicationFeePayment(OrderDomainObject $order, array $paymentData): void
+    {
+        $feeAmount = $paymentData['fee'] ?? 0; // Fee in paise
+        
+        $this->orderApplicationFeeService->createOrderApplicationFee(
+            orderId: $order->getId(),
+            applicationFeeAmountMinorUnit: $feeAmount,
+            orderApplicationFeeStatus: \HiEvents\DomainObjects\Status\OrderApplicationFeeStatus::PAID,
+            paymentMethod: PaymentProviders::RAZORPAY,
+            currency: $order->getCurrency(),
+        );
+    }
+
+    private function isPaymentAlreadyHandled(string $paymentId): bool
+    {
+        return $this->cache->has('razorpay_webhook_payment_' . $paymentId);
+    }
+
+    private function markPaymentAsHandled(string $paymentId, OrderDomainObject $order): void
+    {
+        $this->logger->info('Razorpay payment captured via webhook', [
+            'razorpay_payment_id' => $paymentId,
+            'order_id' => $order->getId(),
+            'amount' => $order->getTotalGross(),
+            'currency' => $order->getCurrency(),
+        ]);
+
+        $this->cache->put('razorpay_webhook_payment_' . $paymentId, true, now()->addHours(24));
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php
new file mode 100644
index 000000000..3261c61d2
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\EventHandlers;
+
+use HiEvents\DomainObjects\Enums\PaymentProviders;
+use HiEvents\DomainObjects\Generated\OrderDomainObjectAbstract;
+use HiEvents\DomainObjects\OrderDomainObject;
+use HiEvents\DomainObjects\Status\OrderRefundStatus;
+use HiEvents\Repository\Interfaces\OrderRefundRepositoryInterface;
+use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\EventStatistics\EventStatisticsRefundService;
+use HiEvents\Services\Infrastructure\DomainEvents\DomainEventDispatcherService;
+use HiEvents\Services\Infrastructure\DomainEvents\Enums\DomainEventType;
+use HiEvents\Services\Infrastructure\DomainEvents\Events\OrderEvent;
+use HiEvents\Values\MoneyValue;
+use Illuminate\Database\DatabaseManager;
+use Illuminate\Log\Logger;
+use Throwable;
+
+class RazorpayRefundHandler
+{
+    public function __construct(
+        private readonly OrderRepositoryInterface          $orderRepository,
+        private readonly RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
+        private readonly Logger                            $logger,
+        private readonly DatabaseManager                   $databaseManager,
+        private readonly EventStatisticsRefundService      $eventStatisticsRefundService,
+        private readonly OrderRefundRepositoryInterface    $orderRefundRepository,
+        private readonly DomainEventDispatcherService      $domainEventDispatcherService,
+    ) {
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function handleEvent(array $refundData): void
+    {
+        $this->databaseManager->transaction(function () use ($refundData) {
+            // Find Razorpay order by payment_id
+            $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($refundData['payment_id']);
+
+            if (!$razorpayOrder) {
+                $this->logger->warning('Razorpay order not found for refund', [
+                    'refund_id' => $refundData['id'],
+                    'payment_id' => $refundData['payment_id'],
+                ]);
+                return;
+            }
+
+            $existingRefund = $this->orderRefundRepository->findFirstWhere([
+                'refund_id' => $refundData['id'],
+            ]);
+
+            if ($existingRefund) {
+                $this->logger->info(__('Refund already processed'), [
+                    'refund_id' => $refundData['id'],
+                    'payment_id' => $refundData['payment_id'],
+                ]);
+                return;
+            }
+
+            // Get order ID from razorpay order array
+            $razorpayOrderArray = $razorpayOrder->toArray();
+            $orderId = $razorpayOrderArray['order_id'] ?? null;
+            
+            if (!$orderId) {
+                $this->logger->error('Could not get order ID from Razorpay order for refund', [
+                    'razorpay_order' => $razorpayOrderArray,
+                    'refund_data' => $refundData,
+                ]);
+                return;
+            }
+
+            $order = $this->orderRepository->findById($orderId);
+
+            if ($refundData['status'] !== 'processed') {
+                $this->handleFailure($refundData, $order);
+                return;
+            }
+
+            // Convert from paise to rupees
+            $refundedAmount = $refundData['amount'] / 100;
+
+            // Get order ID from order array
+            $orderArray = $order->toArray();
+            $orderIdFromOrder = $orderArray['id'] ?? $orderId;
+
+            $this->updateOrderRefundedAmount($orderIdFromOrder, $refundedAmount);
+            $this->updateOrderStatus($order, $refundedAmount);
+            
+            // Update event statistics
+            $this->updateEventStatistics($order, $refundedAmount, $refundData['currency']);
+            
+            $this->createOrderRefund($refundData, $order, $refundedAmount, $orderIdFromOrder);
+
+            $this->logger->info(__('Razorpay refund successful'), [
+                'order_id' => $orderIdFromOrder,
+                'refunded_amount' => $refundedAmount,
+                'currency' => $refundData['currency'],
+                'refund_id' => $refundData['id'],
+            ]);
+
+            $this->domainEventDispatcherService->dispatch(
+                new OrderEvent(
+                    type: DomainEventType::ORDER_REFUNDED,
+                    orderId: $orderIdFromOrder
+                ),
+            );
+        });
+    }
+
+    private function updateEventStatistics(OrderDomainObject $order, float $amount, string $currency): void
+    {
+        // Convert to minor units (paise)
+        $amountMinor = $amount * 100;
+        $moneyValue = MoneyValue::fromMinorUnit($amountMinor, $currency);
+        $this->eventStatisticsRefundService->updateForRefund($order, $moneyValue);
+    }
+
+    private function updateOrderRefundedAmount(int $orderId, float $refundedAmount): void
+    {
+        $this->orderRepository->increment(
+            id: $orderId,
+            column: OrderDomainObjectAbstract::TOTAL_REFUNDED,
+            amount: $refundedAmount
+        );
+    }
+
+    private function updateOrderStatus(OrderDomainObject $order, float $refundedAmount): void
+    {
+        // Get order array and extract ID
+        $orderArray = $order->toArray();
+        $orderId = $orderArray['id'] ?? null;
+        
+        if (!$orderId) {
+            $this->logger->error('Could not get ID from order for status update');
+            return;
+        }
+
+        // Get total refunded amount from order array
+        $totalRefunded = $orderArray['total_refunded'] ?? 0;
+        
+        // Get total gross from order array
+        $totalGross = $orderArray['total_gross'] ?? 0;
+
+        $status = $refundedAmount + $totalRefunded >= $totalGross
+            ? OrderRefundStatus::REFUNDED->name
+            : OrderRefundStatus::PARTIALLY_REFUNDED->name;
+
+        $this->orderRepository->updateFromArray($orderId, [
+            OrderDomainObjectAbstract::REFUND_STATUS => $status,
+        ]);
+    }
+
+    private function handleFailure(array $refundData, OrderDomainObject $order): void
+    {
+        // Get order ID from order array
+        $orderArray = $order->toArray();
+        $orderId = $orderArray['id'] ?? null;
+        
+        if (!$orderId) {
+            $this->logger->error('Could not get ID from order for failure handling');
+            return;
+        }
+
+        $this->orderRepository->updateFromArray($orderId, [
+            OrderDomainObjectAbstract::REFUND_STATUS => OrderRefundStatus::REFUND_FAILED->name,
+        ]);
+
+        $this->logger->error(__('Failed to process Razorpay refund'), $refundData);
+    }
+
+    private function createOrderRefund(array $refundData, OrderDomainObject $order, float $refundedAmount, int $orderId): void
+    {
+        $this->orderRefundRepository->create([
+            'order_id' => $orderId,
+            'payment_provider' => PaymentProviders::RAZORPAY->value,
+            'refund_id' => $refundData['id'],
+            'amount' => $refundedAmount,
+            'currency' => $refundData['currency'],
+            'status' => $refundData['status'],
+            'metadata' => $refundData,
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/backend/routes/api.php b/backend/routes/api.php
index e60d95a60..eda290962 100644
--- a/backend/routes/api.php
+++ b/backend/routes/api.php
@@ -46,6 +46,7 @@
 use HiEvents\Http\Actions\CheckInLists\Public\GetCheckInListPublicAction;
 use HiEvents\Http\Actions\CheckInLists\UpdateCheckInListAction;
 use HiEvents\Http\Actions\Common\GetColorThemesAction;
+use HiEvents\Http\Actions\Common\Webhooks\RazorpayIncomingWebhookAction;
 use HiEvents\Http\Actions\Common\Webhooks\StripeIncomingWebhookAction;
 use HiEvents\Http\Actions\Events\CreateEventAction;
 use HiEvents\Http\Actions\Events\DuplicateEventAction;
@@ -484,6 +485,7 @@ function (Router $router): void {
         // Razorpay payment gateway
         $router->post('/events/{event_id}/order/{order_short_id}/razorpay/order', CreateRazorpayOrderActionPublic::class);
         $router->post('/events/{event_id}/order/{order_short_id}/razorpay/verify', VerifyRazorpayPaymentActionPublic::class);
+        $router->post('/webhooks/razorpay', RazorpayIncomingWebhookAction::class);
 
         // Questions
         $router->get('/events/{event_id}/questions', GetQuestionsPublicAction::class);

From 4dafc1c2eb655b2b1c8aab811dd46800a485997b Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 27 Jan 2026 07:52:16 +0000
Subject: [PATCH 04/41] add todo: support razorpay for saas mode

---
 .../Razorpay/RazorpayOrderCreationService.php | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
index 27605f218..42305d170 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
@@ -70,16 +70,22 @@ public function createOrder(CreateRazorpayOrderRequestDTO $orderDTO): CreateRazo
                 ],
             ];
 
-            // Add application fee if applicable (Razorpay handles fees differently)
-            if ($applicationFee && $this->config->get('services.razorpay.application_fee_enabled')) {
-                $orderData['transfers'] = [
-                    [
-                        'account' => $this->config->get('services.razorpay.platform_account_id'),
-                        'amount' => $applicationFee->grossApplicationFee->toMinorUnit(),
-                        'currency' => $orderDTO->currencyCode,
-                    ]
-                ];
-            }
+            // TODO: Fix for saas mode
+            // if ($applicationFee && $this->config->get('services.razorpay.application_fee_enabled')) {
+            //     $feeMinorUnit = $applicationFee->grossApplicationFee->toMinorUnit();
+
+            //     $orderData['transfers'] = [
+            //         [
+            //             'account' => $this->config->get('services.razorpay.platform_account_id'),
+            //             'amount'  => $feeMinorUnit,
+            //             'currency' => $orderDTO->currencyCode,
+            //             'notes'   => [
+            //                 'order_id' => $orderDTO->order->getId(),
+            //                 'type'     => 'application_fee'
+            //             ],
+            //         ]
+            //     ];
+            // }
 
             $razorpayOrder = $razorpayClient->order->create($orderData);
 
@@ -98,7 +104,6 @@ public function createOrder(CreateRazorpayOrderRequestDTO $orderDTO): CreateRazo
                 receipt: $razorpayOrder->receipt,
             );
         } catch (Error $exception) {
-            dd($exception);
             $this->logger->error("Razorpay order creation failed: {$exception->getMessage()}", [
                 'exception' => $exception,
                 'orderDTO' => $orderDTO->toArray(['account']),

From e5672bf696fcdb57f7435b3ce83c446a05576dbf Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 27 Jan 2026 07:53:11 +0000
Subject: [PATCH 05/41] cleanup

---
 .../Domain/Payment/Razorpay/RazorpayOrderCreationService.php   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
index 42305d170..ec75e4745 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
@@ -2,10 +2,7 @@
 
 namespace HiEvents\Services\Domain\Payment\Razorpay;
 
-use HiEvents\DomainObjects\AccountConfigurationDomainObject;
 use HiEvents\Exceptions\Razorpay\CreateOrderFailedException;
-use HiEvents\Repository\Interfaces\AccountRepositoryInterface;
-use HiEvents\Services\Domain\Order\DTO\ApplicationFeeValuesDTO;
 use HiEvents\Services\Domain\Order\OrderApplicationFeeCalculationService;
 use HiEvents\Services\Domain\Payment\Razorpay\DTOs\CreateRazorpayOrderRequestDTO;
 use HiEvents\Services\Domain\Payment\Razorpay\DTOs\CreateRazorpayOrderResponseDTO;

From 01f6f860c6ff0d09a9014204be2c8bc0cbda3e0f Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 10 Feb 2026 07:57:07 +0000
Subject: [PATCH 06/41] disabled application fee calculation on razorpay
 payments for now

---
 .../Payment/Razorpay/RazorpayOrderCreationService.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
index ec75e4745..6ef65be17 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
@@ -37,11 +37,11 @@ public function createOrder(CreateRazorpayOrderRequestDTO $orderDTO): CreateRazo
             $razorpayClient = $this->razorpayClientFactory->create();
 
             // Calculate application fee for Razorpay
-            $applicationFee = $this->orderApplicationFeeCalculationService->calculateApplicationFee(
-                accountConfiguration: $orderDTO->account->getConfiguration(),
-                order: $orderDTO->order,
-                vatSettings: $orderDTO->account->getAccountVatSetting(),
-            );
+            // $applicationFee = $this->orderApplicationFeeCalculationService->calculateApplicationFee(
+            //     accountConfiguration: $orderDTO->account->getConfiguration(),
+            //     order: $orderDTO->order,
+            //     vatSettings: $orderDTO->account->getAccountVatSetting(),
+            // );
 
             // Razorpay amount is in paise (Indian) or smallest currency unit
             $amountInSmallestUnit = $orderDTO->amount->toMinorUnit();

From 51114224712ebc8abfe1e38e9651a76f4f039592 Mon Sep 17 00:00:00 2001
From: Onessimus Lyngdoh <auditoree9@gmail.com>
Date: Wed, 18 Feb 2026 13:52:51 +0530
Subject: [PATCH 07/41] Update
 backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php

Co-authored-by: Dave Earley <dave.m.earley@gmail.com>
---
 .../Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
index 4fb248674..99b601b11 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
@@ -39,7 +39,7 @@ public function handle(string $payload, string $signature): void
         try {
             // Verify webhook signature
             if (!$this->razorpayPaymentService->verifyWebhookSignature($payload, $signature)) {
-                throw new InvalidSignatureException('Invalid Razorpay webhook signature');
+                throw new InvalidSignatureException(__('Invalid Razorpay webhook signature'));
             }
 
             $data = json_decode($payload, true, 512, JSON_THROW_ON_ERROR);

From ead73ce55be8acd9650c42e90233fc59b955c62c Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Wed, 18 Feb 2026 08:40:32 +0000
Subject: [PATCH 08/41] added webhook_secret to services.razorpay config

---
 backend/config/services.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/config/services.php b/backend/config/services.php
index d675543d7..aa66a69d3 100644
--- a/backend/config/services.php
+++ b/backend/config/services.php
@@ -56,6 +56,7 @@
     'razorpay' => [
         'key_id' => env('RAZORPAY_KEY_ID'),
         'key_secret' => env('RAZORPAY_KEY_SECRET'),
+        'webhook_secret' => env('RAZORPAY_WEBHOOK_SECRET'),
         'application_fee_enabled' => env('RAZORPAY_APPLICATION_FEE_ENABLED', true),
         'platform_account_id' => env('RAZORPAY_PLATFORM_ACCOUNT_ID'),
     ],

From b07d9167b7c851954bb716b6f850e5b6fe0dcd24 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Wed, 18 Feb 2026 08:42:17 +0000
Subject: [PATCH 09/41] initialized required razorpay key:value pairs in
 .env.example for reference

---
 backend/.env.example | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/.env.example b/backend/.env.example
index 12971f17a..b0f5fa11e 100644
--- a/backend/.env.example
+++ b/backend/.env.example
@@ -18,6 +18,12 @@ STRIPE_PUBLIC_KEY=
 STRIPE_SECRET_KEY=
 STRIPE_WEBHOOK_SECRET=
 
+RAZORPAY_KEY_ID=
+RAZORPAY_KEY_SECRET=
+RAZORPAY_WEBHOOK_SECRET=
+RAZORPAY_APPLICATION_FEE_ENABLED=
+RAZORPAY_PLATFORM_ACCOUNT_ID=
+
 CORS_ALLOWED_ORIGINS=*
 
 LOG_CHANNEL=stderr

From 2141e711a97afcab77b206a5d176809e0059d833 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Mon, 23 Feb 2026 07:28:42 +0000
Subject: [PATCH 10/41] added VerifyPaymentDTO and updated related usage

---
 .../VerifyRazorpayPaymentActionPublic.php     | 12 ++++++---
 .../Order/DTO/VerifyRazorpayPaymentDTO.php    | 16 ++++++++++++
 .../Razorpay/VerifyRazorpayPaymentHandler.php | 25 ++++++++++---------
 .../RazorpayPaymentVerificationService.php    | 13 +++++-----
 4 files changed, 45 insertions(+), 21 deletions(-)
 create mode 100644 backend/app/Services/Application/Handlers/Order/DTO/VerifyRazorpayPaymentDTO.php

diff --git a/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php b/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
index 85935aa0c..9a28f8f6a 100644
--- a/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
+++ b/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
@@ -2,6 +2,7 @@
 
 namespace HiEvents\Http\Actions\Orders\Payment\Razorpay;
 
+use Backend\App\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
 use HiEvents\Exceptions\Razorpay\PaymentVerificationFailedException;
 use HiEvents\Http\Actions\BaseAction;
 use HiEvents\Services\Application\Handlers\Order\Payment\Razorpay\VerifyRazorpayPaymentHandler;
@@ -12,16 +13,21 @@ class VerifyRazorpayPaymentActionPublic extends BaseAction
 {
     public function __construct(
         private readonly VerifyRazorpayPaymentHandler $verifyRazorpayPaymentHandler,
-    )
-    {
+    ) {
     }
 
     public function __invoke(int $eventId, string $orderShortId): JsonResponse
     {
         try {
+            $verifyRazorpayPaymentDTO = new VerifyRazorpayPaymentDTO(
+                razorpay_payment_id: request()->post('razorpay_payment_id'),
+                razorpay_order_id: request()->post('razorpay_order_id'),
+                razorpay_signature: request()->post('razorpay_signature'),
+            );
+
             $order = $this->verifyRazorpayPaymentHandler->handle(
                 $orderShortId,
-                request()->all()
+                $verifyRazorpayPaymentDTO
             );
         } catch (PaymentVerificationFailedException $e) {
             return $this->errorResponse($e->getMessage(), Response::HTTP_UNPROCESSABLE_ENTITY);
diff --git a/backend/app/Services/Application/Handlers/Order/DTO/VerifyRazorpayPaymentDTO.php b/backend/app/Services/Application/Handlers/Order/DTO/VerifyRazorpayPaymentDTO.php
new file mode 100644
index 000000000..c1e2e2b66
--- /dev/null
+++ b/backend/app/Services/Application/Handlers/Order/DTO/VerifyRazorpayPaymentDTO.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Backend\App\Services\Application\Handlers\Order\DTO;
+
+use HiEvents\DataTransferObjects\BaseDataObject;
+
+class VerifyRazorpayPaymentDTO extends BaseDataObject
+{
+    public function __construct(
+        public readonly string $razorpay_payment_id,
+        public readonly string $razorpay_order_id,
+        public readonly string $razorpay_signature,
+    )
+    {
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
index f239a131f..ef1e1a30a 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
@@ -2,6 +2,7 @@
 
 namespace HiEvents\Services\Application\Handlers\Order\Payment\Razorpay;
 
+use Backend\App\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
 use HiEvents\DomainObjects\Enums\PaymentProviders;
 use HiEvents\DomainObjects\Generated\OrderDomainObjectAbstract;
 use HiEvents\DomainObjects\OrderDomainObject;
@@ -54,12 +55,12 @@ public function __construct(
      * @throws PaymentVerificationFailedException
      * @throws Throwable
      */
-    public function handle(string $orderShortId, array $paymentData): OrderDomainObject
+    public function handle(string $orderShortId, VerifyRazorpayPaymentDTO $paymentData): OrderDomainObject
     {
         // Check for duplicate processing
         if ($this->hasPaymentBeenHandled($paymentData)) {
             $this->logger->info('Razorpay payment already handled', [
-                'razorpay_payment_id' => $paymentData['razorpay_payment_id'],
+                'razorpay_payment_id' => $paymentData->razorpay_payment_id,
                 'order_short_id' => $orderShortId,
             ]);
             
@@ -93,14 +94,14 @@ public function handle(string $orderShortId, array $paymentData): OrderDomainObj
 
             // Update Razorpay order with payment details
             $this->razorpayOrdersRepository->updateByOrderId($order->getId(), [
-                'razorpay_payment_id' => $paymentData['razorpay_payment_id'],
-                'razorpay_signature' => $paymentData['razorpay_signature'],
+                'razorpay_payment_id' => $paymentData->razorpay_payment_id,
+                'razorpay_signature' => $paymentData->razorpay_signature,
                 'payment_status' => 'captured',
             ]);
 
             // Fetch complete payment details from Razorpay API
             $paymentDetails = $this->razorpayPaymentService->fetchPaymentDetails(
-                $paymentData['razorpay_payment_id']
+                $paymentData->razorpay_payment_id
             );
 
             // Update order status to completed - THIS RETURNS THE UPDATED ORDER WITH ITEMS LOADED
@@ -119,7 +120,7 @@ public function handle(string $orderShortId, array $paymentData): OrderDomainObj
             $this->storeApplicationFeePayment($updatedOrder, $paymentDetails);
             
             // Dispatch events
-            $this->dispatchEvents($updatedOrder, $paymentData);
+            $this->dispatchEvents($updatedOrder);
             
             // Mark payment as handled
             $this->markPaymentAsHandled($paymentData, $updatedOrder);
@@ -176,7 +177,7 @@ private function storeApplicationFeePayment(OrderDomainObject $order, array $pay
         );
     }
 
-    private function dispatchEvents(OrderDomainObject $order, array $paymentData): void
+    private function dispatchEvents(OrderDomainObject $order): void
     {
         // Dispatch Laravel event
         OrderStatusChangedEvent::dispatch($order);
@@ -190,9 +191,9 @@ private function dispatchEvents(OrderDomainObject $order, array $paymentData): v
         );
     }
 
-    private function hasPaymentBeenHandled(array $paymentData): bool
+    private function hasPaymentBeenHandled(VerifyRazorpayPaymentDTO $paymentData): bool
     {
-        $paymentId = $paymentData['razorpay_payment_id'] ?? null;
+        $paymentId = $paymentData->razorpay_payment_id ?? null;
         if (!$paymentId) {
             return false;
         }
@@ -200,17 +201,17 @@ private function hasPaymentBeenHandled(array $paymentData): bool
         return $this->cache->has('razorpay_payment_handled_' . $paymentId);
     }
 
-    private function markPaymentAsHandled(array $paymentData, OrderDomainObject $order): void
+    private function markPaymentAsHandled(VerifyRazorpayPaymentDTO $paymentData, OrderDomainObject $order): void
     {
         $this->logger->info('Razorpay payment verification handled', [
-            'razorpay_payment_id' => $paymentData['razorpay_payment_id'],
+            'razorpay_payment_id' => $paymentData->razorpay_payment_id,
             'order_id' => $order->getId(),
             'amount' => $order->getTotalGross(),
             'currency' => $order->getCurrency(),
         ]);
 
         $this->cache->put(
-            'razorpay_payment_handled_' . $paymentData['razorpay_payment_id'],
+            'razorpay_payment_handled_' . $paymentData->razorpay_payment_id,
             true,
             now()->addHours(24)
         );
diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
index 501d5cb69..1089319d3 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
@@ -2,6 +2,7 @@
 
 namespace HiEvents\Services\Domain\Payment\Razorpay;
 
+use Backend\App\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
 use HiEvents\Exceptions\Razorpay\InvalidSignatureException;
 use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
 use Illuminate\Config\Repository;
@@ -15,20 +16,20 @@ public function __construct(
         private readonly RazorpayClientFactory $razorpayClientFactory,
     ) {}
 
-    public function verifyPaymentSignature(array $paymentData): bool
+    public function verifyPaymentSignature(VerifyRazorpayPaymentDTO $paymentData): bool
     {
         $expectedSignature = hash_hmac(
             'sha256',
-            $paymentData['razorpay_order_id'] . '|' . $paymentData['razorpay_payment_id'],
+            $paymentData->razorpay_order_id . '|' . $paymentData->razorpay_payment_id,
             $this->config->get('services.razorpay.key_secret')
         );
 
-        if ($expectedSignature !== $paymentData['razorpay_signature']) {
+        if ($expectedSignature !== $paymentData->razorpay_signature) {
             $this->logger->error('Razorpay signature verification failed', [
                 'expected' => $expectedSignature,
-                'received' => $paymentData['razorpay_signature'],
-                'order_id' => $paymentData['razorpay_order_id'],
-                'payment_id' => $paymentData['razorpay_payment_id'],
+                'received' => $paymentData->razorpay_signature,
+                'order_id' => $paymentData->razorpay_order_id,
+                'payment_id' => $paymentData->razorpay_payment_id,
             ]);
 
             throw new InvalidSignatureException();

From b3179f93343cc5088a51078da60b9974dce71cba Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Mon, 23 Feb 2026 07:31:56 +0000
Subject: [PATCH 11/41] renamed variable for paymentData to
 verifyRazorpayPaymentData

---
 .../Razorpay/VerifyRazorpayPaymentHandler.php | 28 +++++++++----------
 .../RazorpayPaymentVerificationService.php    | 12 ++++----
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
index ef1e1a30a..f358cce3e 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
@@ -55,12 +55,12 @@ public function __construct(
      * @throws PaymentVerificationFailedException
      * @throws Throwable
      */
-    public function handle(string $orderShortId, VerifyRazorpayPaymentDTO $paymentData): OrderDomainObject
+    public function handle(string $orderShortId, VerifyRazorpayPaymentDTO $verifyRazorpayPaymentData): OrderDomainObject
     {
         // Check for duplicate processing
-        if ($this->hasPaymentBeenHandled($paymentData)) {
+        if ($this->hasPaymentBeenHandled($verifyRazorpayPaymentData)) {
             $this->logger->info('Razorpay payment already handled', [
-                'razorpay_payment_id' => $paymentData->razorpay_payment_id,
+                'razorpay_payment_id' => $verifyRazorpayPaymentData->razorpay_payment_id,
                 'order_short_id' => $orderShortId,
             ]);
             
@@ -70,7 +70,7 @@ public function handle(string $orderShortId, VerifyRazorpayPaymentDTO $paymentDa
                 ->findByShortId($orderShortId);
         }
 
-        return $this->databaseManager->transaction(function () use ($orderShortId, $paymentData) {
+        return $this->databaseManager->transaction(function () use ($orderShortId, $verifyRazorpayPaymentData) {
             // Load order with necessary relations
             $order = $this->orderRepository
                 ->loadRelation(new Relationship(OrderItemDomainObject::class))
@@ -86,7 +86,7 @@ public function handle(string $orderShortId, VerifyRazorpayPaymentDTO $paymentDa
             }
 
             // Verify the payment signature
-            $isValid = $this->razorpayPaymentService->verifyPaymentSignature($paymentData);
+            $isValid = $this->razorpayPaymentService->verifyPaymentSignature($verifyRazorpayPaymentData);
 
             if (!$isValid) {
                 throw new PaymentVerificationFailedException(__('Payment verification failed. Please try again.'));
@@ -94,14 +94,14 @@ public function handle(string $orderShortId, VerifyRazorpayPaymentDTO $paymentDa
 
             // Update Razorpay order with payment details
             $this->razorpayOrdersRepository->updateByOrderId($order->getId(), [
-                'razorpay_payment_id' => $paymentData->razorpay_payment_id,
-                'razorpay_signature' => $paymentData->razorpay_signature,
+                'razorpay_payment_id' => $verifyRazorpayPaymentData->razorpay_payment_id,
+                'razorpay_signature' => $verifyRazorpayPaymentData->razorpay_signature,
                 'payment_status' => 'captured',
             ]);
 
             // Fetch complete payment details from Razorpay API
             $paymentDetails = $this->razorpayPaymentService->fetchPaymentDetails(
-                $paymentData->razorpay_payment_id
+                $verifyRazorpayPaymentData->razorpay_payment_id
             );
 
             // Update order status to completed - THIS RETURNS THE UPDATED ORDER WITH ITEMS LOADED
@@ -123,7 +123,7 @@ public function handle(string $orderShortId, VerifyRazorpayPaymentDTO $paymentDa
             $this->dispatchEvents($updatedOrder);
             
             // Mark payment as handled
-            $this->markPaymentAsHandled($paymentData, $updatedOrder);
+            $this->markPaymentAsHandled($verifyRazorpayPaymentData, $updatedOrder);
 
             return $updatedOrder;
         });
@@ -191,9 +191,9 @@ private function dispatchEvents(OrderDomainObject $order): void
         );
     }
 
-    private function hasPaymentBeenHandled(VerifyRazorpayPaymentDTO $paymentData): bool
+    private function hasPaymentBeenHandled(VerifyRazorpayPaymentDTO $verifyRazorpayPaymentData): bool
     {
-        $paymentId = $paymentData->razorpay_payment_id ?? null;
+        $paymentId = $verifyRazorpayPaymentData->razorpay_payment_id ?? null;
         if (!$paymentId) {
             return false;
         }
@@ -201,17 +201,17 @@ private function hasPaymentBeenHandled(VerifyRazorpayPaymentDTO $paymentData): b
         return $this->cache->has('razorpay_payment_handled_' . $paymentId);
     }
 
-    private function markPaymentAsHandled(VerifyRazorpayPaymentDTO $paymentData, OrderDomainObject $order): void
+    private function markPaymentAsHandled(VerifyRazorpayPaymentDTO $verifyRazorpayPaymentData, OrderDomainObject $order): void
     {
         $this->logger->info('Razorpay payment verification handled', [
-            'razorpay_payment_id' => $paymentData->razorpay_payment_id,
+            'razorpay_payment_id' => $verifyRazorpayPaymentData->razorpay_payment_id,
             'order_id' => $order->getId(),
             'amount' => $order->getTotalGross(),
             'currency' => $order->getCurrency(),
         ]);
 
         $this->cache->put(
-            'razorpay_payment_handled_' . $paymentData->razorpay_payment_id,
+            'razorpay_payment_handled_' . $verifyRazorpayPaymentData->razorpay_payment_id,
             true,
             now()->addHours(24)
         );
diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
index 1089319d3..e71b226b9 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
@@ -16,20 +16,20 @@ public function __construct(
         private readonly RazorpayClientFactory $razorpayClientFactory,
     ) {}
 
-    public function verifyPaymentSignature(VerifyRazorpayPaymentDTO $paymentData): bool
+    public function verifyPaymentSignature(VerifyRazorpayPaymentDTO $verifyRazorpayPaymentData): bool
     {
         $expectedSignature = hash_hmac(
             'sha256',
-            $paymentData->razorpay_order_id . '|' . $paymentData->razorpay_payment_id,
+            $verifyRazorpayPaymentData->razorpay_order_id . '|' . $verifyRazorpayPaymentData->razorpay_payment_id,
             $this->config->get('services.razorpay.key_secret')
         );
 
-        if ($expectedSignature !== $paymentData->razorpay_signature) {
+        if ($expectedSignature !== $verifyRazorpayPaymentData->razorpay_signature) {
             $this->logger->error('Razorpay signature verification failed', [
                 'expected' => $expectedSignature,
-                'received' => $paymentData->razorpay_signature,
-                'order_id' => $paymentData->razorpay_order_id,
-                'payment_id' => $paymentData->razorpay_payment_id,
+                'received' => $verifyRazorpayPaymentData->razorpay_signature,
+                'order_id' => $verifyRazorpayPaymentData->razorpay_order_id,
+                'payment_id' => $verifyRazorpayPaymentData->razorpay_payment_id,
             ]);
 
             throw new InvalidSignatureException();

From 4b90cba021568b6696f062308f2bba28f798b215 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Mon, 23 Feb 2026 07:39:07 +0000
Subject: [PATCH 12/41] fixed VerifyRazorpayPaymentDTO namespace

---
 .../Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php      | 2 +-
 .../Application/Handlers/Order/DTO/VerifyRazorpayPaymentDTO.php | 2 +-
 .../Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php     | 2 +-
 .../Payment/Razorpay/RazorpayPaymentVerificationService.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php b/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
index 9a28f8f6a..12d8cb357 100644
--- a/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
+++ b/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
@@ -2,9 +2,9 @@
 
 namespace HiEvents\Http\Actions\Orders\Payment\Razorpay;
 
-use Backend\App\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
 use HiEvents\Exceptions\Razorpay\PaymentVerificationFailedException;
 use HiEvents\Http\Actions\BaseAction;
+use HiEvents\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
 use HiEvents\Services\Application\Handlers\Order\Payment\Razorpay\VerifyRazorpayPaymentHandler;
 use Illuminate\Http\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/backend/app/Services/Application/Handlers/Order/DTO/VerifyRazorpayPaymentDTO.php b/backend/app/Services/Application/Handlers/Order/DTO/VerifyRazorpayPaymentDTO.php
index c1e2e2b66..3a9bb8573 100644
--- a/backend/app/Services/Application/Handlers/Order/DTO/VerifyRazorpayPaymentDTO.php
+++ b/backend/app/Services/Application/Handlers/Order/DTO/VerifyRazorpayPaymentDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backend\App\Services\Application\Handlers\Order\DTO;
+namespace HiEvents\Services\Application\Handlers\Order\DTO;
 
 use HiEvents\DataTransferObjects\BaseDataObject;
 
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
index f358cce3e..7469243c9 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
@@ -2,7 +2,6 @@
 
 namespace HiEvents\Services\Application\Handlers\Order\Payment\Razorpay;
 
-use Backend\App\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
 use HiEvents\DomainObjects\Enums\PaymentProviders;
 use HiEvents\DomainObjects\Generated\OrderDomainObjectAbstract;
 use HiEvents\DomainObjects\OrderDomainObject;
@@ -21,6 +20,7 @@
 use HiEvents\Repository\Interfaces\AttendeeRepositoryInterface;
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
 use HiEvents\Services\Domain\Order\OrderApplicationFeeService;
 use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentVerificationService;
 use HiEvents\Services\Domain\Product\ProductQuantityUpdateService;
diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
index e71b226b9..9763ec2c6 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
@@ -2,8 +2,8 @@
 
 namespace HiEvents\Services\Domain\Payment\Razorpay;
 
-use Backend\App\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
 use HiEvents\Exceptions\Razorpay\InvalidSignatureException;
+use HiEvents\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
 use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
 use Illuminate\Config\Repository;
 use Psr\Log\LoggerInterface;

From 1104e9cd3a1ec0251b5c53c388f17c6a702287c8 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Mon, 23 Feb 2026 07:50:08 +0000
Subject: [PATCH 13/41] added verification form request

---
 .../Order/VerifyRazorpayPaymentRequest.php    | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 backend/app/Http/Request/Order/VerifyRazorpayPaymentRequest.php

diff --git a/backend/app/Http/Request/Order/VerifyRazorpayPaymentRequest.php b/backend/app/Http/Request/Order/VerifyRazorpayPaymentRequest.php
new file mode 100644
index 000000000..2c59d27ba
--- /dev/null
+++ b/backend/app/Http/Request/Order/VerifyRazorpayPaymentRequest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace HiEvents\Http\Request\Order;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class VerifyRazorpayPaymentRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'razorpay_payment_id' => [
+                'required',
+                'string',
+                'regex:/^pay_[a-zA-Z0-9]+$/',
+            ],
+            'razorpay_order_id' => [
+                'required',
+                'string',
+                'regex:/^order_[a-zA-Z0-9]+$/',
+            ],
+            'razorpay_signature' => [
+                'required',
+                'string',
+                'regex:/^[a-f0-9]{64}$/',
+            ],
+        ];
+    }
+
+    public function messages(): array
+    {
+        return [
+            'razorpay_payment_id.required' => __('The Razorpay payment ID is required.'),
+            'razorpay_payment_id.regex' => __('The Razorpay payment ID must start with "pay_" and contain only alphanumeric characters.'),
+            'razorpay_order_id.required' => __('The Razorpay order ID is required.'),
+            'razorpay_order_id.regex' => __('The Razorpay order ID must start with "order_" and contain only alphanumeric characters.'),
+            'razorpay_signature.required' => __('The Razorpay signature is required.'),
+            'razorpay_signature.regex' => __('The Razorpay signature format is invalid (must be a 64-character hex string).'),
+        ];
+    }
+
+    protected function prepareForValidation(): void
+    {
+        $this->merge([
+            'razorpay_payment_id' => trim($this->razorpay_payment_id),
+            'razorpay_order_id' => trim($this->razorpay_order_id),
+            'razorpay_signature' => trim($this->razorpay_signature),
+        ]);
+    }
+}
\ No newline at end of file

From 9c23bc9e2a1e4cd32f38266a87ea048670ca9eb4 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Mon, 23 Feb 2026 07:54:51 +0000
Subject: [PATCH 14/41] used new form request in razorpay payment verification

---
 .../Razorpay/VerifyRazorpayPaymentActionPublic.php     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php b/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
index 12d8cb357..cd9ff926b 100644
--- a/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
+++ b/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
@@ -4,6 +4,7 @@
 
 use HiEvents\Exceptions\Razorpay\PaymentVerificationFailedException;
 use HiEvents\Http\Actions\BaseAction;
+use HiEvents\Http\Request\Order\VerifyRazorpayPaymentRequest;
 use HiEvents\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
 use HiEvents\Services\Application\Handlers\Order\Payment\Razorpay\VerifyRazorpayPaymentHandler;
 use Illuminate\Http\JsonResponse;
@@ -16,13 +17,14 @@ public function __construct(
     ) {
     }
 
-    public function __invoke(int $eventId, string $orderShortId): JsonResponse
+    public function __invoke(int $eventId, string $orderShortId, VerifyRazorpayPaymentRequest $request): JsonResponse
     {
         try {
+            $validated = $request->validated();
             $verifyRazorpayPaymentDTO = new VerifyRazorpayPaymentDTO(
-                razorpay_payment_id: request()->post('razorpay_payment_id'),
-                razorpay_order_id: request()->post('razorpay_order_id'),
-                razorpay_signature: request()->post('razorpay_signature'),
+                razorpay_payment_id: $validated['razorpay_payment_id'],
+                razorpay_order_id: $validated['razorpay_order_id'],
+                razorpay_signature: $validated['razorpay_signature'],
             );
 
             $order = $this->verifyRazorpayPaymentHandler->handle(

From c46b530c9e26384c29788741e282146e3df30435 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Mon, 23 Feb 2026 08:00:02 +0000
Subject: [PATCH 15/41] distinct tab and condition for stripe and razorpay in
 payment selection

---
 .../routes/product-widget/Payment/index.tsx   | 76 +++++++++++--------
 1 file changed, 43 insertions(+), 33 deletions(-)

diff --git a/frontend/src/components/routes/product-widget/Payment/index.tsx b/frontend/src/components/routes/product-widget/Payment/index.tsx
index 4d9915e29..49d952793 100644
--- a/frontend/src/components/routes/product-widget/Payment/index.tsx
+++ b/frontend/src/components/routes/product-widget/Payment/index.tsx
@@ -1,31 +1,31 @@
-import React, {useState} from "react";
-import {useNavigate, useParams} from "react-router";
-import {useGetEventPublic} from "../../../../queries/useGetEventPublic.ts";
-import {CheckoutContent} from "../../../layouts/Checkout/CheckoutContent";
-import {StripePaymentMethod} from "./PaymentMethods/Stripe";
-import {OfflinePaymentMethod} from "./PaymentMethods/Offline";
-import {Event} from "../../../../types.ts";
-import {Button, Group, Text} from "@mantine/core";
-import {IconBuildingBank, IconLock, IconWallet} from "@tabler/icons-react";
-import {formatCurrency} from "../../../../utilites/currency.ts";
-import {t, Trans} from "@lingui/macro";
-import {useGetOrderPublic} from "../../../../queries/useGetOrderPublic.ts";
+import React, { useState } from "react";
+import { useNavigate, useParams } from "react-router";
+import { useGetEventPublic } from "../../../../queries/useGetEventPublic.ts";
+import { CheckoutContent } from "../../../layouts/Checkout/CheckoutContent";
+import { StripePaymentMethod } from "./PaymentMethods/Stripe";
+import { OfflinePaymentMethod } from "./PaymentMethods/Offline";
+import { Event } from "../../../../types.ts";
+import { Button, Group, Text } from "@mantine/core";
+import { IconBuildingBank, IconLock, IconWallet } from "@tabler/icons-react";
+import { formatCurrency } from "../../../../utilites/currency.ts";
+import { t, Trans } from "@lingui/macro";
+import { useGetOrderPublic } from "../../../../queries/useGetOrderPublic.ts";
 import {
     useTransitionOrderToOfflinePaymentPublic
 } from "../../../../mutations/useTransitionOrderToOfflinePaymentPublic.ts";
-import {Card} from "../../../common/Card";
-import {InlineOrderSummary} from "../../../common/InlineOrderSummary";
-import {showError} from "../../../../utilites/notifications.tsx";
-import {getConfig} from "../../../../utilites/config.ts";
+import { Card } from "../../../common/Card";
+import { InlineOrderSummary } from "../../../common/InlineOrderSummary";
+import { showError } from "../../../../utilites/notifications.tsx";
+import { getConfig } from "../../../../utilites/config.ts";
 import classes from "./Payment.module.scss";
-import {trackEvent, AnalyticsEvents} from "../../../../utilites/analytics.ts";
+import { trackEvent, AnalyticsEvents } from "../../../../utilites/analytics.ts";
 import { RazorpayPaymentMethod } from "./PaymentMethods/Razorpay/index.tsx";
 
 const Payment = () => {
     const navigate = useNavigate();
-    const {eventId, orderShortId} = useParams();
-    const {data: event, isFetched: isEventFetched} = useGetEventPublic(eventId);
-    const {data: order, isFetched: isOrderFetched} = useGetOrderPublic(eventId, orderShortId, ['event']);
+    const { eventId, orderShortId } = useParams();
+    const { data: event, isFetched: isEventFetched } = useGetEventPublic(eventId);
+    const { data: order, isFetched: isOrderFetched } = useGetOrderPublic(eventId, orderShortId, ['event']);
     const isLoading = !isOrderFetched;
     const [isPaymentLoading, setIsPaymentLoading] = useState(false);
     const [activePaymentMethod, setActivePaymentMethod] = useState<'STRIPE' | 'RAZORPAY' | 'OFFLINE' | null>(null);
@@ -98,23 +98,23 @@ const Payment = () => {
         <>
             <CheckoutContent>
                 {(event && order) && (
-                    <InlineOrderSummary event={event} order={order} defaultExpanded={false}/>
+                    <InlineOrderSummary event={event} order={order} defaultExpanded={false} />
                 )}
                 {isStripeEnabled && (
-                    <div style={{display: activePaymentMethod === 'STRIPE' ? 'block' : 'none'}}>
-                        <StripePaymentMethod enabled={true} setSubmitHandler={setSubmitHandler}/>
+                    <div style={{ display: activePaymentMethod === 'STRIPE' ? 'block' : 'none' }}>
+                        <StripePaymentMethod enabled={true} setSubmitHandler={setSubmitHandler} />
                     </div>
                 )}
 
                 {isRazorpayEnabled && (
-                    <div style={{display: activePaymentMethod === 'RAZORPAY' ? 'block' : 'none'}}>
-                        <RazorpayPaymentMethod enabled={true} setSubmitHandler={setSubmitHandler}/>
+                    <div style={{ display: activePaymentMethod === 'RAZORPAY' ? 'block' : 'none' }}>
+                        <RazorpayPaymentMethod enabled={true} setSubmitHandler={setSubmitHandler} />
                     </div>
                 )}
 
                 {isOfflineEnabled && (
-                    <div style={{display: activePaymentMethod === 'OFFLINE' ? 'block' : 'none'}}>
-                        <OfflinePaymentMethod event={event as Event}/>
+                    <div style={{ display: activePaymentMethod === 'OFFLINE' ? 'block' : 'none' }}>
+                        <OfflinePaymentMethod event={event as Event} />
                     </div>
                 )}
 
@@ -124,14 +124,24 @@ const Payment = () => {
                             {t`Payment method`}
                         </Text>
                         <div className={classes.paymentMethodTabs}>
+                            {isStripeEnabled && (
+                                <button
+                                    type="button"
+                                    className={`${classes.paymentMethodTab} ${activePaymentMethod === 'STRIPE' ? classes.active : ''}`}
+                                    onClick={() => setActivePaymentMethod('STRIPE')}
+                                >
+                                    <IconWallet size={18} />
+                                    <span>{t`Stripe`}</span>
+                                </button>
+                            )}
                             {(isStripeEnabled || isRazorpayEnabled) && (
                                 <button
                                     type="button"
-                                    className={`${classes.paymentMethodTab} ${activePaymentMethod === 'STRIPE' || activePaymentMethod === 'RAZORPAY' ? classes.active : ''}`}
-                                    onClick={() => setActivePaymentMethod(isStripeEnabled ? 'STRIPE' : 'RAZORPAY')}
+                                    className={`${classes.paymentMethodTab} ${activePaymentMethod === 'RAZORPAY' ? classes.active : ''}`}
+                                    onClick={() => setActivePaymentMethod('RAZORPAY')}
                                 >
-                                    <IconWallet size={18}/>
-                                    <span>{t`Online`}</span>
+                                    <IconWallet size={18} />
+                                    <span>{t`Razorpay`}</span>
                                 </button>
                             )}
                             <button
@@ -139,7 +149,7 @@ const Payment = () => {
                                 className={`${classes.paymentMethodTab} ${activePaymentMethod === 'OFFLINE' ? classes.active : ''}`}
                                 onClick={() => setActivePaymentMethod('OFFLINE')}
                             >
-                                <IconBuildingBank size={18}/>
+                                <IconBuildingBank size={18} />
                                 <span>{t`Offline`}</span>
                             </button>
                         </div>
@@ -154,7 +164,7 @@ const Payment = () => {
                     >
                         {order?.is_payment_required ? (
                             <Group gap={8} wrap="nowrap">
-                                <IconLock size={16}/>
+                                <IconLock size={16} />
                                 <Text fw={600}>{t`Pay`} {formatCurrency(order.total_gross, order.currency)}</Text>
                             </Group>
                         ) : t`Complete Payment`}

From aa9c5e9690ffd80f9d303c1fbd965d4a6befe87f Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Mon, 23 Feb 2026 08:24:59 +0000
Subject: [PATCH 16/41] move DTO

---
 .../Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php      | 2 +-
 .../Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php     | 2 +-
 .../Payment/Razorpay/DTOs}/VerifyRazorpayPaymentDTO.php         | 2 +-
 .../Payment/Razorpay/RazorpayPaymentVerificationService.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename backend/app/Services/{Application/Handlers/Order/DTO => Domain/Payment/Razorpay/DTOs}/VerifyRazorpayPaymentDTO.php (84%)

diff --git a/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php b/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
index cd9ff926b..268572053 100644
--- a/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
+++ b/backend/app/Http/Actions/Orders/Payment/Razorpay/VerifyRazorpayPaymentActionPublic.php
@@ -5,8 +5,8 @@
 use HiEvents\Exceptions\Razorpay\PaymentVerificationFailedException;
 use HiEvents\Http\Actions\BaseAction;
 use HiEvents\Http\Request\Order\VerifyRazorpayPaymentRequest;
-use HiEvents\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
 use HiEvents\Services\Application\Handlers\Order\Payment\Razorpay\VerifyRazorpayPaymentHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\VerifyRazorpayPaymentDTO;
 use Illuminate\Http\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
index 7469243c9..ccc244a73 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
@@ -20,8 +20,8 @@
 use HiEvents\Repository\Interfaces\AttendeeRepositoryInterface;
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
-use HiEvents\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
 use HiEvents\Services\Domain\Order\OrderApplicationFeeService;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\VerifyRazorpayPaymentDTO;
 use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentVerificationService;
 use HiEvents\Services\Domain\Product\ProductQuantityUpdateService;
 use HiEvents\Services\Infrastructure\DomainEvents\DomainEventDispatcherService;
diff --git a/backend/app/Services/Application/Handlers/Order/DTO/VerifyRazorpayPaymentDTO.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/VerifyRazorpayPaymentDTO.php
similarity index 84%
rename from backend/app/Services/Application/Handlers/Order/DTO/VerifyRazorpayPaymentDTO.php
rename to backend/app/Services/Domain/Payment/Razorpay/DTOs/VerifyRazorpayPaymentDTO.php
index 3a9bb8573..89d90fb95 100644
--- a/backend/app/Services/Application/Handlers/Order/DTO/VerifyRazorpayPaymentDTO.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/VerifyRazorpayPaymentDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HiEvents\Services\Application\Handlers\Order\DTO;
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
 
 use HiEvents\DataTransferObjects\BaseDataObject;
 
diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
index 9763ec2c6..f86808d85 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
@@ -3,7 +3,7 @@
 namespace HiEvents\Services\Domain\Payment\Razorpay;
 
 use HiEvents\Exceptions\Razorpay\InvalidSignatureException;
-use HiEvents\Services\Application\Handlers\Order\DTO\VerifyRazorpayPaymentDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\VerifyRazorpayPaymentDTO;
 use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
 use Illuminate\Config\Repository;
 use Psr\Log\LoggerInterface;

From 9482c9570e4dc0240b1255b3df91a864cc7818e3 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Mon, 23 Feb 2026 12:12:29 +0000
Subject: [PATCH 17/41] webhook handler for order.paid implemented

---
 .../RazorpayIncomingWebhookAction.php         |   1 -
 backend/app/Models/RazorpayOrder.php          |   8 +-
 .../Razorpay/RazorpayWebhookHandler.php       | 119 +++++++-----
 .../Razorpay/DTOs/RazorpayErrorDTO.php        |  17 ++
 .../Razorpay/DTOs/RazorpayOrderDTO.php        |  21 +++
 .../DTOs/RazorpayOrderPaidEventDTO.php        |  17 ++
 .../DTOs/RazorpayOrderPaidPayload.php         |  16 ++
 .../Razorpay/DTOs/RazorpayPaymentDTO.php      |  28 +++
 .../Razorpay/DTOs/RazorpayPaymentEventDTO.php |  17 ++
 .../Razorpay/DTOs/RazorpayPaymentPayload.php  |  15 ++
 .../Razorpay/DTOs/RazorpayWebhookEnvelope.php |  46 +++++
 .../RazorpayOrderPaidHandler.php              | 175 ++++++++++++++++++
 .../RazorpayPaymentAuthorizedHandler.php      |  70 +++++++
 .../RazorpayPaymentCapturedHandler.php        | 100 +++++-----
 .../RazorpayPaymentFailedHandler.php          |  83 +++++++++
 ...14_074419_create_razorpay_orders_table.php |  18 +-
 16 files changed, 641 insertions(+), 110 deletions(-)
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayErrorDTO.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayOrderDTO.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayOrderPaidEventDTO.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayOrderPaidPayload.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayPaymentDTO.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayPaymentEventDTO.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayPaymentPayload.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayWebhookEnvelope.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandler.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandler.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandler.php

diff --git a/backend/app/Http/Actions/Common/Webhooks/RazorpayIncomingWebhookAction.php b/backend/app/Http/Actions/Common/Webhooks/RazorpayIncomingWebhookAction.php
index b2850ef58..8744cb06f 100644
--- a/backend/app/Http/Actions/Common/Webhooks/RazorpayIncomingWebhookAction.php
+++ b/backend/app/Http/Actions/Common/Webhooks/RazorpayIncomingWebhookAction.php
@@ -3,7 +3,6 @@
 namespace HiEvents\Http\Actions\Common\Webhooks;
 
 use HiEvents\Http\Actions\BaseAction;
-use HiEvents\Http\ResponseCodes;
 use HiEvents\Services\Application\Handlers\Order\Payment\Razorpay\RazorpayWebhookHandler;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
diff --git a/backend/app/Models/RazorpayOrder.php b/backend/app/Models/RazorpayOrder.php
index 923a19976..dc50f141d 100644
--- a/backend/app/Models/RazorpayOrder.php
+++ b/backend/app/Models/RazorpayOrder.php
@@ -2,7 +2,6 @@
 
 namespace HiEvents\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class RazorpayOrder extends BaseModel
@@ -14,14 +13,19 @@ class RazorpayOrder extends BaseModel
         'razorpay_order_id',
         'razorpay_payment_id',
         'razorpay_signature',
+        'method',
+        'fee',
+        'tax',
         'amount',
         'currency',
         'receipt',
-        'payment_status',
+        'status',
     ];
 
     protected $casts = [
         'amount' => 'integer',
+        'fee' => 'integer',
+        'tax' => 'integer',
         'created_at' => 'datetime',
         'updated_at' => 'datetime',
     ];
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
index 99b601b11..9e7de965f 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
@@ -2,112 +2,129 @@
 
 namespace HiEvents\Services\Application\Handlers\Order\Payment\Razorpay;
 
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayWebhookEnvelope;
 use HiEvents\Exceptions\Razorpay\InvalidSignatureException;
 use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentVerificationService;
 use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentCapturedHandler;
-use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayRefundHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayOrderPaidHandler;
+// use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayRefundHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentFailedHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentAuthorizedHandler;
 use Illuminate\Cache\Repository;
 use Illuminate\Log\Logger;
 use JsonException;
 use Throwable;
+use Spatie\LaravelData\Exceptions\CannotCreateData;
 
 class RazorpayWebhookHandler
 {
     private static array $validEvents = [
         'payment.captured',
+        'order.paid',
         'refund.processed',
         'payment.failed',
-        'order.paid',
+        'payment.authorized',
     ];
 
     public function __construct(
         private readonly RazorpayPaymentCapturedHandler $paymentCapturedHandler,
-        private readonly RazorpayRefundHandler          $refundHandler,
+        private readonly RazorpayOrderPaidHandler $orderPaidHandler,
+        // private readonly RazorpayRefundHandler               $refundHandler,
+        private readonly RazorpayPaymentFailedHandler $paymentFailedHandler,
+        private readonly RazorpayPaymentAuthorizedHandler $paymentAuthorizedHandler,
         private readonly RazorpayPaymentVerificationService $razorpayPaymentService,
-        private readonly Logger                         $logger,
-        private readonly Repository                     $cache,
+        private readonly Logger $logger,
+        private readonly Repository $cache,
     ) {
     }
 
     /**
      * @throws InvalidSignatureException
      * @throws JsonException
+     * @throws CannotCreateData
      * @throws Throwable
      */
     public function handle(string $payload, string $signature): void
     {
         try {
-            // Verify webhook signature
+            // 1. Verify webhook signature
             if (!$this->razorpayPaymentService->verifyWebhookSignature($payload, $signature)) {
                 throw new InvalidSignatureException(__('Invalid Razorpay webhook signature'));
             }
 
+            // 2. Decode JSON and create envelope DTO
             $data = json_decode($payload, true, 512, JSON_THROW_ON_ERROR);
-            $event = $data['event'] ?? null;
-            $eventId = $data['id'] ?? null;
+            $envelope = RazorpayWebhookEnvelope::fromArray($data);
+            $event = $envelope->event;
 
-            if (!$event || !$eventId) {
-                $this->logger->error('Invalid Razorpay webhook payload', ['payload' => $payload]);
+            // 3. Validate event type
+            if (!in_array($event, self::$validEvents, true)) {
+                $this->logger->debug('Unsupported webhook event', ['event' => $event]);
                 return;
             }
 
-            if (!in_array($event, self::$validEvents, true)) {
-                $this->logger->debug(__('Received a :event Razorpay event, which has no handler', [
-                    'event' => $event,
-                ]), [
-                    'event_id' => $eventId,
-                    'event_type' => $event,
-                ]);
+            // 4. Extract unique event ID for idempotency
+            $eventId = match ($event) {
+                'payment.captured', 'payment.failed', 'payment.authorized' => $envelope->payload->payment->id,
+                'order.paid' => $envelope->payload->order->id,
+                // 'refund.processed' => $envelope->payload->refund->id,
+                default => null,
+            };
 
+            if (!$eventId) {
+                $this->logger->error('Could not extract event ID from payload', ['event' => $event]);
                 return;
             }
 
+            // 5. Idempotency check
             if ($this->hasEventBeenHandled($eventId)) {
                 $this->logger->debug('Razorpay webhook event already handled', [
                     'event_id' => $eventId,
                     'type' => $event,
-                    'data' => $data,
                 ]);
-
                 return;
             }
 
-            $this->logger->debug('Razorpay webhook received: ' . $event, $data);
-
-            switch ($event) {
-                case 'payment.captured':
-                case 'order.paid':
-                    $this->paymentCapturedHandler->handleEvent($data['payload']['payment']['entity']);
-                    break;
-                case 'refund.processed':
-                    $this->refundHandler->handleEvent($data['payload']['refund']['entity']);
-                    break;
-                case 'payment.failed':
-                    // Handle failed payments if needed
-                    $this->logger->info('Razorpay payment failed', $data['payload']['payment']['entity']);
-                    break;
-            }
+            $this->logger->debug('Processing Razorpay webhook', [
+                'event' => $event,
+                'event_id' => $eventId,
+            ]);
 
+            // 6. Route to the appropriate handler based on event type
+            match ($event) {
+                'payment.captured' => $this->paymentCapturedHandler->handleEvent($envelope->payload),
+                'order.paid' => $this->orderPaidHandler->handleEvent($envelope->payload),
+                // 'refund.processed' => $this->refundHandler->handleEvent($envelope->payload),
+                'payment.failed' => $this->paymentFailedHandler->handleEvent($envelope->payload),
+                'payment.authorized' => $this->paymentAuthorizedHandler->handleEvent($envelope->payload),
+                default => $this->logger->debug('No handler for event', ['event' => $event]),
+            };
+
+            // 7. Mark event as handled
             $this->markEventAsHandled($eventId);
-        } catch (InvalidSignatureException $exception) {
-            $this->logger->error(
-                'Unable to verify Razorpay webhook signature: ' . $exception->getMessage(), [
-                    'payload' => $payload,
-                ]
-            );
-            throw $exception;
-        } catch (JsonException $exception) {
-            $this->logger->error(
-                'Invalid JSON in Razorpay webhook payload: ' . $exception->getMessage(), [
-                    'payload' => $payload,
-                ]
-            );
-            throw $exception;
-        } catch (Throwable $exception) {
-            $this->logger->error('Unhandled Razorpay webhook error: ' . $exception->getMessage(), [
+        } catch (InvalidSignatureException $e) {
+            $this->logger->error('Signature verification failed', [
+                'error' => $e->getMessage(),
+            ]);
+            throw $e;
+        } catch (JsonException $e) {
+            $this->logger->error('Invalid JSON payload', [
+                'error' => $e->getMessage(),
                 'payload' => $payload,
             ]);
-            throw $exception;
+            throw $e;
+        } catch (CannotCreateData $e) {
+            $this->logger->error('Failed to create DTO from webhook payload', [
+                'error' => $e->getMessage(),
+                'payload' => $payload,
+            ]);
+            throw $e;
+        } catch (Throwable $e) {
+            $this->logger->error('Unhandled exception processing webhook', [
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString(),
+            ]);
+            throw $e;
         }
     }
 
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayErrorDTO.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayErrorDTO.php
new file mode 100644
index 000000000..751271667
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayErrorDTO.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
+
+use HiEvents\DataTransferObjects\BaseDataObject;
+
+class RazorpayErrorDTO extends BaseDataObject
+{
+    public function __construct(
+        public readonly ?string $code,
+        public readonly ?string $description,
+        public readonly ?string $source,
+        public readonly ?string $step,
+        public readonly ?string $reason,
+    ) {
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayOrderDTO.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayOrderDTO.php
new file mode 100644
index 000000000..078796b56
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayOrderDTO.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
+
+use HiEvents\DataTransferObjects\BaseDataObject;
+
+class RazorpayOrderDTO extends BaseDataObject
+{
+    public function __construct(
+        public readonly string $id,
+        public readonly string $entity,
+        public readonly float $amount,
+        public readonly float $amount_paid,
+        public readonly float $amount_due,
+        public readonly string $currency,
+        public readonly string $status,
+        public readonly ?string $receipt,
+        public readonly ?array $notes,
+        public readonly int $created_at
+    ) {}
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayOrderPaidEventDTO.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayOrderPaidEventDTO.php
new file mode 100644
index 000000000..8291dda7a
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayOrderPaidEventDTO.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
+
+use HiEvents\DataTransferObjects\BaseDataObject;
+
+class RazorpayOrderPaidEventDTO extends BaseDataObject
+{
+    public function __construct(
+        public readonly string $entity,
+        public readonly string $account_id,
+        public readonly string $event,
+        public readonly RazorpayOrderDTO $order,
+        public readonly RazorpayPaymentDTO $payment,
+        public readonly int $created_at
+    ) {}
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayOrderPaidPayload.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayOrderPaidPayload.php
new file mode 100644
index 000000000..f9b558dec
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayOrderPaidPayload.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
+
+use HiEvents\DataTransferObjects\BaseDataObject;
+
+/**
+ * Payload specifically for the order.paid event
+ */
+class RazorpayOrderPaidPayload extends BaseDataObject
+{
+    public function __construct(
+        public readonly RazorpayOrderDTO $order,
+        public readonly RazorpayPaymentDTO $payment,
+    ) {}
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayPaymentDTO.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayPaymentDTO.php
new file mode 100644
index 000000000..6d786fad3
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayPaymentDTO.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
+
+use HiEvents\DataTransferObjects\BaseDataObject;
+
+class RazorpayPaymentDTO extends BaseDataObject
+{
+    public function __construct(
+        public readonly string $id,
+        public readonly string $entity,
+        public readonly float $amount,
+        public readonly string $currency,
+        public readonly string $status,
+        public readonly ?string $order_id,
+        public readonly ?string $method,
+        public readonly ?int $fee,
+        public readonly ?int $tax,
+        public readonly ?string $description,
+        public readonly ?array $notes,
+        public readonly ?string $vpa,
+        public readonly ?string $email,
+        public readonly ?string $contact,
+        public readonly ?int $created_at,
+        public readonly ?RazorpayErrorDTO $error, 
+    ) {
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayPaymentEventDTO.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayPaymentEventDTO.php
new file mode 100644
index 000000000..3c7fc77e4
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayPaymentEventDTO.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
+
+use HiEvents\DataTransferObjects\BaseDataObject;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentDTO;
+
+class RazorpayPaymentEventDTO extends BaseDataObject
+{
+    public function __construct(
+        public readonly string $entity,
+        public readonly string $account_id,
+        public readonly string $event,
+        public readonly RazorpayPaymentDTO $payment,
+        public readonly int $created_at
+    ) {}
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayPaymentPayload.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayPaymentPayload.php
new file mode 100644
index 000000000..301cf09f4
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayPaymentPayload.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
+
+use HiEvents\DataTransferObjects\BaseDataObject;
+
+/**
+ * Payload for payment.* events (captured, failed, authorized)
+ */
+class RazorpayPaymentPayload extends BaseDataObject
+{
+    public function __construct(
+        public readonly RazorpayPaymentDTO $payment,
+    ) {}
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayWebhookEnvelope.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayWebhookEnvelope.php
new file mode 100644
index 000000000..c8db04260
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayWebhookEnvelope.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
+
+use Spatie\LaravelData\Data;
+use InvalidArgumentException;
+
+class RazorpayWebhookEnvelope extends Data
+{
+    public function __construct(
+        public readonly string $entity,
+        public readonly string $account_id,
+        public readonly string $event,
+        public readonly RazorpayOrderPaidPayload|RazorpayPaymentPayload $payload,
+        public readonly int $created_at,
+    ) {
+    }
+
+    public static function fromArray(array $data): self
+    {
+        $event = $data['event'];
+        $payloadData = $data['payload'];
+
+        $payload = match ($event) {
+            'order.paid' => RazorpayOrderPaidPayload::from([
+                'order' => $payloadData['order']['entity'],
+                'payment' => $payloadData['payment']['entity'],
+            ]),
+            'payment.captured', 'payment.failed', 'payment.authorized' => RazorpayPaymentPayload::from([
+                'payment' => $payloadData['payment']['entity'],
+            ]),
+            // 'refund.processed' => RazorpayRefundPayload::from([
+            //     'refund' => $payloadData['refund']['entity'],
+            // ]),
+            default => throw new InvalidArgumentException("Unknown event: {$event}"),
+        };
+
+        return new self(
+            entity: $data['entity'],
+            account_id: $data['account_id'],
+            event: $event,
+            payload: $payload,
+            created_at: $data['created_at'],
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandler.php
new file mode 100644
index 000000000..93725ed31
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandler.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\EventHandlers;
+
+use HiEvents\DomainObjects\Enums\PaymentProviders;
+use HiEvents\DomainObjects\Generated\OrderDomainObjectAbstract;
+use HiEvents\DomainObjects\OrderDomainObject;
+use HiEvents\DomainObjects\OrderItemDomainObject;
+use HiEvents\DomainObjects\Status\AttendeeStatus;
+use HiEvents\DomainObjects\Status\OrderPaymentStatus;
+use HiEvents\DomainObjects\Status\OrderStatus;
+use HiEvents\Events\OrderStatusChangedEvent;
+use HiEvents\Repository\Eloquent\Value\Relationship;
+use HiEvents\Repository\Interfaces\AffiliateRepositoryInterface;
+use HiEvents\Repository\Interfaces\AttendeeRepositoryInterface;
+use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\Order\OrderApplicationFeeService;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayOrderPaidEventDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayOrderPaidPayload;
+use HiEvents\Services\Domain\Product\ProductQuantityUpdateService;
+use HiEvents\Services\Infrastructure\DomainEvents\DomainEventDispatcherService;
+use HiEvents\Services\Infrastructure\DomainEvents\Enums\DomainEventType;
+use HiEvents\Services\Infrastructure\DomainEvents\Events\OrderEvent;
+use Illuminate\Cache\Repository;
+use Illuminate\Database\DatabaseManager;
+use Illuminate\Log\Logger;
+use Throwable;
+
+class RazorpayOrderPaidHandler
+{
+    public function __construct(
+        private readonly OrderRepositoryInterface $orderRepository,
+        private readonly RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
+        private readonly AffiliateRepositoryInterface $affiliateRepository,
+        private readonly ProductQuantityUpdateService $quantityUpdateService,
+        private readonly AttendeeRepositoryInterface $attendeeRepository,
+        private readonly DatabaseManager $databaseManager,
+        private readonly Logger $logger,
+        private readonly Repository $cache,
+        private readonly DomainEventDispatcherService $domainEventDispatcherService,
+        private readonly OrderApplicationFeeService $orderApplicationFeeService,
+    ) {
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function handleEvent(RazorpayOrderPaidPayload $event): void
+    {
+        $orderEntity = $event->order;
+        $paymentEntity = $event->payment;
+
+        // Use the Razorpay order ID as the idempotency key (or payment ID)
+        $idempotencyKey = 'razorpay_order_paid_' . $orderEntity->id;
+
+        if ($this->cache->has($idempotencyKey)) {
+            $this->logger->info('Razorpay order.paid event already handled', [
+                'razorpay_order_id' => $orderEntity->id,
+                'razorpay_payment_id' => $paymentEntity->id,
+            ]);
+            return;
+        }
+
+        $this->databaseManager->transaction(function () use ($orderEntity, $paymentEntity) {
+            // Find local razorpay order record by the Razorpay order ID
+            $razorpayOrder = $this->razorpayOrdersRepository->findByRazorpayOrderId($orderEntity->id);
+
+            if (!$razorpayOrder) {
+                $this->logger->warning('Razorpay order not found for order.paid webhook', [
+                    'razorpay_order_id' => $orderEntity->id,
+                ]);
+                return;
+            }
+
+            $localOrderId = $razorpayOrder->getOrderId();
+
+            // Load the full local order with items
+            $order = $this->orderRepository
+                ->loadRelation(new Relationship(OrderItemDomainObject::class))
+                ->findById($localOrderId);
+
+            if (!$order) {
+                $this->logger->warning('Local order not found for order.paid webhook', [
+                    'local_order_id' => $localOrderId,
+                    'razorpay_order_id' => $orderEntity->id,
+                ]);
+                return;
+            }
+
+            // Update the razorpay_orders record with payment details (all amounts in paise)
+            $this->razorpayOrdersRepository->updateByOrderId($localOrderId, [
+                'razorpay_payment_id' => $paymentEntity->id,
+                'status' => $paymentEntity->status,
+                'method' => $paymentEntity->method,
+                'amount' => $paymentEntity->amount,
+                'currency' => $paymentEntity->currency,
+                'fee' => $paymentEntity->fee,
+                'tax' => $paymentEntity->tax,
+            ]);
+
+            // If order not already marked as paid, update its status and related entities
+            if ($order->getPaymentStatus() !== OrderPaymentStatus::PAYMENT_RECEIVED->name) {
+                $updatedOrder = $this->updateOrderStatuses($order);
+
+                $this->updateAttendeeStatuses($updatedOrder);
+                $this->quantityUpdateService->updateQuantitiesFromOrder($updatedOrder);
+                $this->updateAffiliateSales($updatedOrder);
+
+                OrderStatusChangedEvent::dispatch($updatedOrder);
+
+                $this->domainEventDispatcherService->dispatch(
+                    new OrderEvent(
+                        type: DomainEventType::ORDER_CREATED,
+                        orderId: $updatedOrder->getId()
+                    )
+                );
+            }
+
+            // Store application fee (fee is in paise)
+            $this->orderApplicationFeeService->createOrderApplicationFee(
+                orderId: $order->getId(),
+                applicationFeeAmountMinorUnit: $paymentEntity->fee ?? 0,
+                orderApplicationFeeStatus: \HiEvents\DomainObjects\Status\OrderApplicationFeeStatus::PAID,
+                paymentMethod: PaymentProviders::RAZORPAY,
+                currency: $paymentEntity->currency,
+            );
+
+            $this->logger->info('Razorpay order.paid webhook processed successfully', [
+                'razorpay_order_id' => $orderEntity->id,
+                'razorpay_payment_id' => $paymentEntity->id,
+                'local_order_id' => $order->getId(),
+            ]);
+        });
+
+        // Mark as handled after successful transaction
+        $this->cache->put($idempotencyKey, true, now()->addHours(24));
+    }
+
+    private function updateOrderStatuses(OrderDomainObject $order): OrderDomainObject
+    {
+        return $this->orderRepository
+            ->updateFromArray($order->getId(), [
+                OrderDomainObjectAbstract::PAYMENT_STATUS => OrderPaymentStatus::PAYMENT_RECEIVED->name,
+                OrderDomainObjectAbstract::STATUS => OrderStatus::COMPLETED->name,
+                OrderDomainObjectAbstract::PAYMENT_PROVIDER => PaymentProviders::RAZORPAY->value,
+            ]);
+    }
+
+    private function updateAttendeeStatuses(OrderDomainObject $order): void
+    {
+        $this->attendeeRepository->updateWhere(
+            attributes: [
+                'status' => AttendeeStatus::ACTIVE->name,
+            ],
+            where: [
+                'order_id' => $order->getId(),
+                'status' => AttendeeStatus::AWAITING_PAYMENT->name,
+            ],
+        );
+    }
+
+    private function updateAffiliateSales(OrderDomainObject $order): void
+    {
+        $orderArray = $order->toArray();
+        $affiliateId = $orderArray['affiliate_id'] ?? null;
+
+        if ($affiliateId) {
+            $this->affiliateRepository->incrementSales(
+                affiliateId: $affiliateId,
+                amount: $order->getTotalGross()
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandler.php
new file mode 100644
index 000000000..351b701aa
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandler.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\EventHandlers;
+
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentEventDTO;
+use Illuminate\Cache\Repository;
+use Illuminate\Database\DatabaseManager;
+use Illuminate\Log\Logger;
+use Throwable;
+
+class RazorpayPaymentAuthorizedHandler
+{
+    public function __construct(
+        private readonly RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
+        private readonly DatabaseManager $databaseManager,
+        private readonly Logger $logger,
+        private readonly Repository $cache,
+    ) {
+    }
+
+    /**
+     * @throws Throwable
+     */
+    // TODO: Change param type to accept payload
+    public function handleEvent(RazorpayPaymentEventDTO $event): void
+    {
+        $paymentEntity = $event->payment;
+        $idempotencyKey = 'razorpay_authorized_' . $paymentEntity->id;
+
+        if ($this->cache->has($idempotencyKey)) {
+            $this->logger->info('Razorpay payment.authorized event already handled', [
+                'payment_id' => $paymentEntity->id,
+            ]);
+            return;
+        }
+
+        $this->databaseManager->transaction(function () use ($paymentEntity) {
+            // Try to find by payment ID first, then by order ID
+            $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($paymentEntity->id)
+                ?? $this->razorpayOrdersRepository->findByOrderId($paymentEntity->order_id);
+
+            if (!$razorpayOrder) {
+                $this->logger->warning('Razorpay order not found for payment.authorized', [
+                    'payment_id' => $paymentEntity->id,
+                    'order_id' => $paymentEntity->order_id,
+                ]);
+                return;
+            }
+
+            // Update record with payment details (status will be 'authorized')
+            $this->razorpayOrdersRepository->updateByOrderId($razorpayOrder->getOrderId(), [
+                'razorpay_payment_id' => $paymentEntity->id,
+                'status' => $paymentEntity->status, // 'authorized'
+                'method' => $paymentEntity->method,
+                'amount' => $paymentEntity->amount,
+                'currency' => $paymentEntity->currency,
+                'fee' => $paymentEntity->fee,
+                'tax' => $paymentEntity->tax,
+            ]);
+
+            $this->logger->info('Razorpay payment authorized recorded', [
+                'payment_id' => $paymentEntity->id,
+                'order_id' => $razorpayOrder->getOrderId(),
+            ]);
+        });
+
+        $this->cache->put($idempotencyKey, true, now()->addHours(24));
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php
index a3df5a3da..74b82275f 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php
@@ -16,6 +16,7 @@
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
 use HiEvents\Services\Domain\Order\OrderApplicationFeeService;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentEventDTO;
 use HiEvents\Services\Domain\Product\ProductQuantityUpdateService;
 use HiEvents\Services\Infrastructure\DomainEvents\DomainEventDispatcherService;
 use HiEvents\Services\Infrastructure\DomainEvents\Enums\DomainEventType;
@@ -44,31 +45,34 @@ public function __construct(
     /**
      * @throws Throwable
      */
-    public function handleEvent(array $paymentData): void
+    // TODO: Change param type to accept payload
+    public function handleEvent(RazorpayPaymentEventDTO $event): void
     {
-        if ($this->isPaymentAlreadyHandled($paymentData['id'])) {
+        $paymentEntity = $event->payment;
+
+        // Idempotency check: avoid processing the same payment twice
+        if ($this->isPaymentAlreadyHandled($paymentEntity->id)) {
             $this->logger->info('Razorpay payment already handled via webhook', [
-                'razorpay_payment_id' => $paymentData['id'],
+                'razorpay_payment_id' => $paymentEntity->id,
             ]);
             return;
         }
 
-        $this->databaseManager->transaction(function () use ($paymentData) {
-            // Find by razorpay_payment_id (stored in razorpay_order table)
-            $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($paymentData['id']);
+        $this->databaseManager->transaction(function () use ($paymentEntity) {
+            // Find the local razorpay order record by the Razorpay payment ID
+            $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($paymentEntity->id);
 
             if (!$razorpayOrder) {
                 $this->logger->warning('Razorpay order not found for webhook', [
-                    'razorpay_payment_id' => $paymentData['id'],
+                    'razorpay_payment_id' => $paymentEntity->id,
                 ]);
                 return;
             }
 
-            // Get the order ID from the razorpay order object
-            // Try toArray() method first, then check for getters
+            // Extract the local order ID from the razorpay order record
             $razorpayOrderArray = $razorpayOrder->toArray();
             $orderId = $razorpayOrderArray['order_id'] ?? null;
-            
+
             if (!$orderId) {
                 $this->logger->error('Could not get order ID from Razorpay order', [
                     'razorpay_order' => $razorpayOrderArray,
@@ -76,44 +80,43 @@ public function handleEvent(array $paymentData): void
                 return;
             }
 
-            // Load the order with items
+            // Load the full order with its items
             $order = $this->orderRepository
                 ->loadRelation(new Relationship(OrderItemDomainObject::class))
                 ->findById($orderId);
 
             if (!$order) {
                 $this->logger->warning('Order not found for Razorpay payment', [
-                    'razorpay_payment_id' => $paymentData['id'],
+                    'razorpay_payment_id' => $paymentEntity->id,
                     'order_id' => $orderId,
                 ]);
                 return;
             }
 
-            // Update Razorpay order info with webhook data
+            // Update the razorpay_orders record with webhook data (all amounts in paise)
             $this->razorpayOrdersRepository->updateByOrderId($orderId, [
-                'razorpay_payment_id' => $paymentData['id'],
-                'status' => $paymentData['status'],
-                'method' => $paymentData['method'],
-                'amount' => $paymentData['amount'] / 100, // Convert from paise to rupees
-                'currency' => $paymentData['currency'],
-                'fee' => $paymentData['fee'] ?? 0,
-                'tax' => $paymentData['tax'] ?? 0,
+                'razorpay_payment_id' => $paymentEntity->id,
+                'status'  => $paymentEntity->status,
+                'method'  => $paymentEntity->method,
+                'amount'  => $paymentEntity->amount,
+                'currency' => $paymentEntity->currency,
+                'fee'     => $paymentEntity->fee,
+                'tax'     => $paymentEntity->tax,
             ]);
 
-            // Update order if not already completed (in case callback failed)
-            // Get payment status from order array
+            // If the order is not already marked as paid, update its status and related entities
             $orderArray = $order->toArray();
-            $paymentStatus = $orderArray['payment_status'] ?? null;
-            
-            if ($paymentStatus !== OrderPaymentStatus::PAYMENT_RECEIVED->name) {
+            $currentPaymentStatus = $orderArray['payment_status'] ?? null;
+
+            if ($currentPaymentStatus !== OrderPaymentStatus::PAYMENT_RECEIVED->name) {
                 $updatedOrder = $this->updateOrderStatuses($order);
-                
+
                 $this->updateAttendeeStatuses($updatedOrder);
                 $this->quantityUpdateService->updateQuantitiesFromOrder($updatedOrder);
                 $this->updateAffiliateSales($updatedOrder);
-                
+
                 OrderStatusChangedEvent::dispatch($updatedOrder);
-                
+
                 $this->domainEventDispatcherService->dispatch(
                     new OrderEvent(
                         type: DomainEventType::ORDER_CREATED,
@@ -122,10 +125,17 @@ public function handleEvent(array $paymentData): void
                 );
             }
 
-            // Store application fee
-            $this->storeApplicationFeePayment($order, $paymentData);
-            
-            $this->markPaymentAsHandled($paymentData['id'], $order);
+            // Store the application fee (fee is already in paise)
+            $this->orderApplicationFeeService->createOrderApplicationFee(
+                orderId: $order->getId(),
+                applicationFeeAmountMinorUnit: $paymentEntity->fee ?? 0,
+                orderApplicationFeeStatus: \HiEvents\DomainObjects\Status\OrderApplicationFeeStatus::PAID,
+                paymentMethod: PaymentProviders::RAZORPAY,
+                currency: $paymentEntity->currency,
+            );
+
+            // Final idempotency marker
+            $this->markPaymentAsHandled($paymentEntity->id, $order);
         });
     }
 
@@ -134,7 +144,7 @@ private function updateOrderStatuses(OrderDomainObject $order): OrderDomainObjec
         return $this->orderRepository
             ->updateFromArray($order->getId(), [
                 OrderDomainObjectAbstract::PAYMENT_STATUS => OrderPaymentStatus::PAYMENT_RECEIVED->name,
-                OrderDomainObjectAbstract::STATUS => OrderStatus::COMPLETED->name,
+                OrderDomainObjectAbstract::STATUS         => OrderStatus::COMPLETED->name,
                 OrderDomainObjectAbstract::PAYMENT_PROVIDER => PaymentProviders::RAZORPAY->value,
             ]);
     }
@@ -147,17 +157,16 @@ private function updateAttendeeStatuses(OrderDomainObject $order): void
             ],
             where: [
                 'order_id' => $order->getId(),
-                'status' => AttendeeStatus::AWAITING_PAYMENT->name,
+                'status'   => AttendeeStatus::AWAITING_PAYMENT->name,
             ],
         );
     }
 
     private function updateAffiliateSales(OrderDomainObject $order): void
     {
-        // Get affiliate ID from order array
         $orderArray = $order->toArray();
         $affiliateId = $orderArray['affiliate_id'] ?? null;
-        
+
         if ($affiliateId) {
             $this->affiliateRepository->incrementSales(
                 affiliateId: $affiliateId,
@@ -166,19 +175,6 @@ private function updateAffiliateSales(OrderDomainObject $order): void
         }
     }
 
-    private function storeApplicationFeePayment(OrderDomainObject $order, array $paymentData): void
-    {
-        $feeAmount = $paymentData['fee'] ?? 0; // Fee in paise
-        
-        $this->orderApplicationFeeService->createOrderApplicationFee(
-            orderId: $order->getId(),
-            applicationFeeAmountMinorUnit: $feeAmount,
-            orderApplicationFeeStatus: \HiEvents\DomainObjects\Status\OrderApplicationFeeStatus::PAID,
-            paymentMethod: PaymentProviders::RAZORPAY,
-            currency: $order->getCurrency(),
-        );
-    }
-
     private function isPaymentAlreadyHandled(string $paymentId): bool
     {
         return $this->cache->has('razorpay_webhook_payment_' . $paymentId);
@@ -188,9 +184,9 @@ private function markPaymentAsHandled(string $paymentId, OrderDomainObject $orde
     {
         $this->logger->info('Razorpay payment captured via webhook', [
             'razorpay_payment_id' => $paymentId,
-            'order_id' => $order->getId(),
-            'amount' => $order->getTotalGross(),
-            'currency' => $order->getCurrency(),
+            'order_id'            => $order->getId(),
+            'amount'              => $order->getTotalGross(),
+            'currency'            => $order->getCurrency(),
         ]);
 
         $this->cache->put('razorpay_webhook_payment_' . $paymentId, true, now()->addHours(24));
diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandler.php
new file mode 100644
index 000000000..0025aeeba
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandler.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\EventHandlers;
+
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentEventDTO;
+use Illuminate\Cache\Repository;
+use Illuminate\Database\DatabaseManager;
+use Illuminate\Log\Logger;
+use Throwable;
+
+class RazorpayPaymentFailedHandler
+{
+    public function __construct(
+        private readonly RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
+        private readonly DatabaseManager $databaseManager,
+        private readonly Logger $logger,
+        private readonly Repository $cache,
+    ) {}
+
+    /**
+     * @throws Throwable
+     */
+    // TODO: Change param type to accept payload
+    public function handleEvent(RazorpayPaymentEventDTO $event): void
+    {
+        $paymentEntity = $event->payment;
+        $idempotencyKey = 'razorpay_failed_' . $paymentEntity->id;
+
+        if ($this->cache->has($idempotencyKey)) {
+            $this->logger->info('Razorpay payment.failed event already handled', [
+                'payment_id' => $paymentEntity->id,
+            ]);
+            return;
+        }
+
+        $this->databaseManager->transaction(function () use ($paymentEntity) {
+            // Try to find by payment ID first (if this payment ID is already stored)
+            // If not found, fallback to order ID (because payment ID might not be stored yet)
+            $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($paymentEntity->id)
+                ?? $this->razorpayOrdersRepository->findByOrderId($paymentEntity->order_id);
+
+            if (!$razorpayOrder) {
+                $this->logger->warning('Razorpay order not found for payment.failed', [
+                    'payment_id' => $paymentEntity->id,
+                    'order_id' => $paymentEntity->order_id,
+                ]);
+                return;
+            }
+
+            // Prepare update data including error details if available
+            $updateData = [
+                'razorpay_payment_id' => $paymentEntity->id,
+                'status' => $paymentEntity->status, // 'failed'
+                'method' => $paymentEntity->method,
+                'amount' => $paymentEntity->amount,
+                'currency' => $paymentEntity->currency,
+                'fee' => $paymentEntity->fee,
+                'tax' => $paymentEntity->tax,
+            ];
+
+            // Add error details if present
+            if ($paymentEntity->error) {
+                $updateData['failure_reason'] = $paymentEntity->error->description;
+                $updateData['error_code'] = $paymentEntity->error->code;
+            }
+
+            $this->razorpayOrdersRepository->updateByOrderId($razorpayOrder->getOrderId(), $updateData);
+
+            // IMPORTANT: Do NOT change the order's payment status to failed.
+            // As per documentation, a failed payment may later be captured.
+            // The order remains in its current state (e.g., awaiting payment).
+
+            $this->logger->info('Razorpay payment failed recorded', [
+                'payment_id' => $paymentEntity->id,
+                'order_id' => $razorpayOrder->getOrderId(),
+                'failure_reason' => $paymentEntity->error?->description,
+            ]);
+        });
+
+        $this->cache->put($idempotencyKey, true, now()->addHours(24));
+    }
+}
\ No newline at end of file
diff --git a/backend/database/migrations/2026_01_14_074419_create_razorpay_orders_table.php b/backend/database/migrations/2026_01_14_074419_create_razorpay_orders_table.php
index ad1671b82..bf4fc008e 100644
--- a/backend/database/migrations/2026_01_14_074419_create_razorpay_orders_table.php
+++ b/backend/database/migrations/2026_01_14_074419_create_razorpay_orders_table.php
@@ -4,8 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      */
@@ -17,13 +16,24 @@ public function up(): void
             $table->string('razorpay_order_id')->unique();
             $table->string('razorpay_payment_id')->nullable();
             $table->string('razorpay_signature')->nullable();
+
+            $table->string('method')->nullable();
+            $table->integer('fee')->nullable()->comment('Fee in paise');
+            $table->integer('tax')->nullable()->comment('Tax in paise');
+
             $table->integer('amount');
             $table->string('currency', 3);
             $table->string('receipt')->nullable();
-            $table->string('payment_status')->default('created');
+
+            $table->string('status')->default('created');
+
+            $table->string('failure_reason')->nullable()->after('tax');
+            $table->string('error_code')->nullable()->after('failure_reason');
+
             $table->timestamps();
-            
+
             $table->index(['order_id']);
+            $table->index('status');
         });
     }
 

From 8f41af1d576848c9d1affd535d90090f4c575035 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 24 Feb 2026 06:59:03 +0000
Subject: [PATCH 18/41] implemented webhook for payment.authorized,
 payment.captured, payment.failed

---
 .../Payment/Razorpay/VerifyRazorpayPaymentHandler.php      | 2 +-
 .../Razorpay/EventHandlers/RazorpayOrderPaidHandler.php    | 1 -
 .../EventHandlers/RazorpayPaymentAuthorizedHandler.php     | 5 ++---
 .../EventHandlers/RazorpayPaymentCapturedHandler.php       | 5 ++---
 .../EventHandlers/RazorpayPaymentFailedHandler.php         | 7 +++----
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
index ccc244a73..49d8d982a 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/VerifyRazorpayPaymentHandler.php
@@ -96,7 +96,7 @@ public function handle(string $orderShortId, VerifyRazorpayPaymentDTO $verifyRaz
             $this->razorpayOrdersRepository->updateByOrderId($order->getId(), [
                 'razorpay_payment_id' => $verifyRazorpayPaymentData->razorpay_payment_id,
                 'razorpay_signature' => $verifyRazorpayPaymentData->razorpay_signature,
-                'payment_status' => 'captured',
+                'status' => 'captured',
             ]);
 
             // Fetch complete payment details from Razorpay API
diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandler.php
index 93725ed31..77c7901e2 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandler.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandler.php
@@ -16,7 +16,6 @@
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
 use HiEvents\Services\Domain\Order\OrderApplicationFeeService;
-use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayOrderPaidEventDTO;
 use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayOrderPaidPayload;
 use HiEvents\Services\Domain\Product\ProductQuantityUpdateService;
 use HiEvents\Services\Infrastructure\DomainEvents\DomainEventDispatcherService;
diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandler.php
index 351b701aa..77c7825ce 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandler.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandler.php
@@ -3,7 +3,7 @@
 namespace HiEvents\Services\Domain\Payment\Razorpay\EventHandlers;
 
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
-use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentEventDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentPayload;
 use Illuminate\Cache\Repository;
 use Illuminate\Database\DatabaseManager;
 use Illuminate\Log\Logger;
@@ -22,8 +22,7 @@ public function __construct(
     /**
      * @throws Throwable
      */
-    // TODO: Change param type to accept payload
-    public function handleEvent(RazorpayPaymentEventDTO $event): void
+    public function handleEvent(RazorpayPaymentPayload $event): void
     {
         $paymentEntity = $event->payment;
         $idempotencyKey = 'razorpay_authorized_' . $paymentEntity->id;
diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php
index 74b82275f..50ed4fbac 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php
@@ -16,7 +16,7 @@
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
 use HiEvents\Services\Domain\Order\OrderApplicationFeeService;
-use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentEventDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentPayload;
 use HiEvents\Services\Domain\Product\ProductQuantityUpdateService;
 use HiEvents\Services\Infrastructure\DomainEvents\DomainEventDispatcherService;
 use HiEvents\Services\Infrastructure\DomainEvents\Enums\DomainEventType;
@@ -45,8 +45,7 @@ public function __construct(
     /**
      * @throws Throwable
      */
-    // TODO: Change param type to accept payload
-    public function handleEvent(RazorpayPaymentEventDTO $event): void
+    public function handleEvent(RazorpayPaymentPayload $event): void
     {
         $paymentEntity = $event->payment;
 
diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandler.php
index 0025aeeba..823c1f4c3 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandler.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandler.php
@@ -3,7 +3,7 @@
 namespace HiEvents\Services\Domain\Payment\Razorpay\EventHandlers;
 
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
-use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentEventDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentPayload;
 use Illuminate\Cache\Repository;
 use Illuminate\Database\DatabaseManager;
 use Illuminate\Log\Logger;
@@ -21,8 +21,7 @@ public function __construct(
     /**
      * @throws Throwable
      */
-    // TODO: Change param type to accept payload
-    public function handleEvent(RazorpayPaymentEventDTO $event): void
+    public function handleEvent(RazorpayPaymentPayload $event): void
     {
         $paymentEntity = $event->payment;
         $idempotencyKey = 'razorpay_failed_' . $paymentEntity->id;
@@ -38,7 +37,7 @@ public function handleEvent(RazorpayPaymentEventDTO $event): void
             // Try to find by payment ID first (if this payment ID is already stored)
             // If not found, fallback to order ID (because payment ID might not be stored yet)
             $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($paymentEntity->id)
-                ?? $this->razorpayOrdersRepository->findByOrderId($paymentEntity->order_id);
+                ?? $this->razorpayOrdersRepository->findByRazorpayOrderId($paymentEntity->order_id);
 
             if (!$razorpayOrder) {
                 $this->logger->warning('Razorpay order not found for payment.failed', [

From 653a33a926c56abcf9f5e79b0cfe8a87d0601343 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 24 Feb 2026 08:06:16 +0000
Subject: [PATCH 19/41] implemented refund.processed event in razorpay webhook

---
 .../Status/OrderPaymentStatus.php             |   4 +
 .../Eloquent/OrderRefundRepository.php        |   5 +
 .../OrderRefundRepositoryInterface.php        |   2 +-
 .../Razorpay/RazorpayWebhookHandler.php       |   8 +-
 .../Razorpay/DTOs/RazorpayRefundDTO.php       |  22 ++
 .../Razorpay/DTOs/RazorpayRefundPayload.php   |  12 +
 .../Razorpay/DTOs/RazorpayWebhookEnvelope.php |   8 +-
 .../EventHandlers/RazorpayRefundHandler.php   | 213 +++++++-----------
 8 files changed, 129 insertions(+), 145 deletions(-)
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayRefundDTO.php
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayRefundPayload.php

diff --git a/backend/app/DomainObjects/Status/OrderPaymentStatus.php b/backend/app/DomainObjects/Status/OrderPaymentStatus.php
index 60dc33397..ed89d4af6 100644
--- a/backend/app/DomainObjects/Status/OrderPaymentStatus.php
+++ b/backend/app/DomainObjects/Status/OrderPaymentStatus.php
@@ -9,5 +9,9 @@ enum OrderPaymentStatus
     case AWAITING_OFFLINE_PAYMENT;
     case PAYMENT_FAILED;
     case PAYMENT_RECEIVED;
+
+    case REFUNDED;
+
+    case PARTIALLY_REFUNDED;
 }
 
diff --git a/backend/app/Repository/Eloquent/OrderRefundRepository.php b/backend/app/Repository/Eloquent/OrderRefundRepository.php
index 4e81d0963..c5cdadf83 100644
--- a/backend/app/Repository/Eloquent/OrderRefundRepository.php
+++ b/backend/app/Repository/Eloquent/OrderRefundRepository.php
@@ -17,4 +17,9 @@ public function getDomainObject(): string
     {
         return OrderRefundDomainObject::class;
     }
+
+    public function getTotalRefundedForOrder(int $orderId): float
+    {
+        return (float) $this->model->where('order_id', $orderId)->sum('amount');
+    }
 }
diff --git a/backend/app/Repository/Interfaces/OrderRefundRepositoryInterface.php b/backend/app/Repository/Interfaces/OrderRefundRepositoryInterface.php
index 0c475af43..77183ddff 100644
--- a/backend/app/Repository/Interfaces/OrderRefundRepositoryInterface.php
+++ b/backend/app/Repository/Interfaces/OrderRefundRepositoryInterface.php
@@ -9,5 +9,5 @@
  */
 interface OrderRefundRepositoryInterface extends RepositoryInterface
 {
-
+    public function getTotalRefundedForOrder(int $orderId): float;
 }
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
index 9e7de965f..9564bb52e 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
@@ -7,7 +7,7 @@
 use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentVerificationService;
 use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentCapturedHandler;
 use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayOrderPaidHandler;
-// use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayRefundHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayRefundHandler;
 use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentFailedHandler;
 use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentAuthorizedHandler;
 use Illuminate\Cache\Repository;
@@ -29,7 +29,7 @@ class RazorpayWebhookHandler
     public function __construct(
         private readonly RazorpayPaymentCapturedHandler $paymentCapturedHandler,
         private readonly RazorpayOrderPaidHandler $orderPaidHandler,
-        // private readonly RazorpayRefundHandler               $refundHandler,
+        private readonly RazorpayRefundHandler $refundHandler,
         private readonly RazorpayPaymentFailedHandler $paymentFailedHandler,
         private readonly RazorpayPaymentAuthorizedHandler $paymentAuthorizedHandler,
         private readonly RazorpayPaymentVerificationService $razorpayPaymentService,
@@ -67,7 +67,7 @@ public function handle(string $payload, string $signature): void
             $eventId = match ($event) {
                 'payment.captured', 'payment.failed', 'payment.authorized' => $envelope->payload->payment->id,
                 'order.paid' => $envelope->payload->order->id,
-                // 'refund.processed' => $envelope->payload->refund->id,
+                'refund.processed' => $envelope->payload->refund->id,
                 default => null,
             };
 
@@ -94,7 +94,7 @@ public function handle(string $payload, string $signature): void
             match ($event) {
                 'payment.captured' => $this->paymentCapturedHandler->handleEvent($envelope->payload),
                 'order.paid' => $this->orderPaidHandler->handleEvent($envelope->payload),
-                // 'refund.processed' => $this->refundHandler->handleEvent($envelope->payload),
+                'refund.processed' => $this->refundHandler->handleEvent($envelope->payload),
                 'payment.failed' => $this->paymentFailedHandler->handleEvent($envelope->payload),
                 'payment.authorized' => $this->paymentAuthorizedHandler->handleEvent($envelope->payload),
                 default => $this->logger->debug('No handler for event', ['event' => $event]),
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayRefundDTO.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayRefundDTO.php
new file mode 100644
index 000000000..802a3b33a
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayRefundDTO.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
+
+use HiEvents\DataTransferObjects\BaseDataObject;
+
+class RazorpayRefundDTO extends BaseDataObject
+{
+    public function __construct(
+        public readonly string $id,
+        public readonly string $entity,
+        public readonly int $amount,
+        public readonly string $currency,
+        public readonly string $payment_id,
+        public readonly string $status,
+        public readonly ?int $created_at,
+        public readonly ?array $notes,
+        public readonly ?int $fee,
+        public readonly ?int $tax,
+    ) {
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayRefundPayload.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayRefundPayload.php
new file mode 100644
index 000000000..782ff6ab1
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayRefundPayload.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay\DTOs;
+
+use HiEvents\DataTransferObjects\BaseDataObject;
+
+class RazorpayRefundPayload extends BaseDataObject
+{
+    public function __construct(
+        public readonly RazorpayRefundDTO $refund,
+    ) {}
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayWebhookEnvelope.php b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayWebhookEnvelope.php
index c8db04260..7e02db10c 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayWebhookEnvelope.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/DTOs/RazorpayWebhookEnvelope.php
@@ -11,7 +11,7 @@ public function __construct(
         public readonly string $entity,
         public readonly string $account_id,
         public readonly string $event,
-        public readonly RazorpayOrderPaidPayload|RazorpayPaymentPayload $payload,
+        public readonly RazorpayOrderPaidPayload|RazorpayPaymentPayload|RazorpayRefundPayload $payload,
         public readonly int $created_at,
     ) {
     }
@@ -29,9 +29,9 @@ public static function fromArray(array $data): self
             'payment.captured', 'payment.failed', 'payment.authorized' => RazorpayPaymentPayload::from([
                 'payment' => $payloadData['payment']['entity'],
             ]),
-            // 'refund.processed' => RazorpayRefundPayload::from([
-            //     'refund' => $payloadData['refund']['entity'],
-            // ]),
+            'refund.processed' => RazorpayRefundPayload::from([
+                'refund' => $payloadData['refund']['entity'],
+            ]),
             default => throw new InvalidArgumentException("Unknown event: {$event}"),
         };
 
diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php
index 3261c61d2..b7689b626 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php
@@ -2,18 +2,15 @@
 
 namespace HiEvents\Services\Domain\Payment\Razorpay\EventHandlers;
 
-use HiEvents\DomainObjects\Enums\PaymentProviders;
-use HiEvents\DomainObjects\Generated\OrderDomainObjectAbstract;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayRefundPayload;
+use HiEvents\DomainObjects\Status\OrderPaymentStatus;
 use HiEvents\DomainObjects\OrderDomainObject;
-use HiEvents\DomainObjects\Status\OrderRefundStatus;
-use HiEvents\Repository\Interfaces\OrderRefundRepositoryInterface;
+use HiEvents\DomainObjects\OrderItemDomainObject;
+use HiEvents\Repository\Eloquent\Value\Relationship;
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
-use HiEvents\Services\Domain\EventStatistics\EventStatisticsRefundService;
-use HiEvents\Services\Infrastructure\DomainEvents\DomainEventDispatcherService;
-use HiEvents\Services\Infrastructure\DomainEvents\Enums\DomainEventType;
-use HiEvents\Services\Infrastructure\DomainEvents\Events\OrderEvent;
-use HiEvents\Values\MoneyValue;
+use HiEvents\Repository\Interfaces\OrderRefundRepositoryInterface;
+use Illuminate\Cache\Repository;
 use Illuminate\Database\DatabaseManager;
 use Illuminate\Log\Logger;
 use Throwable;
@@ -21,166 +18,110 @@
 class RazorpayRefundHandler
 {
     public function __construct(
-        private readonly OrderRepositoryInterface          $orderRepository,
+        private readonly OrderRepositoryInterface $orderRepository,
         private readonly RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
-        private readonly Logger                            $logger,
-        private readonly DatabaseManager                   $databaseManager,
-        private readonly EventStatisticsRefundService      $eventStatisticsRefundService,
-        private readonly OrderRefundRepositoryInterface    $orderRefundRepository,
-        private readonly DomainEventDispatcherService      $domainEventDispatcherService,
+        private readonly OrderRefundRepositoryInterface $refundRepository,
+        private readonly DatabaseManager $databaseManager,
+        private readonly Logger $logger,
+        private readonly Repository $cache,
     ) {
     }
 
     /**
      * @throws Throwable
      */
-    public function handleEvent(array $refundData): void
+    public function handleEvent(RazorpayRefundPayload $payload): void
     {
-        $this->databaseManager->transaction(function () use ($refundData) {
-            // Find Razorpay order by payment_id
-            $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($refundData['payment_id']);
+        $refundEntity = $payload->refund;
+        $paymentId = $refundEntity->payment_id;
 
-            if (!$razorpayOrder) {
-                $this->logger->warning('Razorpay order not found for refund', [
-                    'refund_id' => $refundData['id'],
-                    'payment_id' => $refundData['payment_id'],
-                ]);
-                return;
-            }
+        // Idempotency key based on refund ID
+        $idempotencyKey = 'razorpay_refund_' . $refundEntity->id;
 
-            $existingRefund = $this->orderRefundRepository->findFirstWhere([
-                'refund_id' => $refundData['id'],
+        if ($this->cache->has($idempotencyKey)) {
+            $this->logger->info('Razorpay refund event already handled', [
+                'refund_id' => $refundEntity->id,
+                'payment_id' => $paymentId,
             ]);
+            return;
+        }
 
-            if ($existingRefund) {
-                $this->logger->info(__('Refund already processed'), [
-                    'refund_id' => $refundData['id'],
-                    'payment_id' => $refundData['payment_id'],
-                ]);
-                return;
-            }
+        $this->databaseManager->transaction(function () use ($refundEntity, $paymentId) {
+            // 1. Find the Razorpay order record by payment ID
+            $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($paymentId);
 
-            // Get order ID from razorpay order array
-            $razorpayOrderArray = $razorpayOrder->toArray();
-            $orderId = $razorpayOrderArray['order_id'] ?? null;
-            
-            if (!$orderId) {
-                $this->logger->error('Could not get order ID from Razorpay order for refund', [
-                    'razorpay_order' => $razorpayOrderArray,
-                    'refund_data' => $refundData,
+            if (!$razorpayOrder) {
+                $this->logger->warning('Razorpay order not found for refund webhook', [
+                    'payment_id' => $paymentId,
+                    'refund_id' => $refundEntity->id,
                 ]);
                 return;
             }
 
-            $order = $this->orderRepository->findById($orderId);
+            $localOrderId = $razorpayOrder->getOrderId();
+
+            // 2. Load the full order with items
+            $order = $this->orderRepository
+                ->loadRelation(new Relationship(OrderItemDomainObject::class))
+                ->findById($localOrderId);
 
-            if ($refundData['status'] !== 'processed') {
-                $this->handleFailure($refundData, $order);
+            if (!$order) {
+                $this->logger->warning('Local order not found for refund webhook', [
+                    'local_order_id' => $localOrderId,
+                    'refund_id' => $refundEntity->id,
+                ]);
                 return;
             }
 
-            // Convert from paise to rupees
-            $refundedAmount = $refundData['amount'] / 100;
-
-            // Get order ID from order array
-            $orderArray = $order->toArray();
-            $orderIdFromOrder = $orderArray['id'] ?? $orderId;
-
-            $this->updateOrderRefundedAmount($orderIdFromOrder, $refundedAmount);
-            $this->updateOrderStatus($order, $refundedAmount);
-            
-            // Update event statistics
-            $this->updateEventStatistics($order, $refundedAmount, $refundData['currency']);
-            
-            $this->createOrderRefund($refundData, $order, $refundedAmount, $orderIdFromOrder);
-
-            $this->logger->info(__('Razorpay refund successful'), [
-                'order_id' => $orderIdFromOrder,
-                'refunded_amount' => $refundedAmount,
-                'currency' => $refundData['currency'],
-                'refund_id' => $refundData['id'],
+            // 3. Store refund details in order_refunds table using repository
+            $refundAmountInRupees = $refundEntity->amount / 100; // Convert paise to rupees
+            $this->refundRepository->create([
+                'order_id' => $order->getId(),
+                'payment_provider' => 'razorpay',
+                'refund_id' => $refundEntity->id,
+                'amount' => $refundAmountInRupees,
+                'currency' => $refundEntity->currency,
+                'status' => $refundEntity->status,
+                'reason' => $refundEntity->notes['reason'] ?? null,
+                'metadata' => [
+                    'razorpay_refund' => $refundEntity->toArray(),
+                ],
             ]);
 
-            $this->domainEventDispatcherService->dispatch(
-                new OrderEvent(
-                    type: DomainEventType::ORDER_REFUNDED,
-                    orderId: $orderIdFromOrder
-                ),
-            );
+            // 4. Update order payment status based on total refunded amount
+            $this->updateOrderPaymentStatus($order);
+
+            $this->logger->info('Razorpay refund processed successfully', [
+                'refund_id' => $refundEntity->id,
+                'payment_id' => $paymentId,
+                'order_id' => $order->getId(),
+                'amount' => $refundAmountInRupees,
+                'status' => $refundEntity->status,
+            ]);
         });
-    }
 
-    private function updateEventStatistics(OrderDomainObject $order, float $amount, string $currency): void
-    {
-        // Convert to minor units (paise)
-        $amountMinor = $amount * 100;
-        $moneyValue = MoneyValue::fromMinorUnit($amountMinor, $currency);
-        $this->eventStatisticsRefundService->updateForRefund($order, $moneyValue);
+        // Mark as handled after successful transaction
+        $this->cache->put($idempotencyKey, true, now()->addHours(24));
     }
 
-    private function updateOrderRefundedAmount(int $orderId, float $refundedAmount): void
+    private function updateOrderPaymentStatus(OrderDomainObject $order): void
     {
-        $this->orderRepository->increment(
-            id: $orderId,
-            column: OrderDomainObjectAbstract::TOTAL_REFUNDED,
-            amount: $refundedAmount
-        );
-    }
+        // Get total refunded amount for this order using repository method
+        $totalRefunded = $this->refundRepository->getTotalRefundedForOrder($order->getId());
+        $orderTotal = $order->getTotalGross(); // Assume returns in rupees
 
-    private function updateOrderStatus(OrderDomainObject $order, float $refundedAmount): void
-    {
-        // Get order array and extract ID
-        $orderArray = $order->toArray();
-        $orderId = $orderArray['id'] ?? null;
-        
-        if (!$orderId) {
-            $this->logger->error('Could not get ID from order for status update');
-            return;
+        if ($totalRefunded <= 0) {
+            return; // No change if no refunds
         }
 
-        // Get total refunded amount from order array
-        $totalRefunded = $orderArray['total_refunded'] ?? 0;
-        
-        // Get total gross from order array
-        $totalGross = $orderArray['total_gross'] ?? 0;
-
-        $status = $refundedAmount + $totalRefunded >= $totalGross
-            ? OrderRefundStatus::REFUNDED->name
-            : OrderRefundStatus::PARTIALLY_REFUNDED->name;
-
-        $this->orderRepository->updateFromArray($orderId, [
-            OrderDomainObjectAbstract::REFUND_STATUS => $status,
-        ]);
-    }
-
-    private function handleFailure(array $refundData, OrderDomainObject $order): void
-    {
-        // Get order ID from order array
-        $orderArray = $order->toArray();
-        $orderId = $orderArray['id'] ?? null;
-        
-        if (!$orderId) {
-            $this->logger->error('Could not get ID from order for failure handling');
-            return;
+        if ($totalRefunded >= $orderTotal) {
+            $newStatus = OrderPaymentStatus::REFUNDED->name;
+        } else {
+            $newStatus = OrderPaymentStatus::PARTIALLY_REFUNDED->name;
         }
 
-        $this->orderRepository->updateFromArray($orderId, [
-            OrderDomainObjectAbstract::REFUND_STATUS => OrderRefundStatus::REFUND_FAILED->name,
-        ]);
-
-        $this->logger->error(__('Failed to process Razorpay refund'), $refundData);
-    }
-
-    private function createOrderRefund(array $refundData, OrderDomainObject $order, float $refundedAmount, int $orderId): void
-    {
-        $this->orderRefundRepository->create([
-            'order_id' => $orderId,
-            'payment_provider' => PaymentProviders::RAZORPAY->value,
-            'refund_id' => $refundData['id'],
-            'amount' => $refundedAmount,
-            'currency' => $refundData['currency'],
-            'status' => $refundData['status'],
-            'metadata' => $refundData,
+        $this->orderRepository->updateFromArray($order->getId(), [
+            'payment_status' => $newStatus,
         ]);
     }
 }
\ No newline at end of file

From 659f0c17a196d9099b1c12b166242dc7c1549d82 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 24 Feb 2026 09:18:39 +0000
Subject: [PATCH 20/41] fixed conditional bug razorpay

---
 frontend/src/components/routes/product-widget/Payment/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/routes/product-widget/Payment/index.tsx b/frontend/src/components/routes/product-widget/Payment/index.tsx
index 49d952793..d03d6c33f 100644
--- a/frontend/src/components/routes/product-widget/Payment/index.tsx
+++ b/frontend/src/components/routes/product-widget/Payment/index.tsx
@@ -134,7 +134,7 @@ const Payment = () => {
                                     <span>{t`Stripe`}</span>
                                 </button>
                             )}
-                            {(isStripeEnabled || isRazorpayEnabled) && (
+                            {isRazorpayEnabled && (
                                 <button
                                     type="button"
                                     className={`${classes.paymentMethodTab} ${activePaymentMethod === 'RAZORPAY' ? classes.active : ''}`}

From 635b93a81f7be2622e54bba0cdb5545dad02ec5a Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Thu, 26 Feb 2026 08:13:23 +0000
Subject: [PATCH 21/41] refactored RazorpayClient for better testability

---
 .../Razorpay/RazorpayOrderCreationService.php |  2 +-
 .../RazorpayPaymentVerificationService.php    |  2 +-
 .../Razorpay/RazorpayApiClient.php            | 25 +++++++++++++++++++
 .../Razorpay/RazorpayClientFactory.php        | 12 ++++-----
 .../Razorpay/RazorpayClientInterface.php      | 10 ++++++++
 5 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php
 create mode 100644 backend/app/Services/Infrastructure/Razorpay/RazorpayClientInterface.php

diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
index 6ef65be17..57a572d12 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
@@ -84,7 +84,7 @@ public function createOrder(CreateRazorpayOrderRequestDTO $orderDTO): CreateRazo
             //     ];
             // }
 
-            $razorpayOrder = $razorpayClient->order->create($orderData);
+            $razorpayOrder = $razorpayClient->createOrder($orderData);
 
             $this->logger->debug('Razorpay order created', [
                 'razorpayOrderId' => $razorpayOrder->id,
diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
index f86808d85..4a28eb702 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationService.php
@@ -53,7 +53,7 @@ public function fetchPaymentDetails(string $paymentId): array
     {
         try {
             $razorpayClient = $this->razorpayClientFactory->create();
-            $payment = $razorpayClient->payment->fetch($paymentId);
+            $payment = $razorpayClient->fetchPayment($paymentId);
             
             return [
                 'id' => $payment->id,
diff --git a/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php b/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php
new file mode 100644
index 000000000..1f8365cea
--- /dev/null
+++ b/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Backend\App\Services\Infrastructure\Razorpay;
+
+use Razorpay\Api\Api;
+
+class RazorpayApiClient implements RazorpayClientInterface
+{
+    private Api $api;
+
+    public function __construct(string $keyId, string $keySecret)
+    {
+        $this->api = new Api($keyId, $keySecret);
+    }
+
+    public function createOrder(array $data): object
+    {
+        return $this->api->order->create($data);
+    }
+
+    public function fetchPayment(string $paymentId): object
+    {
+        return $this->api->payment->fetch($paymentId);
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Infrastructure/Razorpay/RazorpayClientFactory.php b/backend/app/Services/Infrastructure/Razorpay/RazorpayClientFactory.php
index ab2284676..46a05faf0 100644
--- a/backend/app/Services/Infrastructure/Razorpay/RazorpayClientFactory.php
+++ b/backend/app/Services/Infrastructure/Razorpay/RazorpayClientFactory.php
@@ -2,16 +2,18 @@
 
 namespace HiEvents\Services\Infrastructure\Razorpay;
 
-use Razorpay\Api\Api;
+use Backend\App\Services\Infrastructure\Razorpay\RazorpayApiClient;
+use Backend\App\Services\Infrastructure\Razorpay\RazorpayClientInterface;
 use Illuminate\Config\Repository;
 
 class RazorpayClientFactory
 {
     public function __construct(
         private readonly Repository $config,
-    ) {}
+    ) {
+    }
 
-    public function create(): Api
+    public function create(): RazorpayClientInterface
     {
         $keyId = $this->config->get('services.razorpay.key_id');
         $keySecret = $this->config->get('services.razorpay.key_secret');
@@ -20,8 +22,6 @@ public function create(): Api
             throw new \RuntimeException('Razorpay credentials not configured');
         }
 
-        $api = new Api($keyId, $keySecret);
-
-        return $api;
+        return new RazorpayApiClient($keyId, $keySecret);
     }
 }
\ No newline at end of file
diff --git a/backend/app/Services/Infrastructure/Razorpay/RazorpayClientInterface.php b/backend/app/Services/Infrastructure/Razorpay/RazorpayClientInterface.php
new file mode 100644
index 000000000..21f249912
--- /dev/null
+++ b/backend/app/Services/Infrastructure/Razorpay/RazorpayClientInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Backend\App\Services\Infrastructure\Razorpay;
+
+interface RazorpayClientInterface
+{
+    public function createOrder(array $data): object;
+
+    public function fetchPayment(string $paymentId): object;
+}
\ No newline at end of file

From f3654ef893269f95ac1a0dedd8b150cd2aafb523 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Mon, 2 Mar 2026 06:25:20 +0000
Subject: [PATCH 22/41] add test for razorpay client factory

---
 .../Razorpay/RazorpayApiClient.php            |  2 +-
 .../Razorpay/RazorpayClientFactory.php        | 26 ++++++--
 .../Razorpay/RazorpayClientInterface.php      |  2 +-
 .../Razorpay/RazorpayClientFactoryTest.php    | 60 +++++++++++++++++++
 4 files changed, 83 insertions(+), 7 deletions(-)
 create mode 100644 backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientFactoryTest.php

diff --git a/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php b/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php
index 1f8365cea..9eac98c73 100644
--- a/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php
+++ b/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backend\App\Services\Infrastructure\Razorpay;
+namespace HiEvents\Services\Infrastructure\Razorpay;
 
 use Razorpay\Api\Api;
 
diff --git a/backend/app/Services/Infrastructure/Razorpay/RazorpayClientFactory.php b/backend/app/Services/Infrastructure/Razorpay/RazorpayClientFactory.php
index 46a05faf0..4db0a7c02 100644
--- a/backend/app/Services/Infrastructure/Razorpay/RazorpayClientFactory.php
+++ b/backend/app/Services/Infrastructure/Razorpay/RazorpayClientFactory.php
@@ -2,8 +2,6 @@
 
 namespace HiEvents\Services\Infrastructure\Razorpay;
 
-use Backend\App\Services\Infrastructure\Razorpay\RazorpayApiClient;
-use Backend\App\Services\Infrastructure\Razorpay\RazorpayClientInterface;
 use Illuminate\Config\Repository;
 
 class RazorpayClientFactory
@@ -13,15 +11,33 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @throws \RuntimeException if credentials are missing
+     */
     public function create(): RazorpayClientInterface
+    {
+        [$keyId, $keySecret] = $this->getCredentials();
+
+        if (empty($keyId) || empty($keySecret)) {
+            throw new \RuntimeException(
+                'Razorpay credentials not configured. Please set RAZORPAY_KEY_ID and RAZORPAY_KEY_SECRET in your environment.'
+            );
+        }
+
+        return new RazorpayApiClient($keyId, $keySecret);
+    }
+
+    private function getCredentials(): array
     {
         $keyId = $this->config->get('services.razorpay.key_id');
         $keySecret = $this->config->get('services.razorpay.key_secret');
 
-        if (!$keyId || !$keySecret) {
-            throw new \RuntimeException('Razorpay credentials not configured');
+        if (empty($keyId) || empty($keySecret)) {
+            throw new \RuntimeException(
+                'Razorpay credentials not configured. Please set RAZORPAY_KEY_ID and RAZORPAY_KEY_SECRET in your environment.'
+            );
         }
 
-        return new RazorpayApiClient($keyId, $keySecret);
+        return [$keyId, $keySecret];
     }
 }
\ No newline at end of file
diff --git a/backend/app/Services/Infrastructure/Razorpay/RazorpayClientInterface.php b/backend/app/Services/Infrastructure/Razorpay/RazorpayClientInterface.php
index 21f249912..ccf506860 100644
--- a/backend/app/Services/Infrastructure/Razorpay/RazorpayClientInterface.php
+++ b/backend/app/Services/Infrastructure/Razorpay/RazorpayClientInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backend\App\Services\Infrastructure\Razorpay;
+namespace HiEvents\Services\Infrastructure\Razorpay;
 
 interface RazorpayClientInterface
 {
diff --git a/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientFactoryTest.php b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientFactoryTest.php
new file mode 100644
index 000000000..8d1686ce8
--- /dev/null
+++ b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientFactoryTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Unit\Services\Infrastructure\Razorpay;
+
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayApiClient;
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientInterface;
+use Illuminate\Config\Repository;
+use Tests\TestCase;
+
+class RazorpayClientFactoryTest extends TestCase
+{
+    private function makeConfig(array $values): Repository
+    {
+        return new Repository([
+            'services' => [
+                'razorpay' => $values
+            ]
+        ]);
+    }
+
+    public function test_creates_client_when_credentials_exists(){
+        $config = $this->makeConfig([
+            'key_id' => 'test_id',
+            'key_secret' => 'test_secret'
+        ]);
+
+        $factory = new RazorpayClientFactory($config);
+        $client = $factory->create();
+
+        $this->assertInstanceOf(RazorpayClientInterface::class, $client);
+        $this->assertInstanceOf(RazorpayApiClient::class, $client);
+    }
+
+    public function test_throws_exception_when_key_id_missing()
+    {
+        $config = $this->makeConfig([
+            'key_secret' => 'test_secret',
+        ]);
+
+        $factory = new RazorpayClientFactory($config);
+
+        $this->expectException(\RuntimeException::class);
+
+        $factory->create();
+    }
+
+    public function test_throws_exception_when_key_secret_missing()
+    {
+        $config = $this->makeConfig([
+            'key_id' => 'test_key',
+        ]);
+
+        $factory = new RazorpayClientFactory($config);
+
+        $this->expectException(\RuntimeException::class);
+
+        $factory->create();
+    }
+}
\ No newline at end of file

From 04190c332b0a8be03ae9cd567d288a9006400c09 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 3 Mar 2026 06:13:25 +0000
Subject: [PATCH 23/41] added test for razorpay client factory and client
 implementation

---
 .../Razorpay/RazorpayApiClient.php            |   4 +-
 .../Razorpay/RazorpayApiClientTest.php        | 102 ++++++++++++++++++
 .../Razorpay/RazorpayClientFactoryTest.php    |  81 ++++++++------
 3 files changed, 154 insertions(+), 33 deletions(-)
 create mode 100644 backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayApiClientTest.php

diff --git a/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php b/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php
index 9eac98c73..8323dedf9 100644
--- a/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php
+++ b/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php
@@ -8,9 +8,9 @@ class RazorpayApiClient implements RazorpayClientInterface
 {
     private Api $api;
 
-    public function __construct(string $keyId, string $keySecret)
+    public function __construct(string $keyId, string $keySecret, ?Api $api = null)
     {
-        $this->api = new Api($keyId, $keySecret);
+        $this->api = $api ?? new Api($keyId, $keySecret);
     }
 
     public function createOrder(array $data): object
diff --git a/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayApiClientTest.php b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayApiClientTest.php
new file mode 100644
index 000000000..362196f22
--- /dev/null
+++ b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayApiClientTest.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Tests\Unit\Services\Infrastructure\Razorpay;
+
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayApiClient;
+use PHPUnit\Framework\MockObject\MockObject;
+use Razorpay\Api\Api;
+use Razorpay\Api\Order;
+use Razorpay\Api\Payment;
+use Razorpay\Api\Errors\BadRequestError;
+use Tests\TestCase;
+
+class RazorpayApiClientTest extends TestCase
+{
+    private Api&MockObject $apiMock;
+    private RazorpayApiClient $client;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->apiMock = $this->createMock(Api::class);
+        $this->client = new RazorpayApiClient('test_id', 'test_secret', $this->apiMock);
+    }
+
+    public function testItCanCreateAnOrderSuccessfully(): void
+    {
+        $orderData = ['amount' => 50000, 'currency' => 'INR', 'receipt' => 'receipt#1'];
+        $expectedResponse = (object) ['id' => 'order_123', 'status' => 'created'];
+
+        $orderMock = $this->createMock(Order::class);
+        $orderMock->expects($this->once())
+            ->method('create')
+            ->with($orderData)
+            ->willReturn($expectedResponse);
+
+        $this->apiMock->order = $orderMock;
+
+        $result = $this->client->createOrder($orderData);
+
+        $this->assertEquals('order_123', $result->id);
+        $this->assertEquals('created', $result->status);
+    }
+
+    public function testItThrowsExceptionWhenOrderCreationFailed(): void
+    {
+        // 1. Arrange: Send bad data (e.g., amount is 0, which Razorpay rejects)
+        $badOrderData = ['amount' => 0, 'currency' => 'INR'];
+
+        $orderMock = $this->createMock(Order::class);
+
+        // Tell the mock to throw a Razorpay BadRequestError when 'create' is called
+        $orderMock->expects($this->once())
+            ->method('create')
+            ->with($badOrderData)
+            ->willThrowException(new BadRequestError('Order amount less than minimum amount allowed', 400, 400));
+
+        $this->apiMock->order = $orderMock;
+
+        // 2. Assert: Tell PHPUnit to expect this exact error to crash the test
+        $this->expectException(BadRequestError::class);
+        $this->expectExceptionMessage('Order amount less than minimum amount allowed');
+
+        // 3. Act: Trigger the error by calling your client
+        $this->client->createOrder($badOrderData);
+    }
+
+    public function testItCanFetchAPaymentSuccessfully(): void
+    {
+        $paymentId = 'pay_123';
+        $expectedResponse = (object) ['id' => 'pay_123', 'status' => 'captured', 'method' => 'upi'];
+
+        $paymentMock = $this->createMock(Payment::class);
+        $paymentMock->expects($this->once())
+            ->method('fetch')
+            ->with($paymentId)
+            ->willReturn($expectedResponse);
+
+        $this->apiMock->payment = $paymentMock;
+
+        $result = $this->client->fetchPayment($paymentId);
+
+        $this->assertEquals('pay_123', $result->id);
+        $this->assertEquals('captured', $result->status);
+        $this->assertEquals('upi', $result->method);
+    }
+
+    public function testItThrowsExceptionWhenPaymentIsInvalid(): void
+    {
+        $paymentMock = $this->createMock(Payment::class);
+        $paymentMock->expects($this->once())
+            ->method('fetch')
+            ->willThrowException(new BadRequestError('Invalid ID', 400, 400));
+
+        $this->apiMock->payment = $paymentMock;
+
+        $this->expectException(BadRequestError::class);
+        $this->expectExceptionMessage('Invalid ID');
+
+        $this->client->fetchPayment('invalid_id');
+    }
+}
\ No newline at end of file
diff --git a/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientFactoryTest.php b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientFactoryTest.php
index 8d1686ce8..18096539a 100644
--- a/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientFactoryTest.php
+++ b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientFactoryTest.php
@@ -4,57 +4,76 @@
 
 use HiEvents\Services\Infrastructure\Razorpay\RazorpayApiClient;
 use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
-use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientInterface;
 use Illuminate\Config\Repository;
+use PHPUnit\Framework\MockObject\MockObject;
+use RuntimeException;
 use Tests\TestCase;
 
 class RazorpayClientFactoryTest extends TestCase
 {
-    private function makeConfig(array $values): Repository
+    private Repository&MockObject $configMock;
+    private RazorpayClientFactory $factory;
+
+    protected function setUp(): void
     {
-        return new Repository([
-            'services' => [
-                'razorpay' => $values
-            ]
-        ]);
+        parent::setUp();
+
+        // 1. Mock Laravel's config repository
+        $this->configMock = $this->createMock(Repository::class);
+
+        // 2. Inject it into the factory
+        $this->factory = new RazorpayClientFactory($this->configMock);
     }
 
-    public function test_creates_client_when_credentials_exists(){
-        $config = $this->makeConfig([
-            'key_id' => 'test_id',
-            'key_secret' => 'test_secret'
-        ]);
+    public function testItCreatesClientSuccessfullyWhenConfigured(): void
+    {
+        // Tell the mock exactly how to respond when ->get() is called
+        $this->configMock->method('get')->willReturnCallback(function (string $key) {
+            if ($key === 'services.razorpay.key_id') {
+                return 'test_key_id';
+            }
+            if ($key === 'services.razorpay.key_secret') {
+                return 'test_key_secret';
+            }
+            return null;
+        });
 
-        $factory = new RazorpayClientFactory($config);
-        $client = $factory->create();
+        // Act
+        $client = $this->factory->create();
 
-        $this->assertInstanceOf(RazorpayClientInterface::class, $client);
+        // Assert that the factory successfully built the client
         $this->assertInstanceOf(RazorpayApiClient::class, $client);
     }
 
-    public function test_throws_exception_when_key_id_missing()
+    public function testItThrowsExceptionWhenKeyIdIsMissing(): void
     {
-        $config = $this->makeConfig([
-            'key_secret' => 'test_secret',
-        ]);
-
-        $factory = new RazorpayClientFactory($config);
+        // Simulate missing Key ID but present Key Secret
+        $this->configMock->method('get')->willReturnCallback(function (string $key) {
+            if ($key === 'services.razorpay.key_secret') {
+                return 'test_key_secret';
+            }
+            return null; // The Key ID will return null
+        });
 
-        $this->expectException(\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Razorpay credentials not configured.');
 
-        $factory->create();
+        $this->factory->create();
     }
 
-    public function test_throws_exception_when_key_secret_missing()
+    public function testItThrowsExceptionWhenKeySecretIsMissing(): void
     {
-        $config = $this->makeConfig([
-            'key_id' => 'test_key',
-        ]);
-
-        $factory = new RazorpayClientFactory($config);
+        // Simulate present Key ID but missing Key Secret
+        $this->configMock->method('get')->willReturnCallback(function (string $key) {
+            if ($key === 'services.razorpay.key_id') {
+                return 'test_key_id';
+            }
+            return ''; // Testing that an empty string also triggers the failure
+        });
 
-        $this->expectException(\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Razorpay credentials not configured.');
 
-        $factory->create();
+        $this->factory->create();
     }
 }
\ No newline at end of file

From 12d6364e9840b161d91c89d6d64c8c3f429001c2 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 3 Mar 2026 06:14:21 +0000
Subject: [PATCH 24/41] test cleanup

---
 .../Razorpay/RazorpayApiClientTest.php           | 11 +++--------
 .../Razorpay/RazorpayClientFactoryTest.php       | 16 +++++-----------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayApiClientTest.php b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayApiClientTest.php
index 362196f22..9c493a5a9 100644
--- a/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayApiClientTest.php
+++ b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayApiClientTest.php
@@ -44,24 +44,19 @@ public function testItCanCreateAnOrderSuccessfully(): void
 
     public function testItThrowsExceptionWhenOrderCreationFailed(): void
     {
-        // 1. Arrange: Send bad data (e.g., amount is 0, which Razorpay rejects)
         $badOrderData = ['amount' => 0, 'currency' => 'INR'];
-
         $orderMock = $this->createMock(Order::class);
-
-        // Tell the mock to throw a Razorpay BadRequestError when 'create' is called
+        
         $orderMock->expects($this->once())
             ->method('create')
             ->with($badOrderData)
             ->willThrowException(new BadRequestError('Order amount less than minimum amount allowed', 400, 400));
 
         $this->apiMock->order = $orderMock;
-
-        // 2. Assert: Tell PHPUnit to expect this exact error to crash the test
+        
         $this->expectException(BadRequestError::class);
         $this->expectExceptionMessage('Order amount less than minimum amount allowed');
-
-        // 3. Act: Trigger the error by calling your client
+        
         $this->client->createOrder($badOrderData);
     }
 
diff --git a/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientFactoryTest.php b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientFactoryTest.php
index 18096539a..fafcaedaf 100644
--- a/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientFactoryTest.php
+++ b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientFactoryTest.php
@@ -18,16 +18,14 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        // 1. Mock Laravel's config repository
         $this->configMock = $this->createMock(Repository::class);
 
-        // 2. Inject it into the factory
         $this->factory = new RazorpayClientFactory($this->configMock);
     }
 
     public function testItCreatesClientSuccessfullyWhenConfigured(): void
     {
-        // Tell the mock exactly how to respond when ->get() is called
+        
         $this->configMock->method('get')->willReturnCallback(function (string $key) {
             if ($key === 'services.razorpay.key_id') {
                 return 'test_key_id';
@@ -37,22 +35,19 @@ public function testItCreatesClientSuccessfullyWhenConfigured(): void
             }
             return null;
         });
-
-        // Act
+        
         $client = $this->factory->create();
-
-        // Assert that the factory successfully built the client
+        
         $this->assertInstanceOf(RazorpayApiClient::class, $client);
     }
 
     public function testItThrowsExceptionWhenKeyIdIsMissing(): void
     {
-        // Simulate missing Key ID but present Key Secret
         $this->configMock->method('get')->willReturnCallback(function (string $key) {
             if ($key === 'services.razorpay.key_secret') {
                 return 'test_key_secret';
             }
-            return null; // The Key ID will return null
+            return null; 
         });
 
         $this->expectException(RuntimeException::class);
@@ -63,12 +58,11 @@ public function testItThrowsExceptionWhenKeyIdIsMissing(): void
 
     public function testItThrowsExceptionWhenKeySecretIsMissing(): void
     {
-        // Simulate present Key ID but missing Key Secret
         $this->configMock->method('get')->willReturnCallback(function (string $key) {
             if ($key === 'services.razorpay.key_id') {
                 return 'test_key_id';
             }
-            return ''; // Testing that an empty string also triggers the failure
+            return ''; 
         });
 
         $this->expectException(RuntimeException::class);

From 4f7f08f508d6496cb0100fe032c2326f2670fe32 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 3 Mar 2026 06:18:45 +0000
Subject: [PATCH 25/41] cleanup

---
 .../Razorpay/CreateRazorpayOrderActionPublic.php    |  3 +--
 .../Payment/Razorpay/CreateRazorpayOrderHandler.php | 10 ++++------
 .../Razorpay/RazorpayOrderCreationService.php       | 13 ++++++-------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/backend/app/Http/Actions/Orders/Payment/Razorpay/CreateRazorpayOrderActionPublic.php b/backend/app/Http/Actions/Orders/Payment/Razorpay/CreateRazorpayOrderActionPublic.php
index 5f93cdff4..66d6c747a 100644
--- a/backend/app/Http/Actions/Orders/Payment/Razorpay/CreateRazorpayOrderActionPublic.php
+++ b/backend/app/Http/Actions/Orders/Payment/Razorpay/CreateRazorpayOrderActionPublic.php
@@ -12,8 +12,7 @@ class CreateRazorpayOrderActionPublic extends BaseAction
 {
     public function __construct(
         private readonly CreateRazorpayOrderHandler $createRazorpayOrderHandler,
-    )
-    {
+    ) {
     }
 
     public function __invoke(int $eventId, string $orderShortId): JsonResponse
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php
index 2f203b1ca..e393c839a 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php
@@ -22,19 +22,17 @@
 use HiEvents\Services\Domain\Payment\Razorpay\RazorpayOrderCreationService;
 use HiEvents\Services\Infrastructure\Session\CheckoutSessionManagementService;
 use HiEvents\Values\MoneyValue;
-use Razorpay\Api\Errors\Error;
 use Throwable;
 
 readonly class CreateRazorpayOrderHandler
 {
     public function __construct(
-        private OrderRepositoryInterface         $orderRepository,
-        private RazorpayOrderCreationService    $razorpayOrderService,
+        private OrderRepositoryInterface $orderRepository,
+        private RazorpayOrderCreationService $razorpayOrderService,
         private CheckoutSessionManagementService $sessionIdentifierService,
         private RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
-        private AccountRepositoryInterface      $accountRepository,
-    )
-    {
+        private AccountRepositoryInterface $accountRepository,
+    ) {
     }
 
     /**
diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
index 57a572d12..e69466d06 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
@@ -16,13 +16,12 @@
 class RazorpayOrderCreationService
 {
     public function __construct(
-        private readonly LoggerInterface                       $logger,
-        private readonly Repository                            $config,
-        private readonly DatabaseManager                       $databaseManager,
+        private readonly LoggerInterface $logger,
+        private readonly Repository $config,
+        private readonly DatabaseManager $databaseManager,
         private readonly OrderApplicationFeeCalculationService $orderApplicationFeeCalculationService,
-        private readonly RazorpayClientFactory                $razorpayClientFactory,
-    )
-    {
+        private readonly RazorpayClientFactory $razorpayClientFactory,
+    ) {
     }
 
     /**
@@ -45,7 +44,7 @@ public function createOrder(CreateRazorpayOrderRequestDTO $orderDTO): CreateRazo
 
             // Razorpay amount is in paise (Indian) or smallest currency unit
             $amountInSmallestUnit = $orderDTO->amount->toMinorUnit();
-            
+
             // For INR, amount is in paise
             // For other currencies, check Razorpay documentation for conversion
             if ($orderDTO->currencyCode !== 'INR') {

From c0b1376f81f05742fa1675227d48ac17c987ce94 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 3 Mar 2026 09:24:26 +0000
Subject: [PATCH 26/41] added test for RazorpayOrderCreationService

---
 .../Razorpay/RazorpayOrderCreationService.php |  14 +-
 .../RazorpayOrderCreationServiceTest.php      | 162 ++++++++++++++++++
 2 files changed, 169 insertions(+), 7 deletions(-)
 create mode 100644 backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayOrderCreationServiceTest.php

diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
index e69466d06..2da78b429 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayOrderCreationService.php
@@ -8,7 +8,7 @@
 use HiEvents\Services\Domain\Payment\Razorpay\DTOs\CreateRazorpayOrderResponseDTO;
 use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
 use Illuminate\Config\Repository;
-use Illuminate\Database\DatabaseManager;
+use Illuminate\Database\ConnectionInterface;
 use Psr\Log\LoggerInterface;
 use Razorpay\Api\Errors\Error;
 use Throwable;
@@ -18,7 +18,7 @@ class RazorpayOrderCreationService
     public function __construct(
         private readonly LoggerInterface $logger,
         private readonly Repository $config,
-        private readonly DatabaseManager $databaseManager,
+        private readonly ConnectionInterface $dbConnection,
         private readonly OrderApplicationFeeCalculationService $orderApplicationFeeCalculationService,
         private readonly RazorpayClientFactory $razorpayClientFactory,
     ) {
@@ -31,7 +31,7 @@ public function __construct(
     public function createOrder(CreateRazorpayOrderRequestDTO $orderDTO): CreateRazorpayOrderResponseDTO
     {
         try {
-            $this->databaseManager->beginTransaction();
+            $this->dbConnection->beginTransaction();
 
             $razorpayClient = $this->razorpayClientFactory->create();
 
@@ -50,7 +50,7 @@ public function createOrder(CreateRazorpayOrderRequestDTO $orderDTO): CreateRazo
             if ($orderDTO->currencyCode !== 'INR') {
                 // Razorpay supports multiple currencies but amounts might need different handling
                 // This depends on Razorpay's currency requirements
-                $amountInSmallestUnit = $orderDTO->amount->toFloat() * 100; // Default conversion
+                $amountInSmallestUnit = (int) round($orderDTO->amount->toFloat() * 100); // Default conversion
             }
 
             $orderData = [
@@ -90,7 +90,7 @@ public function createOrder(CreateRazorpayOrderRequestDTO $orderDTO): CreateRazo
                 'orderDTO' => $orderDTO->toArray(['account']),
             ]);
 
-            $this->databaseManager->commit();
+            $this->dbConnection->commit();
 
             return new CreateRazorpayOrderResponseDTO(
                 id: $razorpayOrder->id,
@@ -105,13 +105,13 @@ public function createOrder(CreateRazorpayOrderRequestDTO $orderDTO): CreateRazo
                 'orderDTO' => $orderDTO->toArray(['account']),
             ]);
 
-            $this->databaseManager->rollBack();
+            $this->dbConnection->rollBack();
 
             throw new CreateOrderFailedException(
                 __('There was an error communicating with the payment provider. Please try again later.')
             );
         } catch (Throwable $exception) {
-            $this->databaseManager->rollBack();
+            $this->dbConnection->rollBack();
 
             throw $exception;
         }
diff --git a/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayOrderCreationServiceTest.php b/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayOrderCreationServiceTest.php
new file mode 100644
index 000000000..296ce41cb
--- /dev/null
+++ b/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayOrderCreationServiceTest.php
@@ -0,0 +1,162 @@
+<?php
+
+namespace Tests\Unit\Services\Domain\Payment\Razorpay;
+
+use Exception;
+use HiEvents\DomainObjects\AccountDomainObject;
+use HiEvents\DomainObjects\OrderDomainObject;
+use HiEvents\Exceptions\Razorpay\CreateOrderFailedException;
+use HiEvents\Services\Domain\Order\OrderApplicationFeeCalculationService;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\CreateRazorpayOrderRequestDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\CreateRazorpayOrderResponseDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\RazorpayOrderCreationService;
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientInterface;
+use HiEvents\Values\MoneyValue;
+use Illuminate\Config\Repository;
+use Illuminate\Database\ConnectionInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
+use Razorpay\Api\Errors\BadRequestError;
+use Tests\TestCase;
+
+class RazorpayOrderCreationServiceTest extends TestCase
+{
+    private LoggerInterface&MockObject $loggerMock;
+    private Repository&MockObject $configMock;
+    private ConnectionInterface&MockObject $dbMock;
+    private OrderApplicationFeeCalculationService&MockObject $feeServiceMock;
+    private RazorpayClientFactory&MockObject $factoryMock;
+    private RazorpayClientInterface&MockObject $razorpayClientMock;
+    private RazorpayOrderCreationService $service;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->configMock = $this->createMock(Repository::class);
+        $this->dbMock = $this->createMock(ConnectionInterface::class); // <-- Perfectly mockable
+        $this->feeServiceMock = $this->createMock(OrderApplicationFeeCalculationService::class);
+        $this->factoryMock = $this->createMock(RazorpayClientFactory::class);
+        $this->razorpayClientMock = $this->createMock(RazorpayClientInterface::class);
+
+        $this->factoryMock->method('create')->willReturn($this->razorpayClientMock);
+
+        $this->service = new RazorpayOrderCreationService(
+            $this->loggerMock,
+            $this->configMock,
+            $this->dbMock,
+            $this->feeServiceMock,
+            $this->factoryMock
+        );
+    }
+
+    #[DataProvider('currencyDataProvider')]
+    public function testItCalculatesAmountCorrectlyBasedOnCurrency(
+        string $currencyCode,
+        int $minorUnit,
+        float $floatAmount,
+        int $expectedRazorpayAmount
+    ): void {
+        $dtoMock = $this->createMockedRequestDTO($currencyCode, $minorUnit, $floatAmount);
+        
+        $expectedRazorpayResponse = (object) [
+            'id'       => 'order_123',
+            'amount'   => $expectedRazorpayAmount,
+            'currency' => $currencyCode,
+            'receipt'  => 'SHORT_123'
+        ];
+
+        // Database Expectations
+        $this->dbMock->expects($this->once())->method('beginTransaction');
+        $this->dbMock->expects($this->once())->method('commit');
+        $this->dbMock->expects($this->never())->method('rollBack');
+
+        $this->configMock->method('get')
+            ->with('services.razorpay.key_id')
+            ->willReturn('test_key_id');
+
+        $this->razorpayClientMock->expects($this->once())
+            ->method('createOrder')
+            ->with($this->callback(function (array $orderData) use ($expectedRazorpayAmount, $currencyCode) {
+                return $orderData['amount'] === $expectedRazorpayAmount 
+                    && $orderData['currency'] === $currencyCode
+                    && $orderData['receipt'] === 'SHORT_123';
+            }))
+            ->willReturn($expectedRazorpayResponse);
+
+        $response = $this->service->createOrder($dtoMock);
+
+        $this->assertInstanceOf(CreateRazorpayOrderResponseDTO::class, $response);
+        $this->assertEquals('order_123', $response->id);
+    }
+
+    public function testItRollsBackAndThrowsCustomExceptionOnRazorpayError(): void
+    {
+        $dtoMock = $this->createMockedRequestDTO();
+
+        $this->dbMock->expects($this->once())->method('beginTransaction');
+        $this->dbMock->expects($this->never())->method('commit');
+        $this->dbMock->expects($this->once())->method('rollBack');
+
+        $this->razorpayClientMock->expects($this->once())
+            ->method('createOrder')
+            ->willThrowException(new BadRequestError('Invalid amount', 400, 400));
+
+        $this->expectException(CreateOrderFailedException::class);
+
+        $this->service->createOrder($dtoMock);
+    }
+
+    public function testItRollsBackAndRethrowsGenericException(): void
+    {
+        $dtoMock = $this->createMockedRequestDTO();
+
+        $this->dbMock->expects($this->once())->method('beginTransaction');
+        $this->dbMock->expects($this->never())->method('commit');
+        $this->dbMock->expects($this->once())->method('rollBack');
+
+        $this->razorpayClientMock->expects($this->once())
+            ->method('createOrder')
+            ->willThrowException(new Exception('Database connection lost'));
+
+        $this->expectException(Exception::class);
+
+        $this->service->createOrder($dtoMock);
+    }
+
+    private function createMockedRequestDTO(
+        string $currencyCode = 'INR', 
+        int $minorUnit = 50000, 
+        float $floatAmount = 500.00
+    ): CreateRazorpayOrderRequestDTO {
+        $amountMock = $this->createMock(MoneyValue::class); 
+        $amountMock->method('toMinorUnit')->willReturn($minorUnit);
+        $amountMock->method('toFloat')->willReturn($floatAmount);
+
+        $orderMock = $this->createMock(OrderDomainObject::class); 
+        $orderMock->method('getShortId')->willReturn('SHORT_123');
+        $orderMock->method('getId')->willReturn(1);
+        $orderMock->method('getEventId')->willReturn(99);
+
+        $accountMock = $this->createMock(AccountDomainObject::class); 
+        $accountMock->method('getId')->willReturn(5);
+
+        return new CreateRazorpayOrderRequestDTO(
+            amount: $amountMock,
+            currencyCode: $currencyCode,
+            account: $accountMock,
+            order: $orderMock
+        );
+    }
+
+    public static function currencyDataProvider(): array
+    {
+        return [
+            'INR uses minor unit' => ['INR', 50000, 500.00, 50000],
+            'USD calculates float' => ['USD', 5000, 45.50, 4550],
+        ];
+    }
+}
\ No newline at end of file

From 24d958d4ae4cc6c45d6151770430b930031cc8b0 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 3 Mar 2026 10:11:12 +0000
Subject: [PATCH 27/41] removed redundant CreateRazorpayOrderResponseDTO
 creation for return and added test for CreateRazorpayOrderHandler

---
 .../Razorpay/CreateRazorpayOrderHandler.php   |   9 +-
 .../CreateRazorpayOrderHandlerTest.php        | 214 ++++++++++++++++++
 2 files changed, 217 insertions(+), 6 deletions(-)
 create mode 100644 backend/tests/Unit/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandlerTest.php

diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php
index e393c839a..549bb217d 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php
@@ -22,6 +22,7 @@
 use HiEvents\Services\Domain\Payment\Razorpay\RazorpayOrderCreationService;
 use HiEvents\Services\Infrastructure\Session\CheckoutSessionManagementService;
 use HiEvents\Values\MoneyValue;
+use Illuminate\Config\Repository;
 use Throwable;
 
 readonly class CreateRazorpayOrderHandler
@@ -32,6 +33,7 @@ public function __construct(
         private CheckoutSessionManagementService $sessionIdentifierService,
         private RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
         private AccountRepositoryInterface $accountRepository,
+        private Repository $config
     ) {
     }
 
@@ -93,11 +95,6 @@ public function handle(string $orderShortId): CreateRazorpayOrderResponseDTO
             'receipt' => $order->getShortId(),
         ]);
 
-        return new CreateRazorpayOrderResponseDTO(
-            id: $razorpayOrder->id,
-            keyId: config('services.razorpay.key_id'),
-            amount: $razorpayOrder->amount,
-            currency: $razorpayOrder->currency,
-        );
+        return $razorpayOrder;
     }
 }
\ No newline at end of file
diff --git a/backend/tests/Unit/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandlerTest.php
new file mode 100644
index 000000000..a10d872cf
--- /dev/null
+++ b/backend/tests/Unit/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandlerTest.php
@@ -0,0 +1,214 @@
+<?php
+
+namespace Tests\Unit\Services\Application\Handlers\Order\Payment\Razorpay;
+
+use HiEvents\DomainObjects\AccountDomainObject;
+use HiEvents\DomainObjects\OrderDomainObject;
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\DomainObjects\Status\OrderStatus;
+use HiEvents\Exceptions\ResourceConflictException;
+use HiEvents\Exceptions\UnauthorizedException;
+use HiEvents\Repository\Interfaces\AccountRepositoryInterface;
+use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Application\Handlers\Order\Payment\Razorpay\CreateRazorpayOrderHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\CreateRazorpayOrderRequestDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\CreateRazorpayOrderResponseDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\RazorpayOrderCreationService;
+use HiEvents\Services\Infrastructure\Session\CheckoutSessionManagementService;
+use Illuminate\Config\Repository;
+use PHPUnit\Framework\MockObject\MockObject;
+use Tests\TestCase;
+
+class CreateRazorpayOrderHandlerTest extends TestCase
+{
+    private OrderRepositoryInterface&MockObject $orderRepoMock;
+    private RazorpayOrderCreationService&MockObject $razorpayOrderServiceMock;
+    private CheckoutSessionManagementService&MockObject $sessionServiceMock;
+    private RazorpayOrdersRepositoryInterface&MockObject $razorpayOrdersRepoMock;
+    private AccountRepositoryInterface&MockObject $accountRepoMock;
+    private Repository&MockObject $configMock;
+    private CreateRazorpayOrderHandler $handler;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->orderRepoMock = $this->createMock(OrderRepositoryInterface::class);
+        $this->razorpayOrderServiceMock = $this->createMock(RazorpayOrderCreationService::class);
+        $this->sessionServiceMock = $this->createMock(CheckoutSessionManagementService::class);
+        $this->razorpayOrdersRepoMock = $this->createMock(RazorpayOrdersRepositoryInterface::class);
+        $this->accountRepoMock = $this->createMock(AccountRepositoryInterface::class);
+        $this->configMock = $this->createMock(Repository::class);
+
+        // Handle fluent interface chaining consistently
+        $this->orderRepoMock->method('loadRelation')->willReturnSelf();
+        $this->accountRepoMock->method('loadRelation')->willReturnSelf();
+
+        $this->handler = new CreateRazorpayOrderHandler(
+            $this->orderRepoMock,
+            $this->razorpayOrderServiceMock,
+            $this->sessionServiceMock,
+            $this->razorpayOrdersRepoMock,
+            $this->accountRepoMock,
+            $this->configMock
+        );
+    }
+
+    // -------------------------------------------------------------------------
+    // UNHAPPY PATHS
+    // -------------------------------------------------------------------------
+
+    public function testItThrowsExceptionIfOrderNotFound(): void
+    {
+        $this->orderRepoMock->expects($this->once())
+            ->method('findByShortId')
+            ->with('SHORT_123')
+            ->willReturn(null);
+
+        $this->expectException(UnauthorizedException::class);
+        $this->expectExceptionMessage('Sorry, we could not verify your session. Please create a new order.');
+
+        $this->handler->handle('SHORT_123');
+    }
+
+    public function testItThrowsExceptionIfSessionIsInvalid(): void
+    {
+        $orderMock = $this->createMockedOrder();
+
+        $this->orderRepoMock->method('findByShortId')->willReturn($orderMock);
+
+        $this->sessionServiceMock->expects($this->once())
+            ->method('verifySession')
+            ->with('session_abc')
+            ->willReturn(false);
+
+        $this->expectException(UnauthorizedException::class);
+
+        $this->handler->handle('SHORT_123');
+    }
+
+    public function testItThrowsExceptionIfOrderIsNotReservedOrIsExpired(): void
+    {
+        // Use helper to quickly generate an expired order
+        $orderMock = $this->createMockedOrder(OrderStatus::COMPLETED->name, true);
+
+        $this->orderRepoMock->method('findByShortId')->willReturn($orderMock);
+        $this->sessionServiceMock->method('verifySession')->willReturn(true);
+
+        $this->expectException(ResourceConflictException::class);
+
+        $this->handler->handle('SHORT_123');
+    }
+
+    // -------------------------------------------------------------------------
+    // HAPPY PATHS
+    // -------------------------------------------------------------------------
+
+    public function testItReturnsEarlyIfRazorpayOrderAlreadyExists(): void
+    {
+        // 1. Arrange Existing Razorpay Data
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('getRazorpayOrderId')->willReturn('rp_existing_123');
+        $razorpayOrderMock->method('getAmount')->willReturn(50000);
+        $razorpayOrderMock->method('getCurrency')->willReturn('INR');
+
+        // Use helper to build order WITH the existing Razorpay object attached
+        $orderMock = $this->createMockedOrder(OrderStatus::RESERVED->name, false, $razorpayOrderMock);
+
+        $this->orderRepoMock->method('findByShortId')->willReturn($orderMock);
+        $this->sessionServiceMock->method('verifySession')->willReturn(true);
+        $this->accountRepoMock->method('findByEventId')->willReturn($this->createMock(AccountDomainObject::class));
+
+        $this->configMock->method('get')
+            ->with('services.razorpay.key_id')
+            ->willReturn('test_key_123');
+
+        // Verify we strictly avoid calling the external service or DB
+        $this->razorpayOrderServiceMock->expects($this->never())->method('createOrder');
+        $this->razorpayOrdersRepoMock->expects($this->never())->method('create');
+
+        // 2. Act
+        $response = $this->handler->handle('SHORT_123');
+
+        // 3. Assert
+        $this->assertInstanceOf(CreateRazorpayOrderResponseDTO::class, $response);
+        $this->assertEquals('rp_existing_123', $response->id);
+    }
+
+    public function testItCreatesNewRazorpayOrderSuccessfully(): void
+    {
+        // 1. Arrange Order & Account
+        $orderMock = $this->createMockedOrder(); // Defaults to valid/reserved
+        $accountMock = $this->createMock(AccountDomainObject::class);
+
+        $this->orderRepoMock->method('findByShortId')->willReturn($orderMock);
+        $this->sessionServiceMock->method('verifySession')->willReturn(true);
+        $this->accountRepoMock->method('findByEventId')->willReturn($accountMock);
+
+        $this->configMock->method('get')
+            ->with('services.razorpay.key_id')
+            ->willReturn('test_key_123');
+
+        $expectedServiceResponse = new CreateRazorpayOrderResponseDTO(
+            id: 'rp_new_123',
+            keyId: 'test_key_123',
+            amount: 50000,
+            currency: 'INR'
+        );
+
+        // 2. Assert Service is Called with correctly mapped DTO
+        $this->razorpayOrderServiceMock->expects($this->once())
+            ->method('createOrder')
+            ->with($this->callback(function (CreateRazorpayOrderRequestDTO $dto) use ($accountMock, $orderMock) {
+                return $dto->currencyCode === 'INR'
+                    && $dto->account === $accountMock
+                    && $dto->order === $orderMock;
+            }))
+            ->willReturn($expectedServiceResponse);
+
+        // 3. Assert Repository Creates Record
+        $this->razorpayOrdersRepoMock->expects($this->once())
+            ->method('create')
+            ->with([
+                'order_id' => 10,
+                'razorpay_order_id' => 'rp_new_123',
+                'amount' => 50000,
+                'currency' => 'INR',
+                'receipt' => 'SHORT_123',
+            ]);
+
+        // 4. Act
+        $response = $this->handler->handle('SHORT_123');
+
+        // 5. Assert Response
+        $this->assertInstanceOf(CreateRazorpayOrderResponseDTO::class, $response);
+        $this->assertEquals('rp_new_123', $response->id);
+    }
+
+    // -------------------------------------------------------------------------
+    // HELPERS
+    // -------------------------------------------------------------------------
+
+    /**
+     * Helper method to keep test bodies clean and consistent.
+     */
+    private function createMockedOrder(
+        string $status = 'RESERVED', // Using string default to avoid enum lookup in signature
+        bool $isExpired = false,
+        ?RazorpayOrderDomainObject $razorpayOrder = null
+    ): OrderDomainObject&MockObject {
+        $orderMock = $this->createMock(OrderDomainObject::class);
+        $orderMock->method('getSessionId')->willReturn('session_abc');
+        $orderMock->method('getStatus')->willReturn($status);
+        $orderMock->method('isReservedOrderExpired')->willReturn($isExpired);
+        $orderMock->method('getEventId')->willReturn(99);
+        $orderMock->method('getRazorpayOrder')->willReturn($razorpayOrder);
+        $orderMock->method('getTotalGross')->willReturn(500.00);
+        $orderMock->method('getCurrency')->willReturn('INR');
+        $orderMock->method('getId')->willReturn(10);
+        $orderMock->method('getShortId')->willReturn('SHORT_123');
+
+        return $orderMock;
+    }
+}
\ No newline at end of file

From 1f1fa4abb38774d2b59882e8d2b218ce25e6d159 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 3 Mar 2026 10:32:03 +0000
Subject: [PATCH 28/41] added test RazorpayPaymentCapturedHandlerTest

---
 .../RazorpayPaymentCapturedHandler.php        |   6 +-
 .../RazorpayPaymentCapturedHandlerTest.php    | 234 ++++++++++++++++++
 2 files changed, 237 insertions(+), 3 deletions(-)
 create mode 100644 backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandlerTest.php

diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php
index 50ed4fbac..990c34661 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandler.php
@@ -22,7 +22,7 @@
 use HiEvents\Services\Infrastructure\DomainEvents\Enums\DomainEventType;
 use HiEvents\Services\Infrastructure\DomainEvents\Events\OrderEvent;
 use Illuminate\Cache\Repository;
-use Illuminate\Database\DatabaseManager;
+use Illuminate\Database\ConnectionInterface;
 use Illuminate\Log\Logger;
 use Throwable;
 
@@ -34,7 +34,7 @@ public function __construct(
         private readonly AffiliateRepositoryInterface      $affiliateRepository,
         private readonly ProductQuantityUpdateService      $quantityUpdateService,
         private readonly AttendeeRepositoryInterface       $attendeeRepository,
-        private readonly DatabaseManager                   $databaseManager,
+        private readonly ConnectionInterface               $dbConnection,
         private readonly Logger                            $logger,
         private readonly Repository                        $cache,
         private readonly DomainEventDispatcherService      $domainEventDispatcherService,
@@ -57,7 +57,7 @@ public function handleEvent(RazorpayPaymentPayload $event): void
             return;
         }
 
-        $this->databaseManager->transaction(function () use ($paymentEntity) {
+        $this->dbConnection->transaction(function () use ($paymentEntity) {
             // Find the local razorpay order record by the Razorpay payment ID
             $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($paymentEntity->id);
 
diff --git a/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandlerTest.php b/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandlerTest.php
new file mode 100644
index 000000000..c50d5033b
--- /dev/null
+++ b/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentCapturedHandlerTest.php
@@ -0,0 +1,234 @@
+<?php
+
+namespace Tests\Unit\Services\Domain\Payment\Razorpay\EventHandlers;
+
+use HiEvents\DomainObjects\Enums\PaymentProviders;
+use HiEvents\DomainObjects\OrderDomainObject;
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\DomainObjects\Status\AttendeeStatus;
+use HiEvents\DomainObjects\Status\OrderApplicationFeeStatus;
+use HiEvents\DomainObjects\Status\OrderPaymentStatus;
+use HiEvents\DomainObjects\Status\OrderStatus;
+use HiEvents\Events\OrderStatusChangedEvent;
+use HiEvents\Repository\Interfaces\AffiliateRepositoryInterface;
+use HiEvents\Repository\Interfaces\AttendeeRepositoryInterface;
+use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\Order\OrderApplicationFeeService;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentPayload;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentCapturedHandler;
+use HiEvents\Services\Domain\Product\ProductQuantityUpdateService;
+use HiEvents\Services\Infrastructure\DomainEvents\DomainEventDispatcherService;
+use HiEvents\Services\Infrastructure\DomainEvents\Events\OrderEvent;
+use Illuminate\Cache\Repository as CacheRepository;
+use Illuminate\Database\ConnectionInterface;
+use Illuminate\Log\Logger;
+use Illuminate\Support\Facades\Event;
+use PHPUnit\Framework\MockObject\MockObject;
+use Tests\TestCase;
+
+class RazorpayPaymentCapturedHandlerTest extends TestCase
+{
+    private OrderRepositoryInterface&MockObject $orderRepoMock;
+    private RazorpayOrdersRepositoryInterface&MockObject $razorpayOrdersRepoMock;
+    private AffiliateRepositoryInterface&MockObject $affiliateRepoMock;
+    private ProductQuantityUpdateService&MockObject $quantityUpdateServiceMock;
+    private AttendeeRepositoryInterface&MockObject $attendeeRepoMock;
+    private ConnectionInterface&MockObject $dbConnectionMock; 
+    private Logger&MockObject $loggerMock;
+    private CacheRepository&MockObject $cacheMock;
+    private DomainEventDispatcherService&MockObject $eventDispatcherMock;
+    private OrderApplicationFeeService&MockObject $feeServiceMock;
+    private RazorpayPaymentCapturedHandler $handler;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->orderRepoMock = $this->createMock(OrderRepositoryInterface::class);
+        $this->razorpayOrdersRepoMock = $this->createMock(RazorpayOrdersRepositoryInterface::class);
+        $this->affiliateRepoMock = $this->createMock(AffiliateRepositoryInterface::class);
+        $this->quantityUpdateServiceMock = $this->createMock(ProductQuantityUpdateService::class);
+        $this->attendeeRepoMock = $this->createMock(AttendeeRepositoryInterface::class);
+        $this->dbConnectionMock = $this->createMock(ConnectionInterface::class); 
+        $this->loggerMock = $this->createMock(Logger::class);
+        $this->cacheMock = $this->createMock(CacheRepository::class);
+        $this->eventDispatcherMock = $this->createMock(DomainEventDispatcherService::class);
+        $this->feeServiceMock = $this->createMock(OrderApplicationFeeService::class);
+
+        $this->orderRepoMock->method('loadRelation')->willReturnSelf();
+
+        $this->dbConnectionMock->method('transaction')->willReturnCallback(function (callable $callback) {
+            return $callback();
+        });
+        
+        Event::fake();
+
+        $this->handler = new RazorpayPaymentCapturedHandler(
+            $this->orderRepoMock,
+            $this->razorpayOrdersRepoMock,
+            $this->affiliateRepoMock,
+            $this->quantityUpdateServiceMock,
+            $this->attendeeRepoMock,
+            $this->dbConnectionMock, 
+            $this->loggerMock,
+            $this->cacheMock,
+            $this->eventDispatcherMock,
+            $this->feeServiceMock
+        );
+    }
+
+    public function testItReturnsEarlyIfPaymentAlreadyHandled(): void
+    {
+        $payload = $this->createPayload();
+
+        $this->cacheMock->expects($this->once())
+            ->method('has')
+            ->with('razorpay_webhook_payment_pay_123')
+            ->willReturn(true);
+        
+        $this->dbConnectionMock->expects($this->never())->method('transaction');
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItReturnsEarlyIfRazorpayOrderNotFoundInDatabase(): void
+    {
+        $payload = $this->createPayload();
+
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $this->razorpayOrdersRepoMock->expects($this->once())
+            ->method('findByPaymentId')
+            ->with('pay_123')
+            ->willReturn(null); 
+
+        $this->orderRepoMock->expects($this->never())->method('findById');
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItProcessesPaymentSuccessfullyAndUpdatesOrderAndAffiliate(): void
+    {
+        $payload = $this->createPayload();
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('toArray')->willReturn(['order_id' => 10]);
+        $this->razorpayOrdersRepoMock->method('findByPaymentId')->willReturn($razorpayOrderMock);
+
+        $orderMock = $this->createMock(OrderDomainObject::class);
+        $orderMock->method('toArray')->willReturn([
+            'payment_status' => OrderPaymentStatus::AWAITING_PAYMENT->name,
+            'affiliate_id' => 99 
+        ]);
+        $orderMock->method('getId')->willReturn(10);
+        $orderMock->method('getTotalGross')->willReturn(500.00);
+        $orderMock->method('getCurrency')->willReturn('INR');
+
+        $updatedOrderMock = clone $orderMock;
+
+        $this->orderRepoMock->method('findById')->willReturn($orderMock);
+        $this->orderRepoMock->method('updateFromArray')->willReturn($updatedOrderMock);
+
+        
+        $this->razorpayOrdersRepoMock->expects($this->once())
+            ->method('updateByOrderId')
+            ->with(10, $this->callback(fn($data) => $data['status'] === 'captured' && (int)$data['amount'] === 50000));
+
+        $this->orderRepoMock->expects($this->once())
+            ->method('updateFromArray')
+            ->with(10, [
+                'payment_status' => OrderPaymentStatus::PAYMENT_RECEIVED->name,
+                'status' => OrderStatus::COMPLETED->name,
+                'payment_provider' => PaymentProviders::RAZORPAY->value,
+            ]);
+
+        $this->attendeeRepoMock->expects($this->once())
+            ->method('updateWhere')
+            ->with(['status' => AttendeeStatus::ACTIVE->name], ['order_id' => 10, 'status' => AttendeeStatus::AWAITING_PAYMENT->name]);
+
+        $this->quantityUpdateServiceMock->expects($this->once())->method('updateQuantitiesFromOrder');
+
+        $this->affiliateRepoMock->expects($this->once())
+            ->method('incrementSales')
+            ->with(99, 500.00);
+
+        $this->feeServiceMock->expects($this->once())
+            ->method('createOrderApplicationFee')
+            ->with(10, 100, OrderApplicationFeeStatus::PAID, PaymentProviders::RAZORPAY, 'INR');
+
+        $this->cacheMock->expects($this->once())
+            ->method('put')
+            ->with('razorpay_webhook_payment_pay_123', true);
+
+        $this->eventDispatcherMock->expects($this->once())
+            ->method('dispatch')
+            ->with($this->isInstanceOf(OrderEvent::class));
+
+        
+        $this->handler->handleEvent($payload);
+        
+        Event::assertDispatched(OrderStatusChangedEvent::class);
+    }
+
+    public function testItSkipsOrderUpdatesIfAlreadyPaid(): void
+    {
+        $payload = $this->createPayload();
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('toArray')->willReturn(['order_id' => 10]);
+        $this->razorpayOrdersRepoMock->method('findByPaymentId')->willReturn($razorpayOrderMock);
+
+        $orderMock = $this->createMock(OrderDomainObject::class);
+        $orderMock->method('toArray')->willReturn([
+            'payment_status' => OrderPaymentStatus::PAYMENT_RECEIVED->name,
+        ]);
+        $orderMock->method('getId')->willReturn(10);
+        $orderMock->method('getCurrency')->willReturn('INR');
+
+        $this->orderRepoMock->method('findById')->willReturn($orderMock);
+
+        $this->orderRepoMock->expects($this->never())->method('updateFromArray');
+        $this->attendeeRepoMock->expects($this->never())->method('updateWhere');
+        $this->affiliateRepoMock->expects($this->never())->method('incrementSales');
+        $this->eventDispatcherMock->expects($this->never())->method('dispatch');
+
+        $this->feeServiceMock->expects($this->once())->method('createOrderApplicationFee');
+        $this->cacheMock->expects($this->once())->method('put');
+
+        $this->handler->handleEvent($payload);
+
+        Event::assertNotDispatched(OrderStatusChangedEvent::class);
+    }
+
+    
+    
+    
+
+    private function createPayload(): RazorpayPaymentPayload
+    {
+        $paymentDTO = new RazorpayPaymentDTO(
+            id: 'pay_123',
+            entity: 'payment',
+            amount: 50000,
+            currency: 'INR',
+            status: 'captured',
+            method: 'card',
+            order_id: 'order_123',
+            fee: 100,
+            tax: 18,
+            description: 'Test payment',
+            notes: [],
+            vpa: null,
+            email: 'test@example.com',
+            contact: '+919876543210',
+            created_at: null,
+            error: null
+        );
+
+        return new RazorpayPaymentPayload($paymentDTO);
+    }
+}
\ No newline at end of file

From 1550be7f8dc25b4bb1e9ce903551395010910b51 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 3 Mar 2026 11:00:42 +0000
Subject: [PATCH 29/41] added test RazorpayOrderPaidHandlerTest

---
 .../RazorpayOrderPaidHandler.php              |  14 +-
 .../RazorpayOrderPaidHandlerTest.php          | 275 ++++++++++++++++++
 2 files changed, 278 insertions(+), 11 deletions(-)
 create mode 100644 backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandlerTest.php

diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandler.php
index 77c7901e2..05be9b1a2 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandler.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandler.php
@@ -22,7 +22,7 @@
 use HiEvents\Services\Infrastructure\DomainEvents\Enums\DomainEventType;
 use HiEvents\Services\Infrastructure\DomainEvents\Events\OrderEvent;
 use Illuminate\Cache\Repository;
-use Illuminate\Database\DatabaseManager;
+use Illuminate\Database\ConnectionInterface;
 use Illuminate\Log\Logger;
 use Throwable;
 
@@ -34,7 +34,7 @@ public function __construct(
         private readonly AffiliateRepositoryInterface $affiliateRepository,
         private readonly ProductQuantityUpdateService $quantityUpdateService,
         private readonly AttendeeRepositoryInterface $attendeeRepository,
-        private readonly DatabaseManager $databaseManager,
+        private readonly ConnectionInterface $dbConnection,
         private readonly Logger $logger,
         private readonly Repository $cache,
         private readonly DomainEventDispatcherService $domainEventDispatcherService,
@@ -61,7 +61,7 @@ public function handleEvent(RazorpayOrderPaidPayload $event): void
             return;
         }
 
-        $this->databaseManager->transaction(function () use ($orderEntity, $paymentEntity) {
+        $this->dbConnection->transaction(function () use ($orderEntity, $paymentEntity) {
             // Find local razorpay order record by the Razorpay order ID
             $razorpayOrder = $this->razorpayOrdersRepository->findByRazorpayOrderId($orderEntity->id);
 
@@ -79,14 +79,6 @@ public function handleEvent(RazorpayOrderPaidPayload $event): void
                 ->loadRelation(new Relationship(OrderItemDomainObject::class))
                 ->findById($localOrderId);
 
-            if (!$order) {
-                $this->logger->warning('Local order not found for order.paid webhook', [
-                    'local_order_id' => $localOrderId,
-                    'razorpay_order_id' => $orderEntity->id,
-                ]);
-                return;
-            }
-
             // Update the razorpay_orders record with payment details (all amounts in paise)
             $this->razorpayOrdersRepository->updateByOrderId($localOrderId, [
                 'razorpay_payment_id' => $paymentEntity->id,
diff --git a/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandlerTest.php b/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandlerTest.php
new file mode 100644
index 000000000..f70d1b755
--- /dev/null
+++ b/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayOrderPaidHandlerTest.php
@@ -0,0 +1,275 @@
+<?php
+
+namespace Tests\Unit\Services\Domain\Payment\Razorpay\EventHandlers;
+
+use HiEvents\DomainObjects\Enums\PaymentProviders;
+use HiEvents\DomainObjects\OrderDomainObject;
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\DomainObjects\Status\AttendeeStatus;
+use HiEvents\DomainObjects\Status\OrderApplicationFeeStatus;
+use HiEvents\DomainObjects\Status\OrderPaymentStatus;
+use HiEvents\DomainObjects\Status\OrderStatus;
+use HiEvents\Events\OrderStatusChangedEvent;
+use HiEvents\Repository\Interfaces\AffiliateRepositoryInterface;
+use HiEvents\Repository\Interfaces\AttendeeRepositoryInterface;
+use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\Order\OrderApplicationFeeService;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayOrderDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayOrderPaidPayload;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayOrderPaidHandler;
+use HiEvents\Services\Domain\Product\ProductQuantityUpdateService;
+use HiEvents\Services\Infrastructure\DomainEvents\DomainEventDispatcherService;
+use HiEvents\Services\Infrastructure\DomainEvents\Events\OrderEvent;
+use Illuminate\Cache\Repository as CacheRepository;
+use Illuminate\Database\ConnectionInterface;
+use Illuminate\Log\Logger;
+use Illuminate\Support\Facades\Event;
+use PHPUnit\Framework\MockObject\MockObject;
+use Tests\TestCase;
+
+class RazorpayOrderPaidHandlerTest extends TestCase
+{
+    private OrderRepositoryInterface&MockObject $orderRepoMock;
+    private RazorpayOrdersRepositoryInterface&MockObject $razorpayOrdersRepoMock;
+    private AffiliateRepositoryInterface&MockObject $affiliateRepoMock;
+    private ProductQuantityUpdateService&MockObject $quantityUpdateServiceMock;
+    private AttendeeRepositoryInterface&MockObject $attendeeRepoMock;
+    private ConnectionInterface&MockObject $dbConnectionMock;
+    private Logger&MockObject $loggerMock;
+    private CacheRepository&MockObject $cacheMock;
+    private DomainEventDispatcherService&MockObject $eventDispatcherMock;
+    private OrderApplicationFeeService&MockObject $feeServiceMock;
+    private RazorpayOrderPaidHandler $handler;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->orderRepoMock = $this->createMock(OrderRepositoryInterface::class);
+        $this->razorpayOrdersRepoMock = $this->createMock(RazorpayOrdersRepositoryInterface::class);
+        $this->affiliateRepoMock = $this->createMock(AffiliateRepositoryInterface::class);
+        $this->quantityUpdateServiceMock = $this->createMock(ProductQuantityUpdateService::class);
+        $this->attendeeRepoMock = $this->createMock(AttendeeRepositoryInterface::class);
+        $this->dbConnectionMock = $this->createMock(ConnectionInterface::class);
+        $this->loggerMock = $this->createMock(Logger::class);
+        $this->cacheMock = $this->createMock(CacheRepository::class);
+        $this->eventDispatcherMock = $this->createMock(DomainEventDispatcherService::class);
+        $this->feeServiceMock = $this->createMock(OrderApplicationFeeService::class);
+
+        $this->orderRepoMock->method('loadRelation')->willReturnSelf();
+
+
+        $this->dbConnectionMock->method('transaction')->willReturnCallback(function (callable $callback) {
+            return $callback();
+        });
+
+        Event::fake();
+
+        $this->handler = new RazorpayOrderPaidHandler(
+            $this->orderRepoMock,
+            $this->razorpayOrdersRepoMock,
+            $this->affiliateRepoMock,
+            $this->quantityUpdateServiceMock,
+            $this->attendeeRepoMock,
+            $this->dbConnectionMock,
+            $this->loggerMock,
+            $this->cacheMock,
+            $this->eventDispatcherMock,
+            $this->feeServiceMock
+        );
+    }
+
+    public function testItReturnsEarlyIfEventAlreadyHandled(): void
+    {
+        $payload = $this->createPayload();
+
+        $this->cacheMock->expects($this->once())
+            ->method('has')
+            ->with('razorpay_order_paid_order_rzp_123')
+            ->willReturn(true);
+
+        $this->dbConnectionMock->expects($this->never())->method('transaction');
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItReturnsEarlyIfRazorpayOrderNotFoundInDatabase(): void
+    {
+        $payload = $this->createPayload();
+
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $this->razorpayOrdersRepoMock->expects($this->once())
+            ->method('findByRazorpayOrderId')
+            ->with('order_rzp_123')
+            ->willReturn(null);
+
+        $this->orderRepoMock->expects($this->never())->method('findById');
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItThrowsExceptionIfLocalOrderNotFound(): void
+    {
+        $payload = $this->createPayload();
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('getOrderId')->willReturn(10);
+
+        $this->razorpayOrdersRepoMock->method('findByRazorpayOrderId')->willReturn($razorpayOrderMock);
+
+        // Instruct the mock to throw an exception, simulating the repository failing to find the record
+        $this->orderRepoMock->expects($this->once())
+            ->method('findById')
+            ->with(10)
+            ->willThrowException(new \Exception('Order not found'));
+
+        // We expect the exception to bubble up and abort the process
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Order not found');
+
+        // We also strictly verify that NO database updates happen if the order isn't found
+        $this->razorpayOrdersRepoMock->expects($this->never())->method('updateByOrderId');
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItProcessesOrderSuccessfullyAndUpdatesRelatedEntities(): void
+    {
+        $payload = $this->createPayload();
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('getOrderId')->willReturn(10);
+        $this->razorpayOrdersRepoMock->method('findByRazorpayOrderId')->willReturn($razorpayOrderMock);
+
+        $orderMock = $this->createMock(OrderDomainObject::class);
+        $orderMock->method('getPaymentStatus')->willReturn(OrderPaymentStatus::AWAITING_PAYMENT->name);
+        $orderMock->method('getId')->willReturn(10);
+        $orderMock->method('getTotalGross')->willReturn(500.00);
+        $orderMock->method('toArray')->willReturn(['affiliate_id' => 99]);
+
+        $updatedOrderMock = clone $orderMock;
+
+        $this->orderRepoMock->method('findById')->willReturn($orderMock);
+        $this->orderRepoMock->method('updateFromArray')->willReturn($updatedOrderMock);
+
+
+        $this->razorpayOrdersRepoMock->expects($this->once())
+            ->method('updateByOrderId')
+            ->with(10, $this->callback(fn($data) => $data['status'] === 'captured' && (int) $data['amount'] === 50000));
+
+        $this->orderRepoMock->expects($this->once())
+            ->method('updateFromArray')
+            ->with(10, [
+                'payment_status' => OrderPaymentStatus::PAYMENT_RECEIVED->name,
+                'status' => OrderStatus::COMPLETED->name,
+                'payment_provider' => PaymentProviders::RAZORPAY->value,
+            ]);
+
+        $this->attendeeRepoMock->expects($this->once())
+            ->method('updateWhere')
+            ->with(['status' => AttendeeStatus::ACTIVE->name], ['order_id' => 10, 'status' => AttendeeStatus::AWAITING_PAYMENT->name]);
+
+        $this->quantityUpdateServiceMock->expects($this->once())->method('updateQuantitiesFromOrder');
+
+        $this->affiliateRepoMock->expects($this->once())
+            ->method('incrementSales')
+            ->with(99, 500.00);
+
+        $this->feeServiceMock->expects($this->once())
+            ->method('createOrderApplicationFee')
+            ->with(10, 100, OrderApplicationFeeStatus::PAID, PaymentProviders::RAZORPAY, 'INR');
+
+        $this->cacheMock->expects($this->once())
+            ->method('put')
+            ->with('razorpay_order_paid_order_rzp_123', true);
+
+        $this->eventDispatcherMock->expects($this->once())
+            ->method('dispatch')
+            ->with($this->isInstanceOf(OrderEvent::class));
+
+        $this->handler->handleEvent($payload);
+
+        Event::assertDispatched(OrderStatusChangedEvent::class);
+    }
+
+    public function testItSkipsOrderUpdatesIfAlreadyPaid(): void
+    {
+        $payload = $this->createPayload();
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('getOrderId')->willReturn(10);
+        $this->razorpayOrdersRepoMock->method('findByRazorpayOrderId')->willReturn($razorpayOrderMock);
+
+
+        $orderMock = $this->createMock(OrderDomainObject::class);
+        $orderMock->method('getPaymentStatus')->willReturn(OrderPaymentStatus::PAYMENT_RECEIVED->name);
+        $orderMock->method('getId')->willReturn(10);
+
+        $this->orderRepoMock->method('findById')->willReturn($orderMock);
+
+        $this->orderRepoMock->expects($this->never())->method('updateFromArray');
+        $this->attendeeRepoMock->expects($this->never())->method('updateWhere');
+        $this->affiliateRepoMock->expects($this->never())->method('incrementSales');
+        $this->eventDispatcherMock->expects($this->never())->method('dispatch');
+
+        $this->feeServiceMock->expects($this->once())->method('createOrderApplicationFee');
+        $this->cacheMock->expects($this->once())->method('put');
+
+        $this->handler->handleEvent($payload);
+
+        Event::assertNotDispatched(OrderStatusChangedEvent::class);
+    }
+
+    private function createPayload(): RazorpayOrderPaidPayload
+    {
+        return new RazorpayOrderPaidPayload(
+            order: $this->createDummyOrderDTO(),
+            payment: $this->createDummyPaymentDTO()
+        );
+    }
+
+    private function createDummyOrderDTO(): RazorpayOrderDTO
+    {
+        return new RazorpayOrderDTO(
+            id: 'order_rzp_123',
+            entity: 'order',
+            amount: 50000,
+            amount_paid: 50000,
+            amount_due: 0,
+            currency: 'INR',
+            receipt: 'receipt_123',
+            status: 'paid',
+            created_at: time(),
+            notes: []
+        );
+    }
+
+    private function createDummyPaymentDTO(): RazorpayPaymentDTO
+    {
+        return new RazorpayPaymentDTO(
+            id: 'pay_123',
+            entity: 'payment',
+            amount: 50000,
+            currency: 'INR',
+            status: 'captured',
+            method: 'card',
+            order_id: 'order_rzp_123',
+            fee: 100,
+            tax: 18,
+            description: 'Test payment',
+            notes: [],
+            vpa: null,
+            email: 'test@example.com',
+            contact: '+919876543210',
+            created_at: time(),
+            error: null
+
+        );
+    }
+}
\ No newline at end of file

From f8381a6799f8ffc30891e0ad73305b1e35fc9ace Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 3 Mar 2026 11:10:36 +0000
Subject: [PATCH 30/41] added test RazorpayRefundHandlerTest

---
 .../EventHandlers/RazorpayRefundHandler.php   |   6 +-
 .../RazorpayRefundHandlerTest.php             | 198 ++++++++++++++++++
 2 files changed, 201 insertions(+), 3 deletions(-)
 create mode 100644 backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandlerTest.php

diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php
index b7689b626..ee9b3a90e 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php
@@ -11,7 +11,7 @@
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
 use HiEvents\Repository\Interfaces\OrderRefundRepositoryInterface;
 use Illuminate\Cache\Repository;
-use Illuminate\Database\DatabaseManager;
+use Illuminate\Database\ConnectionInterface;
 use Illuminate\Log\Logger;
 use Throwable;
 
@@ -21,7 +21,7 @@ public function __construct(
         private readonly OrderRepositoryInterface $orderRepository,
         private readonly RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
         private readonly OrderRefundRepositoryInterface $refundRepository,
-        private readonly DatabaseManager $databaseManager,
+        private readonly ConnectionInterface $dbConnection,
         private readonly Logger $logger,
         private readonly Repository $cache,
     ) {
@@ -46,7 +46,7 @@ public function handleEvent(RazorpayRefundPayload $payload): void
             return;
         }
 
-        $this->databaseManager->transaction(function () use ($refundEntity, $paymentId) {
+        $this->dbConnection->transaction(function () use ($refundEntity, $paymentId) {
             // 1. Find the Razorpay order record by payment ID
             $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($paymentId);
 
diff --git a/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandlerTest.php b/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandlerTest.php
new file mode 100644
index 000000000..7422ccacd
--- /dev/null
+++ b/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandlerTest.php
@@ -0,0 +1,198 @@
+<?php
+
+namespace Tests\Unit\Services\Domain\Payment\Razorpay\EventHandlers;
+
+use Exception;
+use HiEvents\DomainObjects\OrderDomainObject;
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\DomainObjects\Status\OrderPaymentStatus;
+use HiEvents\Repository\Interfaces\OrderRefundRepositoryInterface;
+use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayRefundDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayRefundPayload;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayRefundHandler;
+use Illuminate\Cache\Repository as CacheRepository;
+use Illuminate\Database\ConnectionInterface;
+use Illuminate\Log\Logger;
+use PHPUnit\Framework\MockObject\MockObject;
+use Tests\TestCase;
+
+class RazorpayRefundHandlerTest extends TestCase
+{
+    private OrderRepositoryInterface&MockObject $orderRepoMock;
+    private RazorpayOrdersRepositoryInterface&MockObject $razorpayOrdersRepoMock;
+    private OrderRefundRepositoryInterface&MockObject $refundRepoMock;
+    private ConnectionInterface&MockObject $dbConnectionMock;
+    private Logger&MockObject $loggerMock;
+    private CacheRepository&MockObject $cacheMock;
+    private RazorpayRefundHandler $handler;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->orderRepoMock = $this->createMock(OrderRepositoryInterface::class);
+        $this->razorpayOrdersRepoMock = $this->createMock(RazorpayOrdersRepositoryInterface::class);
+        $this->refundRepoMock = $this->createMock(OrderRefundRepositoryInterface::class);
+        $this->dbConnectionMock = $this->createMock(ConnectionInterface::class);
+        $this->loggerMock = $this->createMock(Logger::class);
+        $this->cacheMock = $this->createMock(CacheRepository::class);
+
+        $this->orderRepoMock->method('loadRelation')->willReturnSelf();
+
+        $this->dbConnectionMock->method('transaction')->willReturnCallback(function (callable $callback) {
+            return $callback();
+        });
+
+        $this->handler = new RazorpayRefundHandler(
+            $this->orderRepoMock,
+            $this->razorpayOrdersRepoMock,
+            $this->refundRepoMock,
+            $this->dbConnectionMock,
+            $this->loggerMock,
+            $this->cacheMock
+        );
+    }
+
+    public function testItReturnsEarlyIfEventAlreadyHandled(): void
+    {
+        $payload = $this->createPayload();
+
+        $this->cacheMock->expects($this->once())
+            ->method('has')
+            ->with('razorpay_refund_rfnd_123')
+            ->willReturn(true);
+
+        $this->dbConnectionMock->expects($this->never())->method('transaction');
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItReturnsEarlyIfRazorpayOrderNotFoundInDatabase(): void
+    {
+        $payload = $this->createPayload();
+
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $this->razorpayOrdersRepoMock->expects($this->once())
+            ->method('findByPaymentId')
+            ->with('pay_123')
+            ->willReturn(null);
+
+        $this->orderRepoMock->expects($this->never())->method('findById');
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItThrowsExceptionIfLocalOrderNotFound(): void
+    {
+        $payload = $this->createPayload();
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('getOrderId')->willReturn(10);
+
+        $this->razorpayOrdersRepoMock->method('findByPaymentId')->willReturn($razorpayOrderMock);
+
+        $this->orderRepoMock->expects($this->once())
+            ->method('findById')
+            ->with(10)
+            ->willThrowException(new Exception('Order not found'));
+
+        $this->refundRepoMock->expects($this->never())->method('create');
+
+        $this->expectException(Exception::class);
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItProcessesPartialRefundSuccessfully(): void
+    {
+        $payload = $this->createPayload(20000);
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('getOrderId')->willReturn(10);
+        $this->razorpayOrdersRepoMock->method('findByPaymentId')->willReturn($razorpayOrderMock);
+
+        $orderMock = $this->createMock(OrderDomainObject::class);
+        $orderMock->method('getId')->willReturn(10);
+        $orderMock->method('getTotalGross')->willReturn(500.00);
+
+        $this->orderRepoMock->method('findById')->willReturn($orderMock);
+
+        $this->refundRepoMock->expects($this->once())
+            ->method('getTotalRefundedForOrder')
+            ->with(10)
+            ->willReturn(200.00);
+
+        $this->refundRepoMock->expects($this->once())
+            ->method('create')
+            ->with([
+                'order_id' => 10,
+                'payment_provider' => 'razorpay',
+                'refund_id' => 'rfnd_123',
+                'amount' => 200.00,
+                'currency' => 'INR',
+                'status' => 'processed',
+                'reason' => 'customer requested',
+                'metadata' => [
+                    'razorpay_refund' => $payload->refund->toArray(),
+                ],
+            ]);
+
+        $this->orderRepoMock->expects($this->once())
+            ->method('updateFromArray')
+            ->with(10, ['payment_status' => OrderPaymentStatus::PARTIALLY_REFUNDED->name]);
+
+        $this->cacheMock->expects($this->once())->method('put');
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItProcessesFullRefundSuccessfully(): void
+    {
+        $payload = $this->createPayload(50000);
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('getOrderId')->willReturn(10);
+        $this->razorpayOrdersRepoMock->method('findByPaymentId')->willReturn($razorpayOrderMock);
+
+        $orderMock = $this->createMock(OrderDomainObject::class);
+        $orderMock->method('getId')->willReturn(10);
+        $orderMock->method('getTotalGross')->willReturn(500.00);
+
+        $this->orderRepoMock->method('findById')->willReturn($orderMock);
+
+        $this->refundRepoMock->expects($this->once())
+            ->method('getTotalRefundedForOrder')
+            ->with(10)
+            ->willReturn(500.00);
+
+        $this->orderRepoMock->expects($this->once())
+            ->method('updateFromArray')
+            ->with(10, ['payment_status' => OrderPaymentStatus::REFUNDED->name]);
+
+        $this->handler->handleEvent($payload);
+    }
+
+    private function createPayload(int $amountInPaise = 50000): RazorpayRefundPayload
+    {
+        return new RazorpayRefundPayload(
+            refund: new RazorpayRefundDTO(
+                id: 'rfnd_123',
+                entity: 'refund',
+                amount: $amountInPaise,
+                currency: 'INR',
+                payment_id: 'pay_123',
+                status: 'processed',
+                created_at: time(),
+                notes: ['reason' => 'customer requested'],
+                fee: 10,
+                tax: 13
+            )
+        );
+    }
+}
\ No newline at end of file

From ecdd395ac1047a5ed319461ca697426418400be9 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 3 Mar 2026 11:23:19 +0000
Subject: [PATCH 31/41] added test RazorpayPaymentFailedHandlerTest

---
 .../RazorpayPaymentFailedHandler.php          |   6 +-
 .../RazorpayPaymentFailedHandlerTest.php      | 149 ++++++++++++++++++
 2 files changed, 152 insertions(+), 3 deletions(-)
 create mode 100644 backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandlerTest.php

diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandler.php
index 823c1f4c3..3672062fe 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandler.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandler.php
@@ -5,7 +5,7 @@
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
 use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentPayload;
 use Illuminate\Cache\Repository;
-use Illuminate\Database\DatabaseManager;
+use Illuminate\Database\ConnectionInterface;
 use Illuminate\Log\Logger;
 use Throwable;
 
@@ -13,7 +13,7 @@ class RazorpayPaymentFailedHandler
 {
     public function __construct(
         private readonly RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
-        private readonly DatabaseManager $databaseManager,
+        private readonly ConnectionInterface $dbConnection,
         private readonly Logger $logger,
         private readonly Repository $cache,
     ) {}
@@ -33,7 +33,7 @@ public function handleEvent(RazorpayPaymentPayload $event): void
             return;
         }
 
-        $this->databaseManager->transaction(function () use ($paymentEntity) {
+        $this->dbConnection->transaction(function () use ($paymentEntity) {
             // Try to find by payment ID first (if this payment ID is already stored)
             // If not found, fallback to order ID (because payment ID might not be stored yet)
             $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($paymentEntity->id)
diff --git a/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandlerTest.php b/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandlerTest.php
new file mode 100644
index 000000000..1a91d9160
--- /dev/null
+++ b/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentFailedHandlerTest.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace Tests\Unit\Services\Domain\Payment\Razorpay\EventHandlers;
+
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayErrorDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentPayload;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentFailedHandler;
+use Illuminate\Cache\Repository as CacheRepository;
+use Illuminate\Database\ConnectionInterface;
+use Illuminate\Log\Logger;
+use PHPUnit\Framework\MockObject\MockObject;
+use Tests\TestCase;
+
+class RazorpayPaymentFailedHandlerTest extends TestCase
+{
+    private RazorpayOrdersRepositoryInterface&MockObject $razorpayOrdersRepoMock;
+    private ConnectionInterface&MockObject $dbConnectionMock;
+    private Logger&MockObject $loggerMock;
+    private CacheRepository&MockObject $cacheMock;
+    private RazorpayPaymentFailedHandler $handler;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->razorpayOrdersRepoMock = $this->createMock(RazorpayOrdersRepositoryInterface::class);
+        $this->dbConnectionMock = $this->createMock(ConnectionInterface::class);
+        $this->loggerMock = $this->createMock(Logger::class);
+        $this->cacheMock = $this->createMock(CacheRepository::class);
+
+        $this->dbConnectionMock->method('transaction')->willReturnCallback(function (callable $callback) {
+            return $callback();
+        });
+
+        $this->handler = new RazorpayPaymentFailedHandler(
+            $this->razorpayOrdersRepoMock,
+            $this->dbConnectionMock,
+            $this->loggerMock,
+            $this->cacheMock
+        );
+    }
+
+    public function testItReturnsEarlyIfEventAlreadyHandled(): void
+    {
+        $payload = $this->createPayload();
+
+        $this->cacheMock->expects($this->once())
+            ->method('has')
+            ->with('razorpay_failed_pay_123')
+            ->willReturn(true);
+
+        $this->dbConnectionMock->expects($this->never())->method('transaction');
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItReturnsEarlyIfRazorpayOrderNotFound(): void
+    {
+        $payload = $this->createPayload();
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $this->razorpayOrdersRepoMock->method('findByPaymentId')->willReturn(null);
+        $this->razorpayOrdersRepoMock->method('findByRazorpayOrderId')->willReturn(null);
+
+        $this->razorpayOrdersRepoMock->expects($this->never())->method('updateByOrderId');
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItRecordsFailedPaymentSuccessfully(): void
+    {
+        $payload = $this->createPayload();
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('getOrderId')->willReturn(10);
+
+        $this->razorpayOrdersRepoMock->method('findByPaymentId')->willReturn($razorpayOrderMock);
+
+        $this->razorpayOrdersRepoMock->expects($this->once())
+            ->method('updateByOrderId')
+            ->with(10, $this->callback(function (array $data) {
+                return $data['status'] === 'failed' &&
+                    $data['failure_reason'] === 'Bad PIN' &&
+                    $data['error_code'] === 'BAD_PIN';
+            }));
+
+        $this->cacheMock->expects($this->once())
+            ->method('put')
+            ->with('razorpay_failed_pay_123', true);
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItFallsBackToOrderIdIfPaymentIdNotFound(): void
+    {
+        $payload = $this->createPayload();
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('getOrderId')->willReturn(10);
+
+        $this->razorpayOrdersRepoMock->method('findByPaymentId')->willReturn(null);
+        $this->razorpayOrdersRepoMock->method('findByRazorpayOrderId')
+            ->with('order_rzp_123')
+            ->willReturn($razorpayOrderMock);
+
+        $this->razorpayOrdersRepoMock->expects($this->once())
+            ->method('updateByOrderId')
+            ->with(10, $this->isType('array'));
+
+        $this->handler->handleEvent($payload);
+    }
+
+    private function createPayload(): RazorpayPaymentPayload
+    {
+        $error = new RazorpayErrorDTO(
+            code: 'BAD_PIN',
+            description: 'Bad PIN',
+            source: 'bank',
+            step: 'payment_authentication',
+            reason: 'payment_failed',
+        );
+
+        return new RazorpayPaymentPayload(
+            payment: new RazorpayPaymentDTO(
+                id: 'pay_123',
+                entity: 'payment',
+                amount: 50000,
+                currency: 'INR',
+                status: 'failed',
+                method: 'card',
+                order_id: 'order_rzp_123',
+                fee: 0,
+                tax: 0,
+                description: 'Test failed payment',
+                notes: [],
+                vpa: null,
+                email: 'test@example.com',
+                contact: '+919876543210',
+                created_at: time(),
+                error: $error
+            )
+        );
+    }
+}
\ No newline at end of file

From d795b9df70f14df1d7dbb913640579f6bee17f0e Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 3 Mar 2026 11:27:26 +0000
Subject: [PATCH 32/41] added test RazorpayPaymentAuthorizedHandlerTest

---
 .../RazorpayPaymentAuthorizedHandler.php      |   8 +-
 .../RazorpayPaymentAuthorizedHandlerTest.php  | 142 ++++++++++++++++++
 2 files changed, 146 insertions(+), 4 deletions(-)
 create mode 100644 backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandlerTest.php

diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandler.php
index 77c7825ce..d29b9bed3 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandler.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandler.php
@@ -5,7 +5,7 @@
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
 use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentPayload;
 use Illuminate\Cache\Repository;
-use Illuminate\Database\DatabaseManager;
+use Illuminate\Database\ConnectionInterface;
 use Illuminate\Log\Logger;
 use Throwable;
 
@@ -13,7 +13,7 @@ class RazorpayPaymentAuthorizedHandler
 {
     public function __construct(
         private readonly RazorpayOrdersRepositoryInterface $razorpayOrdersRepository,
-        private readonly DatabaseManager $databaseManager,
+        private readonly ConnectionInterface $dbConnection,
         private readonly Logger $logger,
         private readonly Repository $cache,
     ) {
@@ -34,10 +34,10 @@ public function handleEvent(RazorpayPaymentPayload $event): void
             return;
         }
 
-        $this->databaseManager->transaction(function () use ($paymentEntity) {
+        $this->dbConnection->transaction(function () use ($paymentEntity) {
             // Try to find by payment ID first, then by order ID
             $razorpayOrder = $this->razorpayOrdersRepository->findByPaymentId($paymentEntity->id)
-                ?? $this->razorpayOrdersRepository->findByOrderId($paymentEntity->order_id);
+                ?? $this->razorpayOrdersRepository->findByRazorpayOrderId($paymentEntity->order_id);
 
             if (!$razorpayOrder) {
                 $this->logger->warning('Razorpay order not found for payment.authorized', [
diff --git a/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandlerTest.php b/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandlerTest.php
new file mode 100644
index 000000000..e5f5442d6
--- /dev/null
+++ b/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayPaymentAuthorizedHandlerTest.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace Tests\Unit\Services\Domain\Payment\Razorpay\EventHandlers;
+
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\RazorpayPaymentPayload;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentAuthorizedHandler;
+use Illuminate\Cache\Repository as CacheRepository;
+use Illuminate\Database\ConnectionInterface;
+use Illuminate\Log\Logger;
+use PHPUnit\Framework\MockObject\MockObject;
+use Tests\TestCase;
+
+class RazorpayPaymentAuthorizedHandlerTest extends TestCase
+{
+    private RazorpayOrdersRepositoryInterface&MockObject $razorpayOrdersRepoMock;
+    private ConnectionInterface&MockObject $dbConnectionMock;
+    private Logger&MockObject $loggerMock;
+    private CacheRepository&MockObject $cacheMock;
+    private RazorpayPaymentAuthorizedHandler $handler;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->razorpayOrdersRepoMock = $this->createMock(RazorpayOrdersRepositoryInterface::class);
+        $this->dbConnectionMock = $this->createMock(ConnectionInterface::class);
+        $this->loggerMock = $this->createMock(Logger::class);
+        $this->cacheMock = $this->createMock(CacheRepository::class);
+
+        $this->dbConnectionMock->method('transaction')->willReturnCallback(function (callable $callback) {
+            return $callback();
+        });
+
+        $this->handler = new RazorpayPaymentAuthorizedHandler(
+            $this->razorpayOrdersRepoMock,
+            $this->dbConnectionMock,
+            $this->loggerMock,
+            $this->cacheMock
+        );
+    }
+
+    public function testItReturnsEarlyIfEventAlreadyHandled(): void
+    {
+        $payload = $this->createPayload();
+
+        $this->cacheMock->expects($this->once())
+            ->method('has')
+            ->with('razorpay_authorized_pay_123')
+            ->willReturn(true);
+
+        $this->dbConnectionMock->expects($this->never())->method('transaction');
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItReturnsEarlyIfRazorpayOrderNotFound(): void
+    {
+        $payload = $this->createPayload();
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $this->razorpayOrdersRepoMock->method('findByPaymentId')->willReturn(null);
+        $this->razorpayOrdersRepoMock->method('findByOrderId')->willReturn(null);
+
+        $this->razorpayOrdersRepoMock->expects($this->never())->method('updateByOrderId');
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItRecordsAuthorizedPaymentSuccessfully(): void
+    {
+        $payload = $this->createPayload();
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('getOrderId')->willReturn(10);
+
+        $this->razorpayOrdersRepoMock->method('findByPaymentId')->willReturn($razorpayOrderMock);
+
+        $this->razorpayOrdersRepoMock->expects($this->once())
+            ->method('updateByOrderId')
+            ->with(10, $this->callback(function (array $data) {
+                return $data['status'] === 'authorized' &&
+                    $data['razorpay_payment_id'] === 'pay_123' &&
+                    (int) $data['amount'] === 50000;
+            }));
+
+        $this->cacheMock->expects($this->once())
+            ->method('put')
+            ->with('razorpay_authorized_pay_123', true);
+
+        $this->handler->handleEvent($payload);
+    }
+
+    public function testItFallsBackToOrderIdIfPaymentIdNotFound(): void
+    {
+        $payload = $this->createPayload();
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $razorpayOrderMock = $this->createMock(RazorpayOrderDomainObject::class);
+        $razorpayOrderMock->method('getOrderId')->willReturn(10);
+
+        $this->razorpayOrdersRepoMock->method('findByPaymentId')->willReturn(null);
+
+        $this->razorpayOrdersRepoMock->expects($this->once())
+            ->method('findByRazorpayOrderId')
+            ->with('order_rzp_123')
+            ->willReturn($razorpayOrderMock);
+
+        $this->razorpayOrdersRepoMock->expects($this->once())
+            ->method('updateByOrderId')
+            ->with(10, $this->isType('array'));
+
+        $this->handler->handleEvent($payload);
+    }
+
+    private function createPayload(): RazorpayPaymentPayload
+    {
+        return new RazorpayPaymentPayload(
+            payment: new RazorpayPaymentDTO(
+                id: 'pay_123',
+                entity: 'payment',
+                amount: 50000,
+                currency: 'INR',
+                status: 'authorized',
+                method: 'card',
+                order_id: 'order_rzp_123',
+                fee: 100,
+                tax: 18,
+                description: 'Test authorized payment',
+                notes: [],
+                vpa: null,
+                email: 'test@example.com',
+                contact: '+919876543210',
+                created_at: time(),
+                error: null
+            )
+        );
+    }
+}
\ No newline at end of file

From ef3af017eb77efff315ca8cf974d6a77737bdd49 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 3 Mar 2026 11:34:12 +0000
Subject: [PATCH 33/41] added test RazorpayPaymentVerificationServiceTest

---
 ...RazorpayPaymentVerificationServiceTest.php | 154 ++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationServiceTest.php

diff --git a/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationServiceTest.php b/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationServiceTest.php
new file mode 100644
index 000000000..466e9eb3e
--- /dev/null
+++ b/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayPaymentVerificationServiceTest.php
@@ -0,0 +1,154 @@
+<?php
+
+namespace Tests\Unit\Services\Domain\Payment\Razorpay;
+
+use Exception;
+use HiEvents\Exceptions\Razorpay\InvalidSignatureException;
+use HiEvents\Services\Domain\Payment\Razorpay\DTOs\VerifyRazorpayPaymentDTO;
+use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentVerificationService;
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
+use Illuminate\Config\Repository;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
+use Tests\TestCase;
+
+class RazorpayPaymentVerificationServiceTest extends TestCase
+{
+    private LoggerInterface&MockObject $loggerMock;
+    private Repository&MockObject $configMock;
+    private RazorpayClientFactory&MockObject $clientFactoryMock;
+    private RazorpayPaymentVerificationService $service;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->configMock = $this->createMock(Repository::class);
+        $this->clientFactoryMock = $this->createMock(RazorpayClientFactory::class);
+
+        $this->service = new RazorpayPaymentVerificationService(
+            $this->loggerMock,
+            $this->configMock,
+            $this->clientFactoryMock
+        );
+    }
+
+    public function testVerifyPaymentSignatureReturnsTrueOnSuccess(): void
+    {
+        $orderId = 'order_123';
+        $paymentId = 'pay_123';
+        $secret = 'test_secret';
+        $signature = hash_hmac('sha256', $orderId . '|' . $paymentId, $secret);
+
+        $this->configMock->method('get')
+            ->with('services.razorpay.key_secret')
+            ->willReturn($secret);
+
+        $dto = new VerifyRazorpayPaymentDTO(
+            razorpay_order_id: $orderId,
+            razorpay_payment_id: $paymentId,
+            razorpay_signature: $signature
+        );
+
+        $result = $this->service->verifyPaymentSignature($dto);
+
+        $this->assertTrue($result);
+    }
+
+    public function testVerifyPaymentSignatureThrowsExceptionOnFailure(): void
+    {
+        $this->configMock->method('get')
+            ->with('services.razorpay.key_secret')
+            ->willReturn('test_secret');
+
+        $dto = new VerifyRazorpayPaymentDTO(
+            razorpay_order_id: 'order_123',
+            razorpay_payment_id: 'pay_123',
+            razorpay_signature: 'invalid_signature'
+        );
+
+        $this->loggerMock->expects($this->once())
+            ->method('error')
+            ->with('Razorpay signature verification failed', $this->isType('array'));
+
+        $this->expectException(InvalidSignatureException::class);
+
+        $this->service->verifyPaymentSignature($dto);
+    }
+
+    public function testVerifyWebhookSignatureReturnsTrueOnMatch(): void
+    {
+        $payload = '{"event":"payment.captured"}';
+        $secret = 'webhook_secret';
+        $signature = hash_hmac('sha256', $payload, $secret);
+
+        $this->configMock->method('get')
+            ->with('services.razorpay.webhook_secret')
+            ->willReturn($secret);
+
+        $result = $this->service->verifyWebhookSignature($payload, $signature);
+
+        $this->assertTrue($result);
+    }
+
+    public function testVerifyWebhookSignatureReturnsFalseOnMismatch(): void
+    {
+        $this->configMock->method('get')
+            ->with('services.razorpay.webhook_secret')
+            ->willReturn('secret');
+
+        $result = $this->service->verifyWebhookSignature('payload', 'wrong_signature');
+
+        $this->assertFalse($result);
+    }
+
+    public function testFetchPaymentDetailsReturnsMappedArray(): void
+    {
+        $paymentId = 'pay_123';
+        $paymentData = (object) [
+            'id' => $paymentId,
+            'amount' => 50000,
+            'currency' => 'INR',
+            'status' => 'captured',
+            'order_id' => 'order_123',
+            'method' => 'card',
+            'created_at' => 123456789
+        ];
+
+        $clientMock = $this->createMock(\HiEvents\Services\Infrastructure\Razorpay\RazorpayClientInterface::class);
+
+        $clientMock->expects($this->once())
+            ->method('fetchPayment')
+            ->with($paymentId)
+            ->willReturn($paymentData);
+
+        $this->clientFactoryMock->method('create')->willReturn($clientMock);
+
+        $result = $this->service->fetchPaymentDetails($paymentId);
+
+        $this->assertEquals([
+            'id' => $paymentId,
+            'amount' => 50000,
+            'currency' => 'INR',
+            'status' => 'captured',
+            'order_id' => 'order_123',
+            'method' => 'card',
+            'created_at' => 123456789
+        ], $result);
+    }
+
+    public function testFetchPaymentDetailsLogsAndThrowsExceptionOnFailure(): void
+    {
+        $this->clientFactoryMock->method('create')
+            ->willThrowException(new Exception('API Error'));
+
+        $this->loggerMock->expects($this->once())
+            ->method('error')
+            ->with('Failed to fetch Razorpay payment details', $this->isType('array'));
+
+        $this->expectException(Exception::class);
+
+        $this->service->fetchPaymentDetails('pay_123');
+    }
+}
\ No newline at end of file

From 0dbdb7d969143b7176302e7e40f3bf0b33b92656 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Tue, 3 Mar 2026 11:55:29 +0000
Subject: [PATCH 34/41] added test RazorpayWebhookHandlerTest

---
 .../Razorpay/RazorpayWebhookHandler.php       |  10 +-
 .../Razorpay/RazorpayWebhookHandlerTest.php   | 194 ++++++++++++++++++
 2 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 backend/tests/Unit/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandlerTest.php

diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
index 9564bb52e..982ecf6cc 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandler.php
@@ -54,7 +54,15 @@ public function handle(string $payload, string $signature): void
 
             // 2. Decode JSON and create envelope DTO
             $data = json_decode($payload, true, 512, JSON_THROW_ON_ERROR);
-            $envelope = RazorpayWebhookEnvelope::fromArray($data);
+            try {
+                $envelope = RazorpayWebhookEnvelope::fromArray($data);
+            } catch (\InvalidArgumentException $e) {
+                $this->logger->debug('Unsupported or unknown webhook event', [
+                    'event' => $data['event'] ?? 'unknown',
+                    'error' => $e->getMessage()
+                ]);
+                return;
+            }
             $event = $envelope->event;
 
             // 3. Validate event type
diff --git a/backend/tests/Unit/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandlerTest.php
new file mode 100644
index 000000000..851324dd6
--- /dev/null
+++ b/backend/tests/Unit/Services/Application/Handlers/Order/Payment/Razorpay/RazorpayWebhookHandlerTest.php
@@ -0,0 +1,194 @@
+<?php
+
+namespace Tests\Unit\Services\Application\Handlers\Order\Payment\Razorpay;
+
+use HiEvents\Exceptions\Razorpay\InvalidSignatureException;
+use HiEvents\Services\Application\Handlers\Order\Payment\Razorpay\RazorpayWebhookHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayOrderPaidHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentAuthorizedHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentCapturedHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayPaymentFailedHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\EventHandlers\RazorpayRefundHandler;
+use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentVerificationService;
+use Illuminate\Cache\Repository;
+use Illuminate\Log\Logger;
+use PHPUnit\Framework\MockObject\MockObject;
+use Tests\TestCase;
+
+class RazorpayWebhookHandlerTest extends TestCase
+{
+    private RazorpayPaymentCapturedHandler&MockObject $paymentCapturedHandlerMock;
+    private RazorpayOrderPaidHandler&MockObject $orderPaidHandlerMock;
+    private RazorpayRefundHandler&MockObject $refundHandlerMock;
+    private RazorpayPaymentFailedHandler&MockObject $paymentFailedHandlerMock;
+    private RazorpayPaymentAuthorizedHandler&MockObject $paymentAuthorizedHandlerMock;
+    private RazorpayPaymentVerificationService&MockObject $verificationServiceMock;
+    private Logger&MockObject $loggerMock;
+    private Repository&MockObject $cacheMock;
+    private RazorpayWebhookHandler $handler;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->paymentCapturedHandlerMock = $this->createMock(RazorpayPaymentCapturedHandler::class);
+        $this->orderPaidHandlerMock = $this->createMock(RazorpayOrderPaidHandler::class);
+        $this->refundHandlerMock = $this->createMock(RazorpayRefundHandler::class);
+        $this->paymentFailedHandlerMock = $this->createMock(RazorpayPaymentFailedHandler::class);
+        $this->paymentAuthorizedHandlerMock = $this->createMock(RazorpayPaymentAuthorizedHandler::class);
+        $this->verificationServiceMock = $this->createMock(RazorpayPaymentVerificationService::class);
+        $this->loggerMock = $this->createMock(Logger::class);
+        $this->cacheMock = $this->createMock(Repository::class);
+
+        $this->handler = new RazorpayWebhookHandler(
+            $this->paymentCapturedHandlerMock,
+            $this->orderPaidHandlerMock,
+            $this->refundHandlerMock,
+            $this->paymentFailedHandlerMock,
+            $this->paymentAuthorizedHandlerMock,
+            $this->verificationServiceMock,
+            $this->loggerMock,
+            $this->cacheMock
+        );
+    }
+
+    public function testHandleThrowsExceptionOnInvalidSignature(): void
+    {
+        $payload = '{"test":"data"}';
+        $signature = 'invalid_sig';
+
+        $this->verificationServiceMock->method('verifyWebhookSignature')
+            ->with($payload, $signature)
+            ->willReturn(false);
+
+        $this->expectException(InvalidSignatureException::class);
+
+        $this->handler->handle($payload, $signature);
+    }
+
+    public function testHandleReturnsEarlyIfEventAlreadyHandled(): void
+    {
+        $payload = $this->createPaymentWebhookJson('payment.captured', 'pay_123');
+        $signature = 'valid_sig';
+
+        $this->verificationServiceMock->method('verifyWebhookSignature')->willReturn(true);
+        
+        $this->cacheMock->expects($this->once())
+            ->method('has')
+            ->with('razorpay_webhook_pay_123')
+            ->willReturn(true);
+
+        $this->paymentCapturedHandlerMock->expects($this->never())->method('handleEvent');
+
+        $this->handler->handle($payload, $signature);
+    }
+
+    public function testHandleRoutesToPaymentCapturedHandler(): void
+    {
+        $payload = $this->createPaymentWebhookJson('payment.captured', 'pay_123');
+        $signature = 'valid_sig';
+
+        $this->verificationServiceMock->method('verifyWebhookSignature')->willReturn(true);
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $this->paymentCapturedHandlerMock->expects($this->once())->method('handleEvent');
+        $this->cacheMock->expects($this->once())->method('put')->with('razorpay_webhook_pay_123', true);
+
+        $this->handler->handle($payload, $signature);
+    }
+
+    public function testHandleRoutesToOrderPaidHandler(): void
+    {
+        $payload = json_encode([
+            'entity' => 'event',
+            'account_id' => 'acc_123',
+            'event' => 'order.paid',
+            'created_at' => time(),
+            'payload' => [
+                'order' => [
+                    'entity' => [
+                        'id' => 'order_rzp_123',
+                        'entity' => 'order',
+                        'amount' => 50000,
+                        'amount_paid' => 50000,
+                        'amount_due' => 0,
+                        'currency' => 'INR',
+                        'status' => 'paid',
+                        'receipt' => 'rcpt_1',
+                        'notes' => [],
+                        'created_at' => time()
+                    ]
+                ],
+                'payment' => [
+                    'entity' => $this->getPaymentEntityData('pay_123')
+                ]
+            ]
+        ]);
+        $signature = 'valid_sig';
+
+        $this->verificationServiceMock->method('verifyWebhookSignature')->willReturn(true);
+        $this->cacheMock->method('has')->willReturn(false);
+
+        $this->orderPaidHandlerMock->expects($this->once())->method('handleEvent');
+        $this->cacheMock->expects($this->once())->method('put')->with('razorpay_webhook_order_rzp_123', true);
+
+        $this->handler->handle($payload, $signature);
+    }
+
+    public function testHandleReturnsEarlyForUnknownEvent(): void
+    {
+        $payload = json_encode([
+            'entity' => 'event',
+            'account_id' => 'acc_123',
+            'event' => 'payment.dispute.created',
+            'created_at' => time(),
+            'payload' => []
+        ]);
+        $signature = 'valid_sig';
+
+        $this->verificationServiceMock->method('verifyWebhookSignature')->willReturn(true);
+
+        $this->loggerMock->expects($this->once())
+            ->method('debug')
+            ->with('Unsupported or unknown webhook event', $this->isType('array'));
+
+        $this->handler->handle($payload, $signature);
+    }
+
+    private function createPaymentWebhookJson(string $event, string $paymentId): string
+    {
+        return json_encode([
+            'entity' => 'event',
+            'account_id' => 'acc_123',
+            'event' => $event,
+            'created_at' => time(),
+            'payload' => [
+                'payment' => [
+                    'entity' => $this->getPaymentEntityData($paymentId)
+                ]
+            ]
+        ]);
+    }
+
+    private function getPaymentEntityData(string $paymentId): array
+    {
+        return [
+            'id' => $paymentId,
+            'entity' => 'payment',
+            'amount' => 50000,
+            'currency' => 'INR',
+            'status' => 'captured',
+            'method' => 'card',
+            'order_id' => 'order_rzp_123',
+            'fee' => 100,
+            'tax' => 18,
+            'description' => 'Test',
+            'notes' => [],
+            'vpa' => null,
+            'email' => 'test@example.com',
+            'contact' => '+919999999999',
+            'created_at' => time(),
+            'error' => null
+        ];
+    }
+}
\ No newline at end of file

From 5b9f583c44086f2f35524e3c83d4e4429668fe96 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Thu, 5 Mar 2026 09:33:48 +0000
Subject: [PATCH 35/41] fixed direct usage of config helper instead of the
 injected

---
 .../Order/Payment/Razorpay/CreateRazorpayOrderHandler.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php
index 549bb217d..737f21f6a 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Razorpay/CreateRazorpayOrderHandler.php
@@ -71,7 +71,7 @@ public function handle(string $orderShortId): CreateRazorpayOrderResponseDTO
         if ($order->getRazorpayOrder() !== null) {
             return new CreateRazorpayOrderResponseDTO(
                 id: $order->getRazorpayOrder()->getRazorpayOrderId(),
-                keyId: config('services.razorpay.key_id'),
+                keyId: $this->config->get('services.razorpay.key_id'),
                 amount: $order->getRazorpayOrder()->getAmount(),
                 currency: $order->getRazorpayOrder()->getCurrency(),
             );

From 427ffde0d7716159a856a0ecf0445da03fb090d0 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Fri, 6 Mar 2026 06:22:18 +0000
Subject: [PATCH 36/41] implemented client refund method with tests

---
 .../Razorpay/RazorpayApiClient.php            |  8 ++
 .../Razorpay/RazorpayClientInterface.php      |  2 +
 .../Razorpay/RazorpayApiClientTest.php        | 93 ++++++++++++++++++-
 .../Razorpay/RazorpayClientInterfaceTest.php  | 15 +++
 4 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientInterfaceTest.php

diff --git a/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php b/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php
index 8323dedf9..8e2fcfde2 100644
--- a/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php
+++ b/backend/app/Services/Infrastructure/Razorpay/RazorpayApiClient.php
@@ -22,4 +22,12 @@ public function fetchPayment(string $paymentId): object
     {
         return $this->api->payment->fetch($paymentId);
     }
+
+    public function refundPayment(array $params, string|null $idempotencyKey = null): object
+    {
+        $paymentId = $params['payment_id'];
+        unset($params['payment_id']);
+        $payment = $this->api->payment->fetch($paymentId);
+        return $payment->refund($params, $idempotencyKey);
+    }
 }
\ No newline at end of file
diff --git a/backend/app/Services/Infrastructure/Razorpay/RazorpayClientInterface.php b/backend/app/Services/Infrastructure/Razorpay/RazorpayClientInterface.php
index ccf506860..bfea71998 100644
--- a/backend/app/Services/Infrastructure/Razorpay/RazorpayClientInterface.php
+++ b/backend/app/Services/Infrastructure/Razorpay/RazorpayClientInterface.php
@@ -7,4 +7,6 @@ interface RazorpayClientInterface
     public function createOrder(array $data): object;
 
     public function fetchPayment(string $paymentId): object;
+
+    public function refundPayment(array $params, ?string $idempotencyKey = null): object;
 }
\ No newline at end of file
diff --git a/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayApiClientTest.php b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayApiClientTest.php
index 9c493a5a9..88342e26d 100644
--- a/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayApiClientTest.php
+++ b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayApiClientTest.php
@@ -46,17 +46,17 @@ public function testItThrowsExceptionWhenOrderCreationFailed(): void
     {
         $badOrderData = ['amount' => 0, 'currency' => 'INR'];
         $orderMock = $this->createMock(Order::class);
-        
+
         $orderMock->expects($this->once())
             ->method('create')
             ->with($badOrderData)
             ->willThrowException(new BadRequestError('Order amount less than minimum amount allowed', 400, 400));
 
         $this->apiMock->order = $orderMock;
-        
+
         $this->expectException(BadRequestError::class);
         $this->expectExceptionMessage('Order amount less than minimum amount allowed');
-        
+
         $this->client->createOrder($badOrderData);
     }
 
@@ -94,4 +94,91 @@ public function testItThrowsExceptionWhenPaymentIsInvalid(): void
 
         $this->client->fetchPayment('invalid_id');
     }
+
+    public function testItCanRefundAPaymentSuccessfullyWithoutIdempotencyKey(): void
+    {
+        $paymentId = 'pay_123';
+        $refundData = ['amount' => 5000];
+        $expectedResponse = (object) ['id' => 'refund_123', 'status' => 'processed'];
+
+        $paymentMock = $this->createMock(Payment::class);
+        $paymentMock->expects($this->once())
+            ->method('refund')
+            ->with($refundData, null)
+            ->willReturn($expectedResponse);
+
+        $paymentMock->expects($this->once())
+            ->method('fetch')
+            ->with($paymentId)
+            ->willReturn($paymentMock);
+
+        $this->apiMock->payment = $paymentMock;
+
+        $result = $this->client->refundPayment([
+            'payment_id' => $paymentId,
+            'amount' => 5000,
+        ]);
+
+        $this->assertEquals('refund_123', $result->id);
+        $this->assertEquals('processed', $result->status);
+    }
+
+    public function testItCanRefundAPaymentSuccessfullyWithIdempotencyKey(): void
+    {
+        $paymentId = 'pay_123';
+        $refundData = ['amount' => 5000, 'speed' => 'optimum', 'receipt' => 'receipt#1'];
+        $idempotencyKey = 'idempotency-key-123';
+        $expectedResponse = (object) ['id' => 'refund_123', 'status' => 'processed'];
+
+        $paymentMock = $this->createMock(Payment::class);
+        $paymentMock->expects($this->once())
+            ->method('refund')
+            ->with($refundData, $idempotencyKey)
+            ->willReturn($expectedResponse);
+
+        $paymentMock->expects($this->once())
+            ->method('fetch')
+            ->with($paymentId)
+            ->willReturn($paymentMock);
+
+        $this->apiMock->payment = $paymentMock;
+
+        $result = $this->client->refundPayment([
+            'payment_id' => $paymentId,
+            'amount' => 5000,
+            'speed' => 'optimum',
+            'receipt' => 'receipt#1',
+        ], $idempotencyKey);
+
+        $this->assertEquals('refund_123', $result->id);
+        $this->assertEquals('processed', $result->status);
+    }
+
+    public function testItThrowsExceptionWhenRefundFails(): void
+    {
+        $paymentId = 'pay_123';
+        $refundData = ['amount' => 5000];
+
+        $paymentMock = $this->createMock(Payment::class);
+
+        $paymentMock->expects($this->once())
+            ->method('refund')
+            ->with($refundData, null)
+            ->willThrowException(new BadRequestError('Refund failed', 400, 400));
+
+        $paymentMock->expects($this->once())
+            ->method('fetch')
+            ->with($paymentId)
+            ->willReturn($paymentMock);
+
+        $this->apiMock->payment = $paymentMock;
+
+        $this->expectException(BadRequestError::class);
+        $this->expectExceptionMessage('Refund failed');
+
+        $this->client->refundPayment([
+            'payment_id' => $paymentId,
+            'amount' => 5000,
+        ]);
+    }
 }
\ No newline at end of file
diff --git a/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientInterfaceTest.php b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientInterfaceTest.php
new file mode 100644
index 000000000..fc4ba3ac7
--- /dev/null
+++ b/backend/tests/Unit/Services/Infrastructure/Razorpay/RazorpayClientInterfaceTest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Tests\Unit\Services\Infrastructure\Razorpay;
+
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientInterface;
+use Tests\TestCase;
+
+class RazorpayClientInterfaceTest extends TestCase
+{
+    public function testRefundPaymentMethodExists()
+    {
+        $reflection = new \ReflectionClass(RazorpayClientInterface::class);
+        $this->assertTrue($reflection->hasMethod('refundPayment'));
+    }
+}
\ No newline at end of file

From 138d57f730d811fabbd3a3ce5b404134eb2932d2 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Fri, 6 Mar 2026 07:24:45 +0000
Subject: [PATCH 37/41] added RazorpayPaymentRefundService with tests

---
 .../Razorpay/RazorpayPaymentRefundService.php |  39 ++++++
 .../RazorpayPaymentRefundServiceTest.php      | 122 ++++++++++++++++++
 2 files changed, 161 insertions(+)
 create mode 100644 backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundService.php
 create mode 100644 backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundServiceTest.php

diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundService.php
new file mode 100644
index 000000000..4e3dbf39d
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundService.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment\Razorpay;
+
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\Exceptions\RefundNotPossibleException;
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
+
+class RazorpayPaymentRefundService
+{
+    public function __construct(
+        private RazorpayClientFactory $clientFactory
+    ) {
+    }
+
+    public function refundPayment(
+        RazorpayOrderDomainObject $order,
+        int $amountInPaise,
+        ?string $idempotencyKey = null,
+        array $options = []
+    ): object {
+        $paymentId = $order->getRazorpayPaymentId();
+        if (!$paymentId) {
+            throw new RefundNotPossibleException(__('No Razorpay payment ID found for this order.'));
+        }
+
+        $client = $this->clientFactory->create();
+
+        $params = array_merge(
+            [
+                'payment_id' => $paymentId,
+                'amount' => $amountInPaise,
+            ],
+            $options
+        );
+
+        return $client->refundPayment($params, $idempotencyKey);
+    }
+}
\ No newline at end of file
diff --git a/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundServiceTest.php b/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundServiceTest.php
new file mode 100644
index 000000000..d6afc27d4
--- /dev/null
+++ b/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundServiceTest.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace Tests\Unit\Services\Domain\Payment\Razorpay;
+
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\Exceptions\RefundNotPossibleException;
+use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentRefundService;
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
+use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use Tests\TestCase;
+
+class RazorpayPaymentRefundServiceTest extends TestCase
+{
+    private RazorpayClientFactory&MockObject $clientFactoryMock;
+    private RazorpayClientInterface&MockObject $clientMock;
+    private RazorpayPaymentRefundService $service;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->clientFactoryMock = $this->createMock(RazorpayClientFactory::class);
+        $this->clientMock = $this->createMock(RazorpayClientInterface::class);
+        $this->service = new RazorpayPaymentRefundService($this->clientFactoryMock);
+    }
+
+    public function testRefundPaymentSuccess(): void
+    {
+        $payment = $this->createMock(RazorpayOrderDomainObject::class);
+        $payment->method('getRazorpayPaymentId')->willReturn('pay_abc123');
+
+        $this->clientFactoryMock->method('create')->willReturn($this->clientMock);
+
+        $this->clientMock->expects($this->once())
+            ->method('refundPayment')
+            ->with(
+                ['payment_id' => 'pay_abc123', 'amount' => 10000],
+                null
+            )
+            ->willReturn((object) ['id' => 'refund_xyz']);
+
+        $result = $this->service->refundPayment($payment, 10000);
+
+        $this->assertEquals('refund_xyz', $result->id);
+    }
+
+    public function testRefundPaymentThrowsWhenPaymentIdMissing(): void
+    {
+        $payment = $this->createMock(RazorpayOrderDomainObject::class);
+        $payment->method('getRazorpayPaymentId')->willReturn(null);
+
+        $this->expectException(RefundNotPossibleException::class);
+        $this->expectExceptionMessage('No Razorpay payment ID found for this order.');
+
+        $this->service->refundPayment($payment, 10000);
+    }
+
+    public function testRefundPaymentPassesIdempotencyKeyAndOptions(): void
+    {
+        $payment = $this->createMock(RazorpayOrderDomainObject::class);
+        $payment->method('getRazorpayPaymentId')->willReturn('pay_abc123');
+
+        $this->clientFactoryMock->method('create')->willReturn($this->clientMock);
+
+        $this->clientMock->expects($this->once())
+            ->method('refundPayment')
+            ->with(
+                [
+                    'payment_id' => 'pay_abc123',
+                    'amount' => 10000,
+                    'speed' => 'optimum',
+                    'receipt' => 'Receipt#123',
+                    'notes' => ['reason' => 'Customer request']
+                ],
+                'idempotency-key-123'
+            )
+            ->willReturn((object) ['id' => 'refund_xyz']);
+
+        $result = $this->service->refundPayment(
+            $payment,
+            10000,
+            'idempotency-key-123',
+            [
+                'speed' => 'optimum',
+                'receipt' => 'Receipt#123',
+                'notes' => ['reason' => 'Customer request']
+            ]
+        );
+
+        $this->assertEquals('refund_xyz', $result->id);
+    }
+
+    public function testRefundPaymentMergesOptionsCorrectly(): void
+    {
+        $payment = $this->createMock(RazorpayOrderDomainObject::class);
+        $payment->method('getRazorpayPaymentId')->willReturn('pay_abc123');
+
+        $this->clientFactoryMock->method('create')->willReturn($this->clientMock);
+
+        $this->clientMock->expects($this->once())
+            ->method('refundPayment')
+            ->with(
+                [
+                    'payment_id' => 'pay_abc123',
+                    'amount' => 5000,
+                    'speed' => 'optimum',
+                ],
+                null
+            )
+            ->willReturn((object) ['id' => 'refund_xyz']);
+
+        $result = $this->service->refundPayment(
+            $payment,
+            5000,
+            null,
+            ['speed' => 'optimum']
+        );
+
+        $this->assertEquals('refund_xyz', $result->id);
+    }
+}
\ No newline at end of file

From bd795153cddfaa4eade2258afa7408bc7a16ac5e Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Fri, 6 Mar 2026 08:39:06 +0000
Subject: [PATCH 38/41] moved and refactored refund handler to support razorpay

---
 .../Status/OrderRefundStatus.php              |   1 +
 .../Orders/Payment/RefundOrderAction.php      |   2 +-
 .../Handlers/Order/CancelOrderHandler.php     |   2 +-
 .../Handlers/Order/DTO/RefundOrderDTO.php     |   3 +-
 .../{Stripe => }/RefundOrderHandler.php       |  87 +++-
 backend/config/refunds.php                    |   7 +
 .../Order/Payment/RefundOrderHandlerTest.php  | 469 ++++++++++++++++++
 7 files changed, 544 insertions(+), 27 deletions(-)
 rename backend/app/Services/Application/Handlers/Order/Payment/{Stripe => }/RefundOrderHandler.php (59%)
 create mode 100644 backend/config/refunds.php
 create mode 100644 backend/tests/Unit/Services/Application/Handlers/Order/Payment/RefundOrderHandlerTest.php

diff --git a/backend/app/DomainObjects/Status/OrderRefundStatus.php b/backend/app/DomainObjects/Status/OrderRefundStatus.php
index 2fc38b06d..485d96b4e 100644
--- a/backend/app/DomainObjects/Status/OrderRefundStatus.php
+++ b/backend/app/DomainObjects/Status/OrderRefundStatus.php
@@ -8,5 +8,6 @@ enum OrderRefundStatus
     case REFUND_FAILED;
     case REFUNDED;
     case PARTIALLY_REFUNDED;
+    case REFUND_NOT_REQUESTED;
 }
 
diff --git a/backend/app/Http/Actions/Orders/Payment/RefundOrderAction.php b/backend/app/Http/Actions/Orders/Payment/RefundOrderAction.php
index 205409e2e..a0f22e4c2 100644
--- a/backend/app/Http/Actions/Orders/Payment/RefundOrderAction.php
+++ b/backend/app/Http/Actions/Orders/Payment/RefundOrderAction.php
@@ -8,7 +8,7 @@
 use HiEvents\Http\Request\Order\RefundOrderRequest;
 use HiEvents\Resources\Order\OrderResource;
 use HiEvents\Services\Application\Handlers\Order\DTO\RefundOrderDTO;
-use HiEvents\Services\Application\Handlers\Order\Payment\Stripe\RefundOrderHandler;
+use HiEvents\Services\Application\Handlers\Order\Payment\RefundOrderHandler;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Validation\ValidationException;
 use Stripe\Exception\ApiErrorException;
diff --git a/backend/app/Services/Application/Handlers/Order/CancelOrderHandler.php b/backend/app/Services/Application/Handlers/Order/CancelOrderHandler.php
index e1e4ed099..84dafb3fa 100644
--- a/backend/app/Services/Application/Handlers/Order/CancelOrderHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/CancelOrderHandler.php
@@ -8,7 +8,7 @@
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Services\Application\Handlers\Order\DTO\CancelOrderDTO;
 use HiEvents\Services\Application\Handlers\Order\DTO\RefundOrderDTO;
-use HiEvents\Services\Application\Handlers\Order\Payment\Stripe\RefundOrderHandler;
+use HiEvents\Services\Application\Handlers\Order\Payment\RefundOrderHandler;
 use HiEvents\Services\Domain\Order\OrderCancelService;
 use Illuminate\Database\DatabaseManager;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
diff --git a/backend/app/Services/Application/Handlers/Order/DTO/RefundOrderDTO.php b/backend/app/Services/Application/Handlers/Order/DTO/RefundOrderDTO.php
index b4c8d5869..0a1303384 100644
--- a/backend/app/Services/Application/Handlers/Order/DTO/RefundOrderDTO.php
+++ b/backend/app/Services/Application/Handlers/Order/DTO/RefundOrderDTO.php
@@ -11,7 +11,8 @@ public function __construct(
         public readonly int   $order_id,
         public readonly float $amount,
         public readonly bool  $notify_buyer,
-        public readonly bool  $cancel_order
+        public readonly bool  $cancel_order,
+        public readonly array $provider_options = [],
     )
     {
     }
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Stripe/RefundOrderHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/RefundOrderHandler.php
similarity index 59%
rename from backend/app/Services/Application/Handlers/Order/Payment/Stripe/RefundOrderHandler.php
rename to backend/app/Services/Application/Handlers/Order/Payment/RefundOrderHandler.php
index 2882194d4..f2b7247b9 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Stripe/RefundOrderHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/RefundOrderHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HiEvents\Services\Application\Handlers\Order\Payment\Stripe;
+namespace HiEvents\Services\Application\Handlers\Order\Payment;
 
 use Brick\Math\Exception\MathException;
 use Brick\Math\Exception\NumberFormatException;
@@ -11,6 +11,7 @@
 use HiEvents\DomainObjects\Generated\OrderDomainObjectAbstract;
 use HiEvents\DomainObjects\OrderDomainObject;
 use HiEvents\DomainObjects\OrganizerDomainObject;
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
 use HiEvents\DomainObjects\Status\OrderRefundStatus;
 use HiEvents\DomainObjects\StripePaymentDomainObject;
 use HiEvents\Exceptions\RefundNotPossibleException;
@@ -20,11 +21,14 @@
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Services\Application\Handlers\Order\DTO\RefundOrderDTO;
 use HiEvents\Services\Domain\Order\OrderCancelService;
+use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentRefundService;
 use HiEvents\Services\Domain\Payment\Stripe\StripePaymentIntentRefundService;
 use HiEvents\Services\Infrastructure\Stripe\StripeClientFactory;
 use HiEvents\Values\MoneyValue;
+use Illuminate\Config\Repository;
 use Illuminate\Contracts\Mail\Mailer;
-use Illuminate\Database\DatabaseManager;
+use Illuminate\Database\ConnectionInterface;
+use Razorpay\Api\Errors\Error;
 use Stripe\Exception\ApiErrorException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Throwable;
@@ -32,15 +36,16 @@
 class RefundOrderHandler
 {
     public function __construct(
-        private readonly StripePaymentIntentRefundService $refundService,
-        private readonly OrderRepositoryInterface         $orderRepository,
-        private readonly EventRepositoryInterface         $eventRepository,
-        private readonly Mailer                           $mailer,
-        private readonly OrderCancelService               $orderCancelService,
-        private readonly DatabaseManager                  $databaseManager,
-        private readonly StripeClientFactory              $stripeClientFactory,
-    )
-    {
+        private readonly OrderRepositoryInterface $orderRepository,
+        private readonly EventRepositoryInterface $eventRepository,
+        private readonly Mailer $mailer,
+        private readonly OrderCancelService $orderCancelService,
+        private readonly ConnectionInterface $dbConnection,
+        private readonly StripePaymentIntentRefundService $stripeRefundService,
+        private readonly StripeClientFactory $stripeClientFactory,
+        private readonly RazorpayPaymentRefundService $razorpayRefundService,
+        private readonly Repository $config
+    ) {
     }
 
     /**
@@ -50,13 +55,14 @@ public function __construct(
      */
     public function handle(RefundOrderDTO $refundOrderDTO): OrderDomainObject
     {
-        return $this->databaseManager->transaction(fn() => $this->refundOrder($refundOrderDTO));
+        return $this->dbConnection->transaction(fn() => $this->refundOrder($refundOrderDTO));
     }
 
     private function fetchOrder(int $eventId, int $orderId): OrderDomainObject
     {
         $order = $this->orderRepository
             ->loadRelation(new Relationship(StripePaymentDomainObject::class, name: 'stripe_payment'))
+            ->loadRelation(new Relationship(RazorpayOrderDomainObject::class, name: 'razorpay_order'))
             ->findFirstWhere(['event_id' => $eventId, 'id' => $orderId]);
 
         if (!$order) {
@@ -74,8 +80,9 @@ private function fetchOrder(int $eventId, int $orderId): OrderDomainObject
      */
     private function validateRefundability(OrderDomainObject $order): void
     {
-        if (!$order->getStripePayment()) {
-            throw new RefundNotPossibleException(__('There is no Stripe data associated with this order.'));
+        $payment = $order->getStripePayment() ?? $order->getRazorpayOrder();
+        if (!$payment) {
+            throw new RefundNotPossibleException(__('There is no payment data associated with this order.'));
         }
 
         if ($order->getRefundStatus() === OrderRefundStatus::REFUND_PENDING->name) {
@@ -110,6 +117,14 @@ private function markOrderRefundPending(OrderDomainObject $order): OrderDomainOb
         );
     }
 
+    private function generateRazorpayIdempotencyKey(OrderDomainObject $order): ?string
+    {
+        if (!$this->config->get('refunds.razorpay.idempotency_enabled', true)) {
+            return null;
+        }
+        return 'refund_order_' . $order->getId() . '_' . time();
+    }
+
     /**
      * @throws ApiErrorException
      * @throws UnknownCurrencyException
@@ -135,18 +150,42 @@ private function refundOrder(RefundOrderDTO $refundOrderDTO): OrderDomainObject
             $this->orderCancelService->cancelOrder($order);
         }
 
-        // Determine the correct Stripe platform for this refund
-        // Use the platform that was used for the original payment
-        $paymentPlatform = $order->getStripePayment()->getStripePlatformEnum();
+        if ($order->getStripePayment()) {
+            // Determine the correct Stripe platform for this refund
+            // Use the platform that was used for the original payment
+            $paymentPlatform = $order->getStripePayment()->getStripePlatformEnum();
 
-        // Create Stripe client for the original payment's platform
-        $stripeClient = $this->stripeClientFactory->createForPlatform($paymentPlatform);
+            // Create Stripe client for the original payment's platform
+            $stripeClient = $this->stripeClientFactory->createForPlatform($paymentPlatform);
 
-        $this->refundService->refundPayment(
-            amount: $amount,
-            payment: $order->getStripePayment(),
-            stripeClient: $stripeClient
-        );
+            $this->stripeRefundService->refundPayment(
+                amount: $amount,
+                payment: $order->getStripePayment(),
+                stripeClient: $stripeClient
+            );
+        } elseif ($order->getRazorpayOrder()) {
+            // Razorpay refund with idempotency and options
+            $idempotencyKey = $this->generateRazorpayIdempotencyKey($order);
+            $options = $refundOrderDTO->provider_options ?? [];
+
+            try {
+                $this->razorpayRefundService->refundPayment(
+                    $order->getRazorpayOrder(),
+                    $amount->toMinorUnit(),
+                    $idempotencyKey,
+                    $options
+                );
+            } catch (Error $e) {
+                if ($e->getHttpStatusCode() === 409) {
+                    throw new RefundNotPossibleException(
+                        __('A refund for this order is already being processed. Please check again later.')
+                    );
+                }
+                throw $e;
+            }
+        } else {
+            throw new RefundNotPossibleException(__('No payment provider found for this order.'));
+        }
 
         if ($refundOrderDTO->notify_buyer) {
             $this->notifyBuyer($order, $event, $amount);
diff --git a/backend/config/refunds.php b/backend/config/refunds.php
new file mode 100644
index 000000000..99c83a052
--- /dev/null
+++ b/backend/config/refunds.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'razorpay' => [
+        'idempotency_enabled' => env('RAZORPAY_REFUND_IDEMPOTENCY_ENABLED', true),
+    ]
+];
\ No newline at end of file
diff --git a/backend/tests/Unit/Services/Application/Handlers/Order/Payment/RefundOrderHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Order/Payment/RefundOrderHandlerTest.php
new file mode 100644
index 000000000..daf6bab4a
--- /dev/null
+++ b/backend/tests/Unit/Services/Application/Handlers/Order/Payment/RefundOrderHandlerTest.php
@@ -0,0 +1,469 @@
+<?php
+
+namespace Tests\Unit\Services\Application\Handlers\Order\Payment;
+
+use HiEvents\DomainObjects\EventDomainObject;
+use HiEvents\DomainObjects\EventSettingDomainObject;
+use HiEvents\DomainObjects\OrderDomainObject;
+use HiEvents\DomainObjects\OrganizerDomainObject;
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\DomainObjects\StripePaymentDomainObject;
+use HiEvents\DomainObjects\Status\OrderRefundStatus;
+use HiEvents\Exceptions\RefundNotPossibleException;
+use HiEvents\Repository\Interfaces\EventRepositoryInterface;
+use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
+use HiEvents\Services\Application\Handlers\Order\DTO\RefundOrderDTO;
+use HiEvents\Services\Application\Handlers\Order\Payment\RefundOrderHandler;
+use HiEvents\Services\Domain\Order\OrderCancelService;
+use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentRefundService;
+use HiEvents\Services\Domain\Payment\Stripe\StripePaymentIntentRefundService;
+use HiEvents\Services\Infrastructure\Stripe\StripeClientFactory;
+use HiEvents\Values\MoneyValue;
+use Illuminate\Config\Repository;
+use Illuminate\Contracts\Mail\Mailer;
+use Illuminate\Database\ConnectionInterface;
+use Illuminate\Mail\PendingMail;
+use PHPUnit\Framework\MockObject\MockObject;
+use Razorpay\Api\Errors\Error;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Tests\TestCase;
+
+class RefundOrderHandlerTest extends TestCase
+{
+    private OrderRepositoryInterface&MockObject $orderRepoMock;
+    private EventRepositoryInterface&MockObject $eventRepoMock;
+    private Mailer&MockObject $mailerMock;
+    private OrderCancelService&MockObject $orderCancelServiceMock;
+    private ConnectionInterface&MockObject $dbConnectionMock;
+    private StripePaymentIntentRefundService&MockObject $stripeRefundServiceMock;
+    private StripeClientFactory&MockObject $stripeClientFactory;
+    private RazorpayPaymentRefundService&MockObject $razorpayRefundServiceMock;
+    private Repository&MockObject $configMock;
+    private RefundOrderHandler $handler;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->orderRepoMock = $this->createMock(OrderRepositoryInterface::class);
+        $this->eventRepoMock = $this->createMock(EventRepositoryInterface::class);
+        $this->mailerMock = $this->createMock(Mailer::class);
+        $this->orderCancelServiceMock = $this->createMock(OrderCancelService::class);
+        $this->dbConnectionMock = $this->createMock(ConnectionInterface::class);
+        $this->stripeRefundServiceMock = $this->createMock(StripePaymentIntentRefundService::class);
+        $this->stripeClientFactory = $this->createMock(StripeClientFactory::class);
+        $this->razorpayRefundServiceMock = $this->createMock(RazorpayPaymentRefundService::class);
+        $this->configMock = $this->createMock(Repository::class);
+
+        $this->handler = new RefundOrderHandler(
+            $this->orderRepoMock,
+            $this->eventRepoMock,
+            $this->mailerMock,
+            $this->orderCancelServiceMock,
+            $this->dbConnectionMock,
+            $this->stripeRefundServiceMock,
+            $this->stripeClientFactory,
+            $this->razorpayRefundServiceMock,
+            $this->configMock
+        );
+    }
+
+    private function createOrderWithStripePayment(): OrderDomainObject&MockObject
+    {
+        $order = $this->createMock(OrderDomainObject::class);
+        $order->method('getId')->willReturn(1);
+        $order->method('getEventId')->willReturn(1);
+        $order->method('getRefundStatus')->willReturn(null); // Not pending
+        $order->method('getStripePayment')->willReturn($this->createMock(StripePaymentDomainObject::class));
+        $order->method('getRazorpayOrder')->willReturn(null);
+        $order->method('getEmail')->willReturn('test@example.com');
+        $order->method('getLocale')->willReturn('en');
+        $order->method('getCurrency')->willReturn('USD');
+        return $order;
+    }
+
+    private function createOrderWithRazorpayPayment(): OrderDomainObject&MockObject
+    {
+        $order = $this->createMock(OrderDomainObject::class);
+        $order->method('getId')->willReturn(2);
+        $order->method('getEventId')->willReturn(1);
+        $order->method('getRefundStatus')->willReturn(null); // Not pending
+        $order->method('getStripePayment')->willReturn(null);
+        $order->method('getRazorpayOrder')->willReturn($this->createMock(RazorpayOrderDomainObject::class));
+        $order->method('getEmail')->willReturn('test@example.com');
+        $order->method('getLocale')->willReturn('en');
+        $order->method('getCurrency')->willReturn('INR');
+        return $order;
+    }
+
+    private function createEvent(): EventDomainObject&MockObject
+    {
+        $organizerMock = $this->createMock(OrganizerDomainObject::class);
+        $settingsMock = $this->createMock(EventSettingDomainObject::class);
+
+        $event = $this->createMock(EventDomainObject::class);
+        $event->method('getOrganizer')->willReturn($organizerMock);
+        $event->method('getEventSettings')->willReturn($settingsMock);
+        return $event;
+    }
+
+    public function testRefundsStripeOrderSuccessfully(): void
+    {
+        $dto = new RefundOrderDTO(
+            event_id: 1,
+            order_id: 1,
+            amount: 50.00,
+            cancel_order: false,
+            notify_buyer: false
+        );
+
+        $order = $this->createOrderWithStripePayment();
+        $event = $this->createEvent();
+
+        $this->dbConnectionMock->expects($this->once())
+            ->method('transaction')
+            ->willReturnCallback(fn($callback) => $callback());
+
+        $this->orderRepoMock->expects($this->exactly(2))
+            ->method('loadRelation')
+            ->willReturnSelf();
+
+        $this->orderRepoMock->expects($this->once())
+            ->method('findFirstWhere')
+            ->with(['event_id' => 1, 'id' => 1])
+            ->willReturn($order);
+
+        $this->eventRepoMock->expects($this->exactly(2))
+            ->method('loadRelation')
+            ->willReturnSelf();
+
+        $this->eventRepoMock->expects($this->once())
+            ->method('findById')
+            ->with(1)
+            ->willReturn($event);
+
+        $this->stripeRefundServiceMock->expects($this->once())
+            ->method('refundPayment')
+            ->with(
+                $this->callback(fn(MoneyValue $amount) => $amount->toFloat() === 50.00),
+                $order->getStripePayment()
+            );
+
+        $this->orderRepoMock->expects($this->once())
+            ->method('updateFromArray')
+            ->with(1, $this->callback(fn($attrs) => isset($attrs['refund_status'])))
+            ->willReturn($order);
+
+        $result = $this->handler->handle($dto);
+
+        $this->assertSame($order, $result);
+    }
+
+    public function testRefundsRazorpayOrderWithIdempotencyEnabled(): void
+    {
+        $this->configMock->method('get')
+            ->with('refunds.razorpay.idempotency_enabled', true)
+            ->willReturn(true);
+
+        $dto = new RefundOrderDTO(
+            event_id: 1,
+            order_id: 2,
+            amount: 100.00,
+            cancel_order: false,
+            notify_buyer: false,
+            provider_options: ['speed' => 'optimum', 'receipt' => 'Refund#123']
+        );
+
+        $order = $this->createOrderWithRazorpayPayment();
+        $event = $this->createEvent();
+
+        $this->dbConnectionMock->expects($this->once())
+            ->method('transaction')
+            ->willReturnCallback(fn($callback) => $callback());
+
+        $this->orderRepoMock->expects($this->exactly(2))
+            ->method('loadRelation')
+            ->willReturnSelf();
+
+        $this->orderRepoMock->expects($this->once())
+            ->method('findFirstWhere')
+            ->with(['event_id' => 1, 'id' => 2])
+            ->willReturn($order);
+
+        $this->eventRepoMock->expects($this->exactly(2))
+            ->method('loadRelation')
+            ->willReturnSelf();
+
+        $this->eventRepoMock->expects($this->once())
+            ->method('findById')
+            ->with(1)
+            ->willReturn($event);
+
+        $this->razorpayRefundServiceMock->expects($this->once())
+            ->method('refundPayment')
+            ->with(
+                $order->getRazorpayOrder(),
+                10000,
+                $this->callback(fn($key) => is_string($key) && preg_match('/^refund_order_2_\d+$/', $key)),
+                ['speed' => 'optimum', 'receipt' => 'Refund#123']
+            );
+
+        $this->orderRepoMock->expects($this->once())
+            ->method('updateFromArray')
+            ->with(2, $this->callback(fn($attrs) => isset($attrs['refund_status'])))
+            ->willReturn($order);
+
+        $result = $this->handler->handle($dto);
+
+        $this->assertSame($order, $result);
+    }
+
+    public function testSkipsIdempotencyKeyWhenDisabled(): void
+    {
+        $this->configMock->method('get')
+            ->with('refunds.razorpay.idempotency_enabled', true)
+            ->willReturn(false);
+
+        $dto = new RefundOrderDTO(
+            event_id: 1,
+            order_id: 2,
+            amount: 100.00,
+            cancel_order: false,
+            notify_buyer: false
+        );
+
+        $order = $this->createOrderWithRazorpayPayment();
+        $event = $this->createEvent();
+
+        $this->dbConnectionMock->expects($this->once())
+            ->method('transaction')
+            ->willReturnCallback(fn($callback) => $callback());
+
+        $this->orderRepoMock->method('loadRelation')->willReturnSelf();
+        $this->orderRepoMock->method('findFirstWhere')->willReturn($order);
+        $this->eventRepoMock->method('loadRelation')->willReturnSelf();
+        $this->eventRepoMock->method('findById')->willReturn($event);
+
+        $this->razorpayRefundServiceMock->expects($this->once())
+            ->method('refundPayment')
+            ->with(
+                $order->getRazorpayOrder(),
+                10000,
+                null,
+                []
+            );
+
+        $this->orderRepoMock->method('updateFromArray')->willReturn($order);
+
+        $this->handler->handle($dto);
+    }
+
+    public function testThrowsExceptionWhenNoPaymentDataExists(): void
+    {
+        $dto = new RefundOrderDTO(
+            event_id: 1,
+            order_id: 3,
+            amount: 10.00,
+            cancel_order: false,
+            notify_buyer: false
+        );
+
+        $order = $this->createMock(OrderDomainObject::class);
+        $order->method('getStripePayment')->willReturn(null);
+        $order->method('getRazorpayOrder')->willReturn(null);
+        $order->method('getCurrency')->willReturn('USD');
+
+        $this->dbConnectionMock->expects($this->once())
+            ->method('transaction')
+            ->willReturnCallback(fn($callback) => $callback());
+
+        $this->orderRepoMock->method('loadRelation')->willReturnSelf();
+        $this->orderRepoMock->method('findFirstWhere')->willReturn($order);
+        $this->eventRepoMock->method('loadRelation')->willReturnSelf();
+        $this->eventRepoMock->method('findById')->willReturn($this->createEvent());
+
+        $this->expectException(RefundNotPossibleException::class);
+        $this->expectExceptionMessage('There is no payment data associated with this order.');
+
+        $this->handler->handle($dto);
+    }
+
+    public function testThrowsExceptionWhenRefundAlreadyPending(): void
+    {
+        $dto = new RefundOrderDTO(
+            event_id: 1,
+            order_id: 1,
+            amount: 50.00,
+            cancel_order: false,
+            notify_buyer: false
+        );
+
+        // Create order mock manually to ensure refund status is set correctly
+        $order = $this->createMock(OrderDomainObject::class);
+        $order->method('getId')->willReturn(1);
+        $order->method('getEventId')->willReturn(1);
+        $order->method('getRefundStatus')->willReturn(OrderRefundStatus::REFUND_PENDING->name); // Use constant
+        $order->method('getStripePayment')->willReturn($this->createMock(StripePaymentDomainObject::class));
+        $order->method('getRazorpayOrder')->willReturn(null);
+        $order->method('getEmail')->willReturn('test@example.com');
+        $order->method('getLocale')->willReturn('en');
+        $order->method('getCurrency')->willReturn('USD');
+
+        $event = $this->createEvent();
+
+        $this->dbConnectionMock->expects($this->once())
+            ->method('transaction')
+            ->willReturnCallback(fn($callback) => $callback());
+
+        $this->orderRepoMock->method('loadRelation')->willReturnSelf();
+        $this->orderRepoMock->method('findFirstWhere')->willReturn($order);
+        $this->orderRepoMock->method('updateFromArray')->willReturn($order); // For markOrderRefundPending
+
+        $this->eventRepoMock->method('loadRelation')->willReturnSelf();
+        $this->eventRepoMock->method('findById')->willReturn($event);
+
+        $this->expectException(RefundNotPossibleException::class);
+        $this->expectExceptionMessage('There is already a refund pending for this order.');
+
+        $this->handler->handle($dto);
+    }
+
+    public function testCancelsOrderWhenRequested(): void
+    {
+        $dto = new RefundOrderDTO(
+            event_id: 1,
+            order_id: 1,
+            amount: 50.00,
+            cancel_order: true,
+            notify_buyer: false
+        );
+
+        $order = $this->createOrderWithStripePayment();
+        $event = $this->createEvent();
+
+        $this->dbConnectionMock->expects($this->once())
+            ->method('transaction')
+            ->willReturnCallback(fn($callback) => $callback());
+
+        $this->orderRepoMock->method('loadRelation')->willReturnSelf();
+        $this->orderRepoMock->method('findFirstWhere')->willReturn($order);
+        $this->eventRepoMock->method('loadRelation')->willReturnSelf();
+        $this->eventRepoMock->method('findById')->willReturn($event);
+
+        $this->orderCancelServiceMock->expects($this->once())
+            ->method('cancelOrder')
+            ->with($order);
+
+        $this->stripeRefundServiceMock->method('refundPayment');
+        $this->orderRepoMock->method('updateFromArray')->willReturn($order);
+
+        $this->handler->handle($dto);
+    }
+
+
+
+    public function testNotifiesBuyerWhenRequested(): void
+    {
+        $dto = new RefundOrderDTO(
+            event_id: 1,
+            order_id: 1,
+            amount: 50.00,
+            cancel_order: false,
+            notify_buyer: true
+        );
+
+        $order = $this->createOrderWithStripePayment();
+        $event = $this->createEvent();  // now returns event with organizer & settings mocks
+
+        $this->dbConnectionMock->expects($this->once())
+            ->method('transaction')
+            ->willReturnCallback(fn($callback) => $callback());
+
+        $this->orderRepoMock->method('loadRelation')->willReturnSelf();
+        $this->orderRepoMock->method('findFirstWhere')->willReturn($order);
+        $this->eventRepoMock->method('loadRelation')->willReturnSelf();
+        $this->eventRepoMock->method('findById')->willReturn($event);
+
+        $this->stripeRefundServiceMock->method('refundPayment');
+
+        // Create a mock for the pending mail object
+        $pendingMailMock = $this->createMock(PendingMail::class);
+        $pendingMailMock->expects($this->once())
+            ->method('locale')
+            ->with('en')
+            ->willReturnSelf();
+        $pendingMailMock->expects($this->once())
+            ->method('send')
+            ->with($this->isInstanceOf(\HiEvents\Mail\Order\OrderRefunded::class));
+
+        // Set up mailer mock to return the pending mail mock
+        $this->mailerMock->expects($this->once())
+            ->method('to')
+            ->with('test@example.com')
+            ->willReturn($pendingMailMock);
+
+        $this->orderRepoMock->method('updateFromArray')->willReturn($order);
+
+        $this->handler->handle($dto);
+    }
+
+    public function testHandlesRazorpay409Conflict(): void
+    {
+        $this->configMock->method('get')
+            ->with('refunds.razorpay.idempotency_enabled', true)
+            ->willReturn(true);
+
+        $dto = new RefundOrderDTO(
+            event_id: 1,
+            order_id: 2,
+            amount: 100.00,
+            cancel_order: false,
+            notify_buyer: false
+        );
+
+        $order = $this->createOrderWithRazorpayPayment();
+        $event = $this->createEvent();
+
+        $this->dbConnectionMock->expects($this->once())
+            ->method('transaction')
+            ->willReturnCallback(fn($callback) => $callback());
+
+        $this->orderRepoMock->method('loadRelation')->willReturnSelf();
+        $this->orderRepoMock->method('findFirstWhere')->willReturn($order);
+        $this->eventRepoMock->method('loadRelation')->willReturnSelf();
+        $this->eventRepoMock->method('findById')->willReturn($event);
+
+        // Create a real Error exception with status code 409
+        $error = new Error('Conflict', 0, 409);
+
+        $this->razorpayRefundServiceMock->method('refundPayment')
+            ->willThrowException($error);
+
+        $this->expectException(RefundNotPossibleException::class);
+        $this->expectExceptionMessage('already being processed');
+
+        $this->handler->handle($dto);
+    }
+
+    public function testThrowsResourceNotFoundExceptionWhenOrderNotFound(): void
+    {
+        $dto = new RefundOrderDTO(
+            event_id: 1,
+            order_id: 999,
+            amount: 50.00,
+            cancel_order: false,
+            notify_buyer: false
+        );
+
+        $this->dbConnectionMock->expects($this->once())
+            ->method('transaction')
+            ->willReturnCallback(fn($callback) => $callback());
+
+        $this->orderRepoMock->method('loadRelation')->willReturnSelf();
+        $this->orderRepoMock->method('findFirstWhere')->willReturn(null);
+
+        $this->expectException(ResourceNotFoundException::class);
+
+        $this->handler->handle($dto);
+    }
+}
\ No newline at end of file

From 97327d13ea74efb9b0ae61fad773364b874070bb Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Fri, 6 Mar 2026 09:52:55 +0000
Subject: [PATCH 39/41] added idempotent refund service

---
 .../RazorpayOrderDomainObjectAbstract.php     |  84 ++++++++-
 .../RefundAttemptDomainObjectAbstract.php     | 160 ++++++++++++++++++
 .../Generated/WebhookDomainObjectAbstract.php |  22 +--
 .../RefundAttemptDomainObject.php             |   7 +
 backend/app/Models/RefundAttempt.php          |  10 ++
 .../RefundAttemptRepositoryInterface.php      |  18 ++
 .../Order/Payment/RefundOrderHandler.php      |  35 ++--
 .../Payment/IdempotentRefundService.php       | 100 +++++++++++
 ...06_084011_create_refund_attempts_table.php |  34 ++++
 .../Order/Payment/RefundOrderHandlerTest.php  |  61 ++++---
 .../Payment/IdempotentRefundServiceTest.php   | 142 ++++++++++++++++
 11 files changed, 601 insertions(+), 72 deletions(-)
 create mode 100644 backend/app/DomainObjects/Generated/RefundAttemptDomainObjectAbstract.php
 create mode 100644 backend/app/DomainObjects/RefundAttemptDomainObject.php
 create mode 100644 backend/app/Models/RefundAttempt.php
 create mode 100644 backend/app/Repository/Interfaces/RefundAttemptRepositoryInterface.php
 create mode 100644 backend/app/Services/Domain/Payment/IdempotentRefundService.php
 create mode 100644 backend/database/migrations/2026_03_06_084011_create_refund_attempts_table.php
 create mode 100644 backend/tests/Unit/Services/Domain/Payment/IdempotentRefundServiceTest.php

diff --git a/backend/app/DomainObjects/Generated/RazorpayOrderDomainObjectAbstract.php b/backend/app/DomainObjects/Generated/RazorpayOrderDomainObjectAbstract.php
index c0a5b3406..afe730cb1 100644
--- a/backend/app/DomainObjects/Generated/RazorpayOrderDomainObjectAbstract.php
+++ b/backend/app/DomainObjects/Generated/RazorpayOrderDomainObjectAbstract.php
@@ -15,10 +15,15 @@ abstract class RazorpayOrderDomainObjectAbstract extends \HiEvents\DomainObjects
     final public const RAZORPAY_ORDER_ID = 'razorpay_order_id';
     final public const RAZORPAY_PAYMENT_ID = 'razorpay_payment_id';
     final public const RAZORPAY_SIGNATURE = 'razorpay_signature';
+    final public const METHOD = 'method';
+    final public const FEE = 'fee';
+    final public const TAX = 'tax';
     final public const AMOUNT = 'amount';
     final public const CURRENCY = 'currency';
     final public const RECEIPT = 'receipt';
-    final public const PAYMENT_STATUS = 'payment_status';
+    final public const STATUS = 'status';
+    final public const FAILURE_REASON = 'failure_reason';
+    final public const ERROR_CODE = 'error_code';
     final public const CREATED_AT = 'created_at';
     final public const UPDATED_AT = 'updated_at';
 
@@ -27,10 +32,15 @@ abstract class RazorpayOrderDomainObjectAbstract extends \HiEvents\DomainObjects
     protected string $razorpay_order_id;
     protected ?string $razorpay_payment_id = null;
     protected ?string $razorpay_signature = null;
+    protected ?string $method = null;
+    protected ?int $fee = null;
+    protected ?int $tax = null;
     protected int $amount;
     protected string $currency;
     protected ?string $receipt = null;
-    protected string $payment_status = 'created';
+    protected string $status = 'created';
+    protected ?string $failure_reason = null;
+    protected ?string $error_code = null;
     protected ?string $created_at = null;
     protected ?string $updated_at = null;
 
@@ -42,10 +52,15 @@ public function toArray(): array
                     'razorpay_order_id' => $this->razorpay_order_id ?? null,
                     'razorpay_payment_id' => $this->razorpay_payment_id ?? null,
                     'razorpay_signature' => $this->razorpay_signature ?? null,
+                    'method' => $this->method ?? null,
+                    'fee' => $this->fee ?? null,
+                    'tax' => $this->tax ?? null,
                     'amount' => $this->amount ?? null,
                     'currency' => $this->currency ?? null,
                     'receipt' => $this->receipt ?? null,
-                    'payment_status' => $this->payment_status ?? null,
+                    'status' => $this->status ?? null,
+                    'failure_reason' => $this->failure_reason ?? null,
+                    'error_code' => $this->error_code ?? null,
                     'created_at' => $this->created_at ?? null,
                     'updated_at' => $this->updated_at ?? null,
                 ];
@@ -106,6 +121,39 @@ public function getRazorpaySignature(): ?string
         return $this->razorpay_signature;
     }
 
+    public function setMethod(?string $method): self
+    {
+        $this->method = $method;
+        return $this;
+    }
+
+    public function getMethod(): ?string
+    {
+        return $this->method;
+    }
+
+    public function setFee(?int $fee): self
+    {
+        $this->fee = $fee;
+        return $this;
+    }
+
+    public function getFee(): ?int
+    {
+        return $this->fee;
+    }
+
+    public function setTax(?int $tax): self
+    {
+        $this->tax = $tax;
+        return $this;
+    }
+
+    public function getTax(): ?int
+    {
+        return $this->tax;
+    }
+
     public function setAmount(int $amount): self
     {
         $this->amount = $amount;
@@ -139,15 +187,37 @@ public function getReceipt(): ?string
         return $this->receipt;
     }
 
-    public function setPaymentStatus(string $payment_status): self
+    public function setStatus(string $status): self
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    public function getStatus(): string
+    {
+        return $this->status;
+    }
+
+    public function setFailureReason(?string $failure_reason): self
+    {
+        $this->failure_reason = $failure_reason;
+        return $this;
+    }
+
+    public function getFailureReason(): ?string
+    {
+        return $this->failure_reason;
+    }
+
+    public function setErrorCode(?string $error_code): self
     {
-        $this->payment_status = $payment_status;
+        $this->error_code = $error_code;
         return $this;
     }
 
-    public function getPaymentStatus(): string
+    public function getErrorCode(): ?string
     {
-        return $this->payment_status;
+        return $this->error_code;
     }
 
     public function setCreatedAt(?string $created_at): self
diff --git a/backend/app/DomainObjects/Generated/RefundAttemptDomainObjectAbstract.php b/backend/app/DomainObjects/Generated/RefundAttemptDomainObjectAbstract.php
new file mode 100644
index 000000000..1e96fc44b
--- /dev/null
+++ b/backend/app/DomainObjects/Generated/RefundAttemptDomainObjectAbstract.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace HiEvents\DomainObjects\Generated;
+
+/**
+ * THIS FILE IS AUTOGENERATED - DO NOT EDIT IT DIRECTLY.
+ * @package HiEvents\DomainObjects\Generated
+ */
+abstract class RefundAttemptDomainObjectAbstract extends \HiEvents\DomainObjects\AbstractDomainObject
+{
+    final public const SINGULAR_NAME = 'refund_attempt';
+    final public const PLURAL_NAME = 'refund_attempts';
+    final public const ID = 'id';
+    final public const IDEMPOTENCY_KEY = 'idempotency_key';
+    final public const PAYMENT_TYPE = 'payment_type';
+    final public const PAYMENT_ID = 'payment_id';
+    final public const STATUS = 'status';
+    final public const REQUEST_DATA = 'request_data';
+    final public const RESPONSE_DATA = 'response_data';
+    final public const ATTEMPTS = 'attempts';
+    final public const CREATED_AT = 'created_at';
+    final public const UPDATED_AT = 'updated_at';
+
+    protected int $id;
+    protected string $idempotency_key;
+    protected string $payment_type;
+    protected int $payment_id;
+    protected string $status;
+    protected array|string|null $request_data = null;
+    protected array|string|null $response_data = null;
+    protected int $attempts = 0;
+    protected ?string $created_at = null;
+    protected ?string $updated_at = null;
+
+    public function toArray(): array
+    {
+        return [
+                    'id' => $this->id ?? null,
+                    'idempotency_key' => $this->idempotency_key ?? null,
+                    'payment_type' => $this->payment_type ?? null,
+                    'payment_id' => $this->payment_id ?? null,
+                    'status' => $this->status ?? null,
+                    'request_data' => $this->request_data ?? null,
+                    'response_data' => $this->response_data ?? null,
+                    'attempts' => $this->attempts ?? null,
+                    'created_at' => $this->created_at ?? null,
+                    'updated_at' => $this->updated_at ?? null,
+                ];
+    }
+
+    public function setId(int $id): self
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function setIdempotencyKey(string $idempotency_key): self
+    {
+        $this->idempotency_key = $idempotency_key;
+        return $this;
+    }
+
+    public function getIdempotencyKey(): string
+    {
+        return $this->idempotency_key;
+    }
+
+    public function setPaymentType(string $payment_type): self
+    {
+        $this->payment_type = $payment_type;
+        return $this;
+    }
+
+    public function getPaymentType(): string
+    {
+        return $this->payment_type;
+    }
+
+    public function setPaymentId(int $payment_id): self
+    {
+        $this->payment_id = $payment_id;
+        return $this;
+    }
+
+    public function getPaymentId(): int
+    {
+        return $this->payment_id;
+    }
+
+    public function setStatus(string $status): self
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    public function getStatus(): string
+    {
+        return $this->status;
+    }
+
+    public function setRequestData(array|string|null $request_data): self
+    {
+        $this->request_data = $request_data;
+        return $this;
+    }
+
+    public function getRequestData(): array|string|null
+    {
+        return $this->request_data;
+    }
+
+    public function setResponseData(array|string|null $response_data): self
+    {
+        $this->response_data = $response_data;
+        return $this;
+    }
+
+    public function getResponseData(): array|string|null
+    {
+        return $this->response_data;
+    }
+
+    public function setAttempts(int $attempts): self
+    {
+        $this->attempts = $attempts;
+        return $this;
+    }
+
+    public function getAttempts(): int
+    {
+        return $this->attempts;
+    }
+
+    public function setCreatedAt(?string $created_at): self
+    {
+        $this->created_at = $created_at;
+        return $this;
+    }
+
+    public function getCreatedAt(): ?string
+    {
+        return $this->created_at;
+    }
+
+    public function setUpdatedAt(?string $updated_at): self
+    {
+        $this->updated_at = $updated_at;
+        return $this;
+    }
+
+    public function getUpdatedAt(): ?string
+    {
+        return $this->updated_at;
+    }
+}
diff --git a/backend/app/DomainObjects/Generated/WebhookDomainObjectAbstract.php b/backend/app/DomainObjects/Generated/WebhookDomainObjectAbstract.php
index 660f7a66f..8e301915f 100644
--- a/backend/app/DomainObjects/Generated/WebhookDomainObjectAbstract.php
+++ b/backend/app/DomainObjects/Generated/WebhookDomainObjectAbstract.php
@@ -13,8 +13,8 @@ abstract class WebhookDomainObjectAbstract extends \HiEvents\DomainObjects\Abstr
     final public const ID = 'id';
     final public const USER_ID = 'user_id';
     final public const EVENT_ID = 'event_id';
-    final public const ORGANIZER_ID = 'organizer_id';
     final public const ACCOUNT_ID = 'account_id';
+    final public const ORGANIZER_ID = 'organizer_id';
     final public const URL = 'url';
     final public const EVENT_TYPES = 'event_types';
     final public const LAST_RESPONSE_CODE = 'last_response_code';
@@ -29,8 +29,8 @@ abstract class WebhookDomainObjectAbstract extends \HiEvents\DomainObjects\Abstr
     protected int $id;
     protected int $user_id;
     protected ?int $event_id = null;
-    protected ?int $organizer_id = null;
     protected int $account_id;
+    protected ?int $organizer_id = null;
     protected string $url;
     protected array|string $event_types;
     protected ?int $last_response_code = null;
@@ -48,8 +48,8 @@ public function toArray(): array
                     'id' => $this->id ?? null,
                     'user_id' => $this->user_id ?? null,
                     'event_id' => $this->event_id ?? null,
-                    'organizer_id' => $this->organizer_id ?? null,
                     'account_id' => $this->account_id ?? null,
+                    'organizer_id' => $this->organizer_id ?? null,
                     'url' => $this->url ?? null,
                     'event_types' => $this->event_types ?? null,
                     'last_response_code' => $this->last_response_code ?? null,
@@ -96,26 +96,26 @@ public function getEventId(): ?int
         return $this->event_id;
     }
 
-    public function setOrganizerId(?int $organizer_id): self
+    public function setAccountId(int $account_id): self
     {
-        $this->organizer_id = $organizer_id;
+        $this->account_id = $account_id;
         return $this;
     }
 
-    public function getOrganizerId(): ?int
+    public function getAccountId(): int
     {
-        return $this->organizer_id;
+        return $this->account_id;
     }
 
-    public function setAccountId(int $account_id): self
+    public function setOrganizerId(?int $organizer_id): self
     {
-        $this->account_id = $account_id;
+        $this->organizer_id = $organizer_id;
         return $this;
     }
 
-    public function getAccountId(): int
+    public function getOrganizerId(): ?int
     {
-        return $this->account_id;
+        return $this->organizer_id;
     }
 
     public function setUrl(string $url): self
diff --git a/backend/app/DomainObjects/RefundAttemptDomainObject.php b/backend/app/DomainObjects/RefundAttemptDomainObject.php
new file mode 100644
index 000000000..f3fb0f72a
--- /dev/null
+++ b/backend/app/DomainObjects/RefundAttemptDomainObject.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace HiEvents\DomainObjects;
+
+class RefundAttemptDomainObject extends Generated\RefundAttemptDomainObjectAbstract
+{
+}
\ No newline at end of file
diff --git a/backend/app/Models/RefundAttempt.php b/backend/app/Models/RefundAttempt.php
new file mode 100644
index 000000000..d1c257ba0
--- /dev/null
+++ b/backend/app/Models/RefundAttempt.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace HiEvents\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class RefundAttempt extends Model
+{
+    //
+}
diff --git a/backend/app/Repository/Interfaces/RefundAttemptRepositoryInterface.php b/backend/app/Repository/Interfaces/RefundAttemptRepositoryInterface.php
new file mode 100644
index 000000000..76fd806b1
--- /dev/null
+++ b/backend/app/Repository/Interfaces/RefundAttemptRepositoryInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HiEvents\Repository\Interfaces;
+
+use HiEvents\DomainObjects\RefundAttemptDomainObject;
+
+interface RefundAttemptRepositoryInterface extends RepositoryInterface
+{
+    public function findByIdempotencyKey(string $key): ?RefundAttemptDomainObject;
+
+    public function createAttempt(string $key, int $paymentId, string $paymentType, array $requestData): RefundAttemptDomainObject;
+
+    public function markSucceeded(int $id, array $responseData): bool;
+
+    public function markFailed(int $id, array $responseData = []): bool;
+
+    public function incrementAttempts(int $id): bool;
+}
\ No newline at end of file
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/RefundOrderHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/RefundOrderHandler.php
index f2b7247b9..ad2419d78 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/RefundOrderHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/RefundOrderHandler.php
@@ -21,14 +21,13 @@
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Services\Application\Handlers\Order\DTO\RefundOrderDTO;
 use HiEvents\Services\Domain\Order\OrderCancelService;
-use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentRefundService;
+use HiEvents\Services\Domain\Payment\IdempotentRefundService;
 use HiEvents\Services\Domain\Payment\Stripe\StripePaymentIntentRefundService;
 use HiEvents\Services\Infrastructure\Stripe\StripeClientFactory;
 use HiEvents\Values\MoneyValue;
 use Illuminate\Config\Repository;
 use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Database\ConnectionInterface;
-use Razorpay\Api\Errors\Error;
 use Stripe\Exception\ApiErrorException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Throwable;
@@ -43,7 +42,7 @@ public function __construct(
         private readonly ConnectionInterface $dbConnection,
         private readonly StripePaymentIntentRefundService $stripeRefundService,
         private readonly StripeClientFactory $stripeClientFactory,
-        private readonly RazorpayPaymentRefundService $razorpayRefundService,
+        private readonly IdempotentRefundService $idempotentRefundService,
         private readonly Repository $config
     ) {
     }
@@ -117,12 +116,14 @@ private function markOrderRefundPending(OrderDomainObject $order): OrderDomainOb
         );
     }
 
-    private function generateRazorpayIdempotencyKey(OrderDomainObject $order): ?string
+    private function generateRazorpayIdempotencyKey(OrderDomainObject $order, MoneyValue $amount, array $options): ?string
     {
         if (!$this->config->get('refunds.razorpay.idempotency_enabled', true)) {
             return null;
         }
-        return 'refund_order_' . $order->getId() . '_' . time();
+
+        $data = $order->getId() . '_' . $amount->toMinorUnit() . '_' . json_encode($options);
+        return 'refund_' . hash('sha256', $data);
     }
 
     /**
@@ -164,25 +165,15 @@ private function refundOrder(RefundOrderDTO $refundOrderDTO): OrderDomainObject
                 stripeClient: $stripeClient
             );
         } elseif ($order->getRazorpayOrder()) {
-            // Razorpay refund with idempotency and options
-            $idempotencyKey = $this->generateRazorpayIdempotencyKey($order);
             $options = $refundOrderDTO->provider_options ?? [];
+            $idempotencyKey = $this->generateRazorpayIdempotencyKey($order, $amount, $options);
 
-            try {
-                $this->razorpayRefundService->refundPayment(
-                    $order->getRazorpayOrder(),
-                    $amount->toMinorUnit(),
-                    $idempotencyKey,
-                    $options
-                );
-            } catch (Error $e) {
-                if ($e->getHttpStatusCode() === 409) {
-                    throw new RefundNotPossibleException(
-                        __('A refund for this order is already being processed. Please check again later.')
-                    );
-                }
-                throw $e;
-            }
+            $this->idempotentRefundService->refundWithIdempotency(
+                $order->getRazorpayOrder(),
+                $amount,
+                $options,
+                $idempotencyKey
+            );
         } else {
             throw new RefundNotPossibleException(__('No payment provider found for this order.'));
         }
diff --git a/backend/app/Services/Domain/Payment/IdempotentRefundService.php b/backend/app/Services/Domain/Payment/IdempotentRefundService.php
new file mode 100644
index 000000000..7e7d690c6
--- /dev/null
+++ b/backend/app/Services/Domain/Payment/IdempotentRefundService.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace HiEvents\Services\Domain\Payment;
+
+use HiEvents\DomainObjects\RefundAttemptDomainObject;
+use HiEvents\Exceptions\RefundNotPossibleException;
+use HiEvents\Repository\Interfaces\RefundAttemptRepositoryInterface;
+use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentRefundService;
+use HiEvents\Values\MoneyValue;
+use Illuminate\Database\ConnectionInterface;
+use Throwable;
+
+class IdempotentRefundService
+{
+    public function __construct(
+        private readonly RefundAttemptRepositoryInterface $attemptRepository,
+        private readonly RazorpayPaymentRefundService $refundService,
+        private readonly ConnectionInterface $dbManager,
+    ) {
+    }
+
+    /**
+     * @throws Throwable
+     * @throws RefundNotPossibleException
+     */
+    public function refundWithIdempotency(
+        object $payment,
+        MoneyValue $amount,
+        array $options,
+        ?string $idempotencyKey = null // Make nullable
+    ): object {
+        // If no idempotency key provided, skip idempotency and refund directly
+        if ($idempotencyKey === null) {
+            return $this->refundService->refundPayment(
+                $payment,
+                $amount->toMinorUnit(),
+                null,
+                $options
+            );
+        }
+
+        return $this->dbManager->transaction(function () use ($payment, $amount, $options, $idempotencyKey) {
+            // Lock the attempt row if exists
+            $attempt = $this->attemptRepository
+                ->findByIdempotencyKey($idempotencyKey);
+
+            if ($attempt) {
+                return $this->handleExistingAttempt($attempt);
+            }
+
+            // Create new attempt
+            $paymentId = $payment->getId();
+            $paymentType = $this->getPaymentType($payment);
+            $attempt = $this->attemptRepository->createAttempt(
+                $idempotencyKey,
+                $paymentId,
+                $paymentType,
+                ['amount' => $amount->toMinorUnit(), 'options' => $options]
+            );
+
+            try {
+                $result = $this->refundService->refundPayment(
+                    $payment,
+                    $amount->toMinorUnit(),
+                    $idempotencyKey,
+                    $options
+                );
+
+                $this->attemptRepository->markSucceeded($attempt->getId(), (array) $result);
+                return $result;
+            } catch (Throwable $e) {
+                $this->attemptRepository->markFailed($attempt->getId(), ['error' => $e->getMessage()]);
+                throw $e;
+            }
+        });
+    }
+
+    private function handleExistingAttempt(RefundAttemptDomainObject $attempt): object
+    {
+        if ($attempt->getStatus() === 'succeeded') {
+            return (object) $attempt->getResponseData();
+        }
+
+        if ($attempt->getStatus() === 'failed') {
+            $this->attemptRepository->incrementAttempts($attempt->getId());
+            throw new RefundNotPossibleException('Previous refund attempt failed. Please retry.');
+        }
+
+        throw new RefundNotPossibleException('A refund for this order is already being processed.');
+    }
+
+    private function getPaymentType(object $payment): string
+    {
+        return match (true) {
+            $payment instanceof \HiEvents\DomainObjects\StripePaymentDomainObject => 'stripe',
+            $payment instanceof \HiEvents\DomainObjects\RazorpayOrderDomainObject => 'razorpay',
+            default => throw new \InvalidArgumentException('Unknown payment type'),
+        };
+    }
+}
\ No newline at end of file
diff --git a/backend/database/migrations/2026_03_06_084011_create_refund_attempts_table.php b/backend/database/migrations/2026_03_06_084011_create_refund_attempts_table.php
new file mode 100644
index 000000000..55342648f
--- /dev/null
+++ b/backend/database/migrations/2026_03_06_084011_create_refund_attempts_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('refund_attempts', function (Blueprint $table) {
+            $table->id();
+            $table->string('idempotency_key', 100)->unique();
+            $table->morphs('payment');
+            $table->string('status');
+            $table->json('request_data')->nullable();
+            $table->json('response_data')->nullable();
+            $table->integer('attempts')->default(0);
+            $table->timestamps();
+
+            $table->index(['payment_id', 'payment_type']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('refund_attempts');
+    }
+};
diff --git a/backend/tests/Unit/Services/Application/Handlers/Order/Payment/RefundOrderHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Order/Payment/RefundOrderHandlerTest.php
index daf6bab4a..a7d17563b 100644
--- a/backend/tests/Unit/Services/Application/Handlers/Order/Payment/RefundOrderHandlerTest.php
+++ b/backend/tests/Unit/Services/Application/Handlers/Order/Payment/RefundOrderHandlerTest.php
@@ -15,7 +15,7 @@
 use HiEvents\Services\Application\Handlers\Order\DTO\RefundOrderDTO;
 use HiEvents\Services\Application\Handlers\Order\Payment\RefundOrderHandler;
 use HiEvents\Services\Domain\Order\OrderCancelService;
-use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentRefundService;
+use HiEvents\Services\Domain\Payment\IdempotentRefundService;
 use HiEvents\Services\Domain\Payment\Stripe\StripePaymentIntentRefundService;
 use HiEvents\Services\Infrastructure\Stripe\StripeClientFactory;
 use HiEvents\Values\MoneyValue;
@@ -24,7 +24,6 @@
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Mail\PendingMail;
 use PHPUnit\Framework\MockObject\MockObject;
-use Razorpay\Api\Errors\Error;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Tests\TestCase;
 
@@ -37,7 +36,7 @@ class RefundOrderHandlerTest extends TestCase
     private ConnectionInterface&MockObject $dbConnectionMock;
     private StripePaymentIntentRefundService&MockObject $stripeRefundServiceMock;
     private StripeClientFactory&MockObject $stripeClientFactory;
-    private RazorpayPaymentRefundService&MockObject $razorpayRefundServiceMock;
+    private IdempotentRefundService&MockObject $idempotentRefundServiceMock;
     private Repository&MockObject $configMock;
     private RefundOrderHandler $handler;
 
@@ -52,7 +51,7 @@ protected function setUp(): void
         $this->dbConnectionMock = $this->createMock(ConnectionInterface::class);
         $this->stripeRefundServiceMock = $this->createMock(StripePaymentIntentRefundService::class);
         $this->stripeClientFactory = $this->createMock(StripeClientFactory::class);
-        $this->razorpayRefundServiceMock = $this->createMock(RazorpayPaymentRefundService::class);
+        $this->idempotentRefundServiceMock = $this->createMock(IdempotentRefundService::class);
         $this->configMock = $this->createMock(Repository::class);
 
         $this->handler = new RefundOrderHandler(
@@ -63,7 +62,7 @@ protected function setUp(): void
             $this->dbConnectionMock,
             $this->stripeRefundServiceMock,
             $this->stripeClientFactory,
-            $this->razorpayRefundServiceMock,
+            $this->idempotentRefundServiceMock,
             $this->configMock
         );
     }
@@ -73,7 +72,7 @@ private function createOrderWithStripePayment(): OrderDomainObject&MockObject
         $order = $this->createMock(OrderDomainObject::class);
         $order->method('getId')->willReturn(1);
         $order->method('getEventId')->willReturn(1);
-        $order->method('getRefundStatus')->willReturn(null); // Not pending
+        $order->method('getRefundStatus')->willReturn(null);
         $order->method('getStripePayment')->willReturn($this->createMock(StripePaymentDomainObject::class));
         $order->method('getRazorpayOrder')->willReturn(null);
         $order->method('getEmail')->willReturn('test@example.com');
@@ -87,7 +86,7 @@ private function createOrderWithRazorpayPayment(): OrderDomainObject&MockObject
         $order = $this->createMock(OrderDomainObject::class);
         $order->method('getId')->willReturn(2);
         $order->method('getEventId')->willReturn(1);
-        $order->method('getRefundStatus')->willReturn(null); // Not pending
+        $order->method('getRefundStatus')->willReturn(null);
         $order->method('getStripePayment')->willReturn(null);
         $order->method('getRazorpayOrder')->willReturn($this->createMock(RazorpayOrderDomainObject::class));
         $order->method('getEmail')->willReturn('test@example.com');
@@ -162,7 +161,7 @@ public function testRefundsStripeOrderSuccessfully(): void
     public function testRefundsRazorpayOrderWithIdempotencyEnabled(): void
     {
         $this->configMock->method('get')
-            ->with('refunds.razorpay.idempotency_enabled', true)
+            ->with('refunds.razorpay.idempotency_enabled')
             ->willReturn(true);
 
         $dto = new RefundOrderDTO(
@@ -199,13 +198,18 @@ public function testRefundsRazorpayOrderWithIdempotencyEnabled(): void
             ->with(1)
             ->willReturn($event);
 
-        $this->razorpayRefundServiceMock->expects($this->once())
-            ->method('refundPayment')
+        $this->idempotentRefundServiceMock->expects($this->once())
+            ->method('refundWithIdempotency')
             ->with(
                 $order->getRazorpayOrder(),
-                10000,
-                $this->callback(fn($key) => is_string($key) && preg_match('/^refund_order_2_\d+$/', $key)),
-                ['speed' => 'optimum', 'receipt' => 'Refund#123']
+                $this->callback(fn(MoneyValue $amount) => $amount->toFloat() === 100.00),
+                ['speed' => 'optimum', 'receipt' => 'Refund#123'],
+                $this->callback(function ($key) {
+                    return is_string($key)
+                        && str_starts_with($key, 'refund_')
+                        && strlen($key) === 71
+                        && ctype_xdigit(substr($key, 7));
+                })
             );
 
         $this->orderRepoMock->expects($this->once())
@@ -221,7 +225,7 @@ public function testRefundsRazorpayOrderWithIdempotencyEnabled(): void
     public function testSkipsIdempotencyKeyWhenDisabled(): void
     {
         $this->configMock->method('get')
-            ->with('refunds.razorpay.idempotency_enabled', true)
+            ->with('refunds.razorpay.idempotency_enabled')
             ->willReturn(false);
 
         $dto = new RefundOrderDTO(
@@ -244,13 +248,13 @@ public function testSkipsIdempotencyKeyWhenDisabled(): void
         $this->eventRepoMock->method('loadRelation')->willReturnSelf();
         $this->eventRepoMock->method('findById')->willReturn($event);
 
-        $this->razorpayRefundServiceMock->expects($this->once())
-            ->method('refundPayment')
+        $this->idempotentRefundServiceMock->expects($this->once())
+            ->method('refundWithIdempotency')
             ->with(
                 $order->getRazorpayOrder(),
-                10000,
-                null,
-                []
+                $this->callback(fn(MoneyValue $amount) => $amount->toFloat() === 100.00),
+                [],
+                null
             );
 
         $this->orderRepoMock->method('updateFromArray')->willReturn($order);
@@ -298,11 +302,10 @@ public function testThrowsExceptionWhenRefundAlreadyPending(): void
             notify_buyer: false
         );
 
-        // Create order mock manually to ensure refund status is set correctly
         $order = $this->createMock(OrderDomainObject::class);
         $order->method('getId')->willReturn(1);
         $order->method('getEventId')->willReturn(1);
-        $order->method('getRefundStatus')->willReturn(OrderRefundStatus::REFUND_PENDING->name); // Use constant
+        $order->method('getRefundStatus')->willReturn(OrderRefundStatus::REFUND_PENDING->name);
         $order->method('getStripePayment')->willReturn($this->createMock(StripePaymentDomainObject::class));
         $order->method('getRazorpayOrder')->willReturn(null);
         $order->method('getEmail')->willReturn('test@example.com');
@@ -317,7 +320,7 @@ public function testThrowsExceptionWhenRefundAlreadyPending(): void
 
         $this->orderRepoMock->method('loadRelation')->willReturnSelf();
         $this->orderRepoMock->method('findFirstWhere')->willReturn($order);
-        $this->orderRepoMock->method('updateFromArray')->willReturn($order); // For markOrderRefundPending
+        $this->orderRepoMock->method('updateFromArray')->willReturn($order);
 
         $this->eventRepoMock->method('loadRelation')->willReturnSelf();
         $this->eventRepoMock->method('findById')->willReturn($event);
@@ -360,8 +363,6 @@ public function testCancelsOrderWhenRequested(): void
         $this->handler->handle($dto);
     }
 
-
-
     public function testNotifiesBuyerWhenRequested(): void
     {
         $dto = new RefundOrderDTO(
@@ -373,7 +374,7 @@ public function testNotifiesBuyerWhenRequested(): void
         );
 
         $order = $this->createOrderWithStripePayment();
-        $event = $this->createEvent();  // now returns event with organizer & settings mocks
+        $event = $this->createEvent();
 
         $this->dbConnectionMock->expects($this->once())
             ->method('transaction')
@@ -386,7 +387,6 @@ public function testNotifiesBuyerWhenRequested(): void
 
         $this->stripeRefundServiceMock->method('refundPayment');
 
-        // Create a mock for the pending mail object
         $pendingMailMock = $this->createMock(PendingMail::class);
         $pendingMailMock->expects($this->once())
             ->method('locale')
@@ -396,7 +396,6 @@ public function testNotifiesBuyerWhenRequested(): void
             ->method('send')
             ->with($this->isInstanceOf(\HiEvents\Mail\Order\OrderRefunded::class));
 
-        // Set up mailer mock to return the pending mail mock
         $this->mailerMock->expects($this->once())
             ->method('to')
             ->with('test@example.com')
@@ -407,7 +406,7 @@ public function testNotifiesBuyerWhenRequested(): void
         $this->handler->handle($dto);
     }
 
-    public function testHandlesRazorpay409Conflict(): void
+    public function testHandlesRazorpayIdempotentConflict(): void
     {
         $this->configMock->method('get')
             ->with('refunds.razorpay.idempotency_enabled', true)
@@ -433,11 +432,9 @@ public function testHandlesRazorpay409Conflict(): void
         $this->eventRepoMock->method('loadRelation')->willReturnSelf();
         $this->eventRepoMock->method('findById')->willReturn($event);
 
-        // Create a real Error exception with status code 409
-        $error = new Error('Conflict', 0, 409);
 
-        $this->razorpayRefundServiceMock->method('refundPayment')
-            ->willThrowException($error);
+        $this->idempotentRefundServiceMock->method('refundWithIdempotency')
+            ->willThrowException(new RefundNotPossibleException('A refund for this order is already being processed.'));
 
         $this->expectException(RefundNotPossibleException::class);
         $this->expectExceptionMessage('already being processed');
diff --git a/backend/tests/Unit/Services/Domain/Payment/IdempotentRefundServiceTest.php b/backend/tests/Unit/Services/Domain/Payment/IdempotentRefundServiceTest.php
new file mode 100644
index 000000000..74dcfa7af
--- /dev/null
+++ b/backend/tests/Unit/Services/Domain/Payment/IdempotentRefundServiceTest.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace Tests\Unit\Services\Domain\Payment;
+
+use HiEvents\DomainObjects\RazorpayOrderDomainObject;
+use HiEvents\DomainObjects\RefundAttemptDomainObject;
+use HiEvents\Exceptions\RefundNotPossibleException;
+use HiEvents\Repository\Interfaces\RefundAttemptRepositoryInterface;
+use HiEvents\Services\Domain\Payment\IdempotentRefundService;
+use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentRefundService;
+use HiEvents\Values\MoneyValue;
+use Illuminate\Database\ConnectionInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use Tests\TestCase;
+
+class IdempotentRefundServiceTest extends TestCase
+{
+    private RefundAttemptRepositoryInterface&MockObject $attemptRepoMock;
+    private RazorpayPaymentRefundService&MockObject $refundServiceMock;
+    private ConnectionInterface&MockObject $dbConnectionMock;
+    private IdempotentRefundService $service;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->attemptRepoMock = $this->createMock(RefundAttemptRepositoryInterface::class);
+        $this->refundServiceMock = $this->createMock(RazorpayPaymentRefundService::class);
+        $this->dbConnectionMock = $this->createMock(ConnectionInterface::class);
+
+        $this->service = new IdempotentRefundService(
+            $this->attemptRepoMock,
+            $this->refundServiceMock,
+            $this->dbConnectionMock
+        );
+    }
+
+    public function testFirstAttemptCreatesAndReturnsRefund(): void
+    {
+        // Use RazorpayOrderDomainObject to match getPaymentType()
+        $payment = $this->createMock(RazorpayOrderDomainObject::class);
+        $payment->method('getId')->willReturn(1);
+        $amount = MoneyValue::fromFloat(100, 'INR');
+        $options = ['speed' => 'optimum'];
+        $key = 'test-key';
+
+        $this->dbConnectionMock->expects($this->once())
+            ->method('transaction')
+            ->willReturnCallback(fn($callback) => $callback());
+
+        $this->attemptRepoMock->expects($this->once())
+            ->method('findByIdempotencyKey')
+            ->with($key)
+            ->willReturn(null);
+
+        $attemptMock = $this->createMock(RefundAttemptDomainObject::class);
+        $attemptMock->method('getId')->willReturn(1);
+
+        $this->attemptRepoMock->expects($this->once())
+            ->method('createAttempt')
+            ->with($key, 1, 'razorpay', ['amount' => 10000, 'options' => $options])
+            ->willReturn($attemptMock);
+
+        $expectedResult = (object)['id' => 'refund_123'];
+        $this->refundServiceMock->expects($this->once())
+            ->method('refundPayment')
+            ->with($payment, 10000, $key, $options)
+            ->willReturn($expectedResult);
+
+        $this->attemptRepoMock->expects($this->once())
+            ->method('markSucceeded')
+            ->with(1, (array)$expectedResult);
+
+        $result = $this->service->refundWithIdempotency($payment, $amount, $options, $key);
+
+        $this->assertSame($expectedResult, $result);
+    }
+
+    public function testReturnsStoredResponseIfAlreadySucceeded(): void
+    {
+        $payment = $this->createMock(RazorpayOrderDomainObject::class);
+        $amount = MoneyValue::fromFloat(100, 'INR');
+        $options = [];
+        $key = 'test-key';
+
+        $this->dbConnectionMock->method('transaction')->willReturnCallback(fn($c) => $c());
+
+        $attempt = $this->createMock(RefundAttemptDomainObject::class);
+        $attempt->method('getStatus')->willReturn('succeeded');
+        $attempt->method('getResponseData')->willReturn(['id' => 'refund_123']);
+
+        $this->attemptRepoMock->method('findByIdempotencyKey')->with($key)->willReturn($attempt);
+
+        $this->refundServiceMock->expects($this->never())->method('refundPayment');
+
+        $result = $this->service->refundWithIdempotency($payment, $amount, $options, $key);
+
+        $this->assertEquals((object)['id' => 'refund_123'], $result);
+    }
+
+    public function testThrowsIfPreviousAttemptFailed(): void
+    {
+        $payment = $this->createMock(RazorpayOrderDomainObject::class);
+        $amount = MoneyValue::fromFloat(100, 'INR');
+        $options = [];
+        $key = 'test-key';
+
+        $this->dbConnectionMock->method('transaction')->willReturnCallback(fn($c) => $c());
+
+        $attempt = $this->createMock(RefundAttemptDomainObject::class);
+        $attempt->method('getStatus')->willReturn('failed');
+        $attempt->method('getId')->willReturn(1);
+
+        $this->attemptRepoMock->method('findByIdempotencyKey')->with($key)->willReturn($attempt);
+        $this->attemptRepoMock->expects($this->once())->method('incrementAttempts')->with(1);
+
+        $this->expectException(RefundNotPossibleException::class);
+        $this->expectExceptionMessage('Previous refund attempt failed. Please retry.');
+
+        $this->service->refundWithIdempotency($payment, $amount, $options, $key);
+    }
+
+    public function testThrowsIfAlreadyPending(): void
+    {
+        $payment = $this->createMock(RazorpayOrderDomainObject::class);
+        $amount = MoneyValue::fromFloat(100, 'INR');
+        $options = [];
+        $key = 'test-key';
+
+        $this->dbConnectionMock->method('transaction')->willReturnCallback(fn($c) => $c());
+
+        $attempt = $this->createMock(RefundAttemptDomainObject::class);
+        $attempt->method('getStatus')->willReturn('pending');
+
+        $this->attemptRepoMock->method('findByIdempotencyKey')->with($key)->willReturn($attempt);
+
+        $this->expectException(RefundNotPossibleException::class);
+        $this->expectExceptionMessage('already being processed');
+
+        $this->service->refundWithIdempotency($payment, $amount, $options, $key);
+    }
+}
\ No newline at end of file

From 40077b36eaf96d5059aa118e2189e94438479277 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Fri, 6 Mar 2026 10:28:42 +0000
Subject: [PATCH 40/41] implemented repository and tests and displayed refund
 option in UI

---
 backend/app/Models/RefundAttempt.php          | 24 ++++++--
 .../Providers/RepositoryServiceProvider.php   |  3 +
 .../Eloquent/RefundAttemptRepository.php      | 58 +++++++++++++++++++
 .../Razorpay/RazorpayPaymentRefundService.php | 43 +++++++++-----
 .../RazorpayPaymentRefundServiceTest.php      |  5 +-
 .../components/common/OrdersTable/index.tsx   |  2 +-
 .../modals/CancelOrderModal/index.tsx         |  2 +-
 7 files changed, 115 insertions(+), 22 deletions(-)
 create mode 100644 backend/app/Repository/Eloquent/RefundAttemptRepository.php

diff --git a/backend/app/Models/RefundAttempt.php b/backend/app/Models/RefundAttempt.php
index d1c257ba0..edd3362bb 100644
--- a/backend/app/Models/RefundAttempt.php
+++ b/backend/app/Models/RefundAttempt.php
@@ -2,9 +2,23 @@
 
 namespace HiEvents\Models;
 
-use Illuminate\Database\Eloquent\Model;
-
-class RefundAttempt extends Model
+class RefundAttempt extends BaseModel
 {
-    //
-}
+    protected $table = 'refund_attempts';
+
+    protected $fillable = [
+        'idempotency_key',
+        'payment_id',
+        'payment_type',
+        'status',
+        'request_data',
+        'response_data',
+        'attempts',
+    ];
+
+    protected $casts = [
+        'request_data' => 'array',
+        'response_data' => 'array',
+        'attempts' => 'integer',
+    ];
+}
\ No newline at end of file
diff --git a/backend/app/Providers/RepositoryServiceProvider.php b/backend/app/Providers/RepositoryServiceProvider.php
index b5429940e..dc3690e80 100644
--- a/backend/app/Providers/RepositoryServiceProvider.php
+++ b/backend/app/Providers/RepositoryServiceProvider.php
@@ -43,6 +43,7 @@
 use HiEvents\Repository\Eloquent\QuestionAnswerRepository;
 use HiEvents\Repository\Eloquent\QuestionRepository;
 use HiEvents\Repository\Eloquent\RazorpayOrdersRepository;
+use HiEvents\Repository\Eloquent\RefundAttemptRepository;
 use HiEvents\Repository\Eloquent\StripeCustomerRepository;
 use HiEvents\Repository\Eloquent\StripePaymentsRepository;
 use HiEvents\Repository\Eloquent\StripePayoutsRepository;
@@ -91,6 +92,7 @@
 use HiEvents\Repository\Interfaces\QuestionAnswerRepositoryInterface;
 use HiEvents\Repository\Interfaces\QuestionRepositoryInterface;
 use HiEvents\Repository\Interfaces\RazorpayOrdersRepositoryInterface;
+use HiEvents\Repository\Interfaces\RefundAttemptRepositoryInterface;
 use HiEvents\Repository\Interfaces\StripeCustomerRepositoryInterface;
 use HiEvents\Repository\Interfaces\StripePaymentsRepositoryInterface;
 use HiEvents\Repository\Interfaces\StripePayoutsRepositoryInterface;
@@ -156,6 +158,7 @@ class RepositoryServiceProvider extends ServiceProvider
         TicketLookupTokenRepositoryInterface::class => TicketLookupTokenRepository::class,
         AccountMessagingTierRepositoryInterface::class => AccountMessagingTierRepository::class,
         WaitlistEntryRepositoryInterface::class => WaitlistEntryRepository::class,
+        RefundAttemptRepositoryInterface::class => RefundAttemptRepository::class,
     ];
 
     public function register(): void
diff --git a/backend/app/Repository/Eloquent/RefundAttemptRepository.php b/backend/app/Repository/Eloquent/RefundAttemptRepository.php
new file mode 100644
index 000000000..8c50cc7b4
--- /dev/null
+++ b/backend/app/Repository/Eloquent/RefundAttemptRepository.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace HiEvents\Repository\Eloquent;
+
+use HiEvents\DomainObjects\RefundAttemptDomainObject;
+use HiEvents\Models\RefundAttempt;
+use HiEvents\Repository\Interfaces\RefundAttemptRepositoryInterface;
+
+class RefundAttemptRepository extends BaseRepository implements RefundAttemptRepositoryInterface
+{
+    public function getDomainObject(): string
+    {
+        return RefundAttemptDomainObject::class;
+    }
+
+    protected function getModel(): string
+    {
+        return RefundAttempt::class;
+    }
+
+    public function findByIdempotencyKey(string $key): ?RefundAttemptDomainObject
+    {
+        return $this->findFirstWhere(['idempotency_key' => $key]);
+    }
+
+    public function createAttempt(string $key, int $paymentId, string $paymentType, array $requestData): RefundAttemptDomainObject
+    {
+        return $this->create([
+            'idempotency_key' => $key,
+            'payment_id' => $paymentId,
+            'payment_type' => $paymentType,
+            'request_data' => json_encode($requestData), // Encode to JSON string
+            'status' => 'pending',
+            'attempts' => 0,
+        ]);
+    }
+
+    public function markSucceeded(int $id, array $responseData): bool
+    {
+        return (bool) $this->updateFromArray($id, [
+            'status' => 'succeeded',
+            'response_data' => json_encode($responseData), // Encode to JSON string
+        ]);
+    }
+
+    public function markFailed(int $id, array $responseData = []): bool
+    {
+        return (bool) $this->updateFromArray($id, [
+            'status' => 'failed',
+            'response_data' => json_encode($responseData), // Encode to JSON string
+        ]);
+    }
+
+    public function incrementAttempts(int $id): bool
+    {
+        return (bool) $this->model->where('id', $id)->increment('attempts');
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundService.php b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundService.php
index 4e3dbf39d..4a7c4bf4a 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundService.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundService.php
@@ -5,35 +5,50 @@
 use HiEvents\DomainObjects\RazorpayOrderDomainObject;
 use HiEvents\Exceptions\RefundNotPossibleException;
 use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
+use Illuminate\Log\Logger;
+use Razorpay\Api\Errors\BadRequestError;
 
 class RazorpayPaymentRefundService
 {
     public function __construct(
-        private RazorpayClientFactory $clientFactory
-    ) {
-    }
+        private RazorpayClientFactory $clientFactory,
+        private Logger $logger
+    ) {}
 
     public function refundPayment(
-        RazorpayOrderDomainObject $order,
+        RazorpayOrderDomainObject $payment,
         int $amountInPaise,
         ?string $idempotencyKey = null,
         array $options = []
     ): object {
-        $paymentId = $order->getRazorpayPaymentId();
+        // Validate payment ID exists
+        $paymentId = $payment->getRazorpayPaymentId();
         if (!$paymentId) {
             throw new RefundNotPossibleException(__('No Razorpay payment ID found for this order.'));
         }
 
-        $client = $this->clientFactory->create();
+        try {
+            $client = $this->clientFactory->create();
+            $params = array_merge(
+                ['payment_id' => $paymentId, 'amount' => $amountInPaise],
+                $options
+            );
+            return $client->refundPayment($params, $idempotencyKey);
+        } catch (BadRequestError $e) {
+            // Handle insufficient balance error
+            if (str_contains($e->getMessage(), 'enough balance')) {
+                $this->logger->error('Razorpay refund failed: insufficient balance', [
+                    'payment_id' => $paymentId,
+                    'amount' => $amountInPaise,
+                    'error' => $e->getMessage()
+                ]);
 
-        $params = array_merge(
-            [
-                'payment_id' => $paymentId,
-                'amount' => $amountInPaise,
-            ],
-            $options
-        );
+                throw new RefundNotPossibleException(
+                    __('Refund failed due to insufficient account balance. Please add funds to your Razorpay account or try again later.')
+                );
+            }
 
-        return $client->refundPayment($params, $idempotencyKey);
+            throw $e;
+        }
     }
 }
\ No newline at end of file
diff --git a/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundServiceTest.php b/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundServiceTest.php
index d6afc27d4..f4c71aec2 100644
--- a/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundServiceTest.php
+++ b/backend/tests/Unit/Services/Domain/Payment/Razorpay/RazorpayPaymentRefundServiceTest.php
@@ -7,6 +7,7 @@
 use HiEvents\Services\Domain\Payment\Razorpay\RazorpayPaymentRefundService;
 use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientFactory;
 use HiEvents\Services\Infrastructure\Razorpay\RazorpayClientInterface;
+use Illuminate\Log\Logger;
 use PHPUnit\Framework\MockObject\MockObject;
 use Tests\TestCase;
 
@@ -15,6 +16,7 @@ class RazorpayPaymentRefundServiceTest extends TestCase
     private RazorpayClientFactory&MockObject $clientFactoryMock;
     private RazorpayClientInterface&MockObject $clientMock;
     private RazorpayPaymentRefundService $service;
+    private Logger&MockObject $logger;
 
     protected function setUp(): void
     {
@@ -22,7 +24,8 @@ protected function setUp(): void
 
         $this->clientFactoryMock = $this->createMock(RazorpayClientFactory::class);
         $this->clientMock = $this->createMock(RazorpayClientInterface::class);
-        $this->service = new RazorpayPaymentRefundService($this->clientFactoryMock);
+        $this->logger = $this->createMock(Logger::class);
+        $this->service = new RazorpayPaymentRefundService($this->clientFactoryMock, $this->logger);
     }
 
     public function testRefundPaymentSuccess(): void
diff --git a/frontend/src/components/common/OrdersTable/index.tsx b/frontend/src/components/common/OrdersTable/index.tsx
index 1ddaabb58..db9455b4e 100644
--- a/frontend/src/components/common/OrdersTable/index.tsx
+++ b/frontend/src/components/common/OrdersTable/index.tsx
@@ -132,7 +132,7 @@ export const OrdersTable = ({orders, event}: OrdersTableProps) => {
     const ActionMenu = ({order}: { order: Order }) => {
         const isRefundable = !order.is_free_order
             && order.status !== 'AWAITING_OFFLINE_PAYMENT'
-            && order.payment_provider === 'STRIPE'
+            && ['STRIPE', 'RAZORPAY'].includes(order.payment_provider)
             && order.refund_status !== 'REFUNDED';
 
         return (
diff --git a/frontend/src/components/modals/CancelOrderModal/index.tsx b/frontend/src/components/modals/CancelOrderModal/index.tsx
index 24c9cdb91..b7a0f63aa 100644
--- a/frontend/src/components/modals/CancelOrderModal/index.tsx
+++ b/frontend/src/components/modals/CancelOrderModal/index.tsx
@@ -26,7 +26,7 @@ export const CancelOrderModal = ({onClose, orderId}: RefundOrderModalProps) => {
 
     const isRefundable = order && !order.is_free_order
         && order.status !== 'AWAITING_OFFLINE_PAYMENT'
-        && order.payment_provider === 'STRIPE'
+        && ['STRIPE', 'RAZORPAY'].includes(order.payment_provider)
         && order.refund_status !== 'REFUNDED';
 
     const handleCancelOrder = () => {

From f110738320423e17efc587ba8893723aa4a52044 Mon Sep 17 00:00:00 2001
From: Oness <auditoree9@gmail.com>
Date: Fri, 6 Mar 2026 10:50:52 +0000
Subject: [PATCH 41/41] update refund_status and total_refunded instead of
 payment_status in refund webhook handler, also enabled razorpay for refund on
 cancellation

---
 .../app/DomainObjects/OrderDomainObject.php   | 19 ++++++++++++-------
 .../EventHandlers/RazorpayRefundHandler.php   |  3 ++-
 .../RazorpayRefundHandlerTest.php             | 10 ++++++++--
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/backend/app/DomainObjects/OrderDomainObject.php b/backend/app/DomainObjects/OrderDomainObject.php
index 1b0ffe16a..77e91bc39 100644
--- a/backend/app/DomainObjects/OrderDomainObject.php
+++ b/backend/app/DomainObjects/OrderDomainObject.php
@@ -26,7 +26,7 @@ class OrderDomainObject extends Generated\OrderDomainObjectAbstract implements I
     public ?Collection $attendees = null;
 
     public ?StripePaymentDomainObject $stripePayment = null;
-    
+
     public ?RazorpayOrderDomainObject $razorpayOrder = null;
 
     /** @var Collection<QuestionAndAnswerViewDomainObject>|null */
@@ -146,7 +146,7 @@ public function getAttendees(): ?Collection
 
     public function isPaymentRequired(): bool
     {
-        return (int)ceil($this->getTotalGross()) > 0;
+        return (int) ceil($this->getTotalGross()) > 0;
     }
 
     public function isOrderAwaitingOfflinePayment(): bool
@@ -184,7 +184,7 @@ public function setStripePayment(?StripePaymentDomainObject $stripePayment): Ord
         $this->stripePayment = $stripePayment;
         return $this;
     }
-    
+
     public function setRazorpayOrder(?RazorpayOrderDomainObject $razorpayOrder): OrderDomainObject
     {
         $this->razorpayOrder = $razorpayOrder;
@@ -230,7 +230,7 @@ public function getStripePayment(): ?StripePaymentDomainObject
     {
         return $this->stripePayment;
     }
-    
+
     public function getRazorpayOrder(): ?RazorpayOrderDomainObject
     {
         return $this->razorpayOrder;
@@ -296,17 +296,22 @@ public function getSessionIdentifier(): ?string
 
     public function isRefundable(): bool
     {
+        $allowedProviders = [
+            PaymentProviders::STRIPE->name,
+            PaymentProviders::RAZORPAY->name,
+        ];
+
         return !$this->isFreeOrder()
             && $this->getStatus() !== OrderPaymentStatus::AWAITING_OFFLINE_PAYMENT->name
-            && $this->getPaymentProvider() === PaymentProviders::STRIPE->name
+            && in_array($this->getPaymentProvider(), $allowedProviders, true)
             && $this->getRefundStatus() !== OrderRefundStatus::REFUNDED->name;
     }
-    
+
     public function isRazorpayOrder(): bool
     {
         return $this->getPaymentProvider() === PaymentProviders::RAZORPAY->name;
     }
-    
+
     public function hasRazorpayOrder(): bool
     {
         return $this->razorpayOrder !== null;
diff --git a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php
index ee9b3a90e..51cbba0e0 100644
--- a/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php
+++ b/backend/app/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandler.php
@@ -121,7 +121,8 @@ private function updateOrderPaymentStatus(OrderDomainObject $order): void
         }
 
         $this->orderRepository->updateFromArray($order->getId(), [
-            'payment_status' => $newStatus,
+            'refund_status' => $newStatus,
+            'total_refunded' => $totalRefunded
         ]);
     }
 }
\ No newline at end of file
diff --git a/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandlerTest.php b/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandlerTest.php
index 7422ccacd..dc41653e8 100644
--- a/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandlerTest.php
+++ b/backend/tests/Unit/Services/Domain/Payment/Razorpay/EventHandlers/RazorpayRefundHandlerTest.php
@@ -144,7 +144,10 @@ public function testItProcessesPartialRefundSuccessfully(): void
 
         $this->orderRepoMock->expects($this->once())
             ->method('updateFromArray')
-            ->with(10, ['payment_status' => OrderPaymentStatus::PARTIALLY_REFUNDED->name]);
+            ->with(10, [
+                'refund_status' => OrderPaymentStatus::PARTIALLY_REFUNDED->name,
+                'total_refunded' => 200.00
+            ]);
 
         $this->cacheMock->expects($this->once())->method('put');
 
@@ -173,7 +176,10 @@ public function testItProcessesFullRefundSuccessfully(): void
 
         $this->orderRepoMock->expects($this->once())
             ->method('updateFromArray')
-            ->with(10, ['payment_status' => OrderPaymentStatus::REFUNDED->name]);
+            ->with(10, [
+                'refund_status' => OrderPaymentStatus::REFUNDED->name,
+                'total_refunded' => 500.00
+            ]);
 
         $this->handler->handleEvent($payload);
     }