conflict data remove for order/show.index.html.erb

app/controllers/origami/home_controller.rb

@@ -27,6 +27,32 @@ class Origami::HomeController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
+    @order_items_count = Hash.new
+    bookings = Booking.all
+    if !bookings.nil?
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                end
+              end
+            end
+          end
+        else
+          sale = Sale.find(booking.sale_id)
+          if sale.sale_status !='completed'
+            if !@order_items_count.key?(booking.dining_facility_id)
+              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            end
+          end
+        end
+      end
+    end
+
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
@@ -65,7 +91,6 @@ class Origami::HomeController < BaseOrigamiController
        else
         sale = Sale.find(booking.sale_id)
          if sale.sale_status != "completed" && sale.sale_status != 'void'
-
            @sale_array.push(sale)
            if @status_order == 'order'
              @status_order = 'sale'

app/controllers/origami/orders_controller.rb

@@ -12,5 +12,31 @@ class Origami::OrdersController < BaseOrigamiController
         @sale_status = sale.sale_status
       end
     end
+
+    @order_items_count = Hash.new
+    bookings = Booking.all
+    if !bookings.nil?
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                end
+              end
+            end
+          end
+        else
+          sale = Sale.find(booking.sale_id)
+          if sale.sale_status !='completed'
+            if !@order_items_count.key?(booking.dining_facility_id)
+              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            end
+          end
+        end
+      end
+    end
   end
 end

app/controllers/origami/rooms_controller.rb

@@ -23,6 +23,32 @@ class Origami::RoomsController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
+    @order_items_count = Hash.new
+    bookings = Booking.all
+    if !bookings.nil?
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                end
+              end
+            end
+          end
+        else
+          sale = Sale.find(booking.sale_id)
+          if sale.sale_status !='completed'
+            if !@order_items_count.key?(booking.dining_facility_id)
+              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            end
+          end
+        end
+      end
+    end
+    
     @room.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
            @order_items = Array.new

app/models/printer/order_queue_printer.rb

@@ -52,7 +52,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   end
 
    # Query for per order
-  def print_order_summary(print_settings,oqs, order_id, order_items, print_status)
+  def print_order_summary(print_settings,oqs, order_id, order_items, print_status, before_updated_qty="", options="")
     #Use CUPS service
     #Generate PDF
     #Print 
@@ -76,20 +76,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
           if !order_slim_pdf.empty?
             order_slim_pdf.each do |order_item_slim|
               if order_item_slim[0] == 'OrderSlimPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 end
               elsif order_item_slim[0] == 'OrderSetPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 end
               end
             end
@@ -109,20 +109,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/order_summary_#{order_id}" + ".pdf"
-      pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+      pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
       if !order_slim_pdf.empty?
         order_slim_pdf.each do |order_summary_slim|
           if order_summary_slim[0] == 'OrderSlimPdf'
             if order_summary_slim[1] == '1'
-              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             end
           elsif order_summary_slim[0] == 'OrderSetPdf'
             if order_summary_slim[1] == '1'
-              pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             end
           end
         end
@@ -143,7 +143,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   end
 
   # Print for orders in booking
-  def print_booking_summary(print_settings,oqs, booking_id, print_status)
+  def print_booking_summary(print_settings,oqs, booking_id, print_status,before_updated_qty="")
     # Must be one print  
     if print_settings.print_copies == 0
       print_settings.print_copies = 1
@@ -162,20 +162,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+          pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
           if !order_slim_pdf.empty?
             order_slim_pdf.each do |order_item_slim|
               if order_item_slim[0] == 'OrderSlimPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 end
               elsif order_item_slim[0] == 'OrderSetPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 end
               end
             end
@@ -198,20 +198,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
-      pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+      pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
       if !order_slim_pdf.empty?
         order_slim_pdf.each do |order_summary_slim|
           if order_summary_slim[0] == 'OrderSlimPdf'
             if order_summary_slim[1] == '1'   
-              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             end
           elsif order_summary_slim[0] == 'OrderSetPdf'
             if order_summary_slim[1] == '1'
-              pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             end
           end
         end

app/views/home/dashboard.html.erb

@@ -155,7 +155,7 @@
                 <% if !(@total_payment_methods.nil?) %>
                   <% @total_payment_methods.each do |payment| %>
                     <% if !@sale_data[0].empty? %>
-                      <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' %>
+                      <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' && payment.payment_method != 'unionpay' %>
                         <tr>
                           <td><%= payment.payment_method.to_s.capitalize %> Sale : </td>
                           <td align="right">

app/views/origami/home/show.html.erb

@@ -50,6 +50,11 @@
                             <% end %>                         
                                 <div class="card-block">
                                   <%= table.name %>
+                                  <% if !@order_items_count.nil? %>
+                                    <% if @order_items_count.key?(table.id) %>
+                                      (Orders : <%= @order_items_count[table.id] %>)
+                                    <% end %>
+                                  <% end %>
                                   <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                                   <div style="font-size:12px;"></div>
                                 </div>
