From e09dbb095c6582c8947951d30e57c117f7bf2ba1 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 27 Jun 2017 10:15:22 +0630
Subject: [PATCH] not to show price 0 and 10

---
 app/models/order_queue_station.rb         |  4 +-
 app/models/printer/order_queue_printer.rb | 71 +++++++++++++----------
 app/pdf/order_item_pdf.rb                 |  2 +-
 app/pdf/order_summary_pdf.rb              | 52 ++++++++---------
 app/views/origami/home/show.html.erb      |  4 +-
 app/views/origami/rooms/show.html.erb     |  4 +-
 6 files changed, 74 insertions(+), 63 deletions(-)

diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index bd2e85ca..7a220e0f 100644
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -38,7 +38,9 @@ class OrderQueueStation < ApplicationRecord
             # else
             
               AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
-              oqs_order_items.push(order_item)
+              if (order_item.price != 10 || order_item.price != 0)
+                oqs_order_items.push(order_item)
+              end
             # end                                           
           end
         end
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index bbeafecf..363d9b38 100644
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -6,19 +6,23 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     #Print
     order_item =  print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code)  
 
-    filename = "tmp/order_item_#{order_item[0].item_name}" + ".pdf"  
-    pdf = OrderItemPdf.new(order_item[0], print_status, options)
-    pdf.render_file filename
+    filename = "tmp/order_item_#{order_item[0].item_name}" + ".pdf" 
 
-    if oqs.print_copy
-      self.print(filename, oqs.printer_name)
+    # check for item not to show 
+    if order_item[0].price == 0 || order_item[0].price == 10
+      pdf = OrderItemPdf.new(order_item[0], print_status, options)
+      pdf.render_file filename    
 
-      #For print copy
-      pdf.render_file filename.gsub(".","-copy.")
-      self.print(filename.gsub(".","-copy."), oqs.printer_name)
-    else
-      self.print(filename, oqs.printer_name)
-    end    
+      if oqs.print_copy
+        self.print(filename, oqs.printer_name)
+
+        #For print copy
+        pdf.render_file filename.gsub(".","-copy.")
+        self.print(filename.gsub(".","-copy."), oqs.printer_name)
+      else
+        self.print(filename, oqs.printer_name)
+      end 
+    end   
   end
 
    # Query for per order
@@ -33,14 +37,18 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         filename = "tmp/order_item_#{odi.item_name}" + ".pdf"
         # For Item Options
         options = odi.options == "[]"? "" : odi.options
-        pdf = OrderItemPdf.new(odi, print_status, options)
-        # pdf.render_file "tmp/order_item.pdf"
-        pdf.render_file filename
-        if oqs.print_copy
-          self.print(filename, oqs.printer_name)
-          self.print(filename.gsub(".","-copy."), oqs.printer_name)
-        else
-          self.print(filename, oqs.printer_name)
+
+        # check for item not to show 
+        if odi.price == 0 || odi.price == 10
+          pdf = OrderItemPdf.new(odi, print_status, options)
+          # pdf.render_file "tmp/order_item.pdf"
+          pdf.render_file filename
+          if oqs.print_copy
+            self.print(filename, oqs.printer_name)
+            self.print(filename.gsub(".","-copy."), oqs.printer_name)
+          else
+            self.print(filename, oqs.printer_name)
+          end
         end 
       end
     # For Print Order Summary
@@ -69,19 +77,22 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         filename = "tmp/order_item_#{odi.item_name}" + ".pdf"
         # For Item Options
         options = odi.options == "[]"? "" : odi.options
-        pdf = OrderItemPdf.new(odi, print_status, options)
-             
-        pdf.render_file filename               
 
-        if oqs.print_copy
-          self.print(filename, oqs.printer_name)
+        # check for item not to show 
+        if odi.price == 0 || odi.price == 10
+          pdf = OrderItemPdf.new(odi, print_status, options)             
+          pdf.render_file filename               
 
