GOLF/golf_backend
GOLF/golf_backend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssChage:GWM

Browse Source
This commit is contained in:
sriramv 2023-06-22 17:04:13 +05:30
parent 4c7b940550
commit 6724448c9c
8 changed files with 130 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Config/Routes.php
View File

@ -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');

20
app/Controllers/Admin_controller.php
View File

@ -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");

50
app/Views/cart.php
View File

@ -39,31 +39,31 @@
<!-- List of Products -->
<div class="row border-bottom pt-4 pb-4">
<div class="col-1 mt-2">
<div class="col-2 col-lg-1 mt-2">
<img src="<?= base_url()."/public"; ?>/assets/member_images/cart-icon.png" width="70" height="70">
</div>
<div class="col-7">
<div class="col-10 col-lg-7">
<div class="product-name"><?= $value['package_name'] ?></div>
<div class="credits-number"><?= $value['credit'] ?> Credits</div>
<div class="credit-point"><?= $value['offer_label'] ?></div>
<div class="credit-price">1 Credit at $<?= round($value['cost'] / $value['credit'] , 2); ?></div>
</div>
<div class="col-2">
<div class="col-6 col-lg-2 mt-4">
<div class="quantity">
<div class="d-flex"><span class="price-symbol">$</span><span class="price"><?= $value['cost']; ?></span><span>x</span></div>
<input type="number" onKeyDown="return false" id="<?php echo $key; ?>" class="input-text qty text" name="count[]" value="<?php if ($pack_id[$key]['count'] == 0) {
<div class="d-flex"><span class="price-symbol">$</span><span class="price"><?= $value['cost']; ?></span><span>x</span></div>
<div class="qty-no">
<input type="number" onKeyDown="return false" id="<?php echo $key; ?>" class="input-text qty text" name="count[]" value="<?php if ($pack_id[$key]['count'] == 0) {
echo 1;
} else {
echo $pack_id[$key]['count'];
}
?>" title="Qty" size="4" min="1" max="" step="1" placeholder="" inputmode="numeric" autocomplete="off"/>
<!-- <button type="button" class="plus"><i class="fa fa-angle-up"></i></button>
<button type="button" class="minus"><i class="fa fa-angle-down"></i></button> -->
<button type="button" class="plus"><i class="fa fa-angle-up"></i></button>
<button type="button" class="minus"><i class="fa fa-angle-down"></i></button> </div>
</div>
</div>
<div class="col-2 text-right-price">
</div>
<div class="col-6 col-lg-2 mt-4 text-right-price">
<div class="product-price <?php echo $key; ?>">$<?= $value['cost'] * $pack_id[$key]['count'] ?></div>
<input id="cost_<?php echo $key; ?>" value="<?= $value['cost'] ?>" type="hidden">
<div class="remove-product"><a href="<?= base_url('/remove_product/').md5($pack_id[$key]['id']); ?>">Remove</a></div>
@ -84,37 +84,35 @@
<div class="col-3 pb-4">
<div class="subtotal-label">Subtotal</div>
</div>
<div class="col-9">
<div class="col-9">
<div class="subtotal-price text-right-price subtotal"><span class="price-symbol">$</span><?= $cost_sum; ?></div>
</div>
</div>
<!-- Product Tax-->
<div class="row">
<div class="col-lg-6">
<div class="col-6 col-lg-6">
<div class="subtotal-label">Taxes</div>
</div>
<div class="col-lg-2"></div>
<div class="col-lg-2 text-end">
<div class="taxes pst-label">GST </div>
<div class="col-1 col-lg-2"></div>
<div class="col-2 col-lg-2 text-end">
<div class="taxes pst-label">GST</div>
</div>
<div class="col-lg-2 text-end">
<div class="col-3 col-lg-2 text-end">
<input id="gst" value="<?= $gst[0]['value'] ?>" type="hidden">
<div class="subtotal-price text-right-price pst"><span class="price-symbol">$</span><?= $cost_sum * $gst[0]['value'] / 100; ?></div>
<div class="subtotal-price text-right-price gst"><span class="price-symbol">$</span><?= $cost_sum * $gst[0]['value'] / 100; ?></div>
</div>
<div class="col-lg-6">
<div class="col-6 col-lg-6">
</div>
<?php if ($pst[0]['value'] != 0) { ?>
<div class="col-lg-2"></div>
<div class="col-lg-2 text-end">
<div class="taxes gst-label">PST </div>
<div class="taxes gst-label">PST</div>
</div>
<div class="col-lg-2 text-end">
<input id="pst" value="<?= $pst[0]['value'] ?>" type="hidden">
<div class="subtotal-price text-right-price gst"><span class="price-symbol">$</span><?= $cost_sum * $pst[0]['value'] / 100; ?></div>
<div class="subtotal-price text-right-price pst"><span class="price-symbol">$</span><?= $cost_sum * $pst[0]['value'] / 100; ?></div>
</div>
<?php } ?>
</div>
@ -133,10 +131,10 @@
<!-- Product Sub total-->
<div class="row pt-4 pb-4">
<?php if (!isset($msg)) {
echo '<div class="col-3 pb-4">';
echo '<div class="col-12 col-lg-6 pb-4 text-lg-start text-center">';
}
else {
echo '<div class="col-12 pb-4 text-center">';
echo '<div class="col-12 col-lg-6 pb-4 text-center">';
} ?>
<form class="coupon-field">
@ -154,7 +152,7 @@
</form>
</div>
<?php if (!isset($msg)) { ?>
<div class="col-9 checkout-btn">
<div class="col-12 col-lg-6 checkout-btn text-center text-lg-end">
<button type="submit">Checkout</button>
</div>
<?php } ?>

