From 36addf472e43f8e8d2dbca54c1d79312e76c41d5 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Thu, 8 Jun 2023 12:03:02 +0530
Subject: [PATCH] susee

---
 app/Controllers/Member_controller.php   |  5 ++++-
 app/Controllers/Sendmail_controller.php |  3 ++-
 app/Views/checkout.php                  |  4 ++--
 app/Views/member_form.php               | 18 ++++++++---------
 app/Views/memberaccess.php              | 27 +++++++++++++++----------
 app/Views/myaccount.php                 | 12 +++++++----
 app/Views/payment.php                   |  6 +++---
 7 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 8f9e918..7310d3a 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -336,7 +336,10 @@ class Member_controller extends BaseController
 		   $user_data = $this->MemberModel->where('md5(id)', $id)->find();
 		   $this->session->setTempdata('id',$user_data[0]['id'],3);
 		   $this->session->setTempdata('email',$user_data[0]['email'],3);
-		   $this->session->setTempdata('mail_success', "Email verification sucessfully",3);
+		   if(!$user_data[0]['password'] == null)
+		   $this->session->setTempdata('mail_success', "Email verification sucessfull",3);
+		   else
+		   $this->session->setTempdata('mail_success', "Email already verified . Please set password",3);
 		   return view('changepassword.php');
 		}
 	}
diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php
index ea44189..88969fa 100644
--- a/app/Controllers/Sendmail_controller.php
+++ b/app/Controllers/Sendmail_controller.php
@@ -225,7 +225,8 @@ class Sendmail_controller extends BaseController
             else
             {
              // Show error message
-             echo 'Email already verified.';
+            //  echo 'Email already verified.';
+             return redirect()->to(base_url()."set_password/".md5($user_data[0]['id']));
             }
         }
         else
diff --git a/app/Views/checkout.php b/app/Views/checkout.php
index 6801011..2202cd9 100644
--- a/app/Views/checkout.php
+++ b/app/Views/checkout.php
@@ -230,11 +230,11 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
                     </div>
                     <div class="row item2">
                         <div class="col-lg-6 col-6"><p>PST (<?= $pst; ?>%):</p></div>
-                        <div class="col-lg-6 col-6 text-end"><p><span class="price-symbol">$</span><?= round($amount * $pst / 100); ?></p></div>
+                        <div class="col-lg-6 col-6 text-end"><p><span class="price-symbol">$</span><?= round($amount * $pst / 100 , 2); ?></p></div>
                     </div>
                     <div class="row item3">
                         <div class="col-lg-6 col-6"><p>GST (<?= $gst; ?>%):</p></div>
-                        <div class="col-lg-6 col-6 text-end"><p><span class="price-symbol">$</span><?= round($amount * $gst / 100); ?></p></div>
+                        <div class="col-lg-6 col-6 text-end"><p><span class="price-symbol">$</span><?= round($amount * $gst / 100 , 2); ?></p></div>
                     </div>
                     <div class="row order2">
                         <div class="col-lg-6 col-6"><h5>Order Total:</h5></div>
diff --git a/app/Views/member_form.php b/app/Views/member_form.php
index 5dfacee..7c5ab61 100644
--- a/app/Views/member_form.php
+++ b/app/Views/member_form.php
@@ -79,30 +79,30 @@
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">Country<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <input type="text"  class="form-control"  name="country" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['country'];} ?>" placeholder="Country">
-                                                <!-- <select id="selectize-select"   class="form-control country" name="country" id="country">
+                                                <!-- <input type="text"  class="form-control"  name="country" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['country'];} ?>" placeholder="Country"> -->
+                                                <select id="selectize-select"   class="form-control country" name="country" id="country">
                                                 <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['country']; ?>"> <?= $Memberdata[0]['country_name']; ?> </option>   <?php } ?>
                                                 <?=  $country; ?>  
