edit
This commit is contained in:
@@ -3,7 +3,9 @@ class BatchLineItemsController < ApplicationController
|
|||||||
skip_before_filter :verify_authenticity_token
|
skip_before_filter :verify_authenticity_token
|
||||||
before_action :authenticate_member!
|
before_action :authenticate_member!
|
||||||
def index
|
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)
|
@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
|
end
|
||||||
def export
|
def export
|
||||||
@@ -28,6 +30,7 @@ class BatchLineItemsController < ApplicationController
|
|||||||
end
|
end
|
||||||
@batchLineItems = BatchLineItem.all.select('serial_no,wristband_code,batch_id,manufacture_uid,card_type')
|
@batchLineItems = BatchLineItem.all.select('serial_no,wristband_code,batch_id,manufacture_uid,card_type')
|
||||||
end
|
end
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html
|
format.html
|
||||||
format.csv { send_data @batchLineItems.to_csv(user_id), filename: "encoder-#{Date.today}.csv" }
|
format.csv { send_data @batchLineItems.to_csv(user_id), filename: "encoder-#{Date.today}.csv" }
|
||||||
|
|||||||
@@ -24,12 +24,13 @@ class BatchLineItem < ApplicationRecord
|
|||||||
find_lookup=Lookup.find_by_name('generate_serial_no')
|
find_lookup=Lookup.find_by_name('generate_serial_no')
|
||||||
if !find_lookup.nil?
|
if !find_lookup.nil?
|
||||||
max_value=find_lookup.max_value
|
max_value=find_lookup.max_value
|
||||||
max_value=max_value +1
|
|
||||||
prefix=find_lookup.prefix
|
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_len=max_length-prefix.length
|
||||||
sufix_str="0" * sufix_len
|
sufix_str="0" * sufix_len
|
||||||
value_len= max_value.to_s.length
|
|
||||||
start=0
|
start=0
|
||||||
ends=sufix_len-value_len-1
|
ends=sufix_len-value_len-1
|
||||||
sufix_str= sufix_str[start..ends]
|
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
|
serial_no=prefix_str.to_s+sufix_str+max_value.to_s
|
||||||
return serial_no
|
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
|
||||||
end
|
end
|
||||||
def self.to_csv(user_id)
|
def self.to_csv(user_id)
|
||||||
|
|||||||
@@ -1,15 +1,13 @@
|
|||||||
defaults: &DEFAULTS
|
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:
|
development:
|
||||||
smartpay_provision_url: http://192.168.1.146:3000
|
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"
|
|
||||||
test:
|
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,
|
# Do not keep production secrets in the repository,
|
||||||
# instead read values from the environment.
|
# instead read values from the environment.
|
||||||
production:
|
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
|
# e3db7e59ca27d8d0119a - hledan
|
||||||
# 394e11b1b04037611fe3 - hagl
|
# 394e11b1b04037611fe3 - hagl
|
||||||
Reference in New Issue
Block a user