7
app/Views/layout/header.php
View File

@ -165,12 +165,19 @@
<span> Credit Packs </span>
</a>
</li>
<!-- <li>
<a href="<?= base_url()."product_list"; ?>">
<i class="mdi mdi-currency-usd"></i>
<span> Product </span>
</a>
</li> -->
<li>
<a href="<?= base_url()."transactions_list"; ?>">
<i class="mdi mdi-currency-usd"></i>
<span> Transactions </span>
</a>
</li>
<li>
<a href="#sidebarTables" data-toggle="collapse">
<i class="ri-settings-3-line"></i>

7
app/Views/member_layout/footer.php
View File

@ -49,8 +49,7 @@
else
{
echo base_url('membership');
}
}
?>">Pre-Sales Offer</a></li>
<li><a href="<?php if(session()->has('logged_user')) { echo base_url()."member_home"; }else{ echo base_url(); } ?>">Member Access</a></li>
<li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/about-us/">About Us</a></li>
@ -67,8 +66,8 @@
</div>
<ul class="footer-sociallink">
<li><a href="https://twitter.com/" target="_blank"><i class="fa fa-twitter"></i></a></li>
<li><a href="https://facebook.com/" target="_blank"><i class="fa fa-facebook"></i></a></li>
<li><a href="https://www.instagram.com/" target="_blank"><i class="fa fa-instagram"></i></a></li>
<li><a href="https://www.facebook.com/GolfEvolutionKelowna" target="_blank"><i class="fa fa-facebook"></i></a></li>
<li><a href="https://www.instagram.com/GolfEvolutionKelowna/" target="_blank"><i class="fa fa-instagram"></i></a></li>
</ul>
</div>
</div>

12
app/Views/memberaccess.php
View File

@ -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();
// });
</script>
<script>

71
public/assets/member_css/front-style.css
View File

