diff --git a/app/controllers/batch_line_items_controller.rb b/app/controllers/batch_line_items_controller.rb
index 6cfa311..ebb0b85 100644
--- a/app/controllers/batch_line_items_controller.rb
+++ b/app/controllers/batch_line_items_controller.rb
@@ -3,7 +3,9 @@ class BatchLineItemsController < ApplicationController
 	skip_before_filter  :verify_authenticity_token 
 	before_action :authenticate_member!
 	def index
-		@batches=Batch.all			 
+		user_id=current_member.user_id
+
+		@batches=Batch.where('user_id=?',user_id)			 
 		@batchLineItems=BatchLineItem.joins('inner join batches on batches.id=batch_line_items.batch_id').select('batch_line_items.*,batches.order_ref as batch_name').page(params[:page]).per(2)
 	end	 
 	def export
@@ -28,6 +30,7 @@ class BatchLineItemsController < ApplicationController
 			end
 			@batchLineItems = BatchLineItem.all.select('serial_no,wristband_code,batch_id,manufacture_uid,card_type')
 		end 
+	 
 		respond_to do |format|	 
 			format.html
 		   	format.csv { send_data @batchLineItems.to_csv(user_id), filename: "encoder-#{Date.today}.csv" }
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d10b492..055a779 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -31,7 +31,7 @@ class UsersController < ApplicationController
     cipher = OpenSSL::Cipher::Cipher.new("aes-256-cbc")
     key=cipher.random_key
     secrect_key= Base64.encode64(key)
-    @user.secrect_key=secrect_key  
+    @user.secrect_key=secrect_key      
 
     respond_to do |format|
       if @user.save
diff --git a/app/models/batch_line_item.rb b/app/models/batch_line_item.rb
index db8c83b..6a09370 100644
--- a/app/models/batch_line_item.rb
+++ b/app/models/batch_line_item.rb
@@ -24,12 +24,13 @@ class BatchLineItem < ApplicationRecord
 	    find_lookup=Lookup.find_by_name('generate_serial_no')
 	    if !find_lookup.nil?
 	    	max_value=find_lookup.max_value
-	    	max_value=max_value +1
 	    	prefix=find_lookup.prefix
-	    	max_length=find_lookup.max_length	    	
+	    	max_length=find_lookup.max_length	
+
+	    	max_value=max_value +1	    	
 	    	sufix_len=max_length-prefix.length 
 	    	sufix_str="0" * sufix_len	      
-	    	value_len= max_value.to_s.length	 
+	     	 
 	    	start=0
 	    	ends=sufix_len-value_len-1
 	    	sufix_str= sufix_str[start..ends]
@@ -38,6 +39,13 @@ class BatchLineItem < ApplicationRecord
 
 	    	serial_no=prefix_str.to_s+sufix_str+max_value.to_s	    	
 	    	return serial_no
+	    else
+	    	lookup= Lookup.new
+		  	lookup.name="generate_serial_no"
+		  	lookup.max_value=0
+		  	lookup.prefix='0000'
+		  	lookup.max_length=16
+		  	lookup.save	
 	    end
 	end
 	def self.to_csv(user_id)
diff --git a/config/config.yml b/config/config.yml
index 946baf4..21cf3f3 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -1,15 +1,13 @@
 defaults: &DEFAULTS
