From 735d899eef9613e0802b8c8df2f1c14455b44749 Mon Sep 17 00:00:00 2001
From: Sunandar <sunandar@code2lab.co>
Date: Thu, 26 Jan 2017 16:28:54 +0630
Subject: [PATCH] edit api

---
 .../api/batch_line_items_controller.rb        |  2 +-
 app/controllers/api/batches_controller.rb     |  8 +++++---
 app/models/batch.rb                           |  3 ++-
 db/migrate/20170119083734_create_batches.rb   |  2 +-
 db/schema.rb                                  | 19 ++++++++++---------
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/controllers/api/batch_line_items_controller.rb b/app/controllers/api/batch_line_items_controller.rb
index edfbdd8..eface47 100644
--- a/app/controllers/api/batch_line_items_controller.rb
+++ b/app/controllers/api/batch_line_items_controller.rb
@@ -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')
diff --git a/app/controllers/api/batches_controller.rb b/app/controllers/api/batches_controller.rb
index edec625..782f31b 100644
--- a/app/controllers/api/batches_controller.rb
+++ b/app/controllers/api/batches_controller.rb
@@ -8,12 +8,14 @@ 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
+		    	 @out=true,batch.id
 		    else
-		    	@out=false,'Error occurs in creating batch!'
+		    	 @out=false,'Error occurs in creating batch!'
 		    end
 		 else
 			@out = false, "Sorry!Unauthorized user!"   
diff --git a/app/models/batch.rb b/app/models/batch.rb
index 37effee..1616711 100644
--- a/app/models/batch.rb
+++ b/app/models/batch.rb
@@ -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
diff --git a/db/migrate/20170119083734_create_batches.rb b/db/migrate/20170119083734_create_batches.rb
index f136ea5..3595101 100644
--- a/db/migrate/20170119083734_create_batches.rb
+++ b/db/migrate/20170119083734_create_batches.rb
@@ -13,7 +13,7 @@ class CreateBatches < ActiveRecord::Migration[5.0]
 	    t.datetime   :batch_start_time
 	    t.datetime   :batch_end_time
 	    t.integer    :export_count
-	    t.string     :remark	   
+	    t.string     :remark		       
 	    t.timestamps       
     end    
   end
diff --git a/db/schema.rb b/db/schema.rb
index 02c666f..97da217 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -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"
@@ -27,21 +27,22 @@ ActiveRecord::Schema.define(version: 20170121092515) do
   end
 
   create_table "batches", force: :cascade do |t|
-    t.datetime "date",             null: false
+    t.datetime "date",                               null: false
     t.integer  "user_id"
-    t.string   "order_ref",        null: false
+    t.string   "order_ref",                          null: false
     t.boolean  "batch_start"
     t.boolean  "batch_end"
-    t.string   "created_by",       null: false
-    t.integer  "qty_processing",   null: false
-    t.integer  "qty_success",      null: false
-    t.integer  "qty_fail",         null: false
+    t.string   "created_by",                         null: false
+    t.integer  "qty_processing",                     null: false
+    t.integer  "qty_success",                        null: false
+    t.integer  "qty_fail",                           null: false
     t.datetime "batch_start_time"
     t.datetime "batch_end_time"
     t.integer  "export_count"
     t.string   "remark"
-    t.datetime "created_at",       null: false
-    t.datetime "updated_at",       null: false
+    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