-                                                </select> -->
+                                                </select>
                                                 </div>
                                             </div>
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">State<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <input type="text"  class="form-control"  name="state" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['state'];} ?>" placeholder="State">
-                                                <!-- <select id="selectize-select"   class="form-control state" name="state" id="state"> 
+                                                <!-- <input type="text"  class="form-control"  name="state" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['state'];} ?>" placeholder="State"> -->
+                                                <select id="selectize-select"   class="form-control state" name="state" id="state"> 
                                                 <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['state']; ?>"> <?= $Memberdata[0]['state_name']; ?> </option>   <?php } ?>
-                                                </select> -->
+                                                </select>
                                                 </div>
                                             </div>
                                         
                                              <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">City<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <input type="text"  class="form-control"  name="city" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['city'];} ?>" placeholder="City">
-                                                <!-- <select id="selectize-select"   class="form-control city" name="city" id="city">
+                                                <!-- <input type="text"  class="form-control"  name="city" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['city'];} ?>" placeholder="City"> -->
+                                                <select id="selectize-select"   class="form-control city" name="city" id="city">
                                                 <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['city']; ?>"> <?= $Memberdata[0]['city_name']; ?> </option>   <?php } ?>
-                                                </select> -->
+                                                </select>
                                                 </div>
                                             </div>
                                             <div class="form-group row">
diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index 07968e9..ae6d085 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -70,7 +70,7 @@
                     </div>
                     <div class="col-lg-7 text-center">
                         <h1><?= $avaiable_credit; ?></h1>
-                        <p>Credit Available</p>
+                        <?php if($avaiable_credit <= 1) { echo '<p>Credit Available</p>'; } else { echo '<p>Credits Available</p>'; }  ?>
                     </div>
                 </div>
                       
