diff --git a/apps/pg/urls.py b/apps/pg/urls.py
index 6fa5c3f..5eb12ad 100644
--- a/apps/pg/urls.py
+++ b/apps/pg/urls.py
@@ -6,7 +6,7 @@ app_name = "pg"
 
 urlpatterns = [
     path('page/charge/<uuid>/', PaymentRequestView.as_view(), name='payment-request-view'),
-    path('page/pna_callback/<uuid>/', PaymentConfirmView.as_view(), name='payment-confirm-view'),
+    path('page/confirm/<uuid>/', PaymentConfirmView.as_view(), name='payment-confirm-view'),
     path('api/charge_create/', PaymentRequestCreateApiView.as_view(), name='charge-request-create-api-view'),
     path('api/application/charge_create/<uuid>', ApplicationPaymentRequestCreateApiView.as_view(), name='application-user-charge-request-create-api-view'),
     path('api/calculate_commission/', CalculateCommissionView.as_view(), name='calculate-commission-view'),
diff --git a/apps/pg/views.py b/apps/pg/views.py
index 5022bc1..1451db6 100644
--- a/apps/pg/views.py
+++ b/apps/pg/views.py
@@ -119,7 +119,7 @@ class PaymentRequestView(UpdateView):
 
 @method_decorator(csrf_exempt, name='dispatch')
 class PaymentConfirmView(UpdateView):
-    template_name = 'pg/payment_failure.html'
+    template_name = 'pg/payment_confirm.html'
     # template_name = 'pg/payment_success.html'
     form_class = PaymentRequestForm
     # pk_url_kwarg = 'uuid'
@@ -131,13 +131,19 @@ class PaymentConfirmView(UpdateView):
         # return Charge.objects.filter(state__in=[StateChoices.CREATED.value, StateChoices.SUCCESS.value])
 
     def get(self, request, *args, **kwargs):
-
         print('get')
         print(args)
         print(kwargs)
         self.object = self.get_object()
         tool = self.object.get_gateway_tools()
-        tool.confirm_request(request)
+        # state, message = tool.confirm_request(request)
+        # if state:
+        #     self.template_name = 'pg/payment_success.html'
+        #
+        #
+        # # TODO:
+        # context = self.get_context_data(object=self.object)
+        # context['message'] = message
 
         context = self.get_context_data()
         return self.render_to_response(context)
@@ -161,30 +167,3 @@ class PaymentConfirmView(UpdateView):
         context = self.get_context_data(object=self.object)
         context['message'] = message
         return self.render_to_response(context)
-
-
-    # def form_valid(self, form):
-        # self.object = form.save()
-        # charge_request: ChargeRequest = self.get_object()
-        # try:
-        #
-        #     # transaction = Transaction.objects.create(
-        #     #     uuid=charge.uuid,
-        #     #     payee_id=charge.user.pk,
-        #     #     payee_type=1,
-        #     #     payer_id=payer_pk,
-        #     #     payer_type=2,
-        #     #     amount=amount,
-        #     #     details={'description': 'شارژ مجازی کیف پول'}
-        #     # )
-        #     # transaction.submit()
-        #     # transaction.verify()
-        #     # charge.change_state(from_state=StateChoices.PENDING.value, to_state=StateChoices.SUCCESS.value)
-        #
-        # except Exception as e:
-        #     print(e)
-        #     messages.error(self.request, 'خطایی رخ داده است')
-        #     charge_request.change_state(from_state=StateChoices.PENDING.value, to_state=StateChoices.EXPECTED_FAILURE.value)
-        #
-        #     return HttpResponseRedirect(self.get_success_url())
-
diff --git a/templates/pg/payment-confirm.html b/templates/pg/payment-confirm.html
deleted file mode 100644
index 3e87bfc..0000000
--- a/templates/pg/payment-confirm.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends "base.html" %}
-{% load static %}
-{% load crispy_forms_tags %}
-{% load jalali_tags %}
-
-{% block title %}بازگشت{% endblock %}
-{% block page_title %}بازگشت{% endblock %}
-
-
-{% block content %}
-    مبلغ {{ object.amount }} ریال با وضعیت {{ object.get_state_display }}<br>
-    <form action="{{ request.get_full_path }}" method="post" enctype="multipart/form-data">
-        {% csrf_token %}
-        <div class="row g-3">
-            <div class="col-md-12 col-lg-12" id="formset">
-                {#                <div class="card">#}
-                {#                    <div class="card-body">#}
-                {{ form|crispy }}
-                {#                    </div>#}
-                {#                </div>#}
-            </div>
-                        <h6 class="h6">بازگشت به برنامه</h6>
-            <div class="row">
-                <div class="col">
-                    <button type="submit" name="redirect-to-app" value="true" class="btn mx-auto d-block">
-                        <img class="img-thumbnail" width="128" height="128" src="{% static "image/icon.png" %}"/>
-                    </button>
-                </div>
-            </div>
-        </div>
-    </form>
-
-{% endblock %}
\ No newline at end of file
diff --git a/templates/pg/payment_failure.html b/templates/pg/payment_confirm.html
similarity index 94%
rename from templates/pg/payment_failure.html
rename to templates/pg/payment_confirm.html
index bd19088..926cfab 100644
--- a/templates/pg/payment_failure.html
+++ b/templates/pg/payment_confirm.html
@@ -1,179 +1,179 @@
-{% load static %}
-{% load crispy_forms_tags %}
-{% load jalali_tags %}
-
-
-<!DOCTYPE html>
-<html lang="fa" dir="rtl">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Payment Unsuccessful</title>
-
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Vazirmatn:wght@400;700&display=swap" rel="stylesheet">
-
-    <style>
-
-        body {
-            margin: 0;
-            font-family: 'Vazirmatn', sans-serif;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            min-height: 100vh;
-        }
-
-
-        .mobile-frame {
-            width: 100vh;
-            height: 100vh;
-            background-color: #ffffff;
-            box-shadow: 0 10px 30px rgba(0, 0, 0, 0.2);
-            padding: 30px;
-            box-sizing: border-box;
-            display: flex;
-            flex-direction: column;
-        }
-
-        .screen-content {
-            flex-grow: 1;
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-        }
-
-
-        .message-section {
-            flex-grow: 1;
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            align-items: center;
-            text-align: center;
-        }
-
-        .error-icon {
-            width: 40px;
-            height: 40px;
-            background-color: #e53935; /* Red for error */
-            border-radius: 50%;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            color: white;
-            font-size: 24px;
-            font-weight: bold;
-        }
-
-        .error-text {
-            color: #e53935;
-            font-size: 1.1rem;
-            font-weight: bold;
-            margin-top: 15px;
-            margin-bottom: 25px;
-        }
-
-        .divider {
-            width: 100%;
-            height: 1px;
-            background-color: #eeeeee;
-            border: none;
-            margin-bottom: 25px;
-        }
-
-        .details-text {
-            color: #757575;
-            font-size: 0.9rem;
-            line-height: 1.6;
-        }
-
-        .details-text .code {
-            color: #424242;
-            font-weight: 600;
-        }
-
-        .placeholder-link {
-            color: #bdbdbd;
-            font-size: 0.9rem;
-            text-decoration: underline;
-            margin-top: 40px;
-        }
-
-
-        .button-container {
-            display: flex;
-            flex-direction: column;
-            gap: 15px;
-            width: 100%;
-        }
-
-        .btn {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            gap: 8px;
-            width: 100%;
-            padding: 14px;
-            border-radius: 20px;
-            font-size: 1rem;
-            font-weight: bold;
-            font-family: 'Vazirmatn', sans-serif;
-            cursor: pointer;
-            transition: all 0.2s ease-in-out;
-            border: 1px solid transparent;
-        }
-
-        .btn-retry {
-            background-color: #ffffff;
-            border: 2px solid #6931c9;
-            color: #6931c9;
-        }
-
-        .btn-retry:hover {
-            background-color: #f9f7fd;
-        }
-
-        .btn-primary {
-            background-color: #6931c9;
-            color: #ffffff;
-        }
-
-        .btn-primary:hover {
-            background-color: #7745ce;
-        }
-    </style>
-</head>
-<body>
-
-<div class="mobile-frame">
-    <div class="screen-content">
-
-        <div class="message-section">
-            <div class="error-icon">!</div>
-            {% if message %}
-                <p class="error-text">{{ message }}</p>
-            {% else %}
-                <p class="error-text">پرداخت شما ناموفق بود</p>
-            {% endif %}
-            <hr class="divider">
-            <div class="details-text">
-                <p>کد پیگیری تراکنش شما: <span class="code">{{ object.reference_number }}</span></p>
-                <p>در صورت کسر از موجودی، مبلغ پرداختی طی یک تا 72 ساعت آینده به حساب شما بازگردانده خواهد شد.</p>
-            </div>
-            <a href="https://addwin.ir" class="placeholder-link">addwin</a>
-        </div>
-
-        <div class="button-container">
-            <form action="{{ request.get_full_path }}" method="post" enctype="multipart/form-data">
-                {% csrf_token %}
-                {{ form|crispy }}
-                <button class="btn btn-primary" name="redirect-to-app" value="true">بازگشت به صفحه اصلی</button>
-            </form>
-        </div>
-    </div>
-</div>
-
-</body>
+{% load static %}
+{% load crispy_forms_tags %}
+{% load jalali_tags %}
+
+
+<!DOCTYPE html>
+<html lang="fa" dir="rtl">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Payment Unsuccessful</title>
+
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Vazirmatn:wght@400;700&display=swap" rel="stylesheet">
+
+    <style>
+
+        body {
+            margin: 0;
+            font-family: 'Vazirmatn', sans-serif;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            min-height: 100vh;
+        }
+
+
+        .mobile-frame {
+            width: 100vh;
+            height: 100vh;
+            background-color: #ffffff;
+            box-shadow: 0 10px 30px rgba(0, 0, 0, 0.2);
+            padding: 30px;
+            box-sizing: border-box;
+            display: flex;
+            flex-direction: column;
+        }
+
+        .screen-content {
+            flex-grow: 1;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+        }
+
+
+        .message-section {
+            flex-grow: 1;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            text-align: center;
+        }
+
+        .error-icon {
+            width: 40px;
+            height: 40px;
+            background-color: #e53935; /* Red for error */
+            border-radius: 50%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: white;
+            font-size: 24px;
+            font-weight: bold;
+        }
+
+        .error-text {
+            color: #e53935;
+            font-size: 1.1rem;
+            font-weight: bold;
+            margin-top: 15px;
+            margin-bottom: 25px;
+        }
+
+        .divider {
+            width: 100%;
+            height: 1px;
+            background-color: #eeeeee;
+            border: none;
+            margin-bottom: 25px;
+        }
+
+        .details-text {
+            color: #757575;
+            font-size: 0.9rem;
+            line-height: 1.6;
+        }
+
+        .details-text .code {
+            color: #424242;
+            font-weight: 600;
+        }
+
+        .placeholder-link {
+            color: #bdbdbd;
+            font-size: 0.9rem;
+            text-decoration: underline;
+            margin-top: 40px;
+        }
+
+
+        .button-container {
+            display: flex;
+            flex-direction: column;
+            gap: 15px;
+            width: 100%;
+        }
+
+        .btn {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            gap: 8px;
+            width: 100%;
+            padding: 14px;
+            border-radius: 20px;
+            font-size: 1rem;
+            font-weight: bold;
+            font-family: 'Vazirmatn', sans-serif;
+            cursor: pointer;
+            transition: all 0.2s ease-in-out;
+            border: 1px solid transparent;
+        }
+
+        .btn-retry {
+            background-color: #ffffff;
+            border: 2px solid #6931c9;
+            color: #6931c9;
+        }
+
+        .btn-retry:hover {
+            background-color: #f9f7fd;
+        }
+
+        .btn-primary {
+            background-color: #6931c9;
+            color: #ffffff;
+        }
+
+        .btn-primary:hover {
+            background-color: #7745ce;
+        }
+    </style>
+</head>
+<body>
+
+<div class="mobile-frame">
+    <div class="screen-content">
+
+        <div class="message-section">
+            <div class="error-icon">!</div>
+            {% if message %}
+                <p class="error-text">{{ message }}</p>
+            {% else %}
+                <p class="error-text">پرداخت شما ناموفق بود</p>
+            {% endif %}
+            <hr class="divider">
+            <div class="details-text">
+                <p>کد پیگیری تراکنش شما: <span class="code">{{ object.reference_number }}</span></p>
+                <p>در صورت کسر از موجودی، مبلغ پرداختی طی یک تا 72 ساعت آینده به حساب شما بازگردانده خواهد شد.</p>
+            </div>
+            <a href="https://winsoo.ir" class="placeholder-link">وینسو</a>
+        </div>
+
+        <div class="button-container">
+            <form action="{{ request.get_full_path }}" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                {{ form|crispy }}
+                <button class="btn btn-primary" name="redirect-to-app" value="true">بازگشت به صفحه اصلی</button>
+            </form>
+        </div>
+    </div>
+</div>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/templates/pg/payment_success.html b/templates/pg/payment_success.html
index 81cac7d..fa011f1 100644
--- a/templates/pg/payment_success.html
+++ b/templates/pg/payment_success.html
@@ -155,9 +155,9 @@
             <hr class="divider">
             <div class="amount-row">
                 <span class="amount-label">مقدار پرداخت شده:</span>
-                <span class="amount-value">{{ object.amount }} تومان</span>
+                <span class="amount-value">{{ object.amount }} ریال</span>
             </div>
-            <a href="https://addwin.ir" class="placeholder-link">addwin</a>
+            <a href="https://winsoo.ir" class="placeholder-link">وینسو</a>
         </div>
 
         <div class="button-container">
@@ -167,7 +167,6 @@
                 <button class="btn btn-primary" name="redirect-to-app" value="true">بازگشت به صفحه اصلی</button>
             </form>
         </div>
-
     </div>
 </div>