merge:GWM
This commit is contained in:
parent
8fa4894c2f
commit
4d38fae6da
5
.gitignore
vendored
5
.gitignore
vendored
@ -5,12 +5,11 @@
|
||||
|
||||
# Ignore vendor folder
|
||||
public/vendor/
|
||||
|
||||
# Include assets folder and its files
|
||||
!public/assets/
|
||||
!public/square-js/
|
||||
!public/square-stylesheets/
|
||||
|
||||
# Ignore
|
||||
public/assets/css
|
||||
public/assets/data
|
||||
public/assets/fonts
|
||||
@ -18,6 +17,6 @@ public/assets/images
|
||||
public/assets/js
|
||||
public/assets/libs
|
||||
public/assets/member_images
|
||||
|
||||
# Include
|
||||
!public/assets/member_css
|
||||
!public/assets/member_js
|
||||
|
||||
@ -263,7 +263,7 @@ class Member_controller extends BaseController
|
||||
{
|
||||
|
||||
session()->remove('logged_user');
|
||||
|
||||
session()->remove('token');
|
||||
if(!session()->get('logged_admin_user'))
|
||||
{
|
||||
session()->destroy();
|
||||
|
||||
@ -618,18 +618,16 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
|
||||
</script> -->
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
//$("#card-button").removeAttr('disabled');
|
||||
|
||||
$('#card-button').prop("disabled", true);
|
||||
$('.js-example-basic-single').select2();
|
||||
// $("#fast-checkout").css('display','none');
|
||||
// $(".payment-title").css('display','none');
|
||||
|
||||
});
|
||||
|
||||
$('#card-button').click(function() {
|
||||
// $('#card-button').prop("disabled", true);
|
||||
// $('#loading-spinner-overlay').css('visibility', 'visible');
|
||||
// $('#card-button').prop("disabled", true);
|
||||
// $('#loading-spinner-overlay').css('visibility', 'visible');
|
||||
// $('#loading-spinner-overlay').css('visibility', 'visible');
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user