@@ -90,7 +90,7 @@
                     </tr>
                     <?php for( $i = count($credit_data) - 1; $i >= 0 ; $i--) { ?>
                        <tr>
-                       <td><?php $date = new DateTime($credit_data[$i]['created_at']);    echo $date->format('d-M-Y');  ?></td>
+                       <td><?php $date = new DateTime($credit_data[$i]['created_at']);    echo $date->format('M-d-Y');  ?></td>
                        <td>
                        <?php 
                        if($credit_data[$i]['expiring_date'] <  date('m-d-Y', time())) 
@@ -98,7 +98,7 @@
                        else
                        echo '<p>'.$credit_data[$i]['package_name'].'</p>';
                        ?>
-                        <p>Expiry Date:<?= $credit_data[$i]['expiring_date'] ?></p></td>
+                        <p>Expiry Date:<?php $date = new DateTime($credit_data[$i]['expiring_date']);    echo $date->format('M-d-Y'); ?></p></td>
                        <?php 
                        if($credit_data[$i]['running_balance'] > 0) 
                        echo '<td><i class="fa fa-caret-up" aria-hidden="true">'.$credit_data[$i]['running_balance'].'</i> </td>';
@@ -117,10 +117,10 @@
                     <?php foreach ($credit_data as $key => $value) { 
                         if($value['running_balance'] != 0) { ?>
                             <div class="col-lg-4">
-                            <div>No of Credit: <span><?= $value['running_balance'] ?></span></div>
+                            <div>Credits: <span><?= $value['running_balance'] ?></span></div>
                             </div>
                             <div class="col-lg-4">
-                            <div>Expiry Date: <span><?= $value['expiring_date'] ?></span></div>
+                            <div>Expiry Date: <span><?php $date = new DateTime($value['expiring_date']);    echo $date->format('M-d-Y'); ?></span></div>
                             </div>
                         <?php } 
                     break; } ?>
@@ -239,7 +239,13 @@
                         <div class="col-5 col-lg-5"><input type="radio" name="gender" value="non-binary" id="gender"  <?php if($profile[0]['gender'] == 'non-binary') { echo 'checked';} ?>><label for="non-binary">Non-binary</label></div>
                     </div>
                 </div>
-
+                <div class="col-4 col-lg-4 mb-3">
+                    <label for="zipcode">Zip Code</label><br>
+                    <input type="text" name="pincode" id="zipcode" value="<?= $profile[0]['pincode']?>">
+                    <select id="selectize-select"   class="form-control city" name="city" id="city">
+                    <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['city']; ?>"> <?= $Memberdata[0]['city_name']; ?> </option>   <?php } ?>
+                    </select>
+                </div>
                 <div class="col-4 col-lg-4 mb-3">
                     <label for="city">City</label><br>
                     <input type="text" name="city" id="city" value="<?= $profile[0]['city']?>">
@@ -248,10 +254,6 @@
                     <label for="state">State</label><br>
                     <input type="text" name="state" id="state" value="<?= $profile[0]['state']?>">
                 </div>
-                <div class="col-4 col-lg-4 mb-3">
-                    <label for="zipcode">Zip Code</label><br>
-                    <input type="text" name="pincode" id="zipcode" value="<?= $profile[0]['pincode']?>">
-                </div>
 
                 <div class="col-6 col-lg-6">
                     <div id="address-btn" class="custom-btn">save</div>
@@ -272,7 +274,10 @@
                     <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>
-                        <input type="text" name="password" id="new_password" required>
+                        <input type="text" 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>
                     </div>
                     <div class="col-6 col-lg-6"></div>
                     <div class="col-6 col-lg-6 mb-3">
diff --git a/app/Views/myaccount.php b/app/Views/myaccount.php
index f356cd1..0c1f631 100644
--- a/app/Views/myaccount.php
+++ b/app/Views/myaccount.php
@@ -47,9 +47,13 @@
         <form method="post" action="<?= base_url()."register"; ?>" role="form" class="parsley-examples">
                 <h1>Create Account</h1> 
                 <div class="row">
-                    <div class="col-12 mb-3">
-                        <label for="username">Username</label>
-                        <input type="text" class="form-control" required parsley-type="text" name="name" placeholder="Enter your username" id="username"/> 
+                    <div class="col-6 mb-3">
+                        <label for="username">First Name</label>
+                        <input type="text" class="form-control" required parsley-type="text" name="name" placeholder="Enter your firstname" id="username"/> 
+                    </div>
+                    <div class="col-6 mb-3">
+                        <label for="username">Last Name</label>
+                        <input type="text" class="form-control" required parsley-type="text" name="last_name" placeholder="Enter your lastname" id="lastname"/> 
                     </div>
                     <div class="col-12 mb-3">
                         <label for="loginemail">Email Id</label>
@@ -91,7 +95,7 @@
                         <input type="password" id="password" name="password" value="admin" placeholder="Password" />
                     </div>
                 </div>                                    
-                <button class="signin-btn" type="submit">Login In</button>
+                <button class="signin-btn" type="submit">Login</button>
                 <a href="<?=  base_url()."forgot_password"; ?>" class="forget-pwd">Forgot your password?</a>
             </form>
         </div>
diff --git a/app/Views/payment.php b/app/Views/payment.php
index 4f6e1c0..cdafc3f 100644
--- a/app/Views/payment.php
+++ b/app/Views/payment.php
@@ -43,7 +43,7 @@
                                 <div class="trans-id"><?= $order_id; ?></div>
                             </div>
                             <div class="aside-content">
-                                <div class="trans-date label">Transactions Date</div>
+                                <div class="trans-date label">Transaction Date</div>
                                 <div class="trans-date"><?= $formattedDate; ?></div>
                             </div>
                             <div class="aside-content aside-content-last">
@@ -99,7 +99,7 @@
                                 <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); ?></div>                            
+                               <div class="taxes pst"><span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></div>                            
                             </div>
                             <div class="col-lg-6">                               
                             </div>
@@ -108,7 +108,7 @@
                                 <div class="taxes gst label">GST(<?= $gst; ?>%)</div>                            
                             </div>
                             <div class="col-lg-2 text-end">
-                               <div class="taxes gst"><span class="price-symbol">$</span><?= round($Subtotal * $gst / 100); ?></div>                            
+                               <div class="taxes gst"><span class="price-symbol">$</span><?= round($Subtotal * $gst / 100 , 2); ?></div>                            
                             </div>
                         </div>