inventorymaster 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c08baa06dd7ae6f7d9ef110c71bea3b7c056721d
-  data.tar.gz: b0118198395f9d383c218a69a1af3f072b5677db
+  metadata.gz: b46fc41fbd204bff01b7a94a41d528dc154aca8e
+  data.tar.gz: a9ab3f2077c84219d9c59a3628ccf5e5109b53ac
 SHA512:
-  metadata.gz: 9475080feb1672870d2b52f88cb8f7001729003c5c79d7997800a574aa6e6cc8e3d8a966dcc93e80ac01907bb610e607e85e742c69344149f79a3c0156ea264c
-  data.tar.gz: c3605029322249f49b639086f0cd36e78e5ef9a7472784f8878ab69b24276d261942ab549d9869ef7def32e87f9e66be18e34e2c9a24880f60d26e7b14996185
+  metadata.gz: 0b3dd3ac48d9382c1e9f8fe3cbc167cbdb1d7dbf418bcdb332792c8847fbe46ce88ed3c93d17768047ef5f6a27dce207482129c78b59d05af7514a8f930b93d6
+  data.tar.gz: 8e2af0e6e07d478493115f6934838823f8c37c9a397212359a2beb1341f5b9ddbcbeb9044ad73055295b6a1ae8ec64e79fdd83bbea003acf0f2cffbf0b0217f0

data/app/assets/javascripts/inventorymaster/application.js

@@ -12,3 +12,6 @@
 //
 //= require_tree .
 //= require jquery_nested_form
+//= require jquery-ui
+//= require autocomplete-rails
+

data/app/controllers/inventorymaster/products_controller.rb

@@ -3,10 +3,11 @@ require_dependency "inventorymaster/application_controller"
 module Inventorymaster
   class ProductsController < ApplicationController
     before_action :set_product, only: [:show, :edit, :update, :destroy]
-
+     autocomplete Inventorymaster::Product, :name
     # GET /products
     def index
-      @products = Product.all
+      @products = Product.all.page(params[:page])
+      @product = Product.new
     end
 
     # GET /products/1
@@ -20,16 +21,30 @@ module Inventorymaster
       @locations = Location.all
       @transactiontypes = TransactionType.all
       #@product.transaction.build
+       @manufactures= Manufacturer.all
+      @areas = Area.all
       
     end
 
     # GET /products/1/edit
     def edit
+       @products = Product.all
+      @locations = Location.all
+      @transactiontypes = TransactionType.all
+      #@product.transaction.build
+       @manufactures= Manufacturer.all
+      @areas = Area.all
     end
 
     # POST /products
     def create
       @product = Product.new(product_params)
+       @products = Product.all
+      @locations = Location.all
+      @transactiontypes = TransactionType.all
+      #@product.transaction.build
+       @manufactures= Manufacturer.all
+      @areas = Area.all
       @product.ammount = 0
 
       if @product.save

data/app/models/inventorymaster/location.rb

@@ -1,4 +1,5 @@
 module Inventorymaster
   class Location < ActiveRecord::Base
+  	has_many :products
   end
 end

data/app/models/inventorymaster/product.rb

@@ -1,6 +1,24 @@
 module Inventorymaster
   class Product < ActiveRecord::Base
+  	belongs_to :location
+  	belongs_to :area
+  	belongs_to :manufacturer
   	has_many :transactions
   	accepts_nested_attributes_for :transactions
+
+  	validates_uniqueness_of :sku
+  	before_save do
+  		if self.sku.blank?
+    		self.sku = build_token(6)
+    	end
+  	end
+  	def build_token(size)
+  	begin
+	  charset = %w{ 2 3 4 6 7 9 A C D E F G H J K M N P Q R T V W X Y Z}
+	  sku = (0...size).map{ charset.to_a[rand(charset.size)] }.join
+	  end while Product.exists?(sku: sku)
+	  sku
+	end
+
   end
 end

data/app/models/inventorymaster/transaction.rb

@@ -1,5 +1,6 @@
 module Inventorymaster
   class Transaction < ActiveRecord::Base
-  	has_many :locations
+  	belongs_to :location
+  	belongs_to :user
   end
 end

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

@@ -1,4 +1,4 @@
-<h1>Editing Product</h1>
+<h1>Editando  Produto</h1>
 
 <%= form_for(@product) do |f| %>
   <% if @product.errors.any? %>
@@ -14,42 +14,45 @@
   <% end %>
 
   <div class="field">
-    <%= f.label :name %><br>
+    <%= f.label :name ,"Nome"%><br>
     <%= f.text_field :name %>
   </div>
   <div class="field">
-    <%= f.label :sku %><br>
+    <%= f.label :sku ,"SKU"%><br>
     <%= f.text_field :sku %>
   </div>
   <div class="field">
-    <%= f.label :upc %><br>
+    <%= f.label :upc ,"UPC"%><br>
     <%= f.text_field :upc %>
   </div>
   <div class="field">
