From ad312c15a5be21b7964e4035c971d95e0b096e60 Mon Sep 17 00:00:00 2001 From: nandar Date: Wed, 29 Aug 2018 14:34:05 +0630 Subject: [PATCH] update uid api --- app/controllers/api/batch_line_items_controller.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/batch_line_items_controller.rb b/app/controllers/api/batch_line_items_controller.rb index 4ddb743..9f41076 100644 --- a/app/controllers/api/batch_line_items_controller.rb +++ b/app/controllers/api/batch_line_items_controller.rb @@ -143,9 +143,15 @@ class Api::BatchLineItemsController < ApplicationController barcode = params[:barcode] manufacture_uid = params[:manufacture_uid] session_token = params[:session_token] - batch_line_item = BatchLineItem.find_by_barcode(barcode) + find_user = Member.find_by_session_token(session_token) if !find_user.nil? + if barcode.present? + batch_line_item = BatchLineItem.find_by_barcode(barcode) + elsif manufacture_uid.present? + batch_line_item = BatchLineItem.find_by_manufacture_uid(manufacture_uid) + end + if !batch_line_item.nil? if batch_line_item.manufacture_uid.empty? batch_line_item.manufacture_uid = manufacture_uid @@ -172,6 +178,8 @@ class Api::BatchLineItemsController < ApplicationController end end + + def get_item_by_batch batch_id = params[:batch_id] session_token = params[:session_token]