From 36f3ddd7215ea255343dfee25c79cbae0b438fd6 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Mon, 12 Jun 2023 19:34:34 +0530
Subject: [PATCH] susee

---
 app/Views/memberaccess.php | 39 ++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index b9d45e7..d72664f 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -113,7 +113,7 @@
                        else
                        echo '<p>'.$credit_data[$i]['package_name'].'</p>';
                        ?>
-                        <p>Expiry Date : <?php $date = new DateTime($credit_data[$i]['expiring_date']);    echo $date->format('M-d-Y'); ?></p>
+                        <p class="mb-0">Expiry Date : <?php $date = new DateTime($credit_data[$i]['expiring_date']);    echo $date->format('M-d-Y'); ?></p>
                         <p>Order Id : <?php echo $credit_data[$i]['order_id'] ?></p></td>
                        <?php 
                        if($credit_data[$i]['running_balance'] > 0) 
@@ -156,12 +156,12 @@
                                           <th>Details</th>
                                       </tr>
                     <?php foreach ($TransactionData as $key => $value) { ?>
-                                      <tr>
+                                      <tr id="<?= $key."_table-grey" ?>">
                                           <td>#<?= $value['order_id'] ?></td>
                                           <td><?php $date = new DateTime($value['created_at']);    echo $date->format('M-d-Y'); ?></td>
                                           <td>$<?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
                                           <td></td>
-                                          <td class="down-icon" id="<?= $key."_table-grey" ?>"><i class="fa fa-caret-down" aria-hidden="true"></i></td>
+                                          <td class="down-icon" id="<?= $key."_table-grey" ?>"><div class="order-down"><i id="<?= $key."_table-grey_down-icon" ?>" class="fa fa-caret-down" aria-hidden="true"></i></div></td>
                                       </tr>
                                       <!-- <tr class="table-grey <?= $key."_table-grey" ?>">
                                           <td><?= $value['order_id'] ?></td>
@@ -188,33 +188,33 @@
                                           <?php } ?>
                                      
                                           
-                                      <tr class="table-grey <?= $key."_table-grey" ?> table-bottom">
+                                      <tr class="table-grey custom-font <?= $key."_table-grey" ?> table-bottom">
                                           <td></td>
                                           <td></td>
                                           <td>Subtotal</td>
                                           <td><span>$</span><?= array_sum(array_column($value['credit_data'],'costSum')) ?></td>
                                           <td></td>
                                       </tr> 
-                                      <tr class="table-grey <?= $key."_table-grey" ?> table-bottom">
+                                      <tr class="table-grey custom-font <?= $key."_table-grey" ?> table-bottom">
                                           <td>Taxes</td>
                                           <td></td>
                                           <td>PST (<?= $pst ?>%)</td>
                                           <td><span>$</span><?= round(array_sum(array_column($value['credit_data'],'costSum')) * $pst / 100 , 2) ?></td>
                                           <td></td>
                                       </tr>
-                                      <tr class="table-grey <?= $key."_table-grey" ?>">
+                                      <tr class="table-grey custom-font <?= $key."_table-grey" ?>">
                                           <td></td>
                                           <td></td>
                                           <td>GST (<?= $gst ?>%)</td>
                                           <td><span>$</span><?= round(array_sum(array_column($value['credit_data'],'costSum')) * $gst / 100 , 2) ?></td>
                                           <td></td>
                                       </tr>
-                                      <tr class="table-grey <?= $key."_table-grey" ?> table-bottom">
+                                      <tr class="table-grey custom-font <?= $key."_table-grey" ?> table-bottom">
                                           <td></td>
                                           <td></td>
                                           <td>Total</td>
                                           <td><span>$</span><?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
-                                          <td><div><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> 0 </div></td>
+                                          <td class="order-total"><div><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> 0 </div></td>
                                       </tr>
                                     
                 <?php } ?>
@@ -301,17 +301,18 @@
                     <div class="col-6 col-lg-6"></div>
                     <div class="col-6 col-lg-6 mb-3">
                         <label for="new_password">New Password</label><br>
+                        <span toggle="#new_password" id="toggle-password1"  class="fa fa-fw fa-eye field-icon toggle-password"></span>  
                         <input type="password" name="password" id="new_password" 
                         pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,}" 
                         title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters" 
                         required>
                         <span id="error_np"></span>
-                        <span toggle="#new_password" id="toggle-password1"  class="fa fa-fw fa-eye field-icon toggle-password"></span>
+                        
                     </div>
                     <div class="col-6 col-lg-6"></div>
                     <div class="col-6 col-lg-6 mb-3">
                         <label for="confirm_password">Confirm Password</label><br>
-                        <input type="text" name="confirm_password" id="confirm_password" required>
+                        <input type="password" name="confirm_password" id="confirm_password" required>
                         <span id="error_cp"></span>
                     </div>
                     <div class="col-6 col-lg-6"></div>
@@ -364,7 +365,25 @@
 $(document).ready(function(){
   $(".down-icon").click(function(){
     id = $(this).attr('id');
+    // console.log($("#"+id+"_down-icon").attr('class'));
+
     $("."+id+"").slideToggle();
+    $("#"+id+"_down-icon").toggleClass("fa-caret-down fa-caret-up");
+    // alert($("#"+id+"_down-icon").attr('class'))
+    if($("#"+id+"_down-icon").attr('class') ==  "fa fa-caret-up")
+    {
+        $("tr#"+id+"").css('background-color','#353535');
+        $("tr#"+id+" td").css('color','#ffffff');
+        $("tr#"+id+" i").css('color','#ffffff');
+        $("tr#"+id+" i").css('border-color','#ffffff');
+    }
+    else
+    {
+        $("tr#"+id+"").css('background-color','#ffffff');
+        $("tr#"+id+" td").css('color','#475569');
+        $("tr#"+id+" i").css('color','#EB008B');
+        $("tr#"+id+" i").css('border-color','#EB008B');
+    }
   });
 });