Pull from master

app/models/assigned_order_item.rb

@@ -8,14 +8,16 @@ class AssignedOrderItem < ApplicationRecord
   belongs_to :order_queue_station
 
   def self.assigned_order_item (order, item_code, instance_code, order_queue_station )
-    assigned_order_item = AssignedOrderItem.new()
-    assigned_order_item.order = order
-    assigned_order_item.item_code = item_code
-    assigned_order_item.instance_code = instance_code
-    assigned_order_item.order_queue_station = order_queue_station
-    assigned_order_item.print_status = false
-    assigned_order_item.delivery_status = false
-    assigned_order_item.save
+    AssignedOrderItem.transaction do
+      assigned_order_item = AssignedOrderItem.new()
+      assigned_order_item.order = order
+      assigned_order_item.item_code = item_code
+      assigned_order_item.instance_code = instance_code
+      assigned_order_item.order_queue_station = order_queue_station
+      assigned_order_item.print_status = false
+      assigned_order_item.delivery_status = false
+      assigned_order_item.save!
+    end
   end
 
   def self.assigned_order_item_by_job(order_id)

app/models/order.rb

@@ -190,16 +190,18 @@ class Order < ApplicationRecord
 
   def update_items_status_to_billed(items)
     if (items.nil?)
+      OrderItem.where({ order_items_id: '#{self.order_items.pluck(:order_items_id)}'}).update_all(order_item_status: "billed")
       ##Update the order status to ensure that reflect the stage
-      self.order_items.each do |item|
-        item.order_item_status = "billed"
-        item.save
-      end
+      # self.order_items.each do |item|
+      #   item.order_item_status = "billed"
+      #   item.save
+      # end
     else
-      items.each do |item|
-        item.order_item_status = "billed"
-        item.save
-      end
+      OrderItem.where({ order_items_id: '#{items.pluck(:order_items_id)}'}).update_all(order_item_status: "billed")
+      # items.each do |item|
+      #   item.order_item_status = "billed"
+      #   item.save
+      # end
     end
   end
 

app/models/sale.rb

@@ -412,13 +412,15 @@ class Sale < ApplicationRecord
 
   # Tax Re-Calculte
   def compute_tax(sale, total_taxable, total_discount = 0, order_source = nil, tax_type=nil)
-    shop = Shop.first();
+    shop = Shop.first
 
     #if tax is not apply create new record
-    SaleTax.where("sale_id='#{sale.sale_id}'").find_each do |existing_tax|
-      #delete existing and create new
-      existing_tax.delete
-    end
+    # SaleTax.where("sale_id='#{sale.sale_id}'").find_each do |existing_tax|
+    #   #delete existing and create new
+    #   existing_tax.delete
+    # end
+    taxes = SaleTax.where("sale_id='#{sale.sale_id}'").pluck(:sale_tax_id)
+    SaleTax.where("sale_tax_id IN (?)", taxes).destroy_all
 
     total_tax_amount = 0
     tax_incl_exec = "exclusive"
@@ -495,7 +497,7 @@ class Sale < ApplicationRecord
 
   # Tax Calculate
   def apply_tax(total_taxable, order_source = nil)
-    shop = Shop.first();
+    shop = Shop.first
     
     #if tax is not apply create new record
     SaleTax.where("sale_id='#{self.sale_id}'").find_each do |existing_tax|

app/models/sale_order.rb

@@ -7,11 +7,13 @@ class SaleOrder < ApplicationRecord
   belongs_to :sale
   belongs_to :order
 
-  def create_sale_order(sale, order)
-    sale_order = SaleOrder.new
-    sale_order.sale_id = sale
-    sale_order.order_id = order
-    sale_order.save!
+  def create_sale_order(sale, order) 
+    SaleOrder.transaction do
+      sale_order = SaleOrder.new
+      sale_order.sale_id = sale
+      sale_order.order_id = order
+      sale_order.save!
+    end
   end
 
   private

app/models/sale_payment.rb

@@ -71,10 +71,12 @@ class SalePayment < ApplicationRecord
       # update complete order items in oqs
       booking = Booking.find_by_sale_id(sale_id)
       booking.booking_orders.each do |sodr|
-        AssignedOrderItem.where("order_id = '#{ sodr.order_id }'").find_each do |aoi|
-          aoi.delivery_status = 1
-          aoi.save
-        end
+        assigned =AssignedOrderItem.where("order_id = '#{ sodr.order_id }'").pluck(:assigned_order_item_id)
+        AssignedOrderItem.where({ order_id: '#{assigned}'}).update_all(print_status: true)
+        # AssignedOrderItem.where("order_id = '#{ sodr.order_id }'").find_each do |aoi|
+        #   aoi.delivery_status = 1
+        #   aoi.save
+        # end
       end
 
       return true, self.save,membership_data
@@ -616,8 +618,9 @@ class SalePayment < ApplicationRecord
           end
         end
         if status && sale_count == 0
-           table.status = "available"
-           table.save
+           table.update_attributes(status: "available")
+           # table.status = "available"
+           # table.save
         end
 
         # type  = 'payment'