From 996f9c569a73b95b2be0f3516b10a853b3b3bbc9 Mon Sep 17 00:00:00 2001
From: Su Nandar <su.nandar@code2lab.com>
Date: Mon, 31 Jul 2017 14:51:10 +0630
Subject: [PATCH] edit serial no for batchline item

---
 app/models/batch_line_item.rb | 37 ++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/app/models/batch_line_item.rb b/app/models/batch_line_item.rb
index d6eda8b..d3bd64a 100644
--- a/app/models/batch_line_item.rb
+++ b/app/models/batch_line_item.rb
@@ -24,23 +24,28 @@ class BatchLineItem < ApplicationRecord
   def self.generate_serial_no(client_id)
 	    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	    	
-	    	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]
-	    	prefix=prefix[start..2]
-	    	prefix_str=prefix.to_s + client_id.to_s
+  	    	max_value=find_lookup.max_value
+  	    	max_value=max_value +1
+  	    	prefix=find_lookup.prefix
+  	    	max_length=find_lookup.max_length	    	
+  	    	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]
 
-	    	serial_no=prefix_str.to_s+sufix_str+max_value.to_s	    	
-	    	return serial_no	
-  
-	    end
+          prefix_len=prefix.to_s.length
+          client_len= client_id.to_s.length
+          ends= prefix_len -client_len -1          
+  	    	prefix=prefix[start..ends]
+
+  	    	prefix_str=prefix.to_s + client_id.to_s
+
+  	    	serial_no=prefix_str.to_s+sufix_str+max_value.to_s	    	
+  	    	return serial_no	
+  	   end
 	end
 	def self.to_csv(client_id,location_code)
 		encrypt_key=""