inventorymaster 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3db309a0b7ef8ab9589453e6e11028501e401153
-  data.tar.gz: b4d46b40fef05cb4a30efb8ca72bea911190e178
+  metadata.gz: 7d09361368f333253ad8197b441edca6a9922995
+  data.tar.gz: 71940e1320e0e7b8081e70c132de4d440ac84f0a
 SHA512:
-  metadata.gz: afe960edc6c193ba1731679575c3dbb7489adecec11f03bdbf3388597c2e97fd43cacfdc8005e6148cb9de964219b4af18757eaffd2f8c16c9247bbf38a67a1d
-  data.tar.gz: 3b4aaeebb8e83115e4c21c8b0526fbf8e3e87287f1f2b893234e951a99dec6dbae53335ad7373f63e4e021b2081b455e7cb0271c0fe25e326848224c3a086ece
+  metadata.gz: e6b3309797d11e643a41c7794ee129ef907a1f40b2e39b0c2b9f509346e2e951e3b62662144f4d520ebf93dfcdc890e705b4a57ee3794f7c05c9657bf56f19e3
+  data.tar.gz: e185202b758ba3a3a8739b1f95a779f24d3984ee4d95f4b95b2be38f6aaa974f57edb438819c81de648dfb05196609570130456c6d79c15abfc46adc9a545a29

data/app/helpers/inventorymaster/products_helper.rb

@@ -1,5 +1,13 @@
 module Inventorymaster
   module ProductsHelper
-	 
+	 def average_cost(unit_cost,ammount)
+                if unit_cost == nil
+                    return  @cost / @average
+                else
+                    @average += ammount
+                    @cost += unit_cost* ammount
+                    return  @cost / @average
+                end
+            end
   end
 end

data/app/models/inventorymaster/product.rb

@@ -1,6 +1,6 @@
 module Inventorymaster
   class Product < ActiveRecord::Base
-      searchkick autocomplete: ['name']
+      searchkick autocomplete: ['name','sku']
   	belongs_to :location
   	belongs_to :area
   	belongs_to :manufacturer

data/app/models/inventorymaster/transaction.rb

@@ -2,5 +2,6 @@ module Inventorymaster
   class Transaction < ActiveRecord::Base
   	belongs_to :location
   	belongs_to :user
+           belongs_to :transaction_type
   end
 end

data/app/views/inventorymaster/products/index.html.erb

@@ -71,8 +71,21 @@
         <td><span class="label label-warning"><%= product.minimum_stock_count %></span></td>
         <td><span class="label label-primary"><%= product.ammount %></span></td>
         <td><%= link_to 'Detalhar', product ,:class=>"btn btn-xs btn-default"%></td>
-        <td><%= link_to 'Editar', edit_product_path(product) ,:class=>"btn btn-xs btn-warning"%></td>
-        <td><%= link_to 'Deletar', product, method: :delete, data: { confirm: 'Voce tem Certeza?' },:class=>"btn btn-xs btn-danger" %></td>
+        <td>
+  <%= form_tag({:controller=>'transactions',:action=>'new'}, {:method => :get}) do %>
+    <%= hidden_field_tag 'product_id',nil,:value => product.id%>
+    <%= hidden_field_tag 'kind',nil,:value => "Entrada"%>
+    <%= submit_tag("+ Entrada", :class => 'btn btn-xs btn-success') %>
+  <% end %>
+</td>
+<td>
+  <%= form_tag({:controller=>'transactions',:action=>'new'}, {:method => :get}) do %>
+    <%= hidden_field_tag 'product_id',nil,:value => product.id%>
+    <%= hidden_field_tag 'kind',nil,:value => "Saida"%>
+    <%= submit_tag("+ Saida", :class => 'btn btn-xs btn-danger') %>
+  <% end %>
+  </td>
+
       </tr>
     <% end %>
   </tbody>

data/app/views/inventorymaster/products/show.html.erb

@@ -1,24 +1,46 @@
 
-  <%= form_tag({:controller=>'transactions',:action=>'new'}, {:method => :get}) do %>
+
+<table >
+  <tr>
+    <td><%= link_to 'Voltar', products_path,:class=>"btn btn-default btn-xs" %></td>
+    <td>&nbsp;</td>
+    <td><%= link_to 'Editar', edit_product_path(@product) ,:class=>"btn btn-xs btn-warning"%></td>
+    <td>&nbsp;</td>
+    <td><%= link_to 'Deletar', @product, method: :delete, data: { confirm: 'Voce tem Certeza?' },:class=>"btn btn-xs btn-danger" %></td>
+    <td>&nbsp;</td>
+    <td>
+        <%= form_tag({:controller=>'transactions',:action=>'new'}, {:method => :get}) do %>
     <%= hidden_field_tag 'product_id',nil,:value => @product.id%>
     <%= hidden_field_tag 'kind',nil,:value => "Entrada"%>
-    <%= submit_tag("+ Entrada", :class => 'btn btn-small btn-success') %>
+    <%= submit_tag("+ Entrada", :class => 'btn btn-xs btn-success') %>
   <% end %>
 
