From ea93de084ed156419acd9136cb43b618f64ffb69 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 29 Nov 2017 14:11:56 +0630 Subject: [PATCH] add font size for Total & Net Sales in close cashier and change closed time in transacctions --- app/pdf/close_cashier_pdf.rb | 8 ++++---- app/views/transactions/shift_sales/index.html.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 6d548ac0..67ab06fe 100755 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -227,10 +227,10 @@ class CloseCashierPdf < Prawn::Document y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do - text "Total :", :style => :bold, :size => self.item_font_size, :align => :right + text "Total :", :style => :bold, :size => self.header_font_size, :align => :right end bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do - text "#{@total_payment.round(2)}", :style => :bold, :size => self.item_font_size, :align => :right + text "#{@total_payment.round(2)}", :style => :bold, :size => self.header_font_size, :align => :right end # end other payment details @@ -259,10 +259,10 @@ class CloseCashierPdf < Prawn::Document y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do - text "Net Sales :", :style => :bold, :size => self.item_font_size, :align => :right + text "Net Sales :", :style => :bold, :size => self.header_font_size, :align => :right end bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do - text "#{shift_sale.nett_sales}", :style => :bold , :size => self.item_font_size, :align => :right + text "#{shift_sale.nett_sales}", :style => :bold , :size => self.header_font_size, :align => :right end #end for service charges and commercial tax #COMMENTED FOR NO NEED AND NOT CORRECT WHEN OTHER CHARGES diff --git a/app/views/transactions/shift_sales/index.html.erb b/app/views/transactions/shift_sales/index.html.erb index 53e2dbad..481b52c8 100755 --- a/app/views/transactions/shift_sales/index.html.erb +++ b/app/views/transactions/shift_sales/index.html.erb @@ -70,7 +70,7 @@ <%=shift_sale.cashier_terminal.name%> <%= shift_sale.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') %> - <%= shift_sale.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') rescue '-' %> + <%= shift_sale.shift_closed_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') rescue '-' %> <%=shift_sale.opening_balance %> <%=shift_sale.closing_balance %>