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

Pull from master

Browse Source
This commit is contained in:
San Wai Lwin
2018-07-09 09:27:52 +06:30
parent e5eb9b90ad 146f727f46
commit 6891756ae8
35 changed files with 167 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/assigned_order_item.rb
View File

@@ -8,7 +8,10 @@ class AssignedOrderItem < ApplicationRecord
belongs_to :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.order = order
assigned_order_item.item_code = item_code
@@ -17,7 +20,10 @@ class AssignedOrderItem < ApplicationRecord
assigned_order_item.print_status = false
assigned_order_item.delivery_status = false
assigned_order_item.save!
<<<<<<< HEAD
end
=======
>>>>>>> 146f727f462174b1daa31972b597448c12e26d8c
end
def self.assigned_order_item_by_job(order_id)