@ -289,12 +289,17 @@ a{
padding:15px 0;
}
/*Cart*/
@media (max-width: 992px){
body.cart .quantity{
margin:0;
}
}
@media (min-width: 1100px){
.cart .cart-inner .container{
max-width:900px!important;
}
}
.cart .quantity{ display:flex; align-items:center; font-weight: 600;}
.cart .quantity{ display:flex; align-items:center; justify-content:end; font-weight: 600;}
.cart .quantity span:last-child{ margin-right:10px; }
.cart .quantity .price{ margin-right:10px; }
.heading-border{
@ -312,6 +317,26 @@ a{
left:48.5%;
bottom:-15px;
}
@media (max-width: 680px){
.cart .quantity{
flex-wrap:wrap;
}
}
@media (max-width: 992px){
.heading-border{
font-size:26px;
}
.heading-border::before{
left: 45.5%;
}
.cart .product-price{
font-size: 21px!important;
}
.cart .product-name{
font-size: 22px!important;
}}
.cart, .cart .header{
background:#F9FAFB;
}
@ -326,21 +351,27 @@ a{
align-items: center;
justify-content: flex-end;
}
.quantity{
position: relative;
margin:0 auto;
.quantity .qty-no{
position: relative;
}
.quantity, .quantity input{
width:80px;
.quantity input{
width:80px;
}
.quantity input[type=number]::-webkit-inner-spin-button,
.quantity input[type=number]::-webkit-outer-spin-button {
-webkit-appearance: none;
margin: 0;
}
.quantity .plus, .quantity .minus{
position:absolute;
right:0;
right:9px;
background-color: transparent;
border-width:0;
border-width: 0;
padding: 0;
line-height: 28px;
}
.quantity .plus{
top:0;
top:-2px;
}
.quantity input{
height:45px;
@ -350,7 +381,7 @@ a{
padding:10px;
}
.quantity .minus{
bottom:0;
bottom:-3px;
}
.remove-product a{
color:var(--pink-color);
@ -444,6 +475,12 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
.remember-section{
padding-bottom:20px!important;
}
.remember-section a{
color: var(--blue-color);
}
.remember-section a:hover{
color: var(--pink-color);
}
.rember-label {
display: block;
position: relative;
@ -1104,6 +1141,18 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
overflow-y:scroll;
background-color: #ffffff;
}
.account-width.right-panel-active .sign-up-container::-webkit-scrollbar-track {
background-color: #f5f5f5;
}
.account-width.right-panel-active .sign-up-container::-webkit-scrollbar-thumb {
background-color: #596a7e;
border-radius: 15px;
height: 5px;
}
.account-width.right-panel-active .sign-up-container::-webkit-scrollbar {
width: 8px;
background-color: #f5f5f5;
}
@keyframes show {
0%, 49.99% {
@ -1658,4 +1707,4 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
position: absolute;
top:0;
transform: rotate(45deg);
}
}

25
public/assets/member_js/ajax.js
View File

@ -17,6 +17,27 @@ $(document).ready(function(){
});
});
$(document).on( 'click', 'button.plus, button.minus', function() {
var qty = $( this ).parent( '.qty-no' ).find( '.qty' );
var val = parseFloat(qty.val());
var max = parseFloat(qty.attr( 'max' ));
var min = parseFloat(qty.attr( 'min' ));
var step = parseFloat(qty.attr( 'step' ));
if ( $( this ).is( '.plus' ) ) {
if ( max && ( max <= val ) ) {
qty.val( max ).change();
} else {
qty.val( val + step ).change();
}
} else {
if ( min && ( min >= val ) ) {
qty.val( min ).change();
} else if ( val > 1 ) {
qty.val( val - step ).change();
}
}
});
$(document).ready(function(){
$(".input-text").change(function(){
@ -198,7 +219,7 @@ $(document).ready(function(e){
}
else
{
$('#error_np').html("Old password and new passowrd is same").css('color' , 'red');
$('#error_np').html("Old password and new password is same").css('color' , 'red');
}
}
else
@ -257,7 +278,7 @@ $('#new_password, #confirm_password').on('keyup', function () {
}
if ($('#old_password').val() == $('#new_password').val())
{
$('#error_np').html("Old password and new passowrd is same");
$('#error_np').html("Old password and new password is same");
}
if ($('#confirm_password').val() == "" )
{