git_admin/nemo_encoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
Sunandar
2017-01-24 18:10:39 +06:30
parent 2893f33a23
commit cfb738e479
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/style.css
View File

@@ -257,3 +257,4 @@ hr
.container ul.nav>.nav-item:first-child{ .container ul.nav>.nav-item:first-child{
padding-left: 80px; padding-left: 80px;
} }

2
app/controllers/api/batch_line_items_controller.rb
View File

@@ -16,6 +16,7 @@ class Api::BatchLineItemsController < ApplicationController
user_id=find_user.id user_id=find_user.id
end end
if !encrypt_key.nil? if !encrypt_key.nil?
serial_no=BatchLineItem.generate_serial_no(user_id.to_s)
str="manufacture_uid="+manufacture_uid.to_s+"&serial_no="+serial_no.to_s str="manufacture_uid="+manufacture_uid.to_s+"&serial_no="+serial_no.to_s
digest_data= Digest::MD5.hexdigest(str) digest_data= Digest::MD5.hexdigest(str)
@@ -25,7 +26,6 @@ class Api::BatchLineItemsController < ApplicationController
check_manufacture = BatchLineItem.find_by_manufacture_uid_and_wristband_code(manufacture_uid,wristband_code) check_manufacture = BatchLineItem.find_by_manufacture_uid_and_wristband_code(manufacture_uid,wristband_code)
if check_manufacture.nil? if check_manufacture.nil?
serial_no=BatchLineItem.generate_serial_no(user_id.to_s)
batchLineItem=BatchLineItem.new batchLineItem=BatchLineItem.new
batchLineItem.wristband_code=wristband_code batchLineItem.wristband_code=wristband_code