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

barcode update

Browse Source
This commit is contained in:
nandar
2018-07-26 09:33:05 +06:30
parent 8dc9ab0fbe
commit 004f801f71
15 changed files with 284 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/views/batch_line_items/index.html.erb
View File

@@ -14,11 +14,20 @@
<label><strong>Select Product:</strong></label>
<%= select_tag "product_category", options_from_collection_for_select(@product_categories, "id", "name"), :class => 'form-control'%>
</div>
<div class="col-lg-4">
<label><strong>Select Batch:</strong></label><br>
<select class='selectpicker' id='batch' name='batch[]' multiple= "multiple"></select> &nbsp; &nbsp;
<select class='selectpicker' id='batch' name='batch[]' multiple= "multiple"></select>
<%= button_tag "Export csv?",:class =>'btn btn-primary btn-sm',:id =>"btnexport" %>
</div>
</div>
<br/>
<div class="col-lg-3">
<label><strong>Export to Seller:</strong></label>
<%= select_tag "seller", options_from_collection_for_select(@sellers, "id", "name"), :class => 'form-control'%>
</div>
<% end %>
</div>
<div class="row show_image">
@@ -50,7 +59,7 @@
<th>Asset Identity</th>
<th>Manufacture UID</th>
<th>Batch No</th>
<th>Asset Type</th>
<th>Barcode</th>
<th>Created At </th>
<th>Updated At </th>
</tr>
@@ -62,7 +71,7 @@
<td><%= item.asset_identity rescue '' %></td>
<td><%= item.manufacture_uid rescue '' %></td>
<td><%= item.batch_name rescue '' %></td>
<td><%= item.asset_type rescue '' %></td>
<td><%= item.barcode rescue '' %></td>
<td><%= item.created_at.strftime("%e,%b %Y %I:%M %p") rescue '' %></td>
<td><%= item.updated_at.strftime("%e,%b %Y %I:%M %p") rescue '' %></td>
</tr>

2
app/views/layouts/_navigation.html.erb
View File

@@ -19,7 +19,7 @@
</li>
<li class="nav-item">
<%= link_to "Client",clients_path, :class => "nav-link" %>
</li>
</li>
</ul>
<div class="float-xs-right">
<ul class="nav navbar-nav right">

5
app/views/users/_form.html.erb
View File

@@ -28,6 +28,11 @@
<% end %>
<div class="row">
<div class="col-md-6" id="textbox_group">
<div class="form-group">
<label for="user_type" class="string optional control-label">User Type:</label>
<%= f.select(:user_type, ['User', "Seller"], {}, { :class => 'form-control' }) %>
</div>
<div class ="form-group" >
<label for="name" class="string optional control-label">Name:</label>
<%= f.input :name ,:label =>false,:error => false,:placeholder =>'Please enter user name',input_html: { class: "form-control" } %>

11
app/views/users/index.html.erb
View File

@@ -18,26 +18,25 @@
<table class="table" style="border-top:none">
<thead>
<tr>
<th>Name</th>
<th>Name</th>
<th>User Type</th>
<th>Nrc</th>
<th>Email</th>
<th>Phone</th>
<th>Address</th>
<th>Status</th>
<th>Created At </th>
<th>Action</th>
</tr>
</thead>
<tbody>
<% @users.each do |user| %>
<tr>
<td><%= user.name rescue '' %></td>
<td><%= user.name rescue '' %></td>
<td><%= user.user_type rescue '' %></td>
<td><%= user.nrc rescue '' %></td>
<td><%= user.email rescue '' %></td>
<td><%= user.phone rescue '' %></td>
<td><%= user.address rescue '' %></td>
<td></td>
<td><%= user.created_at.strftime("%e,%b %Y %I:%M %p") rescue '' %></td>
<td></td>
<td>
<%= link_to 'Detail',
user_path(user), :class => 'btn btn-primary btn-sm' %>