diff --git a/.vscode/settings.json b/.vscode/settings.json
index c659b65..adb3c07 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
   "files.associations": {
-    "*.html": "jinja-html"
-  }
+    "*.html": "django-html"
+  },
+  "python.languageServer": "None"
 }
diff --git a/src/donations/migrations/0002_alter_donationtier_visible.py b/src/donations/migrations/0002_alter_donationtier_visible.py
new file mode 100644
index 0000000..81a3aa2
--- /dev/null
+++ b/src/donations/migrations/0002_alter_donationtier_visible.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.1 on 2024-12-27 19:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("donations", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="donationtier",
+            name="visible",
+            field=models.BooleanField(
+                default=False, verbose_name="Show on Donations Page ?"
+            ),
+        ),
+    ]
diff --git a/src/donations/models.py b/src/donations/models.py
index 3353112..b57ada8 100644
--- a/src/donations/models.py
+++ b/src/donations/models.py
@@ -21,7 +21,7 @@ class DonationTier(models.Model):
     name = models.CharField(max_length=256)
     description = models.CharField(max_length=1024)
     amount = models.PositiveIntegerField(validators=[MaxValueValidator(10000)])
-    visible = models.BooleanField(default=False)
+    visible = models.BooleanField(verbose_name="Show on Donations Page ?", default=False)
 
     def __str__(self):
         return self.name
diff --git a/src/donations/views.py b/src/donations/views.py
index 061eafa..6c5325f 100644
--- a/src/donations/views.py
+++ b/src/donations/views.py
@@ -4,7 +4,7 @@
 from .forms import DonationForm
 from .models import DonationConfig, DonationTier, DonationReceived
 from temple_web.myconfig import PaymentGatewayConfig
-from .upi_gateway import create_order, check_order_status
+from utils.payment.upi_gateway import create_order, check_order_status
 from uuid import uuid4
 from datetime import date
 from utils.adirect import adirect
@@ -20,7 +20,7 @@
 
 def donations(request):
     donation_config = DonationConfig.get_solo()
-    donation_tiers = DonationTier.objects.all()
+    donation_tiers = DonationTier.objects.filter(visible=True)
     context = {"donation_config": donation_config, "donation_tiers": donation_tiers}
     return render(request, "donations/donations.html", context=context)
 
diff --git a/src/haps/admin.py b/src/haps/admin.py
index 70dc045..55c471b 100644
--- a/src/haps/admin.py
+++ b/src/haps/admin.py
@@ -1,5 +1,11 @@
 from django.contrib import admin
-from .models import EventRegistration, Event
+from .models import EventRegistration, Event, EventFormField
+
+
+class EventFormFieldInline(admin.TabularInline):
+    model = EventFormField
+    extra = 1
+    ordering = ['order']
 
 
 @admin.register(Event)
@@ -11,24 +17,144 @@ class EventAdmin(admin.ModelAdmin):
         "start_time",
         "accept_reg",
         "show_on_home",
+        "login_required",
+        "registration_fee",
         "event_page",
     ]