-  private_key:"-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAulhJXaxNsJdwoRWuKqAunpIHs7NxjgMlWoNAqc2pnmXGrn2Z\n050CCOt+YkCCvvPE2Wle6T0xFF1keV+QkhlvBwXNYfnFdSZnJd61S4U4q1jqnEO3\ncYalZNU/jZF/+pFSPKiYJQaiew1kC/MjDdmn2M83KNJAcrr6WDKvHeYBlesm/xcS\nflm0eKQWzJrtpFluHkzoJw/xsVXdjiNOpS/tAj6pmVqfVQHDVSuLlStJRGeXgU+A\nDftTQDCwD+YJO+HCzWm8tWd0p0Fx+AZvkMjLKT3E85z0pp6C6sH9cRlnt1Lq9W1Q\nyd8xflNKNkHA5aQGxJG44qXPDjr5vPl2poh1aQIDAQABAoIBAFrG44akh3w9afqv\nCxdszQkmbmYWRn09/xZm1jtiGv0062LZgPRbikA6KGlIr+jB6+VVtYy96IjZLjcK\nXO0vQq0TIIhYGt8FBD6ojXzquz6NpEzXmCfPxgam87zNYqD35i3ym5t97e0wCsrf\nePYoT+IIoABc3FSHzajll/VitOcIv8XurxfvvBpfqMf9Uoh13QEkkK0GgixIJMXq\nA1ZDjgRUasiWFe3HoXSkk1O23+mJvz76DOVbPCnEmbWwyrgDaMCRcjQ8+VOKE8Zx\nHZm9mODLqP0d0taK67aswPHRLkMxLN5yfkBTTx8IGiTPk8xt40TjoepYorywx5Rn\nofMBebkCgYEA6T5GljCINemBrgSxlYgiO9Hig9wa088qrVvXbQbLVtSj/QXmhkC/\n0dSKINObnIoUhsNQqigZXoxVXMVzunhJt4/6WlVQiD65befMQXQvuO3wLiMEBDWu\nLxSomG0Rmq0tp0xG99LUCNRx76qSoCUAJgY7Gn9OI+Qfos7d4KZaVScCgYEAzIag\n0KuMaAKWWSGrlMe+vwgqSwFvGep9Sij4+cCXxlajvgAQ0wOhc0nU4VkYErhrNgGt\nduIMeVpxoQ1jqZuQd+AZAJmKfX3hpxOB+lIzR2Q1mXBN4tKfYuHh+TW6eC82Nwrm\npIJYYcC9RuB5cmnNRaSC7DdZKttux0KpXfIrGu8CgYEApDIrDt/rg8h2ekLjoRjM\nwL/oblssp59Xs+LLrPzzeJUJPL5CopBCeTzeYG2XRoQOHzCwQJkqAt1X2o9GASdc\n/dRlseINZ1yAvVZI/GsGjXEze8c6tJv1mz830NY3ZmQzl2qjKyNIEU89RjMWNZbW\nm+4W/XhRUgLuInbuy49QWFECgYBL0BeqYfygzVy322BDvSr6muc6eGSbga1BoSBx\nS6+26IS3uESEQ5NELfkIM0NWJSAwm7yWFcKz9Q+ruE/aHf0WQm5iJ4gLbm8HxJZo\nmLHDY+TuZI+qZZKJT9u4ye6+ABojmxnVny9txMkkja7W91sM1qdlMjsORNqyaAZp\n+Yt65wKBgGoFSIzcqMJIbbsW5y92q02HTNzgVR0oCAdblmhymo1tIFYzyke39G1z\na+/ZE0JvJs0pKXD3ibvPnsfxP3mdO8eQJEGw80W9RyjBKfAM/S6KpYGvdPd8Tizo\nS+Chzm3vd4TuBoPwAxCfa95qvmYh9hTsnEVRM7tYnBhaQSx3q9UJ\n-----END RSA PRIVATE KEY-----\n"
+    smartpay_provision_url:  http://192.168.1.146:3000
 development: 
