diff --git a/app/models/batch_line_item.rb b/app/models/batch_line_item.rb index 6ebbdec..c0b2564 100644 --- a/app/models/batch_line_item.rb +++ b/app/models/batch_line_item.rb @@ -4,6 +4,11 @@ class BatchLineItem < ApplicationRecord attr_accessor :location attr_accessor :product_type require 'digest/md5' + + + CARD = "Card" + WRISTBAND = "Wristband" + ACCOUNT_CARD = "Account Card" def self.generate_account_no(location_code) super_merchant = "101" @@ -67,24 +72,24 @@ 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| 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 + 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 + 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 end - security_code = encoder.security_code - digest = Digest::MD5.hexdigest(security_code) + # security_code = encoder.security_code + # digest = Digest::MD5.hexdigest(security_code) encryptd_data=BatchLineItem.encrypted(str,encrypt_key) encoder.secret_token=encryptd_data - encoder.location=location_code - + encoder.location=location_code csv << attributes.map{ |attr| encoder.send(attr)} end end @@ -117,7 +122,6 @@ class BatchLineItem < ApplicationRecord batchLineItem.verified_at =DateTime.now.beginning_of_day.utc.to_time.strftime("%Y-%m-%d") if !security_code.nil? batchLineItem.security_code = security_code - puts 'security_code;fksdfklsdjfklsdfklsdjfklsdjfklsdjflskd' end batch=Batch.find_by_id(batch_id)