conflict data

2018-05-28 10:46:04 +06:30
parent 597bab756f 7ddbd7d78a
commit c4cefb05ae
8 changed files with 347 additions and 8 deletions
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -24,7 +24,7 @@ class OrderQueueStation < ApplicationRecord
      # get dining    
      dining = DiningFacility.find(table_id)    
      oqs_by_zones = OrderQueueProcessByZone.where("zone_id=#{dining.zone_id}")
-      booking = Booking.find_by_dining_facility_id(dining.id)    
+      booking = Booking.find_by_dining_facility_id(dining.id)
             
      # ToDo per item per printer

@@ -209,6 +209,7 @@ class OrderQueueStation < ApplicationRecord
  def print_slip(oqs, order, order_items)
    printer = PrintSetting.all
    unique_code="OrderSummaryPdf"
+
    if !printer.empty?
      printer.each do |printer_setting|
        if printer_setting.unique_code == 'OrderSummaryPdf' 
@@ -219,8 +220,13 @@ class OrderQueueStation < ApplicationRecord
          unique_code="OrderSummarySetPdf"
        elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
          unique_code="OrderSummaryCustomisePdf"
+<<<<<<< HEAD
        elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
          unique_code="OrderSummarySetCustomisePdf"  
+=======
+        elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+          unique_code="OrderSummarySlimCustomisePdf"
+>>>>>>> 7ddbd7d78a644d6f6bd2c0bffab1a46f69bae23c
        end  
      end
    end 
@@ -241,6 +247,7 @@ class OrderQueueStation < ApplicationRecord
  def print_slip_item(oqs, order, assigned_items)
    printer = PrintSetting.all
    unique_code="OrderItemPdf"
+
    if !printer.empty?
      printer.each do |printer_setting|
        if printer_setting.unique_code == 'OrderItemPdf' 
@@ -251,8 +258,13 @@ class OrderQueueStation < ApplicationRecord
          unique_code="OrderSetItemPdf"
        elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
          unique_code="OrderItemCustomisePdf"
+<<<<<<< HEAD
        elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
          unique_code="OrderSetItemCustomisePdf"  
+=======
+        elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
+          unique_code="OrderItemSlimCustomisePdf"
+>>>>>>> 7ddbd7d78a644d6f6bd2c0bffab1a46f69bae23c
        end  
      end
    end
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -6,8 +6,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
    #Print
    # Must be one print  
    if print_settings.print_copies == 0
-      print_settings.print_copies = 1
-      print_settings.save!
+       print_settings.print_copies = 1
+       print_settings.save!
    end

    order_item =  print_query('order_item', order_item_id) #OrderItem.find_by_item_code(item_code)  
@@ -18,6 +18,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
    print_setting = PrintSetting.all

    # check for item not to show 
+
    if order_item[0].price != 0 
      if !print_setting.empty?
        print_setting.each do |print_settings|
@@ -31,6 +32,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
            pdf = OrderItemCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
          elsif print_settings.unique_code == 'OrderSetItemCustomisePdf'
            pdf = OrderSetItemCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
+          elsif print_settings.unique_code == 'OrderItemSlimCustomisePdf'
+            pdf = OrderItemSlimCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
          end
        end
      end
@@ -93,6 +96,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                pdf = OrderItemCustomisePdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
              elsif print_settings.unique_code == 'OrderSetItemCustomisePdf'
                pdf = OrderSetItemCustomisePdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
+              elsif print_settings.unique_code == 'OrderItemSlimCustomisePdf'
+                pdf = OrderItemSlimCustomisePdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
              end
            end
          end 
@@ -131,6 +136,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
            pdf = OrderSummaryCustomisePdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
          elsif print_settings.unique_code == 'OrderSummarySetCustomisePdf'
            pdf = OrderSummarySetCustomisePdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
+          elsif print_settings.unique_code == 'OrderSummarySlimCustomisePdf'
+            pdf = OrderSummarySlimCustomisePdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
          end
        end
      end 
@@ -188,6 +195,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                pdf = OrderItemCustomisePdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
              elsif print_settings.unique_code == 'OrderSetItemCustomisePdf'
                pdf = OrderSetItemCustomisePdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
+              elsif print_settings.unique_code == 'OrderItemSlimCustomisePdf'
+                pdf = OrderItemSlimCustomisePdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
              end
            end
          end        
@@ -215,6 +224,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
    else      
      filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
      pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
+
      if !print_setting.empty?
        print_setting.each do |print_settings|
          if print_settings.unique_code == 'OrderSummaryPdf'
@@ -227,6 +237,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
            pdf = OrderSummaryCustomisePdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
          elsif print_settings.unique_code == 'OrderSummarySetCustomisePdf'
            pdf = OrderSummarySetCustomisePdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
+          elsif print_settings.unique_code == 'OrderSummarySlimCustomisePdf'
+            pdf = OrderSummarySlimCustomisePdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
          end
        end
      end   
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -6,6 +6,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
    #Print
    printer = PrintSetting.all
    pdf = OrderItemPdf.new
+
    if !printer.empty?
      printer.each do |printer_setting|
        if printer_setting.unique_code == 'OrderItemPdf' 
@@ -17,7 +18,9 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
        elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
          pdf = OrderItemCustomisePdf.new
        elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
-          pdf = OrderSetItemCustomisePdf.new  
+          pdf = OrderSetItemCustomisePdf.new 
+        elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
+          pdf = OrderItemSlimCustomisePdf.new
        end  
      end
    end    
@@ -35,6 +38,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
    filename = "tmp/order_summary_#{booking_id}" + ".pdf"
    printer = PrintSetting.all
    pdf = OrderSummaryPdf.new
+
    if !printer.empty?
      printer.each do |printer_setting|
        if printer_setting.unique_code == 'OrderSummaryPdf' 
@@ -47,6 +51,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
          pdf = OrderSummaryCustomisePdf.new
        elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
          pdf = OrderSummarySetCustomisePdf.new  
+        elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+          pdf = OrderSummarySlimCustomisePdf.new
        end  
      end
    end    
@@ -75,7 +81,9 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
        elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
          pdf = OrderSummaryCustomisePdf.new
        elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
-          pdf = OrderSummarySetCustomisePdf.new  
+          pdf = OrderSummarySetCustomisePdf.new 
+        elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+          pdf = OrderSummarySlimCustomisePdf.new
        end  
      end
    end        
@@ -105,6 +113,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
          pdf = OrderSummaryCustomisePdf.new
        elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
          pdf = OrderSummarySetCustomisePdf.new  
+        elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+          pdf = OrderSummarySlimCustomisePdf.new
        end  
      end
    end  
@@ -133,7 +143,9 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
        elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
          pdf = OrderSummaryCustomisePdf.new
        elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
-          pdf = OrderSummarySetCustomisePdf.new  
+          pdf = OrderSummarySetCustomisePdf.new 
+        elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+          pdf = OrderSummarySlimCustomisePdf.new
        end  
      end
    end  
@@ -162,7 +174,9 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
        elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
          pdf = OrderSummaryCustomisePdf.new
        elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
-          pdf = OrderSummarySetCustomisePdf.new  
+          pdf = OrderSummarySetCustomisePdf.new 
+        elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+          pdf = OrderSummarySlimCustomisePdf.new
        end  
      end
    end