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

Merge branch 'adminbsb_material_ui'

Browse Source
This commit is contained in:
Aung Myo
2018-03-21 18:07:02 +06:30
parent 7063d937e3 25c3a489a6
commit 77face5d3a
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -10,7 +10,7 @@ ruby 2.4.1p111
* Membership Details * Membership Details
Osaka => Osaka =>
Auth Token => wu8YvlLmah0CL => New => v3 Auth Token => wu8YvlLmah0CL => New => v3
=> rj0MJ0XI5GsKZehE => Old => v => rj0MJ0XI5GsKZehE => Old => v2
=> code2lab => Old => code2lab => Old
Merchant account => RxzaYyAGzm7VqAZ4hKnv Merchant account => RxzaYyAGzm7VqAZ4hKnv

12
app/views/origami/home/show.html.erb
View File

@@ -498,15 +498,13 @@
<% end %> <% end %>
<% if current_login_employee.role != "waiter" %> <% if current_login_employee.role != "waiter" %>
<!-- first bill not used in cloud --> <!-- first bill not used in cloud -->
<% if ENV["SERVER_MODE"] == "cloud" %>
<button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
<% else %>
<%if @membership.discount && @obj_sale.customer.membership_id %> <%if @membership.discount && @obj_sale.customer.membership_id %>
<button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">First Bill</button> <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">First Bill</button>
<%else%> <%else%>
<button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button> <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
<%end%> <%end%>
<% end %>
<button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button> <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
<% end %> <% end %>
<% end %> <% end %>
@@ -759,7 +757,11 @@
receipt_no = ($("#receipt_no").html()).trim(); receipt_no = ($("#receipt_no").html()).trim();
if((receipt_no!=undefined) && (receipt_no!="")) if((receipt_no!=undefined) && (receipt_no!=""))
createReceiptNoInFirstBillData(receipt_no,type); createReceiptNoInFirstBillData(receipt_no,type);
location.reload(); // For Server Print - from jade
if ($("#server_mode").val() == "cloud") {
code2lab.printFile(result.filepath, result.printer_url);
}
location.reload();
} }
}); });
}); });