diff --git a/app/controllers/api/batch_line_items_controller.rb b/app/controllers/api/batch_line_items_controller.rb index e27b96b..6a2e23c 100644 --- a/app/controllers/api/batch_line_items_controller.rb +++ b/app/controllers/api/batch_line_items_controller.rb @@ -54,4 +54,4 @@ class Api::BatchLineItemsController < ApplicationController @out=false,'Sorry!Unauthorized user!' end end -end +end \ No newline at end of file diff --git a/app/controllers/api/batches_controller.rb b/app/controllers/api/batches_controller.rb index 93a8e5a..edec625 100644 --- a/app/controllers/api/batches_controller.rb +++ b/app/controllers/api/batches_controller.rb @@ -49,8 +49,12 @@ class Api::BatchesController < ApplicationController check_member= Member.authenticate_session_token(session_token) if !check_member.nil? batch=Batch.find_by_id(batch_id) - batch_line_items=batch.batch_line_item.count - @out=true,batch_line_items + batch_line_count=0 + batch_line_items= BatchLineItem.limit(1) + if !batch_line_items.empty? + batch_line_count=batch.batch_line_item.count + end + @out=true,batch_line_count else @out = false, "Sorry!Unauthorized user!" end @@ -59,6 +63,7 @@ class Api::BatchesController < ApplicationController session_token=params[:session_token] created_by=params[:created_by] + check_member= Member.authenticate_session_token(session_token) if !check_member.nil? if !created_by.nil? diff --git a/app/controllers/batch_line_items_controller.rb b/app/controllers/batch_line_items_controller.rb index 05e6a26..6cfa311 100644 --- a/app/controllers/batch_line_items_controller.rb +++ b/app/controllers/batch_line_items_controller.rb @@ -6,9 +6,10 @@ class BatchLineItemsController < ApplicationController @batches=Batch.all @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 create + def export batch_list=params[:batch] - if ! batch_list.nil? + user_id=current_member.user_id + if !batch_list.nil? batch_list.each do |batch| find_batch=Batch.find_by_id(batch) if !find_batch.nil? @@ -18,8 +19,7 @@ class BatchLineItemsController < ApplicationController end end @batchLineItems = BatchLineItem.where('batch_id in (?) ',batch_list).select('*') - else - user_id=current_member.user_id + else batches=Batch.all batches.each do |batch| export_count=batch.export_count diff --git a/app/models/batch_line_item.rb b/app/models/batch_line_item.rb index 3a643ca..325e11e 100644 --- a/app/models/batch_line_item.rb +++ b/app/models/batch_line_item.rb @@ -44,14 +44,16 @@ class BatchLineItem < ApplicationRecord encrypt_key="" find_user=User.find_by_id(user_id) + if !find_user.nil? - encrypt_key=find_user.secrect_key + encrypt_key=find_user.secrect_key end attributes = %w{serial_no wristband_code batch_id manufacture_uid card_type wristband_token} CSV.generate(headers: true) do |csv| csv << attributes all.each do |encoder| - str="manufacture_uid="+encoder.manufacture_uid.to_s+"&serial_no="+encoder.serial_no.to_s + str="manufacture_uid="+encoder.manufacture_uid.to_s+"&serial_no="+encoder.serial_no.to_s + encryptd_data=BatchLineItem.encrypted(str,encrypt_key) encoder.wristband_token=encryptd_data @@ -60,7 +62,7 @@ class BatchLineItem < ApplicationRecord end end def self.encrypted(message,encrypt_key) - cipher = OpenSSL::Cipher::Cipher.new("aes-256-cbc") + cipher = OpenSSL::Cipher::Cipher.new("aes-128-cbc") cipher.encrypt key = Digest::SHA1.hexdigest(encrypt_key) diff --git a/config/routes.rb b/config/routes.rb index c9e633c..7ab17af 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -13,7 +13,7 @@ Rails.application.routes.draw do #users get 'check_registered_email' => "users#check_registered_email" #Encoder - match 'batch_line_items/export' => 'batch_line_items#create', :as => 'export', :via => :post + match 'batch_line_items/export' => 'batch_line_items#export', :as => 'export', :via => :post namespace :api, defaults: {format: :json} do #login