From 16f13c95ae2ea914bf1f6a254a4f7158cb28d2d3 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Wed, 21 Jun 2023 16:35:36 +0530
Subject: [PATCH] susee

---
 app/Views/payment.php      | 22 +++++++++++++---------
 app/Views/success_mail.php | 14 ++++++++------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/Views/payment.php b/app/Views/payment.php
index e3a88ec..26a6d70 100644
--- a/app/Views/payment.php
+++ b/app/Views/payment.php
@@ -97,23 +97,27 @@
                                 <div class="taxes label">Taxes</div>
                             </div>
                             <div class="col-lg-2"></div>
+                            <div class="col-lg-2 text-end">
+                                <div class="taxes pst label">GST :</div>                            
+                            </div>
+                            <div class="col-lg-2 text-end">
+                               <div class="taxes pst"><span class="price-symbol">$</span><?= round($Subtotal * $gst / 100 , 2); ?></div>                            
+                            </div>
                             <?php if($pst != 0){?>
-                            <div class="col-lg-2 text-end">
-                                <div class="taxes pst label">PST (<?= $pst; ?>%)</div>                            
-                            </div>
-                            <div class="col-lg-2 text-end">
-                               <div class="taxes pst"><span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></div>                            
-                            </div>
-                            <?php }?>
+
                             <div class="col-lg-6">                               
                             </div>
                             <div class="col-lg-2"></div>
                             <div class="col-lg-2 text-end">
-                                <div class="taxes gst label">GST :</div>                            
+                                <div class="taxes gst label">PST :</div>                            
                             </div>
                             <div class="col-lg-2 text-end">
-                               <div class="taxes gst"><span class="price-symbol">$</span><?= round($Subtotal * $gst / 100 , 2); ?></div>                            
+                               <div class="taxes gst"><span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></div>                            
                             </div>
+
+                            <?php }?>
+
+
                         </div>
                        
                         <div class="row sub-total-main">
diff --git a/app/Views/success_mail.php b/app/Views/success_mail.php
index bfbf95e..e67d744 100644
--- a/app/Views/success_mail.php
+++ b/app/Views/success_mail.php
@@ -76,16 +76,18 @@
                                         <td style="  border-bottom: 1px solid #ededed;"><span class="price-symbol">$</span><?php echo $val['costSum']; ?></td>
                                         </tr>
                                         <?php } ?> 
-                                        <?php if ($pst != 0) { ?>
                                             <tr>
-                                            <td style="padding: 10px;">PST :</td>
-                                            <td> <span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></td>
+                                            <td style="padding: 10px;">GST :</td>
+                                            <td> <span class="price-symbol">$</span><?= round($Subtotal * $gst / 100 , 2); ?></td>
                                             </tr>
-                                        <?php } ?>
+                                        <?php if ($pst != 0) { ?>
+
                                                 <tr>
-                                                <td style="padding: 10px;">GST :</td>
-                                                <td> <span class="price-symbol">$</span><?= round($Subtotal * $gst / 100 , 2); ?></td>
+                                                <td style="padding: 10px;">PST :</td>
+                                                <td> <span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></td>
                                                 </tr> 
+                                                                                        <?php } ?>
+
                                                 <tr>
                                                 <td style="padding: 10px;">Total</td>
                                                 <td class="action_head"> <span  class="price-symbol ">$</span><?= round( ( $Subtotal + (($Subtotal * ($gst + $pst) ) / 100) ) , 2 ); ?></td>