Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant

* 'master' of ssh://bitbucket.org/code2lab/sxrestaurant:
  billed
  rake task
  Pending Payment
  Credit payment
  update page height bill pdf
  not show price 0 fixed
  multiple invoice void
  rake task fix
  Shop View
  Shop View
  get update
  not to show price 0 and 10

app/models/order.rb

@@ -82,6 +82,15 @@ class Order < ApplicationRecord
             set_order_items
           end
 
+          # not insert with price 0
+          # puts item[:price]
+          # puts item
+          # if(item[:price] != 0 )
+          #   OrderItem.processs_item(menu_item[:item_code], menu_item[:name], menu_item[:account_id],
+          #                 item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
+          #                 self.employee_name)
+          # end
+
           OrderItem.processs_item(menu_item[:item_code], menu_item[:name], menu_item[:account_id],
                           item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
                           self.employee_name)

app/models/order_queue_station.rb

@@ -36,9 +36,11 @@ class OrderQueueStation < ApplicationRecord
             #   #Same Order_items can appear in two location.
             #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
             # else
-            
-              AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
-              oqs_order_items.push(order_item)
+                          
+              if (order_item.price != 0)
+                AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
+                oqs_order_items.push(order_item)
+              end
             # end                                           
           end
         end

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 
+      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
+          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      
@@ -109,7 +120,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 left join bookings AS b ON b.booking_id = bo.booking_id
                 left join dining_facilities AS df ON df.id = b.dining_facility_id
                 left join customers as cus ON cus.customer_id = orders.customer_id")
-        .where("order_items.item_code = '#{ id }'")
+        .where("order_items.item_code = '#{ id }' AND order_items.price != 0")
         .group("order_items.item_code")
     elsif type == "order_summary"                                
       OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining")
@@ -118,7 +129,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 left join bookings AS b ON b.booking_id = bo.booking_id
                 left join dining_facilities AS df ON df.id = b.dining_facility_id
                 left join customers as cus ON cus.customer_id = orders.customer_id")
-        .where("orders.order_id = '#{ id }'")
+        .where("orders.order_id = '#{ id }' AND order_items.price != 0")
         .group("order_items.order_items_id")
     else 
       # order summary for booking
@@ -128,7 +139,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 left join bookings AS b ON b.booking_id = bo.booking_id
                 left join dining_facilities AS df ON df.id = b.dining_facility_id
                 left join customers as cus ON cus.customer_id = orders.customer_id")
-        .where("b.booking_id = '#{ id }'")                      
+        .where("b.booking_id = '#{ id }' AND order_items.price != 0")                      
     end
 
   end

app/models/sale_payment.rb

@@ -97,7 +97,7 @@ class SalePayment < ApplicationRecord
           sale_data.sale_payments.each do |sale_payment|
               others = others + sale_payment.payment_amount
           end
-          redeem_prices = sale_data.grand_total -others
+          redeem_prices = sale_data.grand_total - others
           # Control for Paypar Cloud
           begin
             response = HTTParty.post(url,
@@ -232,11 +232,19 @@ class SalePayment < ApplicationRecord
     self.sale.amount_changed = self.sale.amount_received.to_f - self.sale.grand_total.to_f
     all_received_amount = 0.0
     sObj = Sale.find(self.sale_id)
+    is_credit = 0
     sObj.sale_payments.each do |spay|
         all_received_amount += spay.payment_amount.to_f
+        if spay.payment_method == "creditnote"
+          is_credit = 1
+        end
     end
     if (self.sale.grand_total <= all_received_amount)
-      self.sale.payment_status = "paid"
+      if is_credit == 0
+        self.sale.payment_status = "paid"
+      else
+       self.sale.payment_status = "outstanding"
+      end
       self.sale.sale_status = "completed"
       self.sale.save!
       table_update_status(sObj)