barcode update

app/models/batch_line_item.rb

@@ -72,20 +72,21 @@ class BatchLineItem < ApplicationRecord
       if !find_client.nil?
           encrypt_key=find_client.secrect_key                     
       end
-	    attributes = %w{serial_no asset_identity batch_id manufacture_uid asset_type secret_token  location security_code}
+	    attributes = %w{serial_no asset_identity batch_id manufacture_uid asset_type secret_token  location}
 	    CSV.generate(headers: true) do |csv|
 	        csv << attributes     
-	        all.each do |encoder|            
+	        all.each do |encoder|     
             if encoder.product_type_id ==1  
+             
               str="account_no="+encoder.asset_identity.to_s+"&manufacture_uid="+encoder.manufacture_uid.to_s+"&serial_no="+encoder.serial_no.to_s 
+              
             elsif encoder.product_type_id == 3
+             
+              attributes = attributes+ %w{security_code}
               str="account_no="+encoder.asset_identity.to_s+"&manufacture_uid="+encoder.manufacture_uid.to_s+"&serial_no="+encoder.serial_no.to_s+"&security_code="+encoder.security_code.to_s
-            else                 
-               str="manufacture_uid="+encoder.manufacture_uid.to_s+"&serial_no="+encoder.serial_no.to_s 
+            else              
+              str="manufacture_uid="+encoder.manufacture_uid.to_s+"&serial_no="+encoder.serial_no.to_s 
             end      	 
-	        	
-            # security_code = encoder.security_code
-            # digest = Digest::MD5.hexdigest(security_code)
 
 	        	encryptd_data=BatchLineItem.encrypted(str,encrypt_key)	         
 	          encoder.secret_token=encryptd_data

app/models/member.rb

@@ -6,6 +6,7 @@ class Member < ApplicationRecord
     devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable,:uid, :confirmable, :lockable
 
+    
     def self.authenticate_session_token(token)
 	  	if token.nil? || token.blank? || token.to_s == ' '
 	      return false