update for db changed

app/controllers/oqs/home_controller.rb

@@ -35,15 +35,15 @@ class Oqs::HomeController < BaseOqsController
 
   # Query for OQS with status
   def queue_items_query(status)
-    AssignedOrderItem.select("assigned_order_items.id, oqs.station_name, oqs.is_active, df.name as zone, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, cus.name as customer_name, odt.created_at")
+    AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.station_name, oqs.is_active, df.name as zone, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, cus.name as customer_name, odt.created_at")
     .joins("join order_queue_process_by_zones as oqpz ON oqpz.order_queue_station_id = assigned_order_items.order_queue_station_id
               left join dining_facilities as df on df.zone_id = oqpz.zone_id
-              left join order_queue_stations as oqs ON oqs.id = assigned_order_items.order_queue_station_id
+              left join order_queue_stations as oqs ON oqs.order_queue_stations_id = assigned_order_items.order_queue_station_id
-              left join orders as od ON od.id = assigned_order_items.order_id
+              left join orders as od ON od.order_id = assigned_order_items.order_id
               left join order_items as odt ON odt.item_code = assigned_order_items.item_code
-              left join customers as cus ON cus.id = od.customer_id")
+              left join customers as cus ON cus.customer_id = od.customer_id")
     .where("assigned_order_items.delivery_status = #{status}") 
-    .group("assigned_order_items.id")
+    .group("assigned_order_items.assigned_order_item_id")
     .order("odt.item_name DESC") 
   end
 end

app/controllers/oqs/print_controller.rb

@@ -2,7 +2,7 @@ class Oqs::PrintController < ApplicationController
   def print
   	unique_code="OrderItemPdf"
   	assigned_item_id=params[:id]
-  	assigned_order_item=AssignedOrderItem.select("order_id, item_code").where('id='+assigned_item_id)
+  	assigned_order_item=AssignedOrderItem.select("order_id, item_code").where('assigned_order_item_id='+assigned_item_id)
 
   	print_settings=PrintSetting.find_by_unique_code(unique_code)
     order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
@@ -17,7 +17,7 @@ class Oqs::PrintController < ApplicationController
   def print_order_summary
     unique_code="OrderSummaryPdf"
     assigned_item_id=params[:id]
-    assigned_order_item=AssignedOrderItem.select("order_id").where('id='+assigned_item_id)
+    assigned_order_item=AssignedOrderItem.select("order_id").where('assigned_order_item_id='+assigned_item_id)
 
     print_settings=PrintSetting.find_by_unique_code(unique_code)
     order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)

app/models/printer/order_queue_printer.rb

@@ -26,21 +26,21 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   def print_query(type, code)
     if type == 'order_item'
       OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining")
-        .joins("left join orders ON orders.id = order_items.order_id
+        .joins("left join orders ON orders.order_id = order_items.order_id
                 left join booking_orders AS bo ON bo.order_id=order_items.order_id
-                left join bookings AS b ON b.id = bo.booking_id
+                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 dining_facilities AS df ON df.dining_facility_id = b.dining_facility_id
-                left join customers as cus ON cus.id = orders.customer_id")
+                left join customers as cus ON cus.customer_id = orders.customer_id")
         .where("order_items.item_code=" + code)
         .group("order_items.item_code")
     else 
       OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining")
-        .joins("left join orders ON orders.id = order_items.order_id
+        .joins("left join orders ON orders.order_id = order_items.order_id
                 left join booking_orders AS bo ON bo.order_id=order_items.order_id
-                left join bookings AS b ON b.id = bo.booking_id
+                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 dining_facilities AS df ON df.dining_facility_id = b.dining_facility_id
-                left join customers as cus ON cus.id = orders.customer_id")
+                left join customers as cus ON cus.customer_id = orders.customer_id")
-        .where("orders.id=" + code.to_s)
+        .where("orders.order_id=" + code.to_s)
         .group("order_items.item_code")              
     end
 

app/models/seed_generator.rb

@@ -14,7 +14,7 @@ class SeedGenerator < ApplicationRecord
       seed.current = current_no
       seed.save
     end
-    padding_len = 16 - prefix.len
+    padding_len = 16 - prefix.length
 
     return prefix +"-"+ seed.current.to_s.to_s.rjust((16-prefix.length)+1,'0')
   end

app/views/oqs/home/index.html.erb

@@ -61,7 +61,7 @@
                     </small>
                   </p>
                   <p class="hidden order-customer"><%= qid.customer_name %></p>
-                  <p class="hidden assigned-order-item"><%= qid.id %></p>                    
+                  <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>                    
                 </div>
                 <!-- <div class="card-footer">
                   <button id=<%= 'assigned_queue_' + qid.id.to_s %> class="btn btn-primary btn-lg btn-block order-complete">COMPLETE</button>
@@ -112,10 +112,10 @@
                     </p>
                     <!-- Hidden Fields for Items -->                    
                     <p class="hidden order-customer"><%= qid.customer_name %></p>
-                    <p class="hidden assigned-order-item"><%= qid.id %></p>
+                    <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>
                   </div>
                   <div class="card-footer">
-                    <button id=<%= 'assigned_queue_' + qid.id.to_s %> class="btn btn-primary btn-lg btn-block order-complete">COMPLETE</button>
+                    <button id=<%= 'assigned_queue_' + qid.assigned_order_item_id.to_s %> class="btn btn-primary btn-lg btn-block order-complete">COMPLETE</button>
                   </div>
                 </div> 
                 <%