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

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/sale.rb

@@ -415,10 +415,12 @@ class Sale < ApplicationRecord
     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"

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