-  smartpay_provision_url:  http://192.168.1.146:3000 
-  private_key: "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAulhJXaxNsJdwoRWuKqAunpIHs7NxjgMlWoNAqc2pnmXGrn2Z\n050CCOt+YkCCvvPE2Wle6T0xFF1keV+QkhlvBwXNYfnFdSZnJd61S4U4q1jqnEO3\ncYalZNU/jZF/+pFSPKiYJQaiew1kC/MjDdmn2M83KNJAcrr6WDKvHeYBlesm/xcS\nflm0eKQWzJrtpFluHkzoJw/xsVXdjiNOpS/tAj6pmVqfVQHDVSuLlStJRGeXgU+A\nDftTQDCwD+YJO+HCzWm8tWd0p0Fx+AZvkMjLKT3E85z0pp6C6sH9cRlnt1Lq9W1Q\nyd8xflNKNkHA5aQGxJG44qXPDjr5vPl2poh1aQIDAQABAoIBAFrG44akh3w9afqv\nCxdszQkmbmYWRn09/xZm1jtiGv0062LZgPRbikA6KGlIr+jB6+VVtYy96IjZLjcK\nXO0vQq0TIIhYGt8FBD6ojXzquz6NpEzXmCfPxgam87zNYqD35i3ym5t97e0wCsrf\nePYoT+IIoABc3FSHzajll/VitOcIv8XurxfvvBpfqMf9Uoh13QEkkK0GgixIJMXq\nA1ZDjgRUasiWFe3HoXSkk1O23+mJvz76DOVbPCnEmbWwyrgDaMCRcjQ8+VOKE8Zx\nHZm9mODLqP0d0taK67aswPHRLkMxLN5yfkBTTx8IGiTPk8xt40TjoepYorywx5Rn\nofMBebkCgYEA6T5GljCINemBrgSxlYgiO9Hig9wa088qrVvXbQbLVtSj/QXmhkC/\n0dSKINObnIoUhsNQqigZXoxVXMVzunhJt4/6WlVQiD65befMQXQvuO3wLiMEBDWu\nLxSomG0Rmq0tp0xG99LUCNRx76qSoCUAJgY7Gn9OI+Qfos7d4KZaVScCgYEAzIag\n0KuMaAKWWSGrlMe+vwgqSwFvGep9Sij4+cCXxlajvgAQ0wOhc0nU4VkYErhrNgGt\nduIMeVpxoQ1jqZuQd+AZAJmKfX3hpxOB+lIzR2Q1mXBN4tKfYuHh+TW6eC82Nwrm\npIJYYcC9RuB5cmnNRaSC7DdZKttux0KpXfIrGu8CgYEApDIrDt/rg8h2ekLjoRjM\nwL/oblssp59Xs+LLrPzzeJUJPL5CopBCeTzeYG2XRoQOHzCwQJkqAt1X2o9GASdc\n/dRlseINZ1yAvVZI/GsGjXEze8c6tJv1mz830NY3ZmQzl2qjKyNIEU89RjMWNZbW\nm+4W/XhRUgLuInbuy49QWFECgYBL0BeqYfygzVy322BDvSr6muc6eGSbga1BoSBx\nS6+26IS3uESEQ5NELfkIM0NWJSAwm7yWFcKz9Q+ruE/aHf0WQm5iJ4gLbm8HxJZo\nmLHDY+TuZI+qZZKJT9u4ye6+ABojmxnVny9txMkkja7W91sM1qdlMjsORNqyaAZp\n+Yt65wKBgGoFSIzcqMJIbbsW5y92q02HTNzgVR0oCAdblmhymo1tIFYzyke39G1z\na+/ZE0JvJs0pKXD3ibvPnsfxP3mdO8eQJEGw80W9RyjBKfAM/S6KpYGvdPd8Tizo\nS+Chzm3vd4TuBoPwAxCfa95qvmYh9hTsnEVRM7tYnBhaQSx3q9UJ\n-----END RSA PRIVATE KEY-----\n"
+  smartpay_provision_url:  http://192.168.1.146:3000               
 test:
