From 7945ed7fb91daad5a9c6486446770cc4e816d981 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Tue, 20 Jun 2023 15:43:31 +0530
Subject: [PATCH] susee

---
 app/Views/memberaccess.php | 22 ++++++++++++++++------
 app/Views/myaccount.php    | 12 ++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index 68723f9..b939602 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -19,6 +19,11 @@
     
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
     <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
+    <link
+     rel="stylesheet"
+     href="https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/17.0.8/css/intlTelInput.css"
+   />
+   <script src="https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/17.0.8/js/intlTelInput.min.js"></script>
     <style>
     .field-icon {
     float: right;
@@ -113,7 +118,9 @@
                        else
                        echo '<p>'.$credit_data[$i]['package_name'].'</p>';
                        ?>
-                        <p class="mb-0">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 class="mb-0">Validity : One year from the date of opening</p>
+
                         <p>Order Id : <?php echo $credit_data[$i]['order_id'] ?></p></td>
                        <?php 
                        if($credit_data[$i]['running_balance'] > 0) 
@@ -126,7 +133,7 @@
                     <?php } ?>
                 </table>
 
-                <div class="row dash-foot mb-3">
+                <!-- <div class="row dash-foot mb-3">
                         <div class="col-lg-4">
                             <div>Upcoming Credit Expiry:</div>
                         </div>
@@ -138,7 +145,7 @@
                             <div>Expiry Date: <span><?php if($expiring_date){ $date = new DateTime($expiring_date);    echo $date->format('M d , Y'); }?></span></div>
                             </div>
 
-                </div>
+                </div> -->
             </div>
         </div>
                     </div>
@@ -180,7 +187,9 @@
                                           <?php foreach ($value['credit_data'] as $credit_datakey => $credit_data_value) { ?>
                                             <tr class="table-grey <?= $key."_table-grey" ?>">
                                             <td><?= $credit_data_value['package_name'] ?></td>
-                                            <td><p>Pack Cost : $<?= $credit_data_value['cost'] ?></p><p>Pack Credits : <?= $credit_data_value['credit_points'] ?> Nos</p><p>Pack Expiry : <?php $date = new DateTime($credit_data_value['expiring_date']);    echo $date->format('M d , Y');  ?></p></td>
+                                            <td><p>Pack Cost : $<?= $credit_data_value['cost'] ?></p><p>Pack Credits : <?= $credit_data_value['credit_points'] ?> Nos</p>
+                                            <!-- <p>Pack Expiry : <?php $date = new DateTime($credit_data_value['expiring_date']);    echo $date->format('M d , Y');  ?></p> -->
+                                        </td>
                                             <td><?= $credit_data_value['pack_count'] ?></td>
                                             <td><span>$</span><?= $credit_data_value['costSum'] ?></td>
                                             <td></td>
@@ -249,7 +258,8 @@
                 </div>
                 <div class="col-6 col-lg-6 mb-3">
                     <label for="street_address">Mobile</label><br>
-                    <input type="text" name="mobile" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1').replace(/^0[^.]/, '0');" id="mobile" value="<?= $profile[0]['mobile']?>">
+                    <!-- id="phone" type="tel" name="phone" -->
+                    <input type="text" name="mobile" id="mobile" value="<?= $profile[0]['mobile']?>">
                 </div>
                 <div class="col-6 col-lg-6">
                     <label>Select your gender</label>
@@ -269,7 +279,7 @@
                     <input type="text" name="city" id="city" value="<?= $profile[0]['city']?>">
                 </div>
                 <div class="col-4 col-lg-4 mb-3">
-                    <label for="state">State</label><br>
+                    <label for="state">Province</label><br>
                     <input type="text" name="state" id="state" value="<?= $profile[0]['state']?>">
                 </div>
                 <div class="col-4 col-lg-4 mb-3">
diff --git a/app/Views/myaccount.php b/app/Views/myaccount.php
index 7f75b6f..b7a91e6 100644
--- a/app/Views/myaccount.php
+++ b/app/Views/myaccount.php
@@ -129,22 +129,22 @@
                         <input type="email" class="form-control" required name="confirm_email" onpaste="disablePaste(event)" placeholder="Enter your email id" id="cemail"/> 
                         <span id="email_match"></span>
                     </div>
-                    <!-- <div class="col-12 mb-3">
+                    <div class="col-12 mb-3">
                         <label for="mobile">Mobile Number</label>
                         <input type="tel" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1').replace(/^0[^.]/, '0');" class="form-control" data-parsley-type="number" name="mobile" placeholder="Enter your mobile number" id="mobile"/> 
                     </div>
-                    <div class="col-12 mb-3">
+                    <!-- <div class="col-12 mb-3">
                         <label for="mobile">Address</label>
                         <input type="text" class="form-control" data-parsley-type="text" name="address" placeholder="Enter your address" id="hori-pass1"/> 
-                    </div>
-                    <div class="col-12 mb-3">
+                    </div> -->
+                    <div class="col-6 mb-3">
                         <label for="mobile">Password</label>
                         <input required parsley-type="password" class="form-control" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,}"  name="password" placeholder="Password" id="hori-pass"/> 
                     </div>
-                    <div class="col-12 mb-3">
+                    <div class="col-6 mb-3">
                         <label for="mobile">Confirm Password</label>
                         <input required parsley-type="password" class="form-control" data-parsley-equalto="#hori-pass" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,}"  name="cpassword" placeholder="Password" id="cpassword"/> 
-                    </div> -->
+                    </div>
                 </div>                                                   
                 <button class="signup-btn" type="submit">Register</button>
             </form>