diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 889e1a5..0945436 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -120,6 +120,10 @@ $routes->match(['get','post'],'/membership','Cart_controller::index');
$routes->match(['get','post'],'/add_package_cartdata','Cart_controller::add_package_cartdata');
$routes->match(['get','post'],'/view_cart/(:any)','Cart_controller::view_cart/$1');
$routes->match(['get','post'],'/continue_shopping/(:any)','Cart_controller::continue_shopping/$1');
+
+$routes->match(['get','post'],'/continue_membership/(:any)','Cart_controller::continue_shopping/$1');
+
+
$routes->match(['get','post'],'/remove_product/(:any)','Cart_controller::remove_product/$1');
$routes->match(['get','post'],'/change_count_onclick','Cart_controller::change_count_onclick');
diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php
index 1812de1..57d3f06 100644
--- a/app/Controllers/Admin_controller.php
+++ b/app/Controllers/Admin_controller.php
@@ -28,6 +28,8 @@ use App\Models\Zipcode_model;
use App\Models\Transaction_model;
+use App\Models\Country_model;
+
use DateTime;
@@ -67,6 +69,8 @@ class Admin_controller extends BaseController
$this->TransactionModel = new Transaction_model();
+ $this->CountryModel = new Country_model();
+
helper(['form', 'url']);
}
@@ -269,6 +273,7 @@ class Admin_controller extends BaseController
}
+ $data['country'] = $this->CountryModel->findAll();
//print_r($data);die();
echo view('layout/header',$userdata);
@@ -348,6 +353,8 @@ class Admin_controller extends BaseController
$data['check']= null;
+ $data['country'] = $this->CountryModel->findAll();
+
echo view('layout/header',$userdata);
echo view('user_form',$data);
diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 90652e7..508c9c1 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -34,7 +34,7 @@ use App\Models\Rule_model;
use App\Models\Zipcode_model;
-
+use App\Models\Country_model;
class Member_controller extends BaseController
@@ -76,6 +76,8 @@ class Member_controller extends BaseController
$this->ZipcodeModel = new Zipcode_model();
+ $this->CountryModel = new Country_model();
+
helper('form');
}
@@ -407,7 +409,6 @@ class Member_controller extends BaseController
foreach($zip as $row)
{
-
$output .= '';
}
@@ -423,6 +424,7 @@ class Member_controller extends BaseController
->find();
+ $data['country'] = $this->CountryModel->findAll();
echo view('layout/header',$userdata);
@@ -494,6 +496,8 @@ class Member_controller extends BaseController
$data['zipcode'] = $output;
+ $data['country'] = $this->CountryModel->findAll();
+
echo view('layout/header',$userdata);
echo view('member_form',$data);
@@ -1210,6 +1214,8 @@ class Member_controller extends BaseController
->find();
+ $data['country'] = $this->CountryModel->findAll();
+
foreach ($creditsData as $creditsDataindex => $creditsDataValue)
{
diff --git a/app/Controllers/PaymentController.php b/app/Controllers/PaymentController.php
index 8c35a92..73d67fb 100644
--- a/app/Controllers/PaymentController.php
+++ b/app/Controllers/PaymentController.php
@@ -40,6 +40,8 @@ use App\Models\Member_address_model;
use App\Models\Zipcode_model;
+use App\Models\Country_model;
+
class PaymentController extends BaseController
{
@@ -78,6 +80,8 @@ class PaymentController extends BaseController
$this->ZipcodeModel = new Zipcode_model();
+ $this->CountryModel = new Country_model();
+
}
@@ -293,6 +297,8 @@ class PaymentController extends BaseController
$data['packageArray'] = $packageArray;
+ $data['country'] = $this->CountryModel->findAll();
+
$data['userdata'] = $this->MemberModel->select('member.* , zipcode.code as zipcode')
->join('zipcode', 'member.pincode = zipcode.id', 'left')
diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php
index 2d173fd..3331fbc 100644
--- a/app/Controllers/Sendmail_controller.php
+++ b/app/Controllers/Sendmail_controller.php
@@ -446,7 +446,7 @@ class Sendmail_controller extends BaseController
//print_r($user_data);die();
- if($user_data[0]['is_email_verified'] == 0)
+ if($user_data[0]['is_email_verified'] == 0 || $user_data[0]['password'] == '')
{
@@ -485,8 +485,8 @@ class Sendmail_controller extends BaseController
// Show error message
// echo 'Email already verified.';
-
- return redirect()->to(base_url()."set_password/".md5($user_data[0]['id']));
+ $this->session->setTempdata('mail_success', "Mail already verified, Please login",3);
+ return redirect()->to(base_url());
}
diff --git a/app/Models/Country_model.php b/app/Models/Country_model.php
new file mode 100644
index 0000000..59197bd
--- /dev/null
+++ b/app/Models/Country_model.php
@@ -0,0 +1,13 @@
+
+
-
@@ -87,6 +89,29 @@
input.attr("type", "password");
}
});
+
+ $("#toggle-password1").click(function() {
+ $(this).toggleClass("fa-eye fa-eye-slash");
+ var input = $($(this).attr("toggle"));
+ if (input.attr("type") == "password") {
+ input.attr("type", "text");
+ }
+ else {
+ input.attr("type", "password");
+ }
+ });
+
+ $("#hori-pass1").change(function() {
+ const passwordPattern = /(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,}/;
+ if (passwordPattern.test($('#hori-pass1').val()))
+ {
+ $('#pass-err').html("")
+ }
+ else
+ {
+ $('#pass-err').html("Must contain at least one number
and one uppercase
and one special character like !@#$%^&*()
and lowercase letter,
and at least 8 or more characters").css('color','red')
+ }
+ });
diff --git a/app/Views/checkout.php b/app/Views/checkout.php
index c2ebf50..965014e 100644
--- a/app/Views/checkout.php
+++ b/app/Views/checkout.php
@@ -293,38 +293,59 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -145,15 +175,33 @@ if(validateEmail(email)){
{
if (response == true)
{
- alert("This mail id already exists");
- $("#email").val('');
+ $('#already_err').html("An account with this mail id already exist").css('color' , 'red');
+
+ $("#email").val('');
}
}
});
}
+$(document).ready(function(){
+ $('#email').on('keyup', function () {
+ if($('#email').val().length != 0)
+ $('#already_err').html("");
+ });
+});
+
+
}
+
+$(document).ready(function(){
+ $('#pincode').change(function() {
+ if ($('#pincode').val() == "") {
+ $('#state').val('');
+ $('#city').val('');
+ }
+ });
+});
diff --git a/app/Views/member_layout/footer.php b/app/Views/member_layout/footer.php
index ece37e7..599756c 100644
--- a/app/Views/member_layout/footer.php
+++ b/app/Views/member_layout/footer.php
@@ -1,4 +1,5 @@