-  private_key: "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAulhJXaxNsJdwoRWuKqAunpIHs7NxjgMlWoNAqc2pnmXGrn2Z\n050CCOt+YkCCvvPE2Wle6T0xFF1keV+QkhlvBwXNYfnFdSZnJd61S4U4q1jqnEO3\ncYalZNU/jZF/+pFSPKiYJQaiew1kC/MjDdmn2M83KNJAcrr6WDKvHeYBlesm/xcS\nflm0eKQWzJrtpFluHkzoJw/xsVXdjiNOpS/tAj6pmVqfVQHDVSuLlStJRGeXgU+A\nDftTQDCwD+YJO+HCzWm8tWd0p0Fx+AZvkMjLKT3E85z0pp6C6sH9cRlnt1Lq9W1Q\nyd8xflNKNkHA5aQGxJG44qXPDjr5vPl2poh1aQIDAQABAoIBAFrG44akh3w9afqv\nCxdszQkmbmYWRn09/xZm1jtiGv0062LZgPRbikA6KGlIr+jB6+VVtYy96IjZLjcK\nXO0vQq0TIIhYGt8FBD6ojXzquz6NpEzXmCfPxgam87zNYqD35i3ym5t97e0wCsrf\nePYoT+IIoABc3FSHzajll/VitOcIv8XurxfvvBpfqMf9Uoh13QEkkK0GgixIJMXq\nA1ZDjgRUasiWFe3HoXSkk1O23+mJvz76DOVbPCnEmbWwyrgDaMCRcjQ8+VOKE8Zx\nHZm9mODLqP0d0taK67aswPHRLkMxLN5yfkBTTx8IGiTPk8xt40TjoepYorywx5Rn\nofMBebkCgYEA6T5GljCINemBrgSxlYgiO9Hig9wa088qrVvXbQbLVtSj/QXmhkC/\n0dSKINObnIoUhsNQqigZXoxVXMVzunhJt4/6WlVQiD65befMQXQvuO3wLiMEBDWu\nLxSomG0Rmq0tp0xG99LUCNRx76qSoCUAJgY7Gn9OI+Qfos7d4KZaVScCgYEAzIag\n0KuMaAKWWSGrlMe+vwgqSwFvGep9Sij4+cCXxlajvgAQ0wOhc0nU4VkYErhrNgGt\nduIMeVpxoQ1jqZuQd+AZAJmKfX3hpxOB+lIzR2Q1mXBN4tKfYuHh+TW6eC82Nwrm\npIJYYcC9RuB5cmnNRaSC7DdZKttux0KpXfIrGu8CgYEApDIrDt/rg8h2ekLjoRjM\nwL/oblssp59Xs+LLrPzzeJUJPL5CopBCeTzeYG2XRoQOHzCwQJkqAt1X2o9GASdc\n/dRlseINZ1yAvVZI/GsGjXEze8c6tJv1mz830NY3ZmQzl2qjKyNIEU89RjMWNZbW\nm+4W/XhRUgLuInbuy49QWFECgYBL0BeqYfygzVy322BDvSr6muc6eGSbga1BoSBx\nS6+26IS3uESEQ5NELfkIM0NWJSAwm7yWFcKz9Q+ruE/aHf0WQm5iJ4gLbm8HxJZo\nmLHDY+TuZI+qZZKJT9u4ye6+ABojmxnVny9txMkkja7W91sM1qdlMjsORNqyaAZp\n+Yt65wKBgGoFSIzcqMJIbbsW5y92q02HTNzgVR0oCAdblmhymo1tIFYzyke39G1z\na+/ZE0JvJs0pKXD3ibvPnsfxP3mdO8eQJEGw80W9RyjBKfAM/S6KpYGvdPd8Tizo\nS+Chzm3vd4TuBoPwAxCfa95qvmYh9hTsnEVRM7tYnBhaQSx3q9UJ\n-----END RSA PRIVATE KEY-----\n"
-
+    smartpay_provision_url:  http://192.168.1.146:3000
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
-  private_key: "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAulhJXaxNsJdwoRWuKqAunpIHs7NxjgMlWoNAqc2pnmXGrn2Z\n050CCOt+YkCCvvPE2Wle6T0xFF1keV+QkhlvBwXNYfnFdSZnJd61S4U4q1jqnEO3\ncYalZNU/jZF/+pFSPKiYJQaiew1kC/MjDdmn2M83KNJAcrr6WDKvHeYBlesm/xcS\nflm0eKQWzJrtpFluHkzoJw/xsVXdjiNOpS/tAj6pmVqfVQHDVSuLlStJRGeXgU+A\nDftTQDCwD+YJO+HCzWm8tWd0p0Fx+AZvkMjLKT3E85z0pp6C6sH9cRlnt1Lq9W1Q\nyd8xflNKNkHA5aQGxJG44qXPDjr5vPl2poh1aQIDAQABAoIBAFrG44akh3w9afqv\nCxdszQkmbmYWRn09/xZm1jtiGv0062LZgPRbikA6KGlIr+jB6+VVtYy96IjZLjcK\nXO0vQq0TIIhYGt8FBD6ojXzquz6NpEzXmCfPxgam87zNYqD35i3ym5t97e0wCsrf\nePYoT+IIoABc3FSHzajll/VitOcIv8XurxfvvBpfqMf9Uoh13QEkkK0GgixIJMXq\nA1ZDjgRUasiWFe3HoXSkk1O23+mJvz76DOVbPCnEmbWwyrgDaMCRcjQ8+VOKE8Zx\nHZm9mODLqP0d0taK67aswPHRLkMxLN5yfkBTTx8IGiTPk8xt40TjoepYorywx5Rn\nofMBebkCgYEA6T5GljCINemBrgSxlYgiO9Hig9wa088qrVvXbQbLVtSj/QXmhkC/\n0dSKINObnIoUhsNQqigZXoxVXMVzunhJt4/6WlVQiD65befMQXQvuO3wLiMEBDWu\nLxSomG0Rmq0tp0xG99LUCNRx76qSoCUAJgY7Gn9OI+Qfos7d4KZaVScCgYEAzIag\n0KuMaAKWWSGrlMe+vwgqSwFvGep9Sij4+cCXxlajvgAQ0wOhc0nU4VkYErhrNgGt\nduIMeVpxoQ1jqZuQd+AZAJmKfX3hpxOB+lIzR2Q1mXBN4tKfYuHh+TW6eC82Nwrm\npIJYYcC9RuB5cmnNRaSC7DdZKttux0KpXfIrGu8CgYEApDIrDt/rg8h2ekLjoRjM\nwL/oblssp59Xs+LLrPzzeJUJPL5CopBCeTzeYG2XRoQOHzCwQJkqAt1X2o9GASdc\n/dRlseINZ1yAvVZI/GsGjXEze8c6tJv1mz830NY3ZmQzl2qjKyNIEU89RjMWNZbW\nm+4W/XhRUgLuInbuy49QWFECgYBL0BeqYfygzVy322BDvSr6muc6eGSbga1BoSBx\nS6+26IS3uESEQ5NELfkIM0NWJSAwm7yWFcKz9Q+ruE/aHf0WQm5iJ4gLbm8HxJZo\nmLHDY+TuZI+qZZKJT9u4ye6+ABojmxnVny9txMkkja7W91sM1qdlMjsORNqyaAZp\n+Yt65wKBgGoFSIzcqMJIbbsW5y92q02HTNzgVR0oCAdblmhymo1tIFYzyke39G1z\na+/ZE0JvJs0pKXD3ibvPnsfxP3mdO8eQJEGw80W9RyjBKfAM/S6KpYGvdPd8Tizo\nS+Chzm3vd4TuBoPwAxCfa95qvmYh9hTsnEVRM7tYnBhaQSx3q9UJ\n-----END RSA PRIVATE KEY-----\n"
+ smartpay_provision_url:  http://192.168.1.146:3000
 
 # e3db7e59ca27d8d0119a - hledan
 # 394e11b1b04037611fe3 - hagl
\ No newline at end of file