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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-03-13 10:32:16 +06:30
parent f051022ab4 40d55ae546
commit 2282bf52f8
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -776,17 +776,17 @@ $(function() {
e.preventDefault();
$("#oqs_loading_wrapper").show();
type = window.location.href.indexOf("quick_service");
if (type != -1) {
quick_service = window.location.href.indexOf("quick_service");
if (quick_service != -1) {
type = 'quick_service'
var table_type = $('#table_type').text();
var table_type = $('#table_type').text();
var table_id = $('#table_id').val();
var customer_id = $('#customer_id').val();
var booking_id = $('#booking_id').text();
var ajax_url = 'addorders/create';
}else{
type = 'cashier'
var table_type = $('#table_type').text();
var table_type = $('#table_type').text();
var table_id = $('#table_id').text();
var customer_id = $('#customer_id').text();
var booking_id = $('#booking_id').text();
@@ -813,17 +813,19 @@ $(function() {
data: params,
dataType: "json",
success:function(result){
customer_display_view(null,"reload");
console.log(type)
console.log(table_type)
if (type == "quick_service") {
window.location.href = "/origami/quick_service"
window.location.href = "/origami/quick_service"
}else{
if(table_type == "Table"){
window.location.href = "/origami/table/" + table_id
window.location.href = "/origami/table/" + table_id
}
else {
window.location.href = "/origami/room/" + table_id
window.location.href = "/origami/room/" + table_id
}
}
customer_display_view(null,"reload");
}
});
// }else{

10
app/assets/javascripts/channels/second_display_view.js
View File

@@ -10,10 +10,12 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
var tax = data.tax_profiles;
var status= data.status
if (status == "reload") {
window.location.reload();
jQuery('#s_reload').click();
}
$('#second_display_slider').addClass("hidden")
$('#second_display_items').removeClass("hidden")
$('#second_display_slider').addClass("hidden")
$('#second_display_items').removeClass("hidden")
// append items
if (status == "add") {
for(var i in items) {
@@ -84,8 +86,6 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
var attribute_arr = [];
var rowCount = $('.second_display_items tbody tr').length+1;
for(var i in items) {
code = items[i].code;
item_code = items[i].item_code;
name = items[i].name;

8
app/views/origami/second_display/index.html.erb
View File

@@ -1,4 +1,5 @@
<div class="container-fluid">
<button type="button" class="hidden" id="s_reload">Reload</button>
<div class="slider" id="second_display_slider">
<%= render 'slider' %>
</div>
@@ -7,5 +8,12 @@
<%= render 'second_display' %>
</div>
</div>
<script type="text/javascript">
$(document).ready(function () {
$('#s_reload').on('click', function () {
window.location.href = '/origami/second_display';
});
});
</script>