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

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Aung Myo
2018-08-27 16:30:50 +06:30
parent 80f0b208fa 28cc5661a7
commit 72c5ca7891
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/OQS.js
View File

@@ -367,7 +367,7 @@ $(document).on('turbolinks:load', function() {
if ($("#server_mode").val() == "cloud") {
code2lab.printFile(result.filepath.substr(6), result.printer_url);
}
location.reload();
}
});
@@ -391,6 +391,7 @@ $(document).on('turbolinks:load', function() {
if ($("#server_mode").val() == "cloud") {
code2lab.printFile(result.filepath.substr(6), result.printer_url);
}
location.reload();
}
});
});

4
app/views/oqs/home/index.html.erb
View File

@@ -179,9 +179,9 @@
<button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
<button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
<!-- <button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
<% if ENV["SERVER_MODE"] != "cloud" %>
<%end%>
<%end%> -->
</div>
</div>
<input type="hidden" id="server_mode" value="<%=ENV["SERVER_MODE"]%>">