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

Merge branch 'printservice_dev' into r-1902001-01

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-08-26 10:38:00 +06:30
parent e49840a159 63abafdbcc
commit 289187c019
41 changed files with 1441 additions and 1044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/transactions/sales/show.html.erb
View File

@@ -280,7 +280,7 @@
</div>
</div>
</div>
<%= print_settings %>
<input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
<span class="hidden" id="member_discount"><%= @membership.discount%></span>
<span class="hidden" id="membership_id"><%= @sale.customer.membership_id rescue 0%></span>
@@ -405,10 +405,12 @@
url: ajax_url,
data: "remark="+ remark + "&sale_id=" + sale_id+ "&access_code=" + access_code,
success: function (result) {
// For Server Print - from jade
if ($("#server_mode").val() == "cloud") {
if(typeof code2lab != 'undefined'){
code2lab.printFile(result.filepath.substr(6), result.printer_url);
if (!$('#print_settings').data('action-cable')) {
// For Server Print - from jade
if ($("#server_mode").val() == "cloud") {
if(typeof code2lab != 'undefined'){
code2lab.printFile(result.filepath.substr(6), result.printer_url);
}
}
}
window.location.href = '/transactions/sales/';