From 6791a5cba9d380d820342112be3a0ebe0ca6e708 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 22 Nov 2017 17:10:54 +0630 Subject: [PATCH] change UI for inventory --- .../inventory_definitions/_form.html.erb | 192 +++++++++--------- .../inventory/stock_checks/index.html.erb | 2 +- .../inventory/stock_checks/show.html.erb | 2 +- app/views/reports/stock_check/index.html.erb | 2 +- 4 files changed, 101 insertions(+), 97 deletions(-) diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb index cb310a29..9b42de68 100755 --- a/app/views/inventory/inventory_definitions/_form.html.erb +++ b/app/views/inventory/inventory_definitions/_form.html.erb @@ -1,115 +1,119 @@
-
- <%= simple_form_for([:inventory, @inventory_definition]) do |f| %> - <%= f.error_notification %> - -
-
- <% arr = MenuItem.active.order("name desc").pluck(:name, :item_code) %> - <% Product.order("name desc").pluck(:name, :item_code).each do |p| %> - <% arr.push(p) %> - <% end %> -
-
- - -
-
- - <% sample = [] %> - <% if @inventory_definition.item_code.nil? %> - <% if !MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code).nil? %> - <% sample = MenuItemInstance.where("item_instance_code=?", @inventory_definition.item_code).pluck(:item_instance_name, :item_instance_code) %> - <% else %> - <% sample = Product.where("item_code=?", @inventory_definition.item_code).pluck(:name, :item_code) %> - <% end %> - <% end %> -
<%= f.input :item_code, collection: sample %>
-
- - <%= f.input :min_order_level %> - <%= f.input :max_stock_level %> -
- -
- <%= f.submit t("views.btn.submit"), class: 'btn bg-blue waves-effect' %> -
- -<% end %> -
-
-
-
view_headline <%= t("views.right_panel.header.page_detail") %>
-

- 1) <%= t("views.right_panel.detail.select_item") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_txt") %>
- 2) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.item_code_txt2") %>
- 3) <%= t("views.right_panel.detail.min_order") %> <%= t("views.right_panel.detail.level") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_order_level_txt") %>
- 4) <%= t("views.right_panel.detail.max_stock") %> <%= t("views.right_panel.detail.level") %> - <%= t("views.right_panel.detail.write_txt") %><%= t("views.right_panel.detail.max_stock_level_txt") %>
-

-
list <%= t("views.right_panel.header.button_lists") %>
-

- 1) <%= t("views.btn.submit") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.inventory") %>
-

- -
list <%= t("views.right_panel.header.link_lists") %>
-

- 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
- 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.home_txt") %>
-

+
+ <%= simple_form_for([:inventory, @inventory_definition]) do |f| %> + <%= f.error_notification %> + +
+
+ <% arr = MenuItem.active.order("name desc").pluck(:name, :item_code) %> + <% Product.order("name desc").pluck(:name, :item_code).each do |p| %> + <% arr.push(p) %> + <% end %> +
+
+ + +
+
+ + <% sample = [] %> + <% if @inventory_definition.item_code.nil? %> + <% if !MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code).nil? %> + <% sample = MenuItemInstance.where("item_instance_code=?", @inventory_definition.item_code).pluck(:item_instance_name, :item_instance_code) %> + <% else %> + <% sample = Product.where("item_code=?", @inventory_definition.item_code).pluck(:name, :item_code) %> + <% end %> + <% end %> +
<%= f.input :item_code, collection: sample %>
+
+ + <%= f.input :min_order_level %> + <%= f.input :max_stock_level %> +
+ +
+ <%= f.submit t("views.btn.submit"), class: 'btn bg-blue waves-effect' %> +
+ + <% end %>
-
+
+
+
+
+
+
+
view_headline <%= t("views.right_panel.header.page_detail") %>
+

+ 1) <%= t("views.right_panel.detail.select_item") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_txt") %>
+ 2) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.item_code_txt2") %>
+ 3) <%= t("views.right_panel.detail.min_order") %> <%= t("views.right_panel.detail.level") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_order_level_txt") %>
+ 4) <%= t("views.right_panel.detail.max_stock") %> <%= t("views.right_panel.detail.level") %> - <%= t("views.right_panel.detail.write_txt") %><%= t("views.right_panel.detail.max_stock_level_txt") %>
+

+
list <%= t("views.right_panel.header.button_lists") %>
+

+ 1) <%= t("views.btn.submit") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.inventory") %>
+

+ +
list <%= t("views.right_panel.header.link_lists") %>
+

+ 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
+ 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.home_txt") %>
+

+
+
- + \ No newline at end of file + \ No newline at end of file diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb index 318e7c1b..20633b22 100755 --- a/app/views/inventory/stock_checks/index.html.erb +++ b/app/views/inventory/stock_checks/index.html.erb @@ -3,7 +3,7 @@ - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> + <%= link_to t('.back', :default => t("views.btn.back")), inventory_path %> diff --git a/app/views/inventory/stock_checks/show.html.erb b/app/views/inventory/stock_checks/show.html.erb index a6c45b7e..68cd965e 100755 --- a/app/views/inventory/stock_checks/show.html.erb +++ b/app/views/inventory/stock_checks/show.html.erb @@ -4,7 +4,7 @@ - <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> + <%= link_to t('.back', :default => t("views.btn.back")), inventory_path %> diff --git a/app/views/reports/stock_check/index.html.erb b/app/views/reports/stock_check/index.html.erb index 0230e54a..1305abe5 100755 --- a/app/views/reports/stock_check/index.html.erb +++ b/app/views/reports/stock_check/index.html.erb @@ -3,7 +3,7 @@ - <%= link_to 'Back', dashboard_path %> + <%= link_to 'Back', inventory_path %>