print

app/pdf/order_item_customise_pdf.rb

@@ -58,7 +58,7 @@ class OrderItemCustomisePdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
 
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do

app/pdf/order_item_pdf.rb

@@ -59,8 +59,7 @@ class OrderItemPdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
-
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
         text "Booking: #{booking_id}", :size => self.item_font_size,:align => :left
@@ -162,7 +161,6 @@ class OrderItemPdf < Prawn::Document
             .joins(" JOIN bookings b ON b.booking_id=bo.booking_id")
             .where("orders.order_id='#{order_no}'")
             .first()
-
     return booking.booking_id
   end
 end

app/pdf/order_item_slim_customise_pdf.rb

@@ -58,7 +58,7 @@ class OrderItemSlimCustomisePdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
 
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do

app/pdf/order_item_slim_pdf.rb

@@ -59,7 +59,7 @@ class OrderItemSlimPdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
 
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do

app/pdf/order_item_star_pdf.rb

@@ -60,7 +60,7 @@ class OrderItemStarPdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
 
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do

app/pdf/order_set_item_customise_pdf.rb

@@ -58,7 +58,7 @@ class OrderSetItemCustomisePdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
 
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do

app/pdf/order_set_item_pdf.rb

@@ -57,7 +57,7 @@ class OrderSetItemPdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
 
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do

app/pdf/order_summary_customise_pdf.rb

@@ -63,7 +63,7 @@ class OrderSummaryCustomisePdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
 
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do

app/pdf/order_summary_pdf.rb

@@ -60,7 +60,7 @@ class OrderSummaryPdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
 
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do

app/pdf/order_summary_set_customise_pdf.rb

@@ -62,7 +62,7 @@ class OrderSummarySetCustomisePdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
 
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do

app/pdf/order_summary_set_pdf.rb

@@ -61,7 +61,7 @@ class OrderSummarySetPdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
 
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do

app/pdf/order_summary_slim_customise_pdf.rb

@@ -62,7 +62,7 @@ class OrderSummarySlimCustomisePdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
 
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do

app/pdf/order_summary_slim_pdf.rb

@@ -61,7 +61,7 @@ class OrderSummarySlimPdf < Prawn::Document
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)
     #booking ID
-    booking_id = get_booking_id(order_no)
+    booking_id = Order.find_by_order_id(order_no).booking.booking_id
 
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do

app/pdf/receipt_bill_a5_pdf.rb

@@ -45,19 +45,19 @@ class ReceiptBillA5Pdf < Prawn::Document
     if sale_data.orders[0].source =='app'
       move_down 3
       y_position = cursor
-      bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
-          text "Mobile Order", :size => self.header_font_size,:align => :left
+      text "Mobile Order", :size => self.header_font_size,:align => :center, :style=>:bold
+      move_down 1
+      y_position = cursor
+      bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+        text "#{sale_data.customer.contact_no}", :size => self.header_font_size,:align => :left
       end
       if !sale_data.bookings[0].dining_facility.nil?
-        bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
-          text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right,:style=>:bold
+        bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
+          text "#{ sale_data.bookings[0].dining_facility.type } -#{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right
         end
       end
       move_down 1
-      text "Customer Ph : #{sale_data.customer.contact_no}", :size => self.header_font_size,:align => :left
-      move_down 1
     end
-    stroke_horizontal_rule
 
     cashier_info(sale_data, customer_name, latest_order_no)
     line_items(sale_items,precision,delimiter)
@@ -117,11 +117,10 @@ class ReceiptBillA5Pdf < Prawn::Document
     move_down line_move
     text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center
     move_down line_move
-
-    stroke_horizontal_rule
   end
 
   def cashier_info(sale_data, customer_name, latest_order_no)
+        stroke_horizontal_rule
         if latest_order_no.nil?
             move_down line_move
             text "Booking : #{ sale_data.bookings[0].booking_id }", :size => self.header_font_size+5,:align => :left

app/pdf/receipt_bill_order_pdf.rb

@@ -46,20 +46,19 @@ class ReceiptBillOrderPdf < Prawn::Document
         if sale_data.orders[0].source =='app'
           move_down 3
           y_position = cursor
-          bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
-              text "Mobile Order", :size => self.header_font_size,:align => :left
+          text "Mobile Order", :size => self.header_font_size,:align => :center, :style=>:bold
+          move_down 1
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+            text "#{sale_data.customer.contact_no}", :size => self.header_font_size,:align => :left
           end
           if !sale_data.bookings[0].dining_facility.nil?
-            bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
-              text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right,:style=>:bold
+            bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
+              text "#{ sale_data.bookings[0].dining_facility.type } -#{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right
             end
           end
           move_down 1
