git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change read NFC UI

Browse Source
This commit is contained in:
nyanlinhtut
2023-05-25 13:46:59 +06:30
parent fe6b1057f3
commit 34b7cbb178
8 changed files with 180 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/assets/javascripts/addorder.js
View File

@@ -1194,11 +1194,26 @@ $(function() {
// Pay Discount for Payment
$("#create_pay_order").on('click', function(e){
// $("#create_pay_order").on('click', function(e){
// $(this).prop("disabled", true);
// $("#create_order").prop("disabled", true);
// $("#read_modal").attr('data-for', 'member');
// e.preventDefault();
// getCardNo();
// onScan.attachTo(document, {
// onScan: function(sCode) {
// setCardNo(sCode)
// }
// });
// });
$("#read_modal").on('shown.bs.modal', function(e) {
$(this).prop("disabled", true);
$("#create_pay_order").prop("disabled", true);
$("#create_order").prop("disabled", true);
$("#sxModal").show();
$("#sxModal").attr('data-for', 'member');
$("#read_modal").attr('data-for', 'member');
e.preventDefault();
getCardNo();
@@ -1209,14 +1224,21 @@ $(function() {
});
});
$("#sxModal .btn_cancel").on('click',function(){
$("#read_modal #close").on('click',function(){
if ($("#order-items-table tr").length > 1){
$("#create_pay_order").prop("disabled", false);
$("#create_order").prop("disabled", false);
}
$("#sxModal").hide();
$("#read_modal").modal('hide');
});
$('#read_modal').on('hidden.bs.modal', function () {
if ($("#order-items-table tr").length > 1) {
$("#create_pay_order").prop("disabled", false);
$("#create_order").prop("disabled", false);
}
})
//click item row for update qty
$('.summary-items').on('click', '.item_box', function(){
$(this).attr('data-active',true);
@@ -1249,6 +1271,11 @@ $(function() {
$('#sx_item_set_detailModal').on('click','#close', function(){
$("#sx_item_set_detailModal").css({ 'display': "none" });
});
$('#read_modal').on('click','#close', function(){
$("#read_modal").css({ 'display': "none" });
});
//click save buttom after change qty
$(document).on('click','#save', function(){
if ($('#modal-qty').val()>0) {

6
app/assets/javascripts/foodcourt/addorder.js
View File

@@ -6,12 +6,12 @@ function getCardNo(){
function setCardNo(cardNo){
if(cardNo.length == 16){
$("#paypar_account_no").val(cardNo);
if ($("#sxModal").attr("data-for") == 'member') {
if ($("#read_modal").attr("data-for") == 'member') {
member_card(cardNo)
} else if ($("#sxModal").attr('data-for') == 'payment') {
} else if ($("#read_modal").attr('data-for') == 'payment') {
pay_with_card(cardNo);
}
$("#sxModal").hide();
$("#read_modal").modal('hide');
}
}
function member_card(cardNo) {

54
app/assets/stylesheets/addorder.scss
View File

@@ -26,34 +26,34 @@ section .content{
.custom-card-block {
padding: 0.3rem !important;
}
#sxModal {
display: none;
overflow: auto;
width: 100%;
height: 100%;
background-color: #000;
background-color: rgba(0,0,0,0.4);
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 1100;
}
// #sxModal {
// display: none;
// overflow: auto;
// width: 100%;
// height: 100%;
// background-color: #000;
// background-color: rgba(0,0,0,0.4);
// position: fixed;
// top: 0;
// right: 0;
// bottom: 0;
// left: 0;
// z-index: 1100;
// }
#sxModal-Content {
position: relative;
left: 42%;
top: 30%;
background-color: #32ad1a;
color: #fff;
text-align: center;
width: 200px;
height: 200px;
padding-top: 5%;
border-radius: 100px;
z-index: 1101;
}
// #sxModal-Content {
// position: relative;
// left: 42%;
// top: 30%;
// background-color: #32ad1a;
// color: #fff;
// text-align: center;
// width: 200px;
// height: 200px;
// padding-top: 5%;
// border-radius: 100px;
// z-index: 1101;
// }
@media (min-width: 34em) {
.custom-card-columns {

75
app/assets/stylesheets/foodcourt.scss
View File

@@ -113,16 +113,11 @@ select.form-control {
opacity:0.6,
}
.pay{
text-align:center;
font-size:20px;
color:white;
border-radius: 50% !important;
width: 45%;
height: 220px;
margin: 0 auto !important;
line-height: 210px;
}
// .btn_paymal_member{
// padding: 40px;
// font-size: 20px;
// font-weight: bolder;
// }
.move_table{
width: 100%;
@@ -318,34 +313,34 @@ select.form-control {
border-left:1px solid #fff;
}
#sxModal {
display: none;
overflow: auto;
width: 100%;
height: 100%;
background-color: #000;
background-color: rgba(0,0,0,0.4);
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 1100;
}
// #sxModal {
// display: none;
// overflow: auto;
// width: 100%;
// height: 100%;
// background-color: #000;
// background-color: rgba(0,0,0,0.4);
// position: fixed;
// top: 0;
// right: 0;
// bottom: 0;
// left: 0;
// z-index: 1100;
// }
#sxModal-Content {
position: relative;
left: 42%;
top: 30%;
background-color: #32ad1a;
color: #fff;
text-align: center;
width: 200px;
height: 200px;
padding-top: 5%;
border-radius: 100px;
z-index: 1101;
}
// #sxModal-Content {
// position: relative;
// left: 42%;
// top: 30%;
// background-color: #32ad1a;
// color: #fff;
// text-align: center;
// width: 200px;
// height: 200px;
// padding-top: 5%;
// border-radius: 100px;
// z-index: 1101;
// }
/*Loading gif for payment*/
@@ -379,8 +374,10 @@ select.form-control {
width:43%;
}
.payment-left {
margin-left: 20px;
.btn_paymal_member {
padding: 40px !important;
font-size: 20px !important;
font-weight: bolder;
}
/* End Payment Page */