-    list_filter = ["show_on_home", "accept_reg"]
-    fields = [
-        "name",
-        "description",
-        "cover_image",
-        "venue",
-        "start_time",
-        "end_time",
-        "accept_reg",
-        "show_on_home",
-        "content",
+    list_filter = ["show_on_home", "accept_reg", "login_required"]
+    fieldsets = [
+        (None, {
+            'fields': [
+                "name",
+                "description",
+                "cover_image",
+                "venue",
+                "start_time",
+                "end_time",
+            ]
+        }),
+        ('Registration Settings', {
+            'fields': [
+                "accept_reg",
+                "login_required",
+                "registration_fee",
+            ],
+            'description': 'Configure how users can register for this event'
+        }),
+        ('Display Settings', {
+            'fields': [
+                "show_on_home",
+                "content",
+            ]
+        })
     ]
+    inlines = [EventFormFieldInline]
 
 
 @admin.register(EventRegistration)
 class EventRegistrationAdmin(admin.ModelAdmin):
-    search_fields = ["event", "user"]
-    list_display = ["event", "user_name", "user_whatsapp", "user", "user_profile_link"]
-    list_filter = ["event__name"]
+    search_fields = ["event__name", "user__email", "order_id", "client_txn_id"]
+    list_display = [
+        "registration_number",
+        "event",
+        "user_name",
+        "user_whatsapp",
+        "datetime",
+        "amount",
+        "payment_status",
+        "order_id",
+        "payment_date_time",
+    ]
+    list_filter = ["event__name", "payment_status"]
+    readonly_fields = [
+        "datetime",
+        "form_responses",
+        "payment_status",
+        "order_id",
+        "client_txn_id",
+        "payment_date_time",
+        "payment_data",
+        "get_payment_details"
+    ]
+
+    fieldsets = [
+        (None, {
+            'fields': [
+                "event",
+                "user",
+                "datetime",
+                "amount",
+                "form_responses",
+            ]
+        }),
+        ('Payment Information', {
+            'fields': [
+                "payment_status",
+                "order_id",
+                "client_txn_id",
+                "payment_date_time",
+            ],
+            'classes': ['collapse']
+        }),
+        ('Payment Diagnostic Data', {
+            'fields': [
+                "get_payment_details",
+            ],
+            'classes': ['collapse'],
+            'description': 'Detailed payment transaction data from UPI gateway'
+        })
+    ]
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+    def has_add_permission(self, request):
+        return False
+
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related('event', 'user')
+
+    def registration_number(self, obj):
+        return obj.registration_number
+    registration_number.short_description = "Registration No."
+
+    def get_payment_details(self, obj):
+        if not obj.payment_data:
+            return "No payment data available"
+
+        # Format payment data for display
+        details = []
+        if obj.payment_data.get('customer_vpa'):
+            details.append(f"Customer UPI: {obj.payment_data['customer_vpa']}")
+        if obj.payment_data.get('upi_txn_id'):
+            details.append(f"UPI Transaction ID: {obj.payment_data['upi_txn_id']}")
+        if obj.payment_data.get('status'):
+            details.append(f"Status: {obj.payment_data['status']}")
+        if obj.payment_data.get('remark'):
+            details.append(f"Remark: {obj.payment_data['remark']}")
+        if obj.payment_data.get('txnAt'):
+            details.append(f"Transaction Time: {obj.payment_data['txnAt']}")
+
+        # Merchant details
+        merchant = obj.payment_data.get('merchant', {})
+        if merchant:
+            details.append("Merchant Details:")
+            if merchant.get('name'):
+                details.append(f"  - Name: {merchant['name']}")
+            if merchant.get('upi_id'):
+                details.append(f"  - UPI ID: {merchant['upi_id']}")
+
+        # User defined fields
+        for i in range(1, 4):
+            udf = obj.payment_data.get(f'udf{i}')
+            if udf:
+                details.append(f"UDF{i}: {udf}")
+
+        if obj.payment_data.get('createdAt'):
+            details.append(f"Created At: {obj.payment_data['createdAt']}")
+
+        return "\n".join(details)
+    get_payment_details.short_description = "Payment Details"
diff --git a/src/haps/migrations/0005_event_login_required_event_registration_fee_and_more.py b/src/haps/migrations/0005_event_login_required_event_registration_fee_and_more.py
new file mode 100644
index 0000000..59a53cf
--- /dev/null
+++ b/src/haps/migrations/0005_event_login_required_event_registration_fee_and_more.py
@@ -0,0 +1,109 @@
+# Generated by Django 4.2.1 on 2024-12-27 19:11
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("haps", "0004_event_content"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="event",
+            name="login_required",
+            field=models.BooleanField(
+                default=True, verbose_name="Login required for registration?"
+            ),
+        ),
+        migrations.AddField(
+            model_name="event",
+            name="registration_fee",
+            field=models.PositiveIntegerField(
+                blank=True, help_text="Leave blank for free registration", null=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="eventregistration",
+            name="amount",
+            field=models.PositiveIntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="eventregistration",
+            name="form_responses",
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AddField(
+            model_name="eventregistration",
+            name="order_id",
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name="eventregistration",
+            name="payment_status",
+            field=models.CharField(
+                choices=[
+                    ("pending", "Pending"),
+                    ("success", "Success"),
+                    ("failure", "Failure"),
+                ],
+                default="pending",
+                max_length=10,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="eventregistration",
+            name="user",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.CreateModel(
+            name="EventFormField",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("field_label", models.CharField(max_length=100)),
+                (
+                    "field_type",
+                    models.CharField(
+                        choices=[
+                            ("text", "Text Input"),
+                            ("number", "Number Input"),
+                            ("email", "Email Input"),
+                            ("textarea", "Text Area"),
+                        ],
+                        max_length=20,
+                    ),
+                ),
+                ("required", models.BooleanField(default=True)),
+                ("order", models.PositiveIntegerField(default=0)),
+                ("help_text", models.CharField(blank=True, max_length=200)),
+                (
+                    "event",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="form_fields",
+                        to="haps.event",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["order"],
+                "unique_together": {("event", "field_label")},
+            },
+        ),
+    ]
diff --git a/src/haps/migrations/0006_eventregistration_client_txn_id_and_more.py b/src/haps/migrations/0006_eventregistration_client_txn_id_and_more.py
new file mode 100644
index 0000000..f3ae884
--- /dev/null
+++ b/src/haps/migrations/0006_eventregistration_client_txn_id_and_more.py
@@ -0,0 +1,32 @@
+# Generated by Django 4.2.1 on 2024-12-29 19:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("haps", "0005_event_login_required_event_registration_fee_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="eventregistration",
+            name="client_txn_id",
+            field=models.CharField(
+                blank=True, db_index=True, max_length=128, null=True, unique=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="eventregistration",
+            name="payment_data",
+            field=models.JSONField(
+                default=dict,
+                help_text="\n    Stores payment-related data from UPI gateway including:\n    - customer_vpa: Customer's UPI ID\n    - upi_txn_id: UPI transaction ID\n    - status: Detailed payment status\n    - remark: Payment remarks/failure reason\n    - txnAt: Transaction timestamp\n    - merchant: Merchant details (name, upi_id)\n    - udf1, udf2, udf3: User defined fields\n    - redirect_url: Payment redirect URL\n    - createdAt: Order creation time\n    ",
+            ),
+        ),
+        migrations.AddField(
+            model_name="eventregistration",
+            name="payment_date_time",
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]
diff --git a/src/haps/models.py b/src/haps/models.py
index 455c851..442f509 100644
--- a/src/haps/models.py
+++ b/src/haps/models.py
@@ -5,7 +5,6 @@
 from utils.slugs import generate_unique_slug
 from ckeditor_uploader.fields import RichTextUploadingField
 from users.models import UserProfile
-from django.utils.html import format_html
 
 User = get_user_model()
 
@@ -21,6 +20,8 @@ class Event(models.Model):
     accept_reg = models.BooleanField(verbose_name="Accepting registrations ?")
     show_on_home = models.BooleanField(verbose_name="Show on Home Page ?")
     content = RichTextUploadingField(null=True, blank=True)
+    login_required = models.BooleanField(default=True, verbose_name="Login required for registration?")
+    registration_fee = models.PositiveIntegerField(null=True, blank=True, help_text="Leave blank for free registration")
 
     def __str__(self):
         return self.name + "  (" + str(self.start_time) + ")"
@@ -28,7 +29,7 @@ def __str__(self):
     def save(self, *args, **kwargs):
         if self.slug == "":
             self.slug = generate_unique_slug(self.name, Event)
-        super().save(args, kwargs)
+        super().save(*args, **kwargs)
 
     def get_absolute_url(self):
         return f"/events/{self.slug}"
@@ -39,20 +40,90 @@ def event_page(self):
         )
 
 
+class EventFormField(models.Model):
+    FIELD_TYPES = [
+        ('text', 'Text Input'),
+        ('number', 'Number Input'),
+        ('email', 'Email Input'),
+        ('textarea', 'Text Area'),
+    ]
+
+    event = models.ForeignKey(Event, on_delete=models.CASCADE, related_name='form_fields')
+    field_label = models.CharField(max_length=100)
+    field_type = models.CharField(max_length=20, choices=FIELD_TYPES)
+    required = models.BooleanField(default=True)
+    order = models.PositiveIntegerField(default=0)
+    help_text = models.CharField(max_length=200, blank=True)
+
+    class Meta:
+        ordering = ['order']
+        unique_together = ['event', 'field_label']
+
+    def __str__(self):
+        return f"{self.event.name} - {self.field_label}"
+
+
 class EventRegistration(models.Model):
+    PAYMENT_STATUS_CHOICES = [
+        ('pending', 'Pending'),
+        ('success', 'Success'),
+        ('failure', 'Failure'),
+    ]
+
     event = models.ForeignKey(Event, on_delete=models.CASCADE)
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    user = models.ForeignKey(User, on_delete=models.CASCADE, null=True, blank=True)
     datetime = models.DateTimeField(auto_now_add=True, null=True, blank=True)
-    # regno = models.CharField(unique=True)
+    form_responses = models.JSONField(default=dict)
+    amount = models.PositiveIntegerField(null=True, blank=True)
+
+    # Payment related fields
+    payment_status = models.CharField(
+        max_length=10,
+        choices=PAYMENT_STATUS_CHOICES,
+        default='pending'
+    )
+    order_id = models.CharField(max_length=100, blank=True, null=True)
+    client_txn_id = models.CharField(max_length=128, unique=True, db_index=True, null=True, blank=True)
+    payment_date_time = models.DateTimeField(null=True, blank=True)
+
+    # Payment diagnostic data from UPI gateway
+    payment_data = models.JSONField(default=dict, help_text="""
+    Stores payment-related data from UPI gateway including:
+    - customer_vpa: Customer's UPI ID
+    - upi_txn_id: UPI transaction ID
+    - status: Detailed payment status
+    - remark: Payment remarks/failure reason
+    - txnAt: Transaction timestamp
+    - merchant: Merchant details (name, upi_id)
+    - udf1, udf2, udf3: User defined fields
+    - redirect_url: Payment redirect URL
+    - createdAt: Order creation time
+    """)
+
+    def __str__(self):
+        return f"Registration #{self.id} - {self.event.name}"
+
+    @property
+    def registration_number(self):
+        """Returns a formatted registration number."""
+        return f"#{self.id}"
+
 
     def user_name(self):
-        return self.user.full_name()
+        if self.user:
+            return self.user.full_name()
+        return self.form_responses.get('name', 'Anonymous')
 
     def user_whatsapp(self):
-        return UserProfile.objects.get(user=self.user).whatsapp_number
+        if self.user:
+            return UserProfile.objects.get(user=self.user).whatsapp_number
+        return self.form_responses.get('whatsapp_number', '')
 
     def user_profile_link(self):
-        return self.user.profile_link()
+        if self.user:
+            return self.user.profile_link()
+        return None
 
     def __str__(self) -> str:
-        return self.user.__str__() + "%" + self.event.__str__()
+        user_str = str(self.user) if self.user else self.form_responses.get('name', 'Anonymous')
+        return f"{user_str} % {self.event}"
\ No newline at end of file
diff --git a/src/haps/templates/haps/item.html b/src/haps/templates/haps/item.html
index e742453..18ad412 100644
--- a/src/haps/templates/haps/item.html
+++ b/src/haps/templates/haps/item.html
@@ -7,8 +7,14 @@
 <section class="bg-white dark:bg-gray-900">
     <div class="max-w-3xl flex px-4 py-8 mx-auto justify-around flex-wrap">
         <div>
-            <img class="my-4 h-auto md:max-w-2xl sm:max-w-xl rounded-lg shadow-xl dark:shadow-gray-800"
-                src="{{hap.cover_image.url}}" alt="image description">
+            {% if hap.cover_image %}
+                <img class="my-4 h-auto md:max-w-2xl sm:max-w-xl rounded-lg shadow-xl dark:shadow-gray-800"
+                    src="{{hap.cover_image.url}}" alt="{{hap.name}} cover image">
+            {% else %}
+                <div class="my-4 h-64 w-96 rounded-lg shadow-xl dark:shadow-gray-800 bg-gray-100 dark:bg-gray-800 flex items-center justify-center">
+                    <span class="material-symbols-outlined text-6xl text-gray-400 dark:text-gray-600">event</span>
+                </div>
+            {% endif %}
         </div>
 
         <div class="my-4 place-self-center text-center">
@@ -17,62 +23,141 @@
                 {{hap.name}}
             </h1>
 
-
             <p class="mt-4 max-w-2xl mb-2 font-light text-gray-500 lg:mb-8 md:text-lg lg:text-xl dark:text-gray-400">
                 {{hap.description}}
             </p>
 
-
             <div class="md:text-lg lg:text-xl mb-8 text-gray-500  dark:text-gray-400 align-middle">
-
                 <div class="align-middle">
-                    <span class="material-symbols-outlined">
-                        event
-                    </span>
+                    <span class="material-symbols-outlined">event</span>
                     <span> {{hap.start_time}}</span>
                 </div>
 
                 <div class="align-middle">
-                    <span class="material-symbols-outlined">
-                        location_on
-                    </span>
-                    <span class="">
-                        {{hap.venue}}
-                    </span>
+                    <span class="material-symbols-outlined">location_on</span>
+                    <span class="">{{hap.venue}}</span>
+                </div>
+
+                {% if hap.registration_fee %}
+                <div class="align-middle mt-2">
+                    <span class="material-symbols-outlined">payments</span>
+                    <span class="">Registration Fee: ₹{{hap.registration_fee}}</span>
                 </div>
+                {% endif %}
             </div>
 
-            <a href="{{hap.slug}}/register"
-                class="inline-flex items-center justify-center px-5 py-3 mr-3 text-base font-medium text-center text-white rounded-lg bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 dark:focus:ring-primary-900">
-                Register Now
-                <svg class="w-5 h-5 ml-2 -mr-1" fill="currentColor" viewBox="0 0 20 20"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <path fill-rule="evenodd"
-                        d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z"
-                        clip-rule="evenodd">
-                    </path>
-                </svg>
-            </a>
-            <a href="#"
-                class="inline-flex items-center justify-center px-5 py-3 text-base font-medium text-center text-gray-900 border border-gray-300 rounded-lg hover:bg-gray-100 focus:ring-4 focus:ring-gray-100 dark:text-white dark:border-gray-700 dark:hover:bg-gray-700 dark:focus:ring-gray-800">
-                Contact us
-            </a>
+            {% if hap.accept_reg %}
+                {% if hap.login_required and not user.is_authenticated %}
+                    <a href="{% url 'users:register' %}?next={{ request.path }}"
+                        class="inline-flex items-center justify-center px-5 py-3 mr-3 text-base font-medium text-center text-white rounded-lg bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 dark:focus:ring-primary-900">
+                        Login to Register
+                        <svg class="w-5 h-5 ml-2 -mr-1" fill="currentColor" viewBox="0 0 20 20"
+                            xmlns="http://www.w3.org/2000/svg">
+                            <path fill-rule="evenodd"
+                                d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z"
+                                clip-rule="evenodd"></path>
+                        </svg>
+                    </a>
+                {% else %}
+                    <button data-modal-target="registration-modal" data-modal-toggle="registration-modal"
+                        class="inline-flex items-center justify-center px-5 py-3 mr-3 text-base font-medium text-center text-white rounded-lg bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 dark:focus:ring-primary-900">
+                        Register Now
+                        <svg class="w-5 h-5 ml-2 -mr-1" fill="currentColor" viewBox="0 0 20 20"
+                            xmlns="http://www.w3.org/2000/svg">
+                            <path fill-rule="evenodd"
+                                d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z"
+                                clip-rule="evenodd"></path>
+                        </svg>
+                    </button>
+                {% endif %}
+            {% endif %}
         </div>
-
-
-
-
-
     </div>
 
-    <div class="px-4 py-8 w-full flex justify-center">
-        <div class="format format-lg w-full">
-            {{hap.content | safe}}
-        </div>
+    {% if hap.content %}
+    <div class="max-w-3xl mx-auto px-4 py-8">
+        {{hap.content|safe}}
     </div>
+    {% endif %}
+</section>
 
+<!-- Registration Modal -->
+<div id="registration-modal" tabindex="-1" aria-hidden="true"
+    class="hidden fixed top-0 right-0 left-0 z-50 w-full h-full flex items-center justify-center bg-gray-900/50 backdrop-blur-lg">
+    <div class="relative w-full max-w-md p-4">
+        <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
+            <div class="flex items-center justify-between p-4 md:p-5 border-b rounded-t dark:border-gray-600">
+                <h3 class="text-lg font-semibold text-gray-900 dark:text-white">
+                    Register for {{hap.name}}
+                </h3>
+                <button type="button"
+                    class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ms-auto inline-flex justify-center items-center dark:hover:bg-gray-600 dark:hover:text-white"
+                    data-modal-toggle="registration-modal">
+                    <svg class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none"
+                        viewBox="0 0 14 14">
+                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                            d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6" />
+                    </svg>
+                    <span class="sr-only">Close modal</span>
+                </button>
+            </div>
 
+            <form class="p-4 md:p-5" method="post" action="{{hap.slug}}/register">
+                {% csrf_token %}
+                <div class="grid gap-4 mb-4 grid-cols-2">
+                    {% if not hap.login_required %}
+                    <div class="col-span-2">
+                        <label for="name" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Full Name</label>
+                        <input type="text" name="name" id="name" required
+                            class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
+                            placeholder="Your full name">
+                    </div>
+                    <div class="col-span-2">
+                        <label for="whatsapp_number" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">WhatsApp Number</label>
+                        <input type="tel" name="whatsapp_number" id="whatsapp_number" required pattern="[0-9]{10}"
+                            class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
+                            placeholder="10 digit number">
+                    </div>
+                    {% endif %}
+
+                    {% for field in hap.form_fields.all %}
+                    <div class="col-span-2">
+                        <label for="field_{{field.id}}" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">
+                            {{field.field_label}}
+                            {% if field.help_text %}
+                            <span class="text-xs text-gray-500">({{field.help_text}})</span>
+                            {% endif %}
+                        </label>
+
+                        {% if field.field_type == 'textarea' %}
+                        <textarea id="field_{{field.id}}" name="field_{{field.id}}" rows="4"
+                            class="block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                            {% if field.required %}required{% endif %}></textarea>
+                        {% else %}
+                        <input type="{{field.field_type}}" name="field_{{field.id}}" id="field_{{field.id}}"
+                            class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
+                            {% if field.required %}required{% endif %}>
+                        {% endif %}
+                    </div>
+                    {% endfor %}
+                </div>
 
-</section>
+                {% if hap.registration_fee %}
+                <div class="mb-4">
+                    <p class="text-sm text-gray-500 dark:text-gray-400">
+                        A registration fee of ₹{{hap.registration_fee}} will be collected after form submission.
+                    </p>
+                </div>
+                {% endif %}
 
-{% endblock %}
\ No newline at end of file
+                <div class="flex justify-end">
+                    <button type="submit"
+                        class="text-white inline-flex items-center bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:outline-none focus:ring-primary-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800">
+                            Submit
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+{% endblock content %}
\ No newline at end of file
diff --git a/src/haps/templates/haps/register_failure.html b/src/haps/templates/haps/register_failure.html
new file mode 100644
index 0000000..319222c
--- /dev/null
+++ b/src/haps/templates/haps/register_failure.html
@@ -0,0 +1,137 @@
+{% extends "commons.html" %}
+
+{% block title %} {{ event.name }} - Registration Failed {% endblock title %}
+{% load haps_extras %}
+
+{% block content %}
+<div class="bg-gray-100 min-h-screen py-8">
+    <div class="bg-white p-6 md:mx-auto max-w-2xl rounded-lg shadow">
+        <div class="text-red-600 w-16 h-16 mx-auto my-6">
+            <i class="fa-regular fa-circle-xmark fa-3x"></i>
+        </div>
+
+        <div class="text-center">
+            <h3 class="md:text-2xl text-base text-gray-900 font-semibold text-center">Registration Failed!</h3>
+            <p class="text-gray-600 my-2">Your registration for the event is incomplete due to payment failure.</p>
+            <p class="text-gray-600">Registration #{{registration.id}}</p>
+            {% if remark %}
+            <p class="text-red-600 mt-2">{{remark}}</p>
+            {% endif %}
+        </div>
+
+        <div class="my-8">
+            <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
+                <tbody>
+                    <tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Event
+                        </th>
+                        <td class="px-6 py-4">
+                            {{event.name}}
+                        </td>
+                    </tr>
+
+                    <tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Name
+                        </th>
+                        <td class="px-6 py-4">
+                            {% if registration.user %}
+                                {{registration.user.get_full_name|default:"Anonymous User"}}
+                            {% else %}
+                                {{registration.form_responses.name|default:"Anonymous User"}}
+                            {% endif %}
+                        </td>
+                    </tr>
+
+                    {% if registration.user %}
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Email
+                        </th>
+                        <td class="px-6 py-4">
+                            {{registration.user.email}}
+                        </td>
+                    </tr>
+                    {% endif %}
+
+                    {% if not registration.user %}
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            WhatsApp
+                        </th>
+                        <td class="px-6 py-4">
+                            {{registration.form_responses.whatsapp_number}}
+                        </td>
+                    </tr>
+                    {% endif %}
+
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Date
+                        </th>
+                        <td class="px-6 py-4">
+                            {{event.start_time}}
+                        </td>
+                    </tr>
+
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Venue
+                        </th>
+                        <td class="px-6 py-4">
+                            {{event.venue}}
+                        </td>
+                    </tr>
+
+                    {% if registration.datetime %}
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Registration Time
+                        </th>
+                        <td class="px-6 py-4">
+                            {{registration.datetime}}
+                        </td>
+                    </tr>
+                    {% endif %}
+
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Registration Fee
+                        </th>
+                        <td class="px-6 py-4">
+                            ₹{{event.registration_fee}}
+                            <span class="ml-2 text-xs px-2 py-1 rounded-full bg-red-100 text-red-800">
+                                Payment Failed
+                            </span>
+                        </td>
+                    </tr>
+
+                    {% for field in event.form_fields.all %}
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            {{field.field_label}}
+                        </th>
+                        <td class="px-6 py-4">
+                            {{registration.form_responses|get_item:field.field_label}}
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+
+        <div class="flex justify-center space-x-4">
+            <a href="{% url 'haps:retry_payment' registration_id=registration.id %}"
+                class="text-white bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 font-medium rounded-lg text-sm px-5 py-2.5 dark:bg-primary-600 dark:hover:bg-primary-700 focus:outline-none dark:focus:ring-primary-800">
+                Retry Payment
+            </a>
+
+            <a href="{% url 'haps:event_item' slug=event.slug %}"
+                class="text-gray-500 bg-white hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-gray-200 rounded-lg border border-gray-200 text-sm font-medium px-5 py-2.5 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600">
+                Back to Event
+            </a>
+        </div>
+    </div>
+</div>
+{% endblock content %}
diff --git a/src/haps/templates/haps/register_success.html b/src/haps/templates/haps/register_success.html
index 2207e98..452f3f3 100644
--- a/src/haps/templates/haps/register_success.html
+++ b/src/haps/templates/haps/register_success.html
@@ -1,12 +1,12 @@
 {% extends "commons.html" %}
 
 {% block title %} {{ event.name }} {% endblock title %}
+{% load haps_extras %}
 
 
 {% block content %}
-
-<div class="bg-gray-100 h-screen">
-    <div class="bg-white p-6  md:mx-auto">
+<div class="bg-gray-100 min-h-screen py-8">
+    <div class="bg-white p-6 md:mx-auto max-w-2xl rounded-lg shadow">
         <svg viewBox="0 0 24 24" class="text-green-600 w-16 h-16 mx-auto my-6">
             <path fill="currentColor"
                 d="M12,0A12,12,0,1,0,24,12,12.014,12.014,0,0,0,12,0Zm6.927,8.2-6.845,9.289a1.011,1.011,0,0,1-1.43.188L5.764,13.769a1,1,0,1,1,1.25-1.562l4.076,3.261,6.227-8.451A1,1,0,1,1,18.927,8.2Z">
@@ -14,91 +14,135 @@
         </svg>
         <div class="text-center">
             <h3 class="md:text-2xl text-base text-gray-900 font-semibold text-center">Registration Done!</h3>
-            <p class="text-gray-600 my-2">Thank you for completing your registration for event</p>
-            <p> Looking forward to see you in the event! </p>
-
+            <p class="text-gray-600 my-2">Thank you for completing your registration.</p>
+            <p class="text-gray-600">Registration #{{registration.id}}</p>
+            <p class="text-gray-600"> Looking forward to seeing you at the event! </p>
         </div>
 
-
-        <div class="flex justify-center my-4">
-            <div class="max-w-2xl  text-center">
-                <table class="w-full text-lg text-left rtl:text-right text-gray-500 dark:text-gray-400">
-
-                    <tbody>
-                        <tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
-                            <th scope="row"
-                                class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
-                                Event
-                            </th>
-                            <td class="px-6 py-4">
-                                {{event.name}}
-                            </td>
-
-                        </tr>
-                        <tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
-                            <th scope="row"
-                                class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
-                                Name
-                            </th>
-                            <td class="px-6 py-4">
-                                {{user.first_name}} {{user.last_name}}
-                            </td>
-
-                        </tr>
-                        <tr class="bg-white border-b dark:bg-gray-800">
-                            <th scope="row"
-                                class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
-                                Email
-                            </th>
-                            <td class="px-6 py-4">
-                                {{user.email}}
-                            </td>
-
-                        </tr>
-
-                        <tr class="bg-white border-b dark:bg-gray-800">
-                            <th scope="row"
-                                class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
-                                Date
-                            </th>
-                            <td class="px-6 py-4">
-                                {{event.start_time}}
-                            </td>
-
-                        </tr>
-
-                        <tr class="bg-white border-b dark:bg-gray-800">
-                            <th scope="row"
-                                class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
-                                Venue
-                            </th>
-                            <td class="px-6 py-4">
-                                {{event.venue}}
-                            </td>
-
-                        </tr>
-                        {# show registration date time #}
-                    </tbody>
-                </table>
-            </div>
-
-
-
+        <div class="my-8">
+            <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
+                <tbody>
+                    <tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Event
+                        </th>
+                        <td class="px-6 py-4">
+                            {{event.name}}
+                        </td>
+                    </tr>
+
+                    <tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Name
+                        </th>
+                        <td class="px-6 py-4">
+                            {% if registration.user %}
+                                {{registration.user.get_full_name}}
+                            {% else %}
+                                {{registration.form_responses.name}}
+                            {% endif %}
+                        </td>
+                    </tr>
+
+                    {% if registration.user %}
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Email
+                        </th>
+                        <td class="px-6 py-4">
+                            {{registration.user.email}}
+                        </td>
+                    </tr>
+                    {% endif %}
+
+                    {% if not registration.user %}
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            WhatsApp
+                        </th>
+                        <td class="px-6 py-4">
+                            {{registration.form_responses.whatsapp_number}}
+                        </td>
+                    </tr>
+                    {% endif %}
+
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Date
+                        </th>
+                        <td class="px-6 py-4">
+                            {{event.start_time}}
+                        </td>
+                    </tr>
+
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Venue
+                        </th>
+                        <td class="px-6 py-4">
+                            {{event.venue}}
+                        </td>
+                    </tr>
+
+                    {% if registration.datetime %}
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Registration Time
+                        </th>
+                        <td class="px-6 py-4">
+                            {{registration.datetime}}
+                        </td>
+                    </tr>
+                    {% endif %}
+
+                    {% if event.registration_fee %}
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            Registration Fee
+                        </th>
+                        <td class="px-6 py-4">
+                            ₹{{event.registration_fee}}
+                            <span class="ml-2 text-xs px-2 py-1 rounded-full
+                                {% if registration.payment_status == 'success' %}
+                                    bg-green-100 text-green-800
+                                {% elif registration.payment_status == 'pending' %}
+                                    bg-yellow-100 text-yellow-800
+                                {% else %}
+                                    bg-red-100 text-red-800
+                                {% endif %}">
+                                {{registration.payment_status|title}}
+                            </span>
+                        </td>
+                    </tr>
+                    {% endif %}
+
+                    {% for field in event.form_fields.all %}
+                    <tr class="bg-white border-b dark:bg-gray-800">
+                        <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
+                            {{field.field_label}}
+                        </th>
+                        <td class="px-6 py-4">
+                            {{registration.form_responses|get_item:field.field_label}}
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
         </div>
 
-        <div class="my-4 flex justify-center">
-            <a href="{{hap.slug}}">
-                <button type="button"
-                    class="my-4 text-white bg-primary-700 hover:bg-primary-600 focus:ring-4 focus:ring-primary-300 font-medium rounded-lg text-sm px-5 py-2.5 me-2 mb-2 dark:bg-primary-600 dark:hover:bg-primary-700 focus:outline-none dark:focus:ring-primary-800">
-                    Print PDF
-                </button>
+        <div class="flex justify-center space-x-4">
+            {% if event.registration_fee and registration.payment_status == 'pending' %}
+            <a href="{% url 'donations:payment' registration_id=registration.id %}"
+                class="text-white bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 font-medium rounded-lg text-sm px-5 py-2.5 dark:bg-primary-600 dark:hover:bg-primary-700 focus:outline-none dark:focus:ring-primary-800">
+                Pay Now
             </a>
+            {% endif %}
 
+            <button type="button" onclick="handlePrint()"
+                class="text-white bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 font-medium rounded-lg text-sm px-5 py-2.5 dark:bg-primary-600 dark:hover:bg-primary-700 focus:outline-none dark:focus:ring-primary-800">
+                Print
+            </button>
         </div>
-
-
-
     </div>
 </div>
-
 {% endblock content %}
\ No newline at end of file
diff --git a/src/haps/templatetags/__init__.py b/src/haps/templatetags/__init__.py
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/haps/templatetags/__init__.py
@@ -0,0 +1 @@
+
diff --git a/src/haps/templatetags/haps_extras.py b/src/haps/templatetags/haps_extras.py
new file mode 100644
index 0000000..83bc6b3
--- /dev/null
+++ b/src/haps/templatetags/haps_extras.py
@@ -0,0 +1,8 @@
+from django import template
+
+register = template.Library()
+
+@register.filter
+def get_item(dictionary, key):
+    """Get an item from a dictionary using template filter"""
+    return dictionary.get(key, '')
diff --git a/src/haps/urls.py b/src/haps/urls.py
index f0ddcec..d3d9c01 100644
--- a/src/haps/urls.py
+++ b/src/haps/urls.py
@@ -6,6 +6,11 @@
 
 urlpatterns = [
     path("", views.haps_list, name="events"),
-    path("<slug>", views.haps_item, name="event_item"),
-    path("<slug>/register", views.register_for_event, name="event_register"),
+    path("<slug:slug>", views.haps_item, name="event_item"),
+    path("<slug:slug>/register", views.register_for_event, name="register"),
+    path("registration/<int:registration_id>/failure", views.register_failure, name="register_failure"),
+    path("registration/<int:registration_id>/success", views.register_success, name="register_success"),
+    path("registration/<int:registration_id>/pay", views.initiate_payment, name="initiate_payment"),
+    path("registration/<int:registration_id>/retry", views.retry_payment, name="retry_payment"),
+    path("payment/callback", views.payment_callback, name="payment_callback"),
 ]
diff --git a/src/haps/views.py b/src/haps/views.py
index 2a22bbf..1ddb8bf 100644
--- a/src/haps/views.py
+++ b/src/haps/views.py
@@ -1,9 +1,15 @@
-from django.shortcuts import render
-from django.http import HttpRequest, Http404
-from .models import Event, EventRegistration
+from django.shortcuts import render, redirect
+from django.http import HttpRequest, HttpResponse
 from django.contrib.auth.decorators import login_required
+from django.contrib import messages
+from .models import Event, EventRegistration
 import logging
-
+import json
+from utils.payment.upi_gateway import create_order, check_order_status
+from django.urls import reverse
+from uuid import uuid4
+from datetime import date
+from utils.logging import critical_logger
 
 log = logging.getLogger(__name__)
 
@@ -23,10 +29,252 @@ def haps_item(request: HttpRequest, slug: str):
 
 @login_required(login_url="/users/register")
 def register_for_event(request: HttpRequest, slug: str):
-    event = Event.objects.get(slug=slug)
-    registration = EventRegistration.objects.get_or_create(
-        event=event, user=request.user
+    """Register for an event"""
+    try:
+        event = Event.objects.get(slug=slug)
+    except Event.DoesNotExist:
+        raise Http404("Event not found")
+
+    if not event.accept_reg:
+        messages.error(request, "Registration is closed for this event.")
+        return redirect('haps:event_item', slug=slug)
+
+    if event.login_required and not request.user.is_authenticated:
+        messages.error(request, "Please login to register for this event.")
+        return redirect('haps:event_item', slug=slug)
+
+    if request.method == 'POST':
+        # Collect form responses
+        form_responses = {}
+
+        # If not login required, collect basic info
+        if not event.login_required:
+            form_responses['name'] = request.POST.get('name')
+            form_responses['whatsapp_number'] = request.POST.get('whatsapp_number')
+
+        # Collect custom field responses
+        for field in event.form_fields.all():
+            field_id = f'field_{field.id}'
+            form_responses[field.field_label] = request.POST.get(field_id)
+
+        # Create registration
+        registration = EventRegistration(
+            event=event,
+            user=request.user if request.user.is_authenticated else None,
+            form_responses=form_responses,
+            amount=event.registration_fee if event.registration_fee else None
+        )
+        registration.save()
+
+        # If payment required, redirect to payment page
+        if event.registration_fee:
+            return redirect('haps:initiate_payment', registration_id=registration.id)
+
+        messages.success(request, "Successfully registered for the event!")
+        return render(request, "haps/register_success.html",
+                     context={"registration": registration, "event": event})
+
+    # If GET request with registration modal, return to event page
+    return redirect('haps:event_item', slug=slug)
+
+
+def register_failure(request: HttpRequest, registration_id: int):
+    """View for displaying registration failure page.
+    This is typically shown when payment fails."""
+
+    try:
+        registration = EventRegistration.objects.select_related('event', 'user').get(id=registration_id)
+    except EventRegistration.DoesNotExist:
+        raise Http404("Registration not found")
+
+    # For testing, you can pass a remark through URL query parameter
+    remark = request.GET.get('remark', 'Payment was not completed')
+
+    context = {
+        "registration": registration,
+        "event": registration.event,
+        "remark": remark
+    }
+    return render(request, "haps/register_failure.html", context=context)
+
+
+def initiate_payment(request: HttpRequest, registration_id: int):
+    """Initiate payment for event registration"""
+    try:
+        registration = EventRegistration.objects.select_related('event', 'user').get(id=registration_id)
+    except EventRegistration.DoesNotExist:
+        raise Http404("Registration not found")
+
+    # Validate amount
+    if not registration.amount:
+        log.error(f"Registration {registration.id} has no amount set")
+        messages.error(request, "Invalid registration amount")
+        return redirect('haps:register_failure', registration_id=registration.id)
+
+    if registration.payment_status == 'success':
+        messages.info(request, "Payment already completed")
+        return redirect('haps:register_success', registration_id=registration.id)
+
+    # Generate unique transaction ID if not exists
+    if not registration.client_txn_id:
+        registration.client_txn_id = f"TempleWebPay-event-{registration.id}-{uuid4().hex[:8]}"
+        registration.save(update_fields=['client_txn_id'])
+
+    # Create callback URL
+    callback_url = request.build_absolute_uri(
+        reverse('haps:payment_callback')
+    )
+
+    # Get user details
+    name = None
+    if registration.user:
+        name = registration.user.get_full_name()
+        if not name:
+            name = registration.user.username
+    else:
+        name = registration.form_responses.get('name')
+
+    if not name:
+        log.error(f"Registration {registration.id} has no customer name")
+
+        # return redirect('haps:register_failure', registration_id=registration.id)
+        name = "Anonymous User"
+
+    mobile = registration.form_responses.get('whatsapp_number', '')
+    email = registration.user.email if registration.user else ''
+
+    try:
+        # Create payment order
+        status, api_resp = create_order(
+            client_txn_id=registration.client_txn_id,
+            redirect_url=callback_url,
+            amount=registration.amount,
+            product_info=f"Registration for {registration.event.name}",
+            customer_name=name,
+            # customer_email=email,
+            # customer_mobile=mobile
+        )
+
+        if not status:
+            log.error(f"Payment gateway error for registration {registration.id}: {api_resp.text}")
+            messages.error(request, "Payment gateway error. Please try again later.")
+            return redirect('haps:register_failure',
+                          registration_id=registration.id,
+                          remark=f"Payment gateway error: {api_resp.text}")
+
+        # Save order ID and redirect to payment URL
+        registration.order_id = api_resp["order_id"]
+        registration.save(update_fields=['order_id'])
+
+        return redirect(api_resp["payment_url"])
+
+    except Exception as e:
+        log.error(f"Payment initiation failed for registration {registration.id}: {str(e)}")
+        messages.error(request, "Failed to initiate payment. Please try again.")
+        return redirect('haps:register_failure', registration_id=registration.id)
+
+
+def payment_callback(request: HttpRequest):
+    """Handle payment gateway callback"""
+    log.debug("Payment callback called")
+    client_txn_id = request.GET.get('client_txn_id')
+    if not client_txn_id:
+        messages.error(request, "Invalid payment callback")
+        return redirect('haps:events')
+
+    try:
+        registration = EventRegistration.objects.get(client_txn_id=client_txn_id)
+    except EventRegistration.DoesNotExist:
+        messages.error(request, "Registration not found")
+        return redirect('haps:events')
+
+    # Prevent duplicate processing
+    if registration.payment_status == 'success':
+        return redirect('haps:register_success', registration_id=registration.id)
+
+    # Check payment status
+    try:
+        status_data = check_order_status(client_txn_id)
+        if not status_data:
+            raise ValueError("Empty response from payment gateway")
+
+        # Store all payment diagnostic data
+        registration.payment_data = {
+            'customer_vpa': status_data.get('customer_vpa'),
+            'upi_txn_id': status_data.get('upi_txn_id'),
+            'status': status_data.get('status'),
+            'remark': status_data.get('remark'),
+            'txnAt': status_data.get('txnAt'),
+            'merchant': status_data.get('Merchant', {}),
+            'udf1': status_data.get('udf1'),
+            'udf2': status_data.get('udf2'),
+            'udf3': status_data.get('udf3'),
+            'redirect_url': status_data.get('redirect_url'),
+            'createdAt': status_data.get('createdAt')
+        }
+
+        # Update payment status
+        if status_data['status'] == 'success':
+            registration.payment_status = 'success'
+            registration.payment_date_time = status_data.get('txnAt')
+            registration.save(update_fields=['payment_status', 'payment_date_time', 'payment_data'])
+            messages.success(request, "Payment successful!")
+            return redirect('haps:register_success', registration_id=registration.id)
+        else:
+            registration.payment_status = 'failure'
+            registration.save(update_fields=['payment_status', 'payment_data'])
+            return redirect('haps:register_failure',
+                        registration_id=registration.id,
+                        remark=status_data.get('remark', 'Payment failed'))
+
+    except Exception as e:
+        log.error(f"Payment verification failed for registration {registration.id}: {str(e)}")
+        registration.payment_data = {'error': str(e)}
+        registration.payment_status = 'failure'
+        registration.save(update_fields=['payment_status', 'payment_data'])
+        return redirect('haps:register_failure',
+                    registration_id=registration.id,
+                    remark="Payment verification failed")
+
+
+def retry_payment(request: HttpRequest, registration_id: int):
+    """Retry failed payment"""
+    try:
+        registration = EventRegistration.objects.get(id=registration_id)
+    except EventRegistration.DoesNotExist:
+        raise Http404("Registration not found")
+
+    if registration.payment_status == 'success':
+        messages.info(request, "Payment already completed")
+        return redirect('haps:register_success', registration_id=registration.id)
+
+    # Log critical payment data before reset
+    critical_logger.critical(
+        f"Payment retry initiated for registration {registration.id}. "
+        f"Previous payment data: order_id={registration.order_id}, "
+        f"client_txn_id={registration.client_txn_id}, "
+        f"payment_status={registration.payment_status}, "
+        f"payment_data={registration.payment_data}"
     )
 
-    context = {"event": event, "user": request.user, "reg": registration}
+    # Reset payment fields for retry
+    registration.order_id = None
+    registration.client_txn_id = None
+    registration.payment_status = 'pending'
+    registration.save(update_fields=['order_id', 'client_txn_id', 'payment_status'])
+
+    return redirect('haps:initiate_payment', registration_id=registration.id)
+
+
+def register_success(request: HttpRequest, registration_id: int):
+    """View for displaying registration success page."""
+    try:
+        registration = EventRegistration.objects.select_related('event', 'user').get(id=registration_id)
+    except EventRegistration.DoesNotExist:
+        raise Http404("Registration not found")
+
+    context = {
+        "registration": registration,
+        "event": registration.event,
+    }
     return render(request, "haps/register_success.html", context=context)
diff --git a/src/static/styles.css b/src/static/styles.css
index 8bfc291..2e4896c 100644
--- a/src/static/styles.css
+++ b/src/static/styles.css
@@ -1714,133 +1714,6 @@ input:checked + .toggle-bg {
   margin-bottom: 0;
 }
 
-.format-lg {
-  font-size: 1.125rem;
-  line-height: 1.7777778;
-}
-
-.format-lg :where(p):not(:where([class~="not-format"] *)) {
-  margin-top: 1.3333333em;
-  margin-bottom: 1.3333333em;
-}
-
-.format-lg :where([class~="lead"]):not(:where([class~="not-format"] *)) {
-  font-size: 1.2222222em;
-  line-height: 1.4545455;
-  margin-top: 1.0909091em;
-  margin-bottom: 1.0909091em;
-}
-
-.format-lg :where(blockquote):not(:where([class~="not-format"] *))::before {
-  margin-top: 1.6666667em;
-}
-
-.format-lg :where(blockquote > p:first-child):not(:where([class~="not-format"] *)) {
-  margin-top: 0.5em;
-}
-
-.format-lg :where(h1):not(:where([class~="not-format"] *)) {
-  font-size: 2.6666667em;
-  margin-top: 0;
-  margin-bottom: 0.8333333em;
-  line-height: 1;
-}
-
-.format-lg :where(h2):not(:where([class~="not-format"] *)) {
-  font-size: 2em;
-  margin-top: 0;
-  margin-bottom: 0.6666667em;
-  line-height: 1.3333333;
-}
-
-.format-lg :where(h3):not(:where([class~="not-format"] *)) {
-  font-size: 1.3333333em;
-  margin-top: 0;
-  margin-bottom: 0.6666667em;
-  line-height: 1.5;
-}
-
-.format-lg :where(h4):not(:where([class~="not-format"] *)) {
-  margin-top: 0;
-  margin-bottom: 0.4444444em;
-  line-height: 1.5555556;
-}
-
-.format-lg :where(img):not(:where([class~="not-format"] *)) {
-  margin-top: 1.7777778em;
-  margin-bottom: 1.7777778em;
-}
-
-.format-lg :where(video):not(:where([class~="not-format"] *)) {
-  margin-top: 1.7777778em;
-  margin-bottom: 1.7777778em;
-}
-
-.format-lg :where(figure):not(:where([class~="not-format"] *)) {
-  margin-top: 1.7777778em;
-  margin-bottom: 1.7777778em;
-}
-
-.format-lg :where(figure > *):not(:where([class~="not-format"] *)) {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-.format-lg :where(figcaption):not(:where([class~="not-format"] *)) {
-  font-size: 0.8888889em;
-  line-height: 1.5;
-  margin-top: 1em;
-}
-
-.format-lg :where(code):not(:where([class~="not-format"] *)) {
-  font-size: 0.8888889em;
-}
-
-.format-lg :where(h2 code):not(:where([class~="not-format"] *)) {
-  font-size: 0.8666667em;
-}
-
-.format-lg :where(h3 code):not(:where([class~="not-format"] *)) {
-  font-size: 0.875em;
-}
-
-.format-lg :where(pre):not(:where([class~="not-format"] *)) {
-  font-size: 0.8888889em;
-  line-height: 1.75;
-  margin-top: 2em;
-  margin-bottom: 2em;
-  border-radius: 0.375rem;
-  padding-top: 1em;
-  padding-right: 1.5em;
-  padding-bottom: 1em;
-  padding-left: 1.5em;
-}
-
-.format-lg :where(ol):not(:where([class~="not-format"] *)) {
-  margin-top: 1.3333333em;
-  margin-bottom: 1.3333333em;
-  padding-left: 1.5555556em;
-}
-
-.format-lg :where(ul):not(:where([class~="not-format"] *)) {
-  margin-top: 1.3333333em;
-  margin-bottom: 1.3333333em;
-  padding-left: 1.5555556em;
-}
-
-.format-lg :where(li):not(:where([class~="not-format"] *)) {
-  margin-top: 0.6666667em;
-  margin-bottom: 0.6666667em;
-}
-
-.format-lg :where(ol > li):not(:where([class~="not-format"] *)) {
-  padding-left: 0.4444444em;
-}
-
-.format-lg :where(ul > li):not(:where([class~="not-format"] *)) {
-  padding-left: 0.4444444em;
-}
-
 .format-lg :where(.format > ul > li p):not(:where([class~="not-format"] *)) {
   margin-top: 0.8888889em;
   margin-bottom: 0.8888889em;
@@ -1862,58 +1735,6 @@ input:checked + .toggle-bg {
   margin-bottom: 1.3333333em;
 }
 
-.format-lg :where(ul ul, ul ol, ol ul, ol ol):not(:where([class~="not-format"] *)) {
-  margin-top: 0.8888889em;
-  margin-bottom: 0.8888889em;
-}
-
-.format-lg :where(hr):not(:where([class~="not-format"] *)) {
-  margin-top: 3.1111111em;
-  margin-bottom: 3.1111111em;
-}
-
-.format-lg :where(hr + *):not(:where([class~="not-format"] *)) {
-  margin-top: 0;
-}
-
-.format-lg :where(h2 + *):not(:where([class~="not-format"] *)) {
-  margin-top: 0;
-}
-
-.format-lg :where(h3 + *):not(:where([class~="not-format"] *)) {
-  margin-top: 0;
-}
-
-.format-lg :where(h4 + *):not(:where([class~="not-format"] *)) {
-  margin-top: 0;
-}
-
-.format-lg :where(table):not(:where([class~="not-format"] *)) {
-  font-size: 0.8888889em;
-  line-height: 1.5;
-}
-
-.format-lg :where(thead th):not(:where([class~="not-format"] *)) {
-  padding-right: 0.75em;
-  padding-bottom: 0.75em;
-  padding-left: 0.75em;
-}
-
-.format-lg :where(thead th:last-child):not(:where([class~="not-format"] *)) {
-  padding-right: 0;
-}
-
-.format-lg :where(tbody td, tfoot td):not(:where([class~="not-format"] *)) {
-  padding-top: 0.75em;
-  padding-right: 0.75em;
-  padding-bottom: 0.75em;
-  padding-left: 0.75em;
-}
-
-.format-lg :where(tbody td:last-child, tfoot td:last-child):not(:where([class~="not-format"] *)) {
-  padding-right: 0;
-}
-
 .format-lg :where(.format > :first-child):not(:where([class~="not-format"] *)) {
   margin-top: 0;
 }
@@ -2036,6 +1857,10 @@ input:checked + .toggle-bg {
   grid-column: span 12 / span 12;
 }
 
+.col-span-2 {
+  grid-column: span 2 / span 2;
+}
+
 .m-4 {
   margin: 1rem;
 }
@@ -2168,6 +1993,11 @@ input:checked + .toggle-bg {
           margin-inline-start: 0.5rem;
 }
 
+.ms-auto {
+  -webkit-margin-start: auto;
+          margin-inline-start: auto;
+}
+
 .mt-1 {
   margin-top: 0.25rem;
 }
@@ -2268,6 +2098,10 @@ input:checked + .toggle-bg {
   height: 1.5rem;
 }
 
+.h-64 {
+  height: 16rem;
+}
+
 .h-7 {
   height: 1.75rem;
 }
@@ -2360,6 +2194,10 @@ input:checked + .toggle-bg {
   width: 2rem;
 }
 
+.w-96 {
+  width: 24rem;
+}
+
 .w-\[52rem\] {
   width: 52rem;
 }
@@ -2695,6 +2533,11 @@ input:checked + .toggle-bg {
   border-bottom-right-radius: 0.5rem;
 }
 
+.rounded-t {
+  border-top-left-radius: 0.25rem;
+  border-top-right-radius: 0.25rem;
+}
+
 .rounded-t-lg {
   border-top-left-radius: 0.5rem;
   border-top-right-radius: 0.5rem;
@@ -2827,6 +2670,10 @@ input:checked + .toggle-bg {
   background-color: rgb(17 24 39 / var(--tw-bg-opacity));
 }
 
+.bg-gray-900\/50 {
+  background-color: rgb(17 24 39 / 0.5);
+}
+
 .bg-green-100 {
   --tw-bg-opacity: 1;
   background-color: rgb(222 247 236 / var(--tw-bg-opacity));
@@ -2867,6 +2714,10 @@ input:checked + .toggle-bg {
   background-color: rgb(253 242 242 / var(--tw-bg-opacity));
 }
 
+.bg-transparent {
+  background-color: transparent;
+}
+
 .bg-white {
   --tw-bg-opacity: 1;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity));
@@ -3103,6 +2954,11 @@ input:checked + .toggle-bg {
   line-height: 1;
 }
 
+.text-6xl {
+  font-size: 3.75rem;
+  line-height: 1;
+}
+
 .text-7xl {
   font-size: 4.5rem;
   line-height: 1;
@@ -3269,6 +3125,11 @@ input:checked + .toggle-bg {
   color: rgb(240 82 82 / var(--tw-text-opacity));
 }
 
+.text-red-600 {
+  --tw-text-opacity: 1;
+  color: rgb(224 36 36 / var(--tw-text-opacity));
+}
+
 .text-red-800 {
   --tw-text-opacity: 1;
   color: rgb(155 28 28 / var(--tw-text-opacity));
@@ -3358,6 +3219,12 @@ input:checked + .toggle-bg {
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }
 
+.backdrop-blur-lg {
+  --tw-backdrop-blur: blur(16px);
+  -webkit-backdrop-filter: var(--tw-backdrop-blur) var(--tw-backdrop-brightness) var(--tw-backdrop-contrast) var(--tw-backdrop-grayscale) var(--tw-backdrop-hue-rotate) var(--tw-backdrop-invert) var(--tw-backdrop-opacity) var(--tw-backdrop-saturate) var(--tw-backdrop-sepia);
+          backdrop-filter: var(--tw-backdrop-blur) var(--tw-backdrop-brightness) var(--tw-backdrop-contrast) var(--tw-backdrop-grayscale) var(--tw-backdrop-hue-rotate) var(--tw-backdrop-invert) var(--tw-backdrop-opacity) var(--tw-backdrop-saturate) var(--tw-backdrop-sepia);
+}
+
 .transition {
   transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
   transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
@@ -3876,14 +3743,14 @@ input:checked + .toggle-bg {
   background-color: rgb(243 244 246 / var(--tw-bg-opacity));
 }
 
-.hover\:bg-primary-100:hover {
+.hover\:bg-gray-200:hover {
   --tw-bg-opacity: 1;
-  background-color: rgb(254 243 199 / var(--tw-bg-opacity));
+  background-color: rgb(229 231 235 / var(--tw-bg-opacity));
 }
 
-.hover\:bg-primary-600:hover {
+.hover\:bg-primary-100:hover {
   --tw-bg-opacity: 1;
-  background-color: rgb(217 119 6 / var(--tw-bg-opacity));
+  background-color: rgb(254 243 199 / var(--tw-bg-opacity));
 }
 
 .hover\:bg-primary-700:hover {
@@ -3934,6 +3801,15 @@ input:checked + .toggle-bg {
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }
 
+.focus\:z-10:focus {
+  z-index: 10;
+}
+
+.focus\:border-blue-500:focus {
+  --tw-border-opacity: 1;
+  border-color: rgb(63 131 248 / var(--tw-border-opacity));
+}
+
 .focus\:border-primary-500:focus {
   --tw-border-opacity: 1;
   border-color: rgb(245 158 11 / var(--tw-border-opacity));
@@ -3966,9 +3842,9 @@ input:checked + .toggle-bg {
   --tw-ring-color: rgb(164 202 254 / var(--tw-ring-opacity));
 }
 
-.focus\:ring-gray-100:focus {
+.focus\:ring-blue-500:focus {
   --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(243 244 246 / var(--tw-ring-opacity));
+  --tw-ring-color: rgb(63 131 248 / var(--tw-ring-opacity));
 }
 
 .focus\:ring-gray-200:focus {
@@ -4154,6 +4030,11 @@ input:checked + .toggle-bg {
   color: rgb(107 114 128 / var(--tw-text-opacity));
 }
 
+:is(.dark .dark\:text-gray-600) {
+  --tw-text-opacity: 1;
+  color: rgb(75 85 99 / var(--tw-text-opacity));
+}
+
 :is(.dark .dark\:text-gray-800) {
   --tw-text-opacity: 1;
   color: rgb(31 41 55 / var(--tw-text-opacity));
@@ -4253,19 +4134,24 @@ input:checked + .toggle-bg {
   color: rgb(255 255 255 / var(--tw-text-opacity));
 }
 
+:is(.dark .dark\:focus\:border-blue-500:focus) {
+  --tw-border-opacity: 1;
+  border-color: rgb(63 131 248 / var(--tw-border-opacity));
+}
+
 :is(.dark .dark\:focus\:border-primary-500:focus) {
   --tw-border-opacity: 1;
   border-color: rgb(245 158 11 / var(--tw-border-opacity));
 }
 
-:is(.dark .dark\:focus\:ring-gray-600:focus) {
+:is(.dark .dark\:focus\:ring-blue-500:focus) {
   --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(75 85 99 / var(--tw-ring-opacity));
+  --tw-ring-color: rgb(63 131 248 / var(--tw-ring-opacity));
 }
 
-:is(.dark .dark\:focus\:ring-gray-800:focus) {
+:is(.dark .dark\:focus\:ring-gray-600:focus) {
   --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(31 41 55 / var(--tw-ring-opacity));
+  --tw-ring-color: rgb(75 85 99 / var(--tw-ring-opacity));
 }
 
 :is(.dark .dark\:focus\:ring-primary-500:focus) {
@@ -4630,6 +4516,10 @@ input:checked + .toggle-bg {
     padding: 3rem;
   }
 
+  .md\:p-5 {
+    padding: 1.25rem;
+  }
+
   .md\:px-12 {
     padding-left: 3rem;
     padding-right: 3rem;
diff --git a/src/utils/logging.py b/src/utils/logging.py
new file mode 100644
index 0000000..f745009
--- /dev/null
+++ b/src/utils/logging.py
@@ -0,0 +1,34 @@
+import logging
+import os
+from datetime import datetime
+from pathlib import Path
+
+def setup_critical_logger():
+    """Setup logger for critical events that need to be preserved"""
+    
+    # Create logs directory if it doesn't exist
+    logs_dir = Path(__file__).parent.parent.parent / 'logs'
+    logs_dir.mkdir(exist_ok=True)
+    
+    # Create critical logger
+    critical_logger = logging.getLogger('critical')
+    critical_logger.setLevel(logging.CRITICAL)
+    
+    # Create file handler
+    log_file = logs_dir / 'critical.log'
+    handler = logging.FileHandler(str(log_file))
+    handler.setLevel(logging.CRITICAL)
+    
+    # Create formatter
+    formatter = logging.Formatter(
+        '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+    )
+    handler.setFormatter(formatter)
+    
+    # Add handler to logger
+    critical_logger.addHandler(handler)
+    
+    return critical_logger
+
+# Create the logger instance
+critical_logger = setup_critical_logger()
diff --git a/src/donations/upi_gateway.py b/src/utils/payment/upi_gateway.py
similarity index 92%
rename from src/donations/upi_gateway.py
rename to src/utils/payment/upi_gateway.py
index 345c3e3..cba53ed 100644
--- a/src/donations/upi_gateway.py
+++ b/src/utils/payment/upi_gateway.py
@@ -40,6 +40,8 @@ def create_order(
     """
     if not customer_email:
         customer_email = "example@example.com"
+    if not customer_mobile:
+        customer_mobile = "9999999999"
     payload_dict = {
         "key": str(PaymentGatewayConfig.API_KEY),
         "client_txn_id": client_txn_id,
@@ -55,19 +57,25 @@ def create_order(
 
     payload_json_str = json.dumps(payload_dict)
 
+    log.info(f"making payment request for {amount=} and {client_txn_id=}")
+    log.debug(payload_dict)
+
     response = requests.request(
         "POST",
         PaymentGatewayConfig.CREATE_ORDER,
         headers=PaymentGatewayConfig.REQUEST_HEADERS,
         data=payload_json_str,
     )
-
+    log.debug(response.text)
     if response.status_code == 200:
         rj = response.json()
         if rj["status"] is True:
+            log.warning(rj)
             return True, rj["data"]
         else:
             log.warning("Failed to create order \n%s", response.text)
+            log.warning("rj[data]", rj["data"])
+            log.warning("rj", rj)
             return False, response
     else:
         log.warning(