-          text "Customer Ph : #{sale_data.customer.contact_no}", :size => self.header_font_size,:align => :left
-          move_down 1
         end
-        stroke_horizontal_rule
-
         cashier_info(sale_data, customer_name, latest_order_no,order_reservation)
         line_items(sale_items,precision,delimiter,order_reservation)
         all_total(sale_data,precision,delimiter,order_reservation)
@@ -80,6 +79,7 @@ class ReceiptBillOrderPdf < Prawn::Document
     end
 
     def cashier_info(sale_data, customer_name, latest_order_no,order_reservation)
+        stroke_horizontal_rule
         move_down line_move
 
         # move_down 2

app/pdf/receipt_bill_pdf.rb

@@ -22,6 +22,7 @@ class ReceiptBillPdf < Prawn::Document
         self.description_width = 150
         self.price_num_width = 50
         self.line_move = 2
+
         # @item_width = self.page_width.to_i / 2
         # @qty_width = @item_width.to_i / 3
         # @double = @qty_width * 1.3
@@ -48,19 +49,19 @@ class ReceiptBillPdf < Prawn::Document
         if sale_data.orders[0].source =='app'
           move_down 3
           y_position = cursor
-          bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
-              text "Mobile Order", :size => self.header_font_size,:align => :left
+          text "Mobile Order", :size => self.header_font_size,:align => :center, :style=>:bold
+          move_down 1
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+            text "#{sale_data.customer.contact_no}", :size => self.header_font_size,:align => :left
           end
           if !sale_data.bookings[0].dining_facility.nil?
-            bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
-              text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right,:style=>:bold
+            bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
+              text "#{ sale_data.bookings[0].dining_facility.type } -#{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right
             end
           end
           move_down 1
-          text "Customer Ph : #{sale_data.customer.contact_no}", :size => self.header_font_size,:align => :left
-          move_down 1
         end
-        stroke_horizontal_rule
 
         cashier_info(sale_data, customer_account, latest_order_no)
         line_items(sale_items,precision,delimiter)
@@ -126,11 +127,10 @@ class ReceiptBillPdf < Prawn::Document
         move_down line_move
         text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center
         move_down line_move
-
-        stroke_horizontal_rule
     end
 
     def cashier_info(sale_data, customer_account, latest_order_no)
+      stroke_horizontal_rule
         if latest_order_no.nil?
             move_down line_move
             text "Booking : #{ sale_data.bookings[0].booking_id }", :size => self.header_font_size+2,:align => :left
@@ -456,7 +456,8 @@ class ReceiptBillPdf < Prawn::Document
 
     def sale_payment(sale_data,precision,delimiter)
         stroke_horizontal_rule
-        #move_down line_move
+        # move_down 2
+        move_down line_move
         # sql = "SELECT SUM(payment_amount)
         #         FROM sale_payments where payment_method='creditnote'
         #         and sale_id='#{sale_data.sale_id}'"

app/pdf/receipt_bill_star_pdf.rb

@@ -47,19 +47,19 @@ class ReceiptBillStarPdf < Prawn::Document
         if sale_data.orders[0].source =='app'
           move_down 3
           y_position = cursor
-          bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
-              text "Mobile Order", :size => self.header_font_size,:align => :left
+          text "Mobile Order", :size => self.header_font_size,:align => :center, :style=>:bold
+          move_down 1
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+            text "#{sale_data.customer.contact_no}", :size => self.header_font_size,:align => :left
           end
           if !sale_data.bookings[0].dining_facility.nil?
-            bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
-              text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right,:style=>:bold
+            bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
+              text "#{ sale_data.bookings[0].dining_facility.type } -#{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right
             end
           end
           move_down 1
-          text "Customer Ph : #{sale_data.customer.contact_no}", :size => self.header_font_size,:align => :left
-          move_down 1
         end
-        stroke_horizontal_rule
 
         cashier_info(sale_data, customer_name, latest_order_no)
         line_items(sale_items,precision,delimiter)
@@ -119,10 +119,10 @@ class ReceiptBillStarPdf < Prawn::Document
         text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center
         move_down line_move
 
-        stroke_horizontal_rule
     end
 
     def cashier_info(sale_data, customer_name, latest_order_no)
+      stroke_horizontal_rule
         if latest_order_no.nil?
             move_down line_move
             text "Booking : #{ sale_data.bookings[0].booking_id }", :size => self.header_font_size+2,:align => :left
@@ -391,7 +391,7 @@ class ReceiptBillStarPdf < Prawn::Document
 
     def sale_payment(sale_data,precision,delimiter)
         stroke_horizontal_rule
-        #move_down line_move
+        move_down line_move
         # sql = "SELECT SUM(payment_amount)
         #         FROM sale_payments where payment_method='creditnote'
         #         and sale_id='#{sale_data.sale_id}'"