diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 3d61b547..b65561e9 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -575,7 +575,6 @@ $(function() { } } - if (JSON.stringify(attribute_arr) === JSON.stringify(instances[field].values) || result) { $('.add_to_order').attr('data-instance-code',instances[field].code); $('.add_to_order').attr('data-instance',instances[field].name); diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index bcd3becf..ebdfa147 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -45,7 +45,7 @@ class ReceiptBillPdf < Prawn::Document delimiter = "" end - header( shop_details) + header(shop_details) stroke_horizontal_rule @@ -60,12 +60,14 @@ class ReceiptBillPdf < Prawn::Document customer(customer_name) - if discount_price_by_accounts.length > 0 + if discount_price_by_accounts.length > 0 && shop_details.show_account_info discount_account(discount_price_by_accounts,printer_settings.precision,delimiter) end - items_account(item_price_by_accounts,printer_settings.precision,delimiter) - + if shop_details.show_account_info + items_account(item_price_by_accounts,printer_settings.precision,delimiter) + end + sign(sale_data) footer(printed_status) @@ -389,6 +391,8 @@ class ReceiptBillPdf < Prawn::Document text "#{ customer_name }" , :size => self.item_font_size,:align => :right end end + + def discount_account(discount_price_by_accounts,precision,delimiter) move_down 5 stroke_horizontal_rule diff --git a/app/views/settings/shops/_form.html.erb b/app/views/settings/shops/_form.html.erb index 5f93ea50..5a353b9b 100755 --- a/app/views/settings/shops/_form.html.erb +++ b/app/views/settings/shops/_form.html.erb @@ -15,12 +15,13 @@ <%= f.input :license_data %> <%= f.input :base_currency %> <%= f.input :cloud_token %> - <%= f.input :cloud_url %> + <%= f.input :cloud_url %> <%= f.input :owner_token %> <%= f.input :id_prefix %> <%= f.input :is_rounding_adj %> <%= f.input :quick_sale_summary %> <%= f.input :calc_tax_order %> + <%= f.input :show_account_info %> diff --git a/app/views/settings/shops/index.html.erb b/app/views/settings/shops/index.html.erb index 61005a34..c323defa 100755 --- a/app/views/settings/shops/index.html.erb +++ b/app/views/settings/shops/index.html.erb @@ -23,6 +23,7 @@