+
+
diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb
index 4c716bac..36b80822 100644
--- a/app/views/inventory/inventory_definitions/_form.html.erb
+++ b/app/views/inventory/inventory_definitions/_form.html.erb
@@ -1,10 +1,15 @@
-<%= simple_form_for(@inventory_definition) do |f| %>
+
+<%= simple_form_for([:inventory,@inventory_definition]) do |f| %>
<%= f.error_notification %>
+ <%= f.input :item_code %>
+ <%= f.input :min_order_level %>
+ <%= f.input :max_stock_level %>
+
<% end %>
diff --git a/app/views/inventory/inventory_definitions/new.html.erb b/app/views/inventory/inventory_definitions/new.html.erb
index a67b973a..ce290607 100644
--- a/app/views/inventory/inventory_definitions/new.html.erb
+++ b/app/views/inventory/inventory_definitions/new.html.erb
@@ -1,5 +1,11 @@
-
-<%= render 'form', inventory_definition: @inventory_definition %>
-
-<%= link_to 'Back', inventory_definitions_path %>
+
diff --git a/app/views/inventory/stock_checks/_form.html.erb b/app/views/inventory/stock_checks/_form.html.erb
deleted file mode 100644
index b6bb2ae5..00000000
--- a/app/views/inventory/stock_checks/_form.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= simple_form_for(@stock_check) do |f| %>
- <%= f.error_notification %>
-
-
-<% end %>
diff --git a/app/views/inventory/stock_checks/_stock_check.json.jbuilder b/app/views/inventory/stock_checks/_stock_check.json.jbuilder
deleted file mode 100644
index 10634ca9..00000000
--- a/app/views/inventory/stock_checks/_stock_check.json.jbuilder
+++ /dev/null
@@ -1,2 +0,0 @@
-json.extract! stock_check, :id, :created_at, :updated_at
-json.url stock_check_url(stock_check, format: :json)
diff --git a/app/views/inventory/stock_checks/create.json.jbuilder b/app/views/inventory/stock_checks/create.json.jbuilder
new file mode 100644
index 00000000..38bcb274
--- /dev/null
+++ b/app/views/inventory/stock_checks/create.json.jbuilder
@@ -0,0 +1 @@
+json.stock_id @check.id
diff --git a/app/views/inventory/stock_checks/edit.html.erb b/app/views/inventory/stock_checks/edit.html.erb
deleted file mode 100644
index aa821705..00000000
--- a/app/views/inventory/stock_checks/edit.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-<%= render 'form', stock_check: @stock_check %>
-
-<%= link_to 'Show', @stock_check %> |
-<%= link_to 'Back', stock_checks_path %>
diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb
index 05b802eb..812d4409 100644
--- a/app/views/inventory/stock_checks/index.html.erb
+++ b/app/views/inventory/stock_checks/index.html.erb
@@ -1,25 +1,102 @@
-
+
-
-
-
- |
-
-
+
+
+
+
+
+ | # |
+ Product |
+ Balance |
+
+
+
+
+
- | <%= link_to 'Show', stock_check %> |
- <%= link_to 'Edit', edit_stock_check_path(stock_check) %> |
- <%= link_to 'Destroy', stock_check, method: :delete, data: { confirm: 'Are you sure?' } %> |
-
- <% end %>
-
-
+
diff --git a/app/views/inventory/stock_checks/index.json.jbuilder b/app/views/inventory/stock_checks/index.json.jbuilder
deleted file mode 100644
index 23740183..00000000
--- a/app/views/inventory/stock_checks/index.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.array! @stock_checks, partial: 'stock_checks/stock_check', as: :stock_check
diff --git a/app/views/inventory/stock_checks/new.html.erb b/app/views/inventory/stock_checks/new.html.erb
deleted file mode 100644
index 503af621..00000000
--- a/app/views/inventory/stock_checks/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-
New Stock Check
-
-<%= render 'form', stock_check: @stock_check %>
-
-<%= link_to 'Back', stock_checks_path %>
diff --git a/app/views/inventory/stock_checks/show.html.erb b/app/views/inventory/stock_checks/show.html.erb
index 6c306d8d..09ff16b5 100644
--- a/app/views/inventory/stock_checks/show.html.erb
+++ b/app/views/inventory/stock_checks/show.html.erb
@@ -1,4 +1,74 @@
-
<%= notice %>
+
+
+
+
+
+ Check by
+
+
+ <%= @check.check_by %>
+
+
+
+
+ Check At
+
+
+ <%= @check.created_at %>
+
+
+
+ Reason
+
+
+ <%= @check.reason %>
+
+
+
+
+
+
+ | # |
+ Product |
+ Stock Count |
+ Stock Balance |
+ Different |
+ Remark |
+
+ <%
+ count = 0
+ @check.stock_check_items.each do |item|
+ count += 1
+ %>
+
+ | <%= count %> |
+ <%= item.item_code %> |
+ <%= item.stock_count %> |
+ <%= item.stock_balance %> |
+ <%= item.different %> |
+ <%= item.remark %> |
+
+ <% end %>
+
+
+
+
+
+
+
+
+
-<%= link_to 'Edit', edit_stock_check_path(@stock_check) %> |
-<%= link_to 'Back', stock_checks_path %>
+
diff --git a/app/views/inventory/stock_checks/show.json.jbuilder b/app/views/inventory/stock_checks/show.json.jbuilder
deleted file mode 100644
index 1a4ad710..00000000
--- a/app/views/inventory/stock_checks/show.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.partial! "stock_checks/stock_check", stock_check: @stock_check
diff --git a/app/views/layouts/inventory.html.erb b/app/views/layouts/inventory.html.erb
index 5bcf7e0a..d6bbf436 100644
--- a/app/views/layouts/inventory.html.erb
+++ b/app/views/layouts/inventory.html.erb
@@ -9,7 +9,7 @@
SmartSales : Restaurant
<%= csrf_meta_tags %>
- <%= stylesheet_link_tag 'inventory', media: 'all', 'data-turbolinks-track': 'reload' %>
+ <%= stylesheet_link_tag 'origami', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'jquery-confirm', 'data-turbolinks-track': 'reload' %>
diff --git a/app/views/origami/in_juties/_assign_in_juty.html.erb b/app/views/origami/in_juties/_assign_in_juty.html.erb
index 81af7d29..b6363195 100644
--- a/app/views/origami/in_juties/_assign_in_juty.html.erb
+++ b/app/views/origami/in_juties/_assign_in_juty.html.erb
@@ -1,46 +1,43 @@
-<%= simple_form_for @in_juty,:url => origami_index_in_juty_path(@table.id), :method => :post do |f| %>
-
- <%= f.error_notification %>
- <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
-
-
+<%= simple_form_for @in_juty, :url => origami_index_in_juty_path(@table.id), :method => :post do |f| %>
+
+ <%= f.error_notification %>
+ <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
- <%= f.hidden_field :dinning_id,:value => @table.id, :class => "form-control col-md-6 " %>
+
+
+ <%= f.hidden_field :dinning_id, :value => @table.id, :class => "form-control col-md-4 " %>
+
+
+ <%= @table.name %>
+
+
+
+
+ <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
+
+
+ <%= f.input :in_time, :placeholder => "From Date", :class => "form-control" %>
+
+ <%= f.input :out_time, :placeholder => "To Date", :class => "form-control" %>
+
+
+
+
+ <%= f.button :submit, "Create", :class => 'btn btn-primary ', :id => 'create' %>
+ <%= f.button :submit, "Update", :class => 'btn btn-primary ', :disabled => '', :id => 'update' %>
+ <%= f.button :button, "Reset", :class => 'btn btn-danger ', :id => 'reset' %>
+
-
- <%= @table.name %>
-
-
-
-
- <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
-
- <%= f.input :in_time, :placeholder => "From Date" , :class => "form-control", :as => :datetime_picker%>
-
- <%= f.input :out_time, :placeholder => "From Date" , :class => "form-control", :as => :datetime_picker%>
-
-
-
- <%= f.button :submit, "Create",:class => 'btn btn-primary ', :id => 'create' %>
- <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update' %>
- <%= f.button :button, "Reset",:class => 'btn btn-danger ', :id => 'reset' %>
-
-
<% end %>
\ No newline at end of file
+
diff --git a/app/views/origami/in_juties/_edit_in_juty.html.erb b/app/views/origami/in_juties/_edit_in_juty.html.erb
index 9eaf8353..a297ac65 100644
--- a/app/views/origami/in_juties/_edit_in_juty.html.erb
+++ b/app/views/origami/in_juties/_edit_in_juty.html.erb
@@ -1,13 +1,14 @@
-<%= simple_form_for([:origami,@in_juty]) do |f| %>
- <%= f.error_notification %>
+<%= simple_form_for([:origami, @in_juty]) do |f| %>
+ <%= f.error_notification %>
-
- <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
- <%= f.input :in_time %>
- <%= f.input :out_time %>
-
+
+ <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
+
+ <%= f.input :in_time %>
+ <%= f.input :out_time %>
+
-
- <%= f.button :submit %>
-
-<% end %>
\ No newline at end of file
+
+ <%= f.button :submit %>
+
+<% end %>
diff --git a/app/views/origami/in_juties/_form.html.erb b/app/views/origami/in_juties/_form.html.erb
index d67df51b..9bed9152 100644
--- a/app/views/origami/in_juties/_form.html.erb
+++ b/app/views/origami/in_juties/_form.html.erb
@@ -1,33 +1,43 @@
-
-<%= simple_form_for([:origami,@in_juty]) do |f| %>
- <%= f.error_notification %>
+<%= simple_form_for @in_juty, :url => origami_index_in_juty_path(@table.id), :method => :post do |f| %>
+
+ <%= f.error_notification %>
+ <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
+
+
+
+ <%= f.hidden_field :dinning_id, :value => @table.id, :class => "form-control col-md-4 " %>
+
+
+ <%= @table.name %>
+
+
+
+
+ <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
+
+
+ <%= f.input :in_time, :placeholder => "From Date", :class => "form-control" %>
+
+ <%= f.input :out_time, :placeholder => "To Date", :class => "form-control" %>
+
+
+
+
+ <% f.button :submit, "Create", :class => 'btn btn-primary ', :id => 'create' %>
+ <% f.button :submit, "Update", :class => 'btn btn-primary ', :disabled => '', :id => 'update' %>
+ <% f.button :button, "Reset", :class => 'btn btn-danger ', :id => 'reset' %>
+
+
+ <%= f.button :submit, :class => 'btn btn-primary' %>
+
-
- <%= f.label :dinning_id %>
- <%= f.collection_select :dinning_id, DiningFacility.all, :id, :name, {prompt: 'Select Dining Facilities'}, {class: 'form-control'} %>
- <%= f.label :commissioner_ids %>
- <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
-
- <%= f.text_field :in_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker"%>
-
- <%= f.text_field :out_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker"%>
-
-
- <%= link_to 'Back', origami_in_juties_path, class: 'btn btn-success' %>
- <%= f.button :submit, class: 'btn btn-info' %>
-
<% end %>
-
+
\ No newline at end of file
+ });
+
+
diff --git a/app/views/origami/in_juties/index.html.erb b/app/views/origami/in_juties/index.html.erb
index 6efeb999..ff5a0fd3 100644
--- a/app/views/origami/in_juties/index.html.erb
+++ b/app/views/origami/in_juties/index.html.erb
@@ -1,38 +1,91 @@
-