From 3b8783eff3974ac8d12cd797a0fb738196f6acf9 Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Thu, 18 Jul 2024 16:12:30 +0530
Subject: [PATCH] Merge : GWM

---
 app/Views/branch_list.php | 17 ++++++++---------
 app/Views/share_docs.php  |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/Views/branch_list.php b/app/Views/branch_list.php
index fdfe382..48f3f36 100644
--- a/app/Views/branch_list.php
+++ b/app/Views/branch_list.php
@@ -32,13 +32,10 @@
                 
                         <table id="business_branch_table" class="table table-striped dt-responsive nowrap w-100">
                             <thead>
-                                <tr>
-                                <th>Branch Name</th>
+                            <tr>
+                            <th>Branch Name</th>
                             <th>GST</th>
                             <th>Address</th>
-                            <th>City</th>
-                            <th>State</th>
-                            <th>PIN Code</th>
                             <th>Contact</th>
                             <th>Status</th>
                             <th>Action</th>
@@ -52,10 +49,12 @@
                         <tr>
                             <td><?= $value['branch_name']; ?></td>
                             <td><?= $value['gstno']; ?></td>
-                            <td><?= $value['address']; ?></td>
-                            <td><?= $value['city']; ?></td>
-                            <td><?= $value['state']; ?></td>
-                            <td><?= $value['pin_code']; ?></td>
+                            <td>
+                                <?= $value['address']; ?></br>
+                                <?= $value['city']; ?>
+                                <?php if (!empty($value['state'])): ?>, <?= $value['state']; ?><?php endif; ?>
+                                <?php if (!empty($value['pin_code'])): ?> - <?= $value['pin_code']; ?><?php endif; ?>
+                            </td>
                             <td><?= $value['contact']; ?></td>
                             <td>
                                 <?php if ($value['isactive'] == 0): ?>
diff --git a/app/Views/share_docs.php b/app/Views/share_docs.php
index 70e13be..1df3a5a 100644
--- a/app/Views/share_docs.php
+++ b/app/Views/share_docs.php
@@ -82,7 +82,7 @@
                                     <th>Service</th>
                                     <th>Document</th>
                                     <th>Doc Status</th>
-                                    <th>Approvel Date</th>
+                                    <th>Approval Date</th>
                                     <th>Action</th>
                                 </tr>
                             </thead>