-    <%= f.label :summary %><br>
+    <%= f.label :summary ,"Descrição"%><br>
     <%= f.text_area :summary %>
   </div>
   <div class="field">
-    <%= f.label :labels %><br>
+    <%= f.label :labels,"Labels" %><br>
     <%= f.text_field :labels %>
+  </div>
+   <div class="field">
+    <%= f.label :location_id ,"Localização do Estoque"%><br>
+    <%= f.select :location_id , @locations.collect { |c| [ c.name, c.id ] } %>
   </div>
   <div class="field">
     <%= f.label :area_id %><br>
-    <%= f.number_field :area_id %>
+      <%= f.select :area_id , @areas.collect { |c| [ c.name, c.id ] },:prompt => 'Selecione um Produto' %>
   </div>
   <div class="field">
     <%= f.label :manufacturer_id %><br>
-    <%= f.number_field :manufacturer_id %>
+      <%= f.select :manufacturer_id , @manufactures.collect { |c| [ c.name, c.id ] },:prompt => 'Selecione um Produto' %>
   </div>
   <div class="field">
-    <%= f.label :minimum_stock_count %><br>
+    <%= f.label :minimum_stock_count,"Estoque Minimo" %><br>
     <%= f.number_field :minimum_stock_count %>
   </div>
   <div class="actions">
-    <%= f.submit %>
-  </div>
+    <%= f.submit "Gravar",:class=>"btn btn-success"%>
 <% end %>
 
 
-<%= link_to 'Show', @product %> |
-<%= link_to 'Back', products_path %>
+<%= link_to 'Detalhar', @product ,:class=>"btn btn-default"%> |
+<%= link_to 'Voltar', products_path ,:class=>"btn btn-default"%>

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

@@ -2,6 +2,13 @@
   <h3><span class="glyphicon glyphicon-users"></span> Produtos</h3>
 </div>
 
+<!--<%= form_for @product do |f| %>
+  <%=f.label :name %>
+  <%=f.autocomplete_field :name, autocomplete_product_name_products_path %>
+<% end %>
+-->
+
+
 <div align="right"><%= link_to 'Inserir Produto', new_product_path ,:class=>"btn btn-primary"%></div>
 <br>
 
@@ -20,12 +27,25 @@
 
   <tbody>
     <% @products.each do |product| %>
-      <tr>
+        <%if product.minimum_stock_count.present?%>
+              <%if product.ammount < product.minimum_stock_count%>
+                <tr class="danger">
+              <%else%>
+                <tr>
+              <%end%>
+        <%else%>
+            <%if product.ammount < Inventorymaster::Setting.find(1).minimum_stock_count%>
+                <tr class="danger">
+              <%else%>
+                <tr>
+              <%end%>
+        <%end%>
+      
         <td><%= product.name %></td>
         <td><%= product.sku %></td>
-        <td><%= product.upc %></td>
-        <td><%= product.area_id %></td>
-        <td><%= product.manufacturer_id %></td>
+        <td><%if product.upc.present?%><%= product.upc %><%else%>-<%end%></td>
+        <td><%= product.area.name unless product.area.nil? %></td>
+        <td><%= product.manufacturer.name unless product.manufacturer.nil?%></td>
         <td><%= product.minimum_stock_count %></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>
@@ -35,4 +55,5 @@
   </tbody>
 </table>
 <br>
+<center><%= paginate @products %></center>
 

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

@@ -1,6 +1,6 @@
-<h1>New Product</h1>
+<h1>Novo Produto</h1>
 
-<%= nested_form_for(@product) do |f| %>
+<%= form_for(@product) do |f| %>
   <% if @product.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(@product.errors.count, "error") %> prohibited this product from being saved:</h2>
@@ -14,43 +14,46 @@
   <% end %>
 
   <div class="field">
-    <%= f.label :name %><br>
+    <%= f.label :name ,"Nome"%><br>
     <%= f.text_field :name %>
   </div>
   <div class="field">
-    <%= f.label :sku %><br>
-    <%= f.text_field :sku %>
+    <%= f.label :sku ,"SKU"%><br>
+    <%= f.text_field :sku %> <i>se você deixar este campo em branco sera gerado um número automaticamente</i>
   </div>
   <div class="field">
-    <%= f.label :upc %><br>
+    <%= f.label :upc,"UPC" %><br>
     <%= f.text_field :upc %>
   </div>
   <div class="field">
-    <%= f.label :summary %><br>
+    <%= f.label :summary ,"Descrição"%><br>
     <%= f.text_area :summary %>
   </div>
   <div class="field">
-    <%= f.label :labels %><br>
+    <%= f.label :labels,"Labels" %><br>
     <%= f.text_field :labels %>
   </div>
-  <div class="field">
-    <%= f.label :area_id %><br>
-    <%= f.number_field :area_id %>
+   <div class="field">
+    <%= f.label :location_id ,"Localização do Estoque"%><br>
+    <%= f.select :location_id , @locations.collect { |c| [ c.name, c.id ] }%>
+  </div>
+ <div class="field">
+    <%= f.label :area_id ,"Area"%><br>
+      <%= f.select :area_id , @areas.collect { |c| [ c.name, c.id ] } %>
   </div>
   <div class="field">
