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

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

Browse Source
This commit is contained in:
phyusin
2018-07-06 17:12:23 +06:30
parent 1635db7247 08ae578e39
commit c6d7b466f5
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/origami/payments/show.html.erb
View File

@@ -770,8 +770,7 @@ var pdf_view = '<%=@pdf_view%>';
var credit = $('#credit').text();
var card = $('#card').text();
var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : '';
var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : 'all';
if (credit <= 0) {
calculate_member_discount(sale_id,tax_type);
}
@@ -1037,7 +1036,6 @@ var pdf_view = '<%=@pdf_view%>';
var member_id = $('#membership_id').text();
var member_discount = $('#member_discount').text();
var item_row = $('.is_card');
if (member_id && member_discount) {
if (item_row.length < 1) {
is_card = false