-  <%= form_tag({:controller=>'transactions',:action=>'new'}, {:method => :get}) do %>
+
+    </td>
+    <td>&nbsp;</td>
+    <td>
+        <%= form_tag({:controller=>'transactions',:action=>'new'}, {:method => :get}) do %>
     <%= hidden_field_tag 'product_id',nil,:value => @product.id%>
     <%= hidden_field_tag 'kind',nil,:value => "Saida"%>
-    <%= submit_tag("+ Saida", :class => 'btn btn-small btn-danger') %>
+    <%= submit_tag("+ Saida", :class => 'btn btn-xs btn-danger') %>
   <% end %>
-<p>
- <%= link_to 'Editar', edit_product_path(@product) ,:class=>"btn btn-xs btn-warning"%>
-      <%= link_to 'Deletar', @product, method: :delete, data: { confirm: 'Voce tem Certeza?' },:class=>"btn btn-xs btn-danger" %>
+
+    </td>
+  </tr>
+</table>
+
+
+
+
+<br>
+<br>
+  <p>
   <strong>Quantidade em Estoque:</strong>
   <span class="label label-primary"><%= @product.ammount %></span>
 </p>
 <p>
   <strong>Nome:</strong>
-  <%= @product.name %>
+  <%= @product.name.upcase %>
 </p>
 
 <p>
@@ -43,12 +65,12 @@
 
 <p>
   <strong>Area:</strong>
-  <%= @product.area_id %>
+  <%= @product.area.name%>
 </p>
 
 <p>
   <strong>Fabricante:</strong>
-  <%= @product.manufacturer_id %>
+  <%= @product.manufacturer.name %>
 </p>
 
 <p>
@@ -56,8 +78,9 @@
   <%= @product.minimum_stock_count %>
 </p>
 
-<%= link_to 'Editar', edit_product_path(@product) ,:class=>"btn btn-warning"%> |
-<%= link_to 'Voltar', products_path,:class=>"btn btn-default" %>
+<%@average=0%>
+<%@cost=0%>
+
 <hr>
 <table class="table table-striped" style="text-align:left;">
 <tr>
@@ -71,17 +94,17 @@
   <td>Custo Medio</td>
   <td>Motivo</td>
 </tr>
-<%@product.transactions.each do |transaction|%>
+<%@product.transactions.order("created_at ASC").each do |transaction|%>
   <tr>
     <td><%=transaction.kind%></td>
     <td><%=transaction.date.strftime("%d/%m/%Y")%></td>
     <td><%=transaction.user.first_name unless transaction.user.nil?%></td>
     <td><%if transaction.upc.present?%><%=transaction.upc%><%else%>-<%end%></td>
-    <td><%=transaction.unit_cost%></td>
-    <td><%=transaction.unit_sale%></td>
+    <td><%=number_to_currency(transaction.unit_cost,:precision=>2)%></td>
+    <td><%=number_to_currency(transaction.unit_sale,:precision=>2)%></td>
     <td><%if transaction.kind == "Saida"%><font color="red">-</font><%else%><font color="blue">+</font><%end%><%=transaction.ammount%></td>
-    <td><%=transaction.average_cost%></td>
-    <td><%=transaction.reason%></td>
+    <td><%=number_to_currency(average_cost(transaction.unit_cost,transaction.ammount),:precision=>2)%></td>
+    <td><%=transaction.transaction_type.name%></td>
   </tr>
 
 <%end%>

data/app/views/inventorymaster/transactions/_form.html.erb

@@ -11,7 +11,7 @@
     </div>
   <% end %>
 
-  <%f.hidden_field :user_id,:value=>current_user.id%>
+  <%= f.hidden_field :user_id, :value => current_user.id %>
 
   <div class="field" style="display:none;">
     <%= f.label :product_id ,"Produto"%><br>
@@ -31,6 +31,7 @@
     <%= f.label :upc ,"UPC"%><br>
     <%= f.text_field :upc %>
   </div>
+
   <div class="field">
     <%= f.label :unit_cost,"Custo Unitário" %><br>
     <%= f.text_field :unit_cost %>

data/config/initializers/format_money.rb

@@ -0,0 +1,11 @@
+module ActionView
+    module Helpers
+        module NumberHelper
+        def number_to_currency_with_real(number, options = {})
+            defaults = {:unit => 'R$', :format => "%u %n", :separator => ",", :delimiter => "."}
+            s = number_to_currency_without_real(number, defaults.merge(options))
+        end
+            alias_method_chain :number_to_currency, :real
+        end
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inventorymaster
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - jcottobboni
@@ -152,6 +152,7 @@ files:
 - app/views/inventorymaster/transactions/new.html.erb
 - app/views/inventorymaster/transactions/show.html.erb
 - app/views/layouts/inventorymaster/application.html.erb
+- config/initializers/format_money.rb
 - config/initializers/kaminari_config.rb
 - config/routes.rb
 - db/migrate/20150502125839_create_inventorymaster_locations.rb