-    <%= f.label :manufacturer_id %><br>
-    <%= f.number_field :manufacturer_id %>
+    <%= f.label :manufacturer_id,"Fabricante" %><br>
+      <%= f.select :manufacturer_id , @manufactures.collect { |c| [ c.name, c.id ] } %>
   </div>
   <div class="field">
-    <%= f.label :minimum_stock_count %><br>
+    <%= f.label :minimum_stock_count,"Estoque Minimo" %><br>
     <%= f.number_field :minimum_stock_count %>
   </div>
 
 
   <div class="actions">
-    <%= f.submit %>
-  </div>
+    <%= f.submit "Gravar",:class=>"btn btn-success"%>
 <% end %>
 
 
-<%= link_to 'Back', products_path %>
+<%= link_to 'Voltar', products_path ,:class=>"btn btn-default" %>

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

@@ -15,22 +15,22 @@
   <%= @product.ammount %>
 </p>
 <p>
-  <strong>Name:</strong>
+  <strong>Nome:</strong>
   <%= @product.name %>
 </p>
 
 <p>
-  <strong>Sku:</strong>
+  <strong>SKU:</strong>
   <%= @product.sku %>
 </p>
 
 <p>
-  <strong>Upc:</strong>
+  <strong>UPC:</strong>
   <%= @product.upc %>
 </p>
 
 <p>
-  <strong>Summary:</strong>
+  <strong>Descrição:</strong>
   <%= @product.summary %>
 </p>
 
@@ -45,21 +45,19 @@
 </p>
 
 <p>
-  <strong>Manufacturer:</strong>
+  <strong>Fabricante:</strong>
   <%= @product.manufacturer_id %>
 </p>
 
 <p>
-  <strong>Minimum stock count:</strong>
+  <strong>Estoque Minimo:</strong>
   <%= @product.minimum_stock_count %>
 </p>
 
-<%= link_to 'Edit', edit_product_path(@product) %> |
-<%= link_to 'Back', products_path %>
+<%= link_to 'Editar', edit_product_path(@product) ,:class=>"btn btn-warning"%> |
+<%= link_to 'Voltar', products_path,:class=>"btn btn-default" %>
 <hr>
-
-<%@product.transactions.each do |transaction|%>
-<table class="table table-condensed">
+<table class="table table-striped" style="text-align:left;">
 <tr>
   <td>Tipo</td>
   <td>Data</td>
@@ -72,20 +70,21 @@
   <td>Custo Medio</td>
   <td>Motivo</td>
 </tr>
+<%@product.transactions.each do |transaction|%>
   <tr>
     <td><%=transaction.kind%></td>
-    <td><%=transaction.date%></td>
-    <td><%=transaction.location_id%></td>
-    <td><%=transaction.user_id%></td>
-    <td><%=transaction.upc%></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><%=transaction.ammount%></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>
   </tr>
-  </table>
+  
 <%end%>
+</table>
 
 
 

data/config/initializers/kaminari_config.rb

@@ -0,0 +1,10 @@
+Kaminari.configure do |config|
+   config.default_per_page = 10
+  # config.max_per_page = nil
+  # config.window = 4
+  # config.outer_window = 0
+  # config.left = 0
+  # config.right = 0
+  # config.page_method_name = :page
+  # config.param_name = :page
+end

data/config/routes.rb

@@ -4,7 +4,9 @@ Inventorymaster::Engine.routes.draw do
   get ':transactions/:id', to: 'transactions#new', on: :member
 end
 
-  resources :products
+  resources :products do
+  get :autocomplete_product_name, :on => :collection
+end
   resources :settings
   resources :manufacturers
   resources :areas

data/db/migrate/20150504000356_addlocation_to_product.rb

@@ -0,0 +1,5 @@
+class AddlocationToProduct < ActiveRecord::Migration
+  def change
+  	add_column :inventorymaster_products, :location_id, :integer
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inventorymaster
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - jcottobboni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails4-autocomplete
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem provides a basic inventory system engine
 email:
 - jcottobboni@gmail.com
@@ -138,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/kaminari_config.rb
 - config/routes.rb
 - db/migrate/20150502125839_create_inventorymaster_locations.rb
 - db/migrate/20150502133104_create_inventorymaster_areas.rb
@@ -148,6 +163,7 @@ files:
 - db/migrate/20150502141015_create_inventorymaster_transaction_types.rb
 - db/migrate/20150502141139_addproduct_to_transaction.rb
 - db/migrate/20150502144050_add_amount_to_product.rb
+- db/migrate/20150504000356_addlocation_to_product.rb
 - lib/inventorymaster.rb
 - lib/inventorymaster/engine.rb
 - lib/inventorymaster/version.rb