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

Merge branch 'master' of bitbucket.org:venbainformationtechnology/golf_backend

Browse Source
This commit is contained in:
suseendhiran17 2023-06-20 17:04:58 +05:30
commit 32006b24fc
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -5,12 +5,11 @@
# Ignore vendor folder # Ignore vendor folder
public/vendor/ public/vendor/
# Include assets folder and its files # Include assets folder and its files
!public/assets/ !public/assets/
!public/square-js/ !public/square-js/
!public/square-stylesheets/ !public/square-stylesheets/
# Ignore
public/assets/css public/assets/css
public/assets/data public/assets/data
public/assets/fonts public/assets/fonts
@ -18,6 +17,6 @@ public/assets/images
public/assets/js public/assets/js
public/assets/libs public/assets/libs
public/assets/member_images public/assets/member_images
# Include
!public/assets/member_css !public/assets/member_css
!public/assets/member_js !public/assets/member_js

2
app/Controllers/Member_controller.php
View File

@ -263,7 +263,7 @@ class Member_controller extends BaseController
{ {
session()->remove('logged_user'); session()->remove('logged_user');
session()->remove('token');
if(!session()->get('logged_admin_user')) if(!session()->get('logged_admin_user'))
{ {
session()->destroy(); session()->destroy();

15
app/Views/checkout.php
View File

@ -373,8 +373,9 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
</div> </div>
</br> </br>
<input type="checkbox" " id="rememberMe"> <label for="rememberMe">By placing your order, you agree to our company privacy policy and condition of use.</label> <div class="address-form" >
<input type="checkbox" " id="rememberMe" > <label for="rememberMe">By placing your order, you agree to our company privacy policy and condition of use.</label>
</div>
<!-- Loading spinner HTML markup --> <!-- Loading spinner HTML markup -->
@ -618,18 +619,16 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
</script> --> </script> -->
<script> <script>
$(document).ready(function() { $(document).ready(function() {
//$("#card-button").removeAttr('disabled');
$('#card-button').prop("disabled", true); $('#card-button').prop("disabled", true);
$('.js-example-basic-single').select2(); $('.js-example-basic-single').select2();
// $("#fast-checkout").css('display','none');
// $(".payment-title").css('display','none');
}); });
$('#card-button').click(function() { $('#card-button').click(function() {
// $('#card-button').prop("disabled", true); // $('#card-button').prop("disabled", true);
// $('#loading-spinner-overlay').css('visibility', 'visible'); // $('#loading-spinner-overlay').css('visibility', 'visible');
// $('#card-button').prop("disabled", true);
// $('#loading-spinner-overlay').css('visibility', 'visible');
}); });

4
app/Views/payment.php
View File

@ -97,17 +97,19 @@
<div class="taxes label">Taxes</div> <div class="taxes label">Taxes</div>
</div> </div>
<div class="col-lg-2"></div> <div class="col-lg-2"></div>
<?php if($pst != 0){?>
<div class="col-lg-2 text-end"> <div class="col-lg-2 text-end">
<div class="taxes pst label">PST (<?= $pst; ?>%)</div> <div class="taxes pst label">PST (<?= $pst; ?>%)</div>
</div> </div>
<div class="col-lg-2 text-end"> <div class="col-lg-2 text-end">
<div class="taxes pst"><span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></div> <div class="taxes pst"><span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></div>
</div> </div>
<?php }?>
<div class="col-lg-6"> <div class="col-lg-6">
</div> </div>
<div class="col-lg-2"></div> <div class="col-lg-2"></div>
<div class="col-lg-2 text-end"> <div class="col-lg-2 text-end">
<div class="taxes gst label">GST (<?= $gst; ?>%)</div> <div class="taxes gst label">GST :</div>
</div> </div>
<div class="col-lg-2 text-end"> <div class="col-lg-2 text-end">
<div class="taxes gst"><span class="price-symbol">$</span><?= round($Subtotal * $gst / 100 , 2); ?></div> <div class="taxes gst"><span class="price-symbol">$</span><?= round($Subtotal * $gst / 100 , 2); ?></div>