From c52b42e67dbeaf35514152a5a3a6ca82cccd0dd3 Mon Sep 17 00:00:00 2001
From: rizwanisready <rizwanisready@gmail.com>
Date: Fri, 2 Aug 2024 17:14:04 +0530
Subject: [PATCH] auto recurring testing phase 25

---
 .../principal_subscriptions_list.html                     | 6 ++++++
 templates/manage_subscriptions/subscription_list.html     | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/templates/manage_subscriptions/principal_subscriptions_list.html b/templates/manage_subscriptions/principal_subscriptions_list.html
index 16dd9a1..79e88c4 100644
--- a/templates/manage_subscriptions/principal_subscriptions_list.html
+++ b/templates/manage_subscriptions/principal_subscriptions_list.html
@@ -60,6 +60,9 @@
                                                         <th class="dt-no-sorting sorting" tabindex="8"
                                                             aria-controls="style-3"
                                                             style="width: 100.625px;">End</th>
+                                                        <th class="checkbox-column sorting_asc" tabindex="0"
+                                                            aria-controls="style-3" aria-sort="ascending"
+                                                            style="width: 69.2656px;"> Is Subscription </th>
                                                         <th class="dt-no-sorting sorting" tabindex="8"
                                                             aria-controls="style-3"
                                                             style="width: 100.625px;">Grace</th>
@@ -85,6 +88,9 @@
                                                         <td>{{data_obj.stripe_subscription_id}}</td>
                                                         <td>{{data_obj.start_date}}</td>
                                                         <td>{{data_obj.end_date}}</td>
+                                                        <td class="text-center">
+                                                            <span class="shadow-none badge {% if data_obj.active %}badge-primary{% else %}badge-danger{% endif %}">{{data_obj.is_stripe_subscription}}</span>
+                                                        </td>
                                                         <td>{{data_obj.grace_period_end_date}}</td>
                                                         <td>{{data_obj.created_on}}</td>
                                                         <td class="text-center">
diff --git a/templates/manage_subscriptions/subscription_list.html b/templates/manage_subscriptions/subscription_list.html
index 5c55852..6333106 100644
--- a/templates/manage_subscriptions/subscription_list.html
+++ b/templates/manage_subscriptions/subscription_list.html
@@ -61,9 +61,6 @@
                                                         <th class="checkbox-column sorting_asc" tabindex="0"
                                                             aria-controls="style-3" aria-sort="ascending"
                                                             style="width: 69.2656px;"> Stripe Product </th>
-                                                        <th class="checkbox-column sorting_asc" tabindex="0"
-                                                            aria-controls="style-3" aria-sort="ascending"
-                                                            style="width: 69.2656px;"> Is Subscription </th>
                                                         <th class="sorting" tabindex="7" aria-controls="style-3"
                                                             style="width: 79.7969px;">Active</th>
                                                         <th class="dt-no-sorting sorting" tabindex="8"
@@ -98,11 +95,6 @@
                                                                 <span class="shadow-none badge badge-danger">N/A</span>
                                                             {% endif %}
                                                         </td>
-                                                        
-                                                        <td class="text-center">
-                                                            <span class="shadow-none badge {% if data_obj.active %}badge-primary{% else %}badge-danger{% endif %}">{{data_obj.is_stripe_subscription}}</span>
-                                                        </td>
-                                                        
                                                         <td class="text-center">
                                                             <span class="shadow-none badge {% if data_obj.active %}badge-primary{% else %}badge-danger{% endif %}">{{data_obj.active}}</span>
                                                         </td>