diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 17d18f5..adaec92 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -101,6 +101,10 @@ $routes->match(['get','post'],'/add_to_cart_package','Admin_controller::add_to_c $routes->match(['post'],'/order_details','Admin_controller::order_details'); $routes->match(['get'],'/view_credit_details/(:any)','Admin_controller::view_credit_details/$1'); +$routes->match(['get'],'/product_list','Admin_controller::product_list'); +$routes->match(['get'],'/product_edit/(:any)','Admin_controller::product_edit/$1'); +$routes->match(['post'],'/product_edit','Admin_controller::product_edit'); +$routes->match(['get','post'],'/product_add','Admin_controller::product_add'); $routes->match(['get'],'/admin_home','Dashboard::admin_home'); // $routes->match(['get'],'/member_home','Dashboard::member_home'); diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php index ac0caf8..842f775 100644 --- a/app/Controllers/Admin_controller.php +++ b/app/Controllers/Admin_controller.php @@ -81,40 +81,26 @@ class Admin_controller extends BaseController { - - $data=[]; - - //$database = \Config\Database::connect(); - - - - if($this->request->getmethod() == 'post') { $email = $this->request->getVar('email'); - //echo $email; die(); - $password = $this->request->getVar('password'); - $userdata = $this->UserModel->verifyEmail($email); - //print_r($userdata); die(); - - if($userdata) { if($userdata['is_active'] == 0) { - $this->session->setTempdata('error','Your account is deactivated',3); + $this->session->setTempdata('error','User id or password is invalid',3); $this->session->setTempdata('A_email',$this->request->getVar('email'),3); $this->session->setTempdata('A_password',$this->request->getVar('password'),3); return redirect()->to(base_url()."admin"); @@ -134,7 +120,7 @@ class Admin_controller extends BaseController else{ - $this->session->setTempdata('error','sorry wrong password entered for the Email',3); + $this->session->setTempdata('error','User id or password is invalid',3); $this->session->setTempdata('A_email',$this->request->getVar('email'),3); $this->session->setTempdata('A_password',$this->request->getVar('password'),3); return redirect()->to(base_url()."admin"); @@ -145,7 +131,7 @@ class Admin_controller extends BaseController { - $this->session->setTempdata('error','sorry Email does not exist',3); + $this->session->setTempdata('error','User id or password is invalid',3); $this->session->setTempdata('A_email',$this->request->getVar('email'),3); $this->session->setTempdata('A_password',$this->request->getVar('password'),3); return redirect()->to(base_url()."admin"); diff --git a/app/Views/cart.php b/app/Views/cart.php index 7fe20f5..53ee60e 100644 --- a/app/Views/cart.php +++ b/app/Views/cart.php @@ -39,31 +39,31 @@
-
+
/assets/member_images/cart-icon.png" width="70" height="70">
-
+
Credits
1 Credit at $
-
- - +
-
$x
- $x
+ +
+ - + +
-
-
+
+
$
Remove
@@ -84,37 +84,35 @@
Subtotal
-
- +
$
-
+
Taxes
-
- -
-
GST
+
+
+
GST
-
+
-
$
+
$
-
+
-
PST
+
PST
-
$
+
$
@@ -133,10 +131,10 @@
'; + echo '
'; } else { - echo '
'; + echo '
'; } ?>
@@ -154,7 +152,7 @@
-
+
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 400c3d4..dd95310 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -165,12 +165,19 @@ Credit Packs +
  • "> Transactions
    • +
  • diff --git a/app/Views/member_layout/footer.php b/app/Views/member_layout/footer.php index ff101f0..8e17339 100644 --- a/app/Views/member_layout/footer.php +++ b/app/Views/member_layout/footer.php @@ -49,8 +49,7 @@ else { echo base_url('membership'); - } - + } ?>">Pre-Sales Offer
  • ">Member Access
  • About Us
    • @@ -67,8 +66,8 @@
      • -
      • -
      • +
      • +
    diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php index b29c062..9a7dcd5 100644 --- a/app/Views/memberaccess.php +++ b/app/Views/memberaccess.php @@ -562,12 +562,12 @@ $(document).ready(function(){ $('#country_code_post').val(countryCode); }); - $("#mobile").click(function(){ - str = $('.iti__selected-flag').attr('title'); - remove_colon = str.replace(/\:.*/g,"$'"); - country = remove_colon.replace(/\(.*/g,"$'"); - $('#country').val(country).change(); - }); + // $("#mobile").click(function(){ + // str = $('.iti__selected-flag').attr('title'); + // remove_colon = str.replace(/\:.*/g,"$'"); + // country = remove_colon.replace(/\(.*/g,"$'"); + // $('#country').val(country).change(); + // });