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 22:08:16 +05:30
commit 0ef13c4620
8 changed files with 198 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Config/App.php
View File

@ -19,8 +19,7 @@ class App extends BaseConfig
*/
// public string $baseURL = 'https://mprkv.co.in/devbook';
public string $baseURL = 'http://localhost/golf_backend';
// public string $baseURL = 'http://localhost:88/golf_backend';
/**
* Allowed Hostnames in the Site URL other than the hostname in the baseURL.

2
app/Views/cart.php
View File

@ -134,7 +134,7 @@
echo '<div class="col-12 col-lg-6 pb-4 text-lg-start text-center">';
}
else {
echo '<div class="col-12 col-lg-6 pb-4 text-center">';
echo '<div class="col-12 col-lg-12 pb-4 text-center">';
} ?>
<form class="coupon-field">

159
app/Views/checkout.php
View File

@ -249,23 +249,14 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<div class="row">
<div class="col-lg-8">
<div class="address-form" >
<div class="address-form mb-5" >
<form id="member_address" >
<div class="row">
<div class="col-lg-12 d-flex align-items-center mb-3">
</div>
<!-- <input type="hidden" value="<?= $userdata[0]['id']; ?>" name="id" > -->
@ -312,7 +303,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<span id="city_span_message"> </span>
</div>
<div class="col-lg-4 mb-3">
<div class="col-lg-4">
<label for="country">Country<span class="text-danger">*</span></label>
@ -373,13 +364,8 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
</div>
</br>
<div class="address-form remember-section">
<label class="rember-label" for="rememberMe">By placing your order, you agree to our company privacy policy and condition of use.
<input type="checkbox" id="rememberMe">
<span class="checkmark"></span>
</label>
</div>
<!-- Loading spinner HTML markup -->
@ -390,76 +376,10 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
</div>
<h4 class="payment-title">Payment Method</h4>
<form class="payment-form" id="fast-checkout">
<div class="wrapper">
<div class="credit-card">
<div class="row">
<div class="col-lg-12 ">
<!-- Add Payment Method Code-->
<input type="hidden" value="<?= $amount; ?>" name="amount" id="amount">
<input type="hidden" value="<?= $order_id; ?>" name="order_id" id="order_id">
<input type="hidden" value="" name="address_id" id="address_id">
<div id="card-container"></div>
<span id="payment-flow-message"></span>
<div class="text-end" style="margin-top:-45px;" id="payment-button"> <button id="card-button" type="button">Proceed to Pay</button></div>
</div>
</div>
</div>
<!-- <div class="google-pay">
<div class="row google-pay-content align-items-center">
<div class="col-lg-10 d-flex align-items-center">
<span>Google Pay</span>
</div>
<div id="google-pay-button" alt="google-pay" type="button"></div>
<div class="col-lg-2 text-end">
<img src="<?= base_url()."/public"; ?>/assets/member_images/g-pay.png" alt="" width="64" height="58"/>
</div>
</div>
</div> -->
</div>
</div>
</form>
<div class="col-lg-4 order-summary-main">
<div class="col-lg-4 order-summary-main mb-5">
<div class="order-summary">
@ -536,9 +456,78 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
</div>
</div>
<div class="col-lg-8">
<div class="address-form remember-section mb-5">
<label class="rember-label" for="rememberMe">By placing your order, you agree to our company privacy policy and condition of use.
<input type="checkbox" id="rememberMe">
<span class="checkmark"></span>
</label>
</div>
</div>
<h4 class="payment-title col-lg-8">Payment Method</h4>
<div class="wrapper col-lg-8 mb-4">
<div class="credit-card">
<form class="payment-form" id="fast-checkout">
<div class="row">
<div class="col-lg-12 ">
<!-- Add Payment Method Code-->
<input type="hidden" value="<?= $amount; ?>" name="amount" id="amount">
<input type="hidden" value="<?= $order_id; ?>" name="order_id" id="order_id">
<input type="hidden" value="" name="address_id" id="address_id">
<div id="card-container"></div>
<span id="payment-flow-message"></span>
<div class="text-end" style="margin-top:-45px;" id="payment-button"> <button id="card-button" type="button">Proceed to Pay</button></div>
</div>
</div>
<!-- <div class="google-pay">
<div class="row google-pay-content align-items-center">
<div class="col-lg-10 d-flex align-items-center">
<span>Google Pay</span>
</div>
<div id="google-pay-button" alt="google-pay" type="button"></div>
<div class="col-lg-2 text-end">
<img src="<?= base_url()."/public"; ?>/assets/member_images/g-pay.png" alt="" width="64" height="58"/>
</div>
</div>
</div> -->
</form>
</div>
</div>
</div>

2
app/Views/member_layout/header.php
View File

@ -77,7 +77,7 @@
<div class="row">
<div class="col-lg-12">
<ul>
<li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>">Home <?= session()->get('token') ?></a></li>
<li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>">Home</a></li>
<li><a href="<?php if (isset($token))
{
if ($token == '')

18
app/Views/membership.php
View File

@ -44,25 +44,25 @@
<section class="pt-5 pb-5 evo-membership">
<section class="pt-4 pb-5 evo-membership">
<div class="container">
<div class="row">
<div class="col-md-2">
<div class="col-md-1">
</div>
<div class="col-md-8">
<div class="col-md-10">
<h1 class="heading-border">Evo Membership</h1>
<p class="text-center">It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using ‘Content here, content here’, making it look like readable English.</p>
<p class="text-center">Elevate your golfing experience with our exclusive membership program designed for golf enthusiasts like you. With our credit pack, you gain access to our state-of-the-art golf simulators, allowing you to practice your swing, improve your skills, and enjoy virtual rounds of golf on some of the world's most renowned courses. Our Evo Membership offers flexibility and convenience, allowing you to redeem credits at your own pace and explore various simulation options. Whether you're a beginner looking to learn the game or a seasoned golfer seeking to enhance your technique, our golf simulator credit pack is your ticket to endless enjoyment on the greens. Join our Evo Membership today and take your golfing journey to new heights.</p>
</div>
<div class="col-md-2">
<div class="col-md-1">
</div>
@ -127,7 +127,7 @@
<td>1 hr Practice / Play</td><td class="text-center">$60</td><td>2</td></tr><tr>
<td>1/2 hr individual coaching</td><td class="text-center">$90</td><td>3</td></tr><tr>
<td>1 hr individual coaching</td><td class="text-center">$150</td><td>5</td></tr>
<tr><td colspan="3">Fitting Session</td></tr>
<tr class="fit-session"><td>Fitting Session</td><td></td><td></td></tr>
<td>Single fitting (driver, irons or woods)</td><td class="text-center">$120</td><td>4</td></tr><tr>
<td>2 hr full bag fitting (Driver, woods, irons, wedges)</td><td class="text-center">$210</td><td>7</td></tr></tbody></table></figure>
@ -211,7 +211,7 @@
<div class="row">
<div class="col-lg-6 pt-5 pb-5 pe-5 bg-white">
<div class="col-12 col-lg-6 pt-5 pb-3 pe-5 bg-white">
<h3 class="mb-3 heading-font">How it Works</h3>
@ -233,7 +233,7 @@
</div>
<div class="col-lg-6">
<div class="col-12 col-lg-6">
</div>
@ -245,7 +245,7 @@
<section class="contact-section pt-5 pb-5 text-center">
<section class="contact-section pt-4 pb-4 text-center">
<div class="container">

58
app/Views/payment.php
View File

@ -56,51 +56,54 @@
</div>
<div class="row order">
<div class="col-lg-12">
<div class="col-lg-12 ps-0 pe-0">
<div class="order-heading">Your Order</div>
</div>
<?php foreach ($memberCredits as $val) { ?>
<div class="col-lg-6">
<div class="row">
<div class="col-lg-4">
<img src="<?= base_url()."/public"; ?>/assets/member_images/cart-icon.png" alt="" width="70" height="70">
<?php foreach ($memberCredits as $val) { ?>
<div class="row total-list">
<div class="col-lg-6">
<div class="row">
<div class="col-2 col-lg-2">
<img src="<?= base_url()."/public"; ?>/assets/member_images/cart-icon.png" alt="" width="70" height="70">
</div>
<div class="col-10 col-lg-10">
<div class="product-name"><?php echo $val['package_name']." (".$val['cost']." x ".$val['pack_count'].")"; ?></div>
<div class="credits-number"><?php echo $val['credit_points']; ?> Credits</div>
<!-- <div class="credit-point">20+4 Credits Extra*</div>
<div class="credit-price">1 Credit at $22.90</div> -->
</div>
<div class="col-lg-3"></div>
</div>
<div class="col-lg-5">
<div class="product-name"><?php echo $val['package_name']." (".$val['cost']." x ".$val['pack_count'].")"; ?></div>
<div class="credits-number"><?php echo $val['credit_points']; ?> Credits</div>
<!-- <div class="credit-point">20+4 Credits Extra*</div>
<div class="credit-price">1 Credit at $22.90</div> -->
</div>
<div class="col-lg-3"></div>
</div>
</div>
<div class="col-lg-6 d-flex justify-content-end align-items-start">
<div class="order-total"><span class="price-symbol">$</span><?php echo $val['costSum']; ?></div>
<div class="col-12 col-lg-6 d-flex justify-content-end align-items-start">
<div class="order-total"><span class="price-symbol">$</span><?php echo $val['costSum']; ?></div>
</div>
</div>
<?php } ?>
</div>
<div class="total">
<div class="row total-list">
<div class="col-lg-6">
<div class="row total-list pt-0">
<div class="col-6 col-lg-6">
<div class="subtotal label">Subtotal</div>
</div>
<div class="col-lg-6 text-end">
<div class="col-6 col-lg-6 text-end">
<div class="subtotal"><span class="price-symbol">$</span><?= $Subtotal; ?></div>
</div>
</div>
<div class="row total-list">
<div class="col-lg-6">
<div class="col-4 col-lg-6">
<div class="taxes label">Taxes</div>
</div>
<div class="col-lg-2"></div>
<div class="col-lg-2 text-end">
<div class="col-2 col-lg-2"></div>
<div class="col-3 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">
<div class="taxes pst"><span class="price-symbol">$</span><?= round($Subtotal * $gst / 100 , 2); ?></div>
</div>
<?php if($pst != 0){?>
@ -114,17 +117,16 @@
<div class="col-lg-2 text-end">
<div class="taxes gst"><span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></div>
</div>
<?php }?>
</div>
<div class="row sub-total-main">
<div class="col-lg-6">
<div class="col-6 col-lg-6">
<div class="order-total label">Total</div>
</div>
<div class="col-lg-6 text-end">
<div class="col-6 col-lg-6 text-end">
<div class="order-total"><span class="price-symbol">$</span><?= round( ( $Subtotal + (($Subtotal * ($gst + $pst) ) / 100) ) , 2 ); ?></div>
</div>
</div>
@ -132,7 +134,7 @@
<div class="row dashboard">
<div class="col-lg-4"></div>
<div class="col-lg-4">
<div class="col-lg-4 text-center">
<a href="<?= base_url('member_home'); ?>" class="custom-btn">Return to Dashboard</a>
</div>
<div class="col-lg-4"></div>

50
composer.lock generated
View File

@ -186,16 +186,16 @@
},
{
"name": "codeigniter4/framework",
"version": "v4.3.5",
"version": "v4.3.6",
"source": {
"type": "git",
"url": "https://github.com/codeigniter4/framework.git",
"reference": "b41bca4ff6efd9baffdb7a1bba33f946fb8580d9"
"reference": "e3921233a20daf05ae9d2b50ca41ce97748e1d6d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/codeigniter4/framework/zipball/b41bca4ff6efd9baffdb7a1bba33f946fb8580d9",
"reference": "b41bca4ff6efd9baffdb7a1bba33f946fb8580d9",
"url": "https://api.github.com/repos/codeigniter4/framework/zipball/e3921233a20daf05ae9d2b50ca41ce97748e1d6d",
"reference": "e3921233a20daf05ae9d2b50ca41ce97748e1d6d",
"shasum": ""
},
"require": {
@ -256,7 +256,7 @@
"slack": "https://codeigniterchat.slack.com",
"source": "https://github.com/codeigniter4/CodeIgniter4"
},
"time": "2023-05-21T13:41:12+00:00"
"time": "2023-06-17T23:13:38+00:00"
},
{
"name": "daycry/cronjob",
@ -369,16 +369,16 @@
},
{
"name": "firebase/php-jwt",
"version": "v6.6.0",
"version": "v6.8.0",
"source": {
"type": "git",
"url": "https://github.com/firebase/php-jwt.git",
"reference": "5a9cf79b4a2eb347230384648cc7b0d68cd97faa"
"reference": "48b0210c51718d682e53210c24d25c5a10a2299b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/5a9cf79b4a2eb347230384648cc7b0d68cd97faa",
"reference": "5a9cf79b4a2eb347230384648cc7b0d68cd97faa",
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/48b0210c51718d682e53210c24d25c5a10a2299b",
"reference": "48b0210c51718d682e53210c24d25c5a10a2299b",
"shasum": ""
},
"require": {
@ -426,9 +426,9 @@
],
"support": {
"issues": "https://github.com/firebase/php-jwt/issues",
"source": "https://github.com/firebase/php-jwt/tree/v6.6.0"
"source": "https://github.com/firebase/php-jwt/tree/v6.8.0"
},
"time": "2023-06-13T17:11:06+00:00"
"time": "2023-06-20T16:45:35+00:00"
},
{
"name": "google/apiclient",
@ -501,7 +501,7 @@
},
{
"name": "google/apiclient-services",
"version": "v0.304.0",
"version": "v0.305.0",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-api-php-client-services.git",
@ -539,7 +539,7 @@
],
"support": {
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.304.0"
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.305.0"
},
"time": "2023-06-07T02:11:36+00:00"
},
@ -2308,16 +2308,16 @@
},
{
"name": "fakerphp/faker",
"version": "v1.22.0",
"version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/FakerPHP/Faker.git",
"reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2"
"reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/f85772abd508bd04e20bb4b1bbe260a68d0066d2",
"reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2",
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e3daa170d00fde61ea7719ef47bb09bb8f1d9b01",
"reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01",
"shasum": ""
},
"require": {
@ -2370,9 +2370,9 @@
],
"support": {
"issues": "https://github.com/FakerPHP/Faker/issues",
"source": "https://github.com/FakerPHP/Faker/tree/v1.22.0"
"source": "https://github.com/FakerPHP/Faker/tree/v1.23.0"
},
"time": "2023-05-14T12:31:37+00:00"
"time": "2023-06-12T08:44:38+00:00"
},
{
"name": "mikey179/vfsstream",
@ -2971,16 +2971,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.6.8",
"version": "9.6.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e"
"reference": "a9aceaf20a682aeacf28d582654a1670d8826778"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e",
"reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778",
"reference": "a9aceaf20a682aeacf28d582654a1670d8826778",
"shasum": ""
},
"require": {
@ -3054,7 +3054,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9"
},
"funding": [
{
@ -3070,7 +3070,7 @@
"type": "tidelift"
}
],
"time": "2023-05-11T05:14:45+00:00"
"time": "2023-06-11T06:13:56+00:00"
},
{
"name": "psr/container",

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

@ -70,6 +70,11 @@ a{
.heading-font{
font-size:26px;
}
@media (max-width: 768px){
.heading-font{
font-size:24px!important;
}
}
/* ----------------header---------------- */
.cart-menu img{ margin-right:5px; }
.header{
@ -165,6 +170,14 @@ a{
#id section{
display: none;
}
@media (min-width: 768px) and (max-width: 1210px){
.header1 ul{
margin-right:0;
}
.header ul li{
margin:0 5px;
}
}
@media only screen and (min-width: 992px) {
.nav{
display: none !important;
@ -185,6 +198,7 @@ a{
z-index:99;
margin-top:10px;
overflow: hidden;
box-shadow: 0 2px 4px 0 rgb(0 0 0 / 17%);
}
/* ----------------footer---------------- */
.footer{
@ -429,6 +443,9 @@ body.cart .quantity{
body.checkout .select2-container, body.checkout span.selection{
padding:0!important;
}
body.checkout span.select2{
width:100%!important;
}
body.checkout .select2-container--default .select2-selection--single{
border: 2px solid #E5E7EB;
height:40px;
@ -513,6 +530,11 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
border-radius:5px;
}
@media (max-width: 768px){
.checkmark{
top:8px!important;
}
}
/* When the checkbox is checked, add a blue background */
@ -563,11 +585,11 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
padding-bottom:15px;
}
.membership-img>div:last-child{
border-right-width:0;
border-width:0;
}
.presale-offer-section{
background:#f8f8f4;
padding: 80px 0 80px 0;
padding:45px 0 45px 0;
}
@media (min-width: 768px){
.membership-img{
@ -888,8 +910,7 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
background: #FFFFFF;
box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.1);
border-radius: 5px;
padding: 30px;
margin-bottom:50px;
padding: 30px;
}
.order-summary h4{
font-size: 22px;
@ -935,11 +956,13 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
.checkout .product-price, .checkout .product-total{
font-weight:500;
}
@media (min-width: 992px){
.checkout-inner .order-summary-main{
position: sticky;
top: 0;
top: 15px;
height: 100%;
}
}
/*----------------------------- Checkout End------------------------- */
/*--------------Payment Sucessful Start ----------*/
@ -991,15 +1014,14 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
color: #475569;
}
.order{
padding: 20px 0px;
border-bottom: 2px dashed #E6F1FF;
padding: 20px 0 20px 15px;
}
.total-list{
padding: 20px 0px;
padding: 20px 0!important;
border-bottom: 2px dashed #E6F1FF;
}
.sub-total-main{
padding: 20px 0px;
padding: 20px 0;
}
.dashboard button{
width: 100%;
@ -1018,8 +1040,9 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
background-color:var(--pink-color);
}
.payment .order-heading{
font-size:18px;
margin-bottom:20px;
font-size:20px;
margin-bottom:5px;
font-weight:500;
}
.payment .product-name{
font-size:20px;
@ -1253,8 +1276,7 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
float: left;
border: 1px solid #ccc;
background-color: #f1f1f1;
width:20%;
width:20%;
}
/* Style the buttons that are used to open the tab content */
@ -1295,6 +1317,11 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
padding:30px 30px 20px;
}
@media (max-width: 992px){
.tab, .tabcontent {
width:100%;
}
}
/*-----------------dashboard- start--------------*/
.dash-head{
background: #FFFFFF;
@ -1657,6 +1684,23 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px;
max-width:500px;
}
@media (max-width: 992px){
.credit-table{
margin-bottom:60px;
}
.how-works{
background-image:none!important;
}
}
.credit-table .fit-session{
background-color: var(--pink-color);
}
.credit-table .fit-session td{
border-width:0;
text-align:center;
color:#ffffff;
font-weight: 600;
}
.credit-table table{
border-collapse: collapse;
width:100%;