edit
This commit is contained in:
@@ -257,3 +257,4 @@ hr
|
||||
.container ul.nav>.nav-item:first-child{
|
||||
padding-left: 80px;
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ class Api::BatchLineItemsController < ApplicationController
|
||||
user_id=find_user.id
|
||||
end
|
||||
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
|
||||
|
||||
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)
|
||||
if check_manufacture.nil?
|
||||
serial_no=BatchLineItem.generate_serial_no(user_id.to_s)
|
||||
|
||||
batchLineItem=BatchLineItem.new
|
||||
batchLineItem.wristband_code=wristband_code
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
<td><%= user.created_at.strftime("%e,%b %Y %I:%M %p") rescue '' %></td>
|
||||
<td>
|
||||
<%= link_to 'Detail',
|
||||
user_path(user), :class => 'btn btn-primary btn-sm' %>
|
||||
user_path(user), :class => 'btn btn-primary btn-sm ' %>
|
||||
<%= link_to t('.edit', :default => t("helpers.links.edit")),
|
||||
edit_user_path(user), :class => 'btn btn-primary btn-sm' %>
|
||||
<%= link_to 'Delete', user_path(user), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-primary btn-sm' %>
|
||||
|
||||
Reference in New Issue
Block a user