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

Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01

Browse Source
This commit is contained in:
yarzar_code
2020-06-08 15:48:13 +06:30
parent 7a09ed0108 f9db23b500
commit 62fb440850
65 changed files with 2049 additions and 1842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/origami.js
View File

@@ -326,8 +326,8 @@ function setCommPorts(comPortLists) {
/** pay with CB bank **/
function pay_withBank(cmd_type, payment_type, bnk_bill_amount,sale_id,receipt_no,cashier_type) {
$("#loading_wrapper").show();
var com_port = $("#com_port_name").val();
reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port,cashier_type);
var com_port = $("#com_port_name").val();
reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port,cashier_type);
}
//add req data to card_sale_trans table

4
app/assets/stylesheets/BSBMaterial/style.css
View File

@@ -11,7 +11,7 @@
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3);
border: none;
position: fixed;
top: 0;
/*top: 0;*/
left: 0;
z-index: 12;
width: 100%; }
@@ -6649,7 +6649,7 @@ fieldset[disabled] .form-control {
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3);
border: none;
position: fixed;
top: 0;
/*top: 0;*/
left: 0;
z-index: 12;
width: 100%; }