From e7cd8deb8e9f2ff5f8dd8a3557660f352da74132 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 17 Nov 2017 15:51:20 +0630 Subject: [PATCH] fix tester bugs --- app/controllers/origami/discounts_controller.rb | 9 +++++---- app/models/sale_item.rb | 2 +- app/pdf/close_cashier_pdf.rb | 2 +- app/pdf/crm_order_pdf.rb | 2 +- app/pdf/stock_result_pdf.rb | 2 +- app/views/origami/discounts/index.html.erb | 7 +++++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index c1319bfe..f3bd218f 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -114,7 +114,8 @@ class Origami::DiscountsController < BaseOrigamiController if Sale.exists?(sale_id) sale = Sale.find(sale_id) table_id = sale.bookings[0].dining_facility_id - table_type = DiningFacility.find(table_id).type + dining = DiningFacility.find(table_id) + table_type = dining.type discount_items = [] #destroy all discount sale item @@ -133,14 +134,14 @@ class Origami::DiscountsController < BaseOrigamiController sale.sale_items.destroy(discount_items) action_by = current_user.id - remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- #{table.name} " + remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- #{dining.name} " sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"REMOVEALLDISCOUNT" ) # Re-calc All Amount in Sale sale.compute_by_sale_items(sale_id, sale.sale_items, 0) - result = {:status=> "Success", :table_id => table_id, :table_type => table_type } + result = {:status=> "Success", :table_id => table_id, :dining => dining.name, :table_type => table_type } else - result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table_type } + result = {:status=> "Please, Check Again!", :table_id => table_id, :dining => dining.name, :table_type => table_type } end render :json => result.to_json diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index c4aae1fa..d4aaf5ee 100755 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -39,7 +39,7 @@ class SaleItem < ApplicationRecord # Check for actual sale items sale_items.each do |si| - if si.account_id == a.id + if si.account_id == a.id account_price[:price] = account_price[:price] + si.price end end diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 71969440..1f456a07 100755 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -22,7 +22,7 @@ class CloseCashierPdf < Prawn::Document super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) # db font setup - if printer_settings.font != nil + if printer_settings.font != "" font_families.update("#{printer_settings.font}" => { :normal => "public/fonts/#{printer_settings.font}.ttf", :italic => "public/fonts/#{printer_settings.font}.ttf", diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb index dca0ab9b..a33b5fce 100755 --- a/app/pdf/crm_order_pdf.rb +++ b/app/pdf/crm_order_pdf.rb @@ -20,7 +20,7 @@ class CrmOrderPdf < Prawn::Document super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.p_width, self.page_height]) # db font setup - if printer_settings.font != nil + if printer_settings.font != "" font_families.update("#{printer_settings.font}" => { :normal => "public/fonts/#{printer_settings.font}.ttf", :italic => "public/fonts/#{printer_settings.font}.ttf", diff --git a/app/pdf/stock_result_pdf.rb b/app/pdf/stock_result_pdf.rb index 4787e9b1..510ab317 100755 --- a/app/pdf/stock_result_pdf.rb +++ b/app/pdf/stock_result_pdf.rb @@ -22,7 +22,7 @@ class StockResultPdf < Prawn::Document super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) # db font setup - if printer_settings.font != nil + if printer_settings.font != "" font_families.update("#{printer_settings.font}" => { :normal => "public/fonts/#{printer_settings.font}.ttf", :italic => "public/fonts/#{printer_settings.font}.ttf", diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 23b83054..2549849a 100755 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -424,9 +424,11 @@ // Selected Items var sale_items = get_selected_sale_items(); + console.log(sale_items.length); if(sale_items.length == 0){ //swal("Information!", "You have no selected item!"); - swal ( "Oops" , "You have no selected item!" , "error" ); + swal ( "Oops" , "You have no selected item!" , "error" ); + return; } for(var i=0;i < sale_items.length;i++){ @@ -434,7 +436,8 @@ discount_items.push(sale_items[i]); } else { - swal ("Oops" , "You have no selected item!" , "error" ); + swal ("Oops" , "You have no selected item!" , "error" ); + return; } }