@@ -62,6 +67,11 @@
                             <% end %>                   
                             <div class="card-block">
                                 <%= table.name %> 
+                                <% if !@order_items_count.nil? %>
+                                  <% if @order_items_count.key?(table.id) %>
+                                    (Orders : <%= @order_items_count[table.id] %>)
+                                  <% end %>
+                                <% end %>
                                 <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
                               </div>
                             </div>
@@ -87,6 +97,11 @@
                           <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                             <div class="card-block">
                               <%= room.name %>
+                              <% if !@order_items_count.nil? %>
+                                <% if @order_items_count.key?(room.id) %>
+                                  (Orders : <%= @order_items_count[room.id] %>)
+                                <% end %>
+                              <% end %>
                                   <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
                             </div>
                           </div>
@@ -94,6 +109,11 @@
                             <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                               <div class="card-block">
                                 <%= room.name %>
+                                <% if !@order_items_count.nil? %>
+                                  <% if @order_items_count.key?(room.id) %>
+                                    (Orders : <%= @order_items_count[room.id] %>)
+                                  <% end %>
+                                <% end %>
                                     <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
                               </div>
                             </div>

app/views/origami/orders/show.html.erb

@@ -47,6 +47,11 @@
               <% end %>                         
                   <div class="card-block">
                     <%= table.name %>
+                    <% if !@order_items_count.nil? %>
+                      <% if @order_items_count.key?(table.id) %>
+                        (Orders : <%= @order_items_count[table.id] %>)
+                      <% end %>
+                    <% end %>
                     <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                     <div style="font-size:12px;"></div>
                   </div>
@@ -59,6 +64,11 @@
               <% end %>                   
               <div class="card-block">
                   <%= table.name %> 
+                  <% if !@order_items_count.nil? %>
+                    <% if @order_items_count.key?(table.id) %>
+                      (Orders : <%= @order_items_count[table.id] %>)
+                    <% end %>
+                  <% end %>
                   <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
                 </div>
               </div>
@@ -84,6 +94,11 @@
               <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                 <div class="card-block">
                   <%= room.name %>
+                  <% if !@order_items_count.nil? %>
+                    <% if @order_items_count.key?(room.id) %>
+                      (Orders : <%= @order_items_count[room.id] %>)
+                    <% end %>
+                  <% end %>
                       <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
                 </div>
               </div>
@@ -91,6 +106,11 @@
                 <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                   <div class="card-block">
                     <%= room.name %>
+                    <% if !@order_items_count.nil? %>
+                      <% if @order_items_count.key?(room.id) %>
+                        (Orders : <%= @order_items_count[room.id] %>)
+                      <% end %>
+                    <% end %>
                         <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
                   </div>
                 </div>
@@ -140,7 +160,6 @@
 <!-- tabs - End -->
 </div>
 <!-- Column One -->
-
 <!-- Column Two -->
 <div class="col-lg-5 col-md-5 col-sm-5">
  <div class="card"  >
@@ -196,11 +215,13 @@
 <div class="card-footer ">
  <table class="table" id="order-charges-table" border="0">
    <tr>
-               <td colspan="2" class="charges-name"><strong>Sub Total:</strong></td>
+     <td class="charges-name"><strong>Sub Total:</strong></td>
      <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
    </tr>
    <tr>
-                <td colspan="2" class="charges-name"><strong>Discount:</strong></td>
+
+    <td class="charges-name"><strong>Discount:</strong></td>
+
     <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
   </tr>
   <tr class="rebate_amount"></tr>

app/views/origami/rooms/show.html.erb

@@ -50,6 +50,11 @@
                 <% end %>              
                     <div class="card-block">
                        <%= table.name %>
+                      <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(table.id) %>
+                          (Orders : <%= @order_items_count[table.id] %>)
+                        <% end %>
+                      <% end %>
                          <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
                     </div>
                   </div>
@@ -61,6 +66,11 @@
                   <% end %>           
                     <div class="card-block">
                        <%= table.name %>
+                       <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(table.id) %>
+                          (Orders : <%= @order_items_count[table.id] %>)
+                        <% end %>
+                      <% end %>
                          <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
                     </div>
                   </div>
@@ -87,6 +97,11 @@
                  <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                    <div class="card-block">
                       <%= room.name %>
+                      <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(room.id) %>
+                          (Orders : <%= @order_items_count[room.id] %>)
+                        <% end %>
+                      <% end %>
                       <span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
                       <div  style="font-size:12px;"></div>
                    </div>
@@ -95,6 +110,11 @@
                  <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                    <div class="card-block">
                       <%= room.name %>
+                      <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(room.id) %>
+                          (Orders : <%= @order_items_count[room.id] %>)
+                        <% end %>
+                      <% end %>
                       <span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
                    </div>
                  </div>