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

SQA feedback

Browse Source
This commit is contained in:
phyusin
2018-03-20 15:55:00 +06:30
parent 829c09040d
commit f354e32e31
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/origami/shifts/show.html.erb
View File

@@ -58,7 +58,7 @@
</div>
</div>
<script>
var type = '<%= @type %>';
var cashier_type = '<%= @cashier_type %>';
$('#close_cashier').on('click',function(){
var amount = $('#closing_balance_amount').val();
var shift_id = "<%= @shift.id rescue ""%>"
@@ -73,7 +73,7 @@
});
$('#back').on('click',function(){
if(type!='quick_service'){
if(cashier_type!='quick_service'){
window.location.href = '/origami';
}else{
window.location.href = '/origami/quick_service';
@@ -95,7 +95,7 @@
closeOnCancel: false,
allowOutsideClick: false
}, function () {
window.location.href = '/origami/shift/'+type+'/close';
window.location.href = '/origami/shift/'+cashier_type+'/close';
});
}
});
@@ -120,7 +120,7 @@
closeOnCancel: false,
allowOutsideClick: false
}, function () {
window.location.href = '/origami/shift/'+type+'/close';
window.location.href = '/origami/shift/'+cashier_type+'/close';
});
}
}
@@ -184,7 +184,7 @@
closeOnCancel: false,
allowOutsideClick: false
}, function () {
window.location.href = '/origami/shift/close';
window.location.href = '/origami/shift/'+cashier_type+'/close';
});
// reqCBBankAlipaySettlement();
}