git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update report and inventory layout design

Browse Source
This commit is contained in:
Aung Myo
2017-10-25 14:03:15 +06:30
parent 0eea755acd
commit da6d85eaf5
25 changed files with 693 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/views/inventory/inventory_definitions/_form.html.erb
View File

@@ -1,5 +1,5 @@
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
<div class="p-l-10">
<%= simple_form_for([:inventory, @inventory_definition]) do |f| %>
<%= f.error_notification %>
@@ -10,8 +10,8 @@
<% Product.order("name desc").pluck(:name, :item_code).each do |p| %>
<% arr.push(p) %>
<% end %>
<div class="col-md-3">
<label class="control-label"><abbr title="required">*</abbr> Item</label>
<div class="col-md-4">
<label class="control-label"><abbr title="required">*</abbr>Select Item</label>
<select class="form-control item_code_place" id="item">
<% if !@inventory_definition.item_code.nil? %>
<% menuiteminstance = MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code) %>
@@ -21,7 +21,7 @@
<% code = menuiteminstance.menu_item.item_code %>
<% end %>
<% end %>
<option value=""></option>
<option value="">Select Item</option>
<% arr.each do |a| %>
<% if a[1] == code %>
<option value="<%= a[1] %>" selected><%= a[0] %></option>
@@ -48,19 +48,32 @@
</div>
<div class="form-actions">
<%= f.submit 'Submit', class: 'btn bg-blue waves-effect' %>
<%= f.submit t("views.btn.submit"), class: 'btn bg-blue waves-effect' %>
</div>
<% end %>
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
<div class="card">
<div class="body">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
<h5><i class="material-icons md-18">list INPUT LISTS</i> </h5>
<p>
1) Select Item - select to create for new inventory <br>
</p>
<p>
2) Min Order Level - to write minimun number with type Integer/Numeric <br>
</p>
<p>
3) Max Stock Level - to write minimun number with type Integer/Numeric for check stock<br>
</p>
<h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
<p>
1) <%= t("views.btn.submit") %> - to create new inventory <br>
</p>
<h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
<p>1) Home / Back - go to dashboard</p>
</div>
</div>
</div>
@@ -70,10 +83,10 @@
<script>
$(document).ready(function () {
$(".item_code_place").select2({
placeholder: 'Select Item'
});
$("select#inventory_definition_item_code").select2();
// $(".item_code_place").select2({
// placeholder: 'Select Item'
// });
// $("select#inventory_definition_item_code").select2();
$(".item_code_place").on('change', function (event) {
var ajax_url = "<%= settings_find_item_instance_path %>";
@@ -90,7 +103,7 @@
$("select#inventory_definition_item_code").append(itemlist);
}
// $("select#inventory_definition_item_code").append(itemlist);
$("select#inventory_definition_item_code").select2();
// $("select#inventory_definition_item_code").select2();
}
});
});

2
app/views/inventory/inventory_definitions/new.html.erb
View File

@@ -2,7 +2,7 @@
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item"><a href="<%= inventory_path %>">Product Inventory</a></li>
<li class="breadcrumb-item active">Edit</li>
<li class="breadcrumb-item active">New</li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), inventory_path %>
</span>