edit api
This commit is contained in:
@@ -32,7 +32,7 @@ class Api::BatchLineItemsController < ApplicationController
|
||||
batchLineItem.serial_no=serial_no
|
||||
batchLineItem.batch_id=batch_id
|
||||
batchLineItem.manufacture_uid = manufacture_uid
|
||||
batchLineItem.card_type = card_type
|
||||
batchLineItem.card_type = card_type.upcase
|
||||
|
||||
if batchLineItem.save
|
||||
lookup=Lookup.find_by_name('generate_serial_no')
|
||||
|
||||
@@ -8,8 +8,10 @@ class Api::BatchesController < ApplicationController
|
||||
created_by = params[:created_by]
|
||||
order_ref = params[:order_ref]
|
||||
card_qty = params[:card_qty]
|
||||
adult_or_child=params[:adult_or_child]
|
||||
|
||||
user_id=check_member.user_id
|
||||
batch = Batch.create_batch(created_by,date,order_ref,card_qty,user_id)
|
||||
batch = Batch.create_batch(created_by,date,order_ref,card_qty,user_id,adult_or_child)
|
||||
if !batch.nil?
|
||||
@out=true,batch.id
|
||||
else
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
class Batch < ApplicationRecord
|
||||
has_many :batch_line_item
|
||||
|
||||
def self.create_batch(created_by,date,order_ref, card_qty,user_id)
|
||||
def self.create_batch(created_by,date,order_ref, card_qty,user_id,adult_or_child)
|
||||
batch = Batch.new
|
||||
batch.created_by = created_by
|
||||
batch.order_ref = order_ref
|
||||
@@ -13,6 +13,7 @@ class Batch < ApplicationRecord
|
||||
batch.qty_fail = 0
|
||||
batch.user_id=user_id
|
||||
batch.export_count=0
|
||||
batch.adult_or_child=adult_or_child.upcase
|
||||
if batch.save
|
||||
return batch
|
||||
else
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 20170121092515) do
|
||||
ActiveRecord::Schema.define(version: 20170126074122) do
|
||||
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
@@ -42,6 +42,7 @@ ActiveRecord::Schema.define(version: 20170121092515) do
|
||||
t.string "remark"
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.string "adult_or_child", default: "CHILD"
|
||||
t.index ["user_id"], name: "index_batches_on_user_id", using: :btree
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user