-          #For print copy
-          pdf.render_file filename.gsub(".","-copy.")
-          self.print(filename.gsub(".","-copy."), oqs.printer_name)
-        else
-          self.print(filename, oqs.printer_name)
-        end 
+          if oqs.print_copy
+            self.print(filename, oqs.printer_name)
+
+            #For print copy
+            pdf.render_file filename.gsub(".","-copy.")
+            self.print(filename.gsub(".","-copy."), oqs.printer_name)
+          else
+            self.print(filename, oqs.printer_name)
+          end 
+        end
       end
     # For Print Order Summary
     else      
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 6d6346f9..b6c821fc 100644
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -60,7 +60,7 @@ class OrderItemPdf < Prawn::Document
   def order_items(order_item, options)
     y_position = cursor
 
-    #Add Order Item
+    #Add Order Item    
     add_order_items(order_item, options)
 
     dash(1, :space => 1, :phase => 1)
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index d85a5916..504bbc51 100644
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -86,38 +86,36 @@ class OrderSummaryPdf < Prawn::Document
     move_down 5
 
     order_item.each do|odi|
-      y_position = cursor
-
-      # pad_top(15) {
-      #   text_box "#{odi.item_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix
-      #   text_box "#{odi.qty}", :at =>[self.item_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
-      # }
-      bounding_box([0,y_position], :width => self.item_width) do
-        text "#{odi.item_name}", :size => self.item_font_size,:align => :left
-      end
-
-      bounding_box([self.item_width,y_position], :width => self.qty_width) do
-        text "#{odi.qty}", :size => self.item_font_size,:align => :left
-      end
-
-      move_down 5
-
-      # add option
-      options = odi.options == "[]"? "" : odi.options
-      
-      if options != ""
+      # check for item not to show 
+      if odi.price == 0 || odi.price == 10
         y_position = cursor
-        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
-            text "#{options}", :size => self.item_font_size,:align => :left
+
+        bounding_box([0,y_position], :width => self.item_width) do
+          text "#{odi.item_name}", :size => self.item_font_size,:align => :left
+        end
+
+        bounding_box([self.item_width,y_position], :width => self.qty_width) do
+          text "#{odi.qty}", :size => self.item_font_size,:align => :left
         end
 
         move_down 5
+
+        # add option
+        options = odi.options == "[]"? "" : odi.options
+        
+        if options != ""
+          y_position = cursor
+          bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+              text "#{options}", :size => self.item_font_size,:align => :left
+          end
+
+          move_down 5
+        end
+
+        dash(1, :space => 1, :phase => 1)
+        stroke_horizontal_line 0, (self.page_width - self.margin)
+        move_down 5
       end
-
-      dash(1, :space => 1, :phase => 1)
-      stroke_horizontal_line 0, (self.page_width - self.margin)
-      move_down 5
     end        
-
   end
 end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 2e852b7c..efbb3e10 100644
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -163,7 +163,7 @@
                <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
                <%
                # Can't check for discount
-                unless sale_item.price == 0
+                unless sale_item.price == 0 || sale_item.price == 10
                 %>
                <tr>
                  <td><%= count %></td>
@@ -183,7 +183,7 @@
                         count += 1
                     sub_total = sub_total + (order_item.price * order_item.qty)
 
-                unless order_item.price == 0 %>
+                unless order_item.price == 0 || order_item.price == 10 %>
                <tr>
                  <td><%= count %></td>
                  <td class='item-name'><%= order_item.item_name %></td>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 584410d6..0ddaff7a 100644
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -158,7 +158,7 @@
                   sub_total = sub_total + sale_item.price 
                %>
                <input type="hidden" id="sale_id" value="<%= @obj.sale_id %>">
-               <% unless sale_item.price == 0 %>
+               <% unless sale_item.price == 0 || sale_item.price == 10 %>
                <tr>
                  <td class='item-name'><%= sale_item.product_name %></td>
                  <td class='item-attr'><%= sale_item.qty %></td>
@@ -174,7 +174,7 @@
                     @order_items.each do |order_item |
                     sub_total = sub_total + (order_item.price * order_item.qty)
 
-                unless order_item.price == 0 %>
+                unless order_item.price == 0 || order_item.price == 10 %>
                <tr>
                  <td class='item-name'><%= order_item.item_name %></td>
                  <td class='item-attr'><%= order_item.qty %></td>