diff --git a/app/Controllers/Cart_controller.php b/app/Controllers/Cart_controller.php index e98a12c..e7dfb23 100644 --- a/app/Controllers/Cart_controller.php +++ b/app/Controllers/Cart_controller.php @@ -79,8 +79,8 @@ class Cart_controller extends BaseController else { $this->session->set('user_token',$token); + $this->session->set('token',$token); $data['token'] = $token; - $data['primary_id'] = $this->request->getVar('id'); $data['table_name'] = 'package_and_pricing'; $data['count'] = 1; diff --git a/app/Views/changepassword.php b/app/Views/changepassword.php index 6964504..5311638 100644 --- a/app/Views/changepassword.php +++ b/app/Views/changepassword.php @@ -26,6 +26,8 @@ position: absolute; } + + @@ -58,13 +60,25 @@
- - - Must contain at least one number and one uppercase and one special character like !@#$%^&*() and lowercase letter, and at least 8 or more characters + placeholder="Enter password" name="password" required> --> + +
+
+

Password requirements

+
    +
  • At least one letter
  • +
  • At least one capital letter
  • +
  • At least one number
  • +
  • Be at least 8 characters
  • +
  • use any one [~,!,@,#,$,%,^,&,*,-,=,.,;,']
  • +
+
+
+
@@ -78,7 +92,56 @@
- + + + \ No newline at end of file diff --git a/app/Views/member_layout/header.php b/app/Views/member_layout/header.php index 70ee0ea..78f4b6e 100644 --- a/app/Views/member_layout/header.php +++ b/app/Views/member_layout/header.php @@ -10,7 +10,7 @@
- /assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="120" height="89"> + /assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="120" height="89">
-
@@ -76,7 +76,7 @@
@@ -90,7 +90,7 @@ diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php index e599c24..7fd7052 100644 --- a/app/Views/memberaccess.php +++ b/app/Views/memberaccess.php @@ -105,15 +105,15 @@ = 0 ; $i--) { ?> - format('M d , Y'); ?> + format('M-d-Y'); ?> Credit Expiry

'; else echo '

'.$credit_data[$i]['package_name'].'

'; ?> -

Expiry Date : format('M d , Y'); ?>

+

Expiry Date : format('M-d-Y'); ?>

Order Id :

0) @@ -135,7 +135,7 @@
Credits:
-
Expiry Date: format('M d , Y'); ?>
+
Expiry Date: format('M-d-Y'); ?>
@@ -158,14 +158,14 @@ $value) { ?> "> # - format('M d , Y'); ?> + format('M-d-Y'); ?> $ ">
" class="fa fa-caret-down" aria-hidden="true">
@@ -356,7 +366,56 @@ $('.js-example-basic-single').select2(); }); - + +