From 7bf9ce64b42d46c3cfee12b1316805e76244e7ed Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 5 Jul 2017 15:29:34 +0630 Subject: [PATCH 1/6] oqs print format for 76 --- app/pdf/order_item_pdf.rb | 6 +++--- app/pdf/order_summary_pdf.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index b71944e3..546e8f82 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -2,13 +2,13 @@ class OrderItemPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width def initialize(print_settings,order_item, print_status, options, alt_name) - self.page_width = 180 + self.page_width = 185 self.page_height = 1450 self.margin = 0 self.price_width = 40 # No Need for item - self.qty_width = 30 + self.qty_width = 35 self.total_width = 40 # No Need for item - self.item_width = self.page_width - self.qty_width + self.item_width = self.page_width - (self.qty_width - self.margin) self.item_height = 15 self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) self.label_width=90 diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index c1762b17..6d530058 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -2,11 +2,11 @@ class OrderSummaryPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width def initialize(print_settings,order, print_status, order_items = nil,alt_name) - self.page_width = 180 + self.page_width = 190 self.page_height = 1450 self.margin = 0 self.price_width = 40 # No Need for item - self.qty_width = 30 + self.qty_width = 35 self.total_width = 40 # No Need for item self.item_width = self.page_width - (self.qty_width - self.margin) self.item_height = 15 From ff47acd134cb32c0901c244e3cfca35bd38a2744 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 5 Jul 2017 15:32:33 +0630 Subject: [PATCH 2/6] format bill --- app/pdf/receipt_bill_pdf.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index e3d85b8b..31ad9ed7 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -140,10 +140,10 @@ class ReceiptBillPdf < Prawn::Document y_position = cursor pad_top(15) { - text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix - text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_name_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix - text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_name_width,y_position], :width => self.qty_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix } move_down 1 end From da71a542eecf1fc3119113d04afa1c60d699cb2d Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 5 Jul 2017 16:15:15 +0630 Subject: [PATCH 3/6] format bill --- app/pdf/receipt_bill_pdf.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 31ad9ed7..9f692430 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -140,12 +140,12 @@ class ReceiptBillPdf < Prawn::Document y_position = cursor pad_top(15) { - text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size, :overflow => :shrink_to_fix - text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_name_width,y_position], :width => self.qty_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix - text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_name_width,y_position], :width => self.qty_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix } - move_down 1 + move_down 3 end end From efa7b8997bee8833ef1f46f4491518b4a58aed86 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 5 Jul 2017 17:59:15 +0630 Subject: [PATCH 4/6] control normal user no call paypar --- .../origami/payments_controller.rb | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 2b2d27a6..402f317d 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -8,6 +8,7 @@ class Origami::PaymentsController < BaseOrigamiController sale_id = params[:sale_id] # sale_id sale_data = Sale.find_by_sale_id(sale_id) sale_items = SaleItem.where("sale_id=?",sale_id) + member_info = nil # Print for First Bill to Customer @@ -17,7 +18,9 @@ class Origami::PaymentsController < BaseOrigamiController # customer= Customer.where('customer_id=' +.customer_id) customer= Customer.find(sale_data.customer_id) # get member information - member_info = Customer.get_member_account(customer) + if customer.membership_id != nil + member_info = Customer.get_member_account(customer) + end # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) @@ -36,6 +39,8 @@ class Origami::PaymentsController < BaseOrigamiController def create cash = params[:cash] sale_id = params[:sale_id] + member_info = nil + if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) sale_payment = SalePayment.new @@ -46,11 +51,14 @@ class Origami::PaymentsController < BaseOrigamiController unique_code = "ReceiptBillPdf" customer= Customer.find(saleObj.customer_id) - rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) + #shop detail shop_details = Shop.find(1) # get member information - member_info = Customer.get_member_account(customer) + if customer.membership_id != nil + member_info = Customer.get_member_account(customer) + rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) + end # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) @@ -67,6 +75,7 @@ class Origami::PaymentsController < BaseOrigamiController def show sale_id = params[:sale_id] + if Sale.exists?(sale_id) @cash = 0.0 @other = 0.0 @@ -76,16 +85,16 @@ class Origami::PaymentsController < BaseOrigamiController @mastercount = 0.0 @credit = 0.0 @sale_data = Sale.find_by_sale_id(sale_id) + @balance = 0.00 + @accountable_type = '' #get customer amount @customer = Customer.find(@sale_data.customer_id) # get member information - response = Customer.get_member_account(@customer) - - @balance = 0.00 - @accountable_type = '' - if response["status"]==true + if customer.membership_id != nil + response = Customer.get_member_account(@customer) + if response["status"]==true response["data"].each do |res| if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount" @balance += res["balance"] @@ -93,7 +102,8 @@ class Origami::PaymentsController < BaseOrigamiController @accountable_type = "Rebate Balance" end end - end + end + end #end customer amount @@ -119,8 +129,8 @@ class Origami::PaymentsController < BaseOrigamiController end def reprint - sale_id = params[:sale_id] + member_info = nil saleObj = Sale.find(sale_id) @@ -130,8 +140,10 @@ class Origami::PaymentsController < BaseOrigamiController #shop detail shop_details = Shop.find(1) # get member information - member_info = Customer.get_member_account(customer) - rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) + if customer.membership_id != nil + member_info = Customer.get_member_account(customer) + rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) + end # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) From 930a04d493e4d13a0d656a48be1c32db3040f2ef Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 5 Jul 2017 18:06:23 +0630 Subject: [PATCH 5/6] move down item in bill --- app/pdf/receipt_bill_pdf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 9f692430..bd65ed20 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -145,7 +145,7 @@ class ReceiptBillPdf < Prawn::Document text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_name_width,y_position], :width => self.qty_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix } - move_down 3 + move_down 5 end end From 3f4fbb7793b8f83d34176beaaae2754920557bd5 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 5 Jul 2017 18:11:02 +0630 Subject: [PATCH 6/6] update payment cntr --- app/controllers/origami/payments_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 402f317d..c956f7f9 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -92,7 +92,7 @@ class Origami::PaymentsController < BaseOrigamiController @customer = Customer.find(@sale_data.customer_id) # get member information - if customer.membership_id != nil + if @customer.membership_id != nil response = Customer.get_member_account(@customer) if response["status"]==true response["data"].each do |res|