git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
phyusin
2018-07-11 10:08:58 +06:30
parent 47b59cca59 cd42b1136e
commit c67655d1f3
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/assigned_order_item.rb
View File

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

8
app/models/sale_order.rb
View File

@@ -8,18 +8,10 @@ class SaleOrder < ApplicationRecord
belongs_to :order belongs_to :order
def create_sale_order(sale, order) def create_sale_order(sale, order)
<<<<<<< HEAD
SaleOrder.transaction do
=======
>>>>>>> 146f727f462174b1daa31972b597448c12e26d8c
sale_order = SaleOrder.new sale_order = SaleOrder.new
sale_order.sale_id = sale sale_order.sale_id = sale
sale_order.order_id = order sale_order.order_id = order
sale_order.save! sale_order.save!
<<<<<<< HEAD
end
=======
>>>>>>> 146f727f462174b1daa31972b597448c12e26d8c
end end
private private