Permalink
Browse files

Merge branch 'roomer' of github.com:jpcoymat/WMS into roomer

  • Loading branch information...
2 parents 4ff062f + a09f03d commit 4a86323124f789023888aa8eae76d6444edca57e @dceballos dceballos committed Nov 22, 2013
View
3 Gemfile
@@ -23,8 +23,9 @@ gem 'acts_as_tree'
gem 'unicorn'
gem 'bcrypt-ruby', '~> 3.0.0'
-gem 'roomer', :git => 'git@github.com:gosuri/roomer.git', :ref => 'search_path'
+gem 'roomer', :github => 'gosuri/roomer', :ref => 'search_path'
+ruby '2.0.0'
# Deploy with Capistrano
# gem 'capistrano'
View
28 Gemfile.lock
@@ -1,5 +1,5 @@
GIT
- remote: git@github.com:gosuri/roomer.git
+ remote: git://github.com/gosuri/roomer.git
revision: 46cb1b047d5394ceac77bb4ef417c08ba1c55d1f
ref: search_path
specs:
@@ -10,7 +10,7 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- aasm (3.0.22)
+ aasm (3.0.24)
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.5.3)
@@ -40,12 +40,12 @@ GEM
multi_json (~> 1.0)
acts_as_tree (1.4.0)
activerecord (>= 3.0.0)
- arel (3.0.2)
+ arel (3.0.3)
atomic (1.1.14)
bcrypt-ruby (3.0.1)
builder (3.0.4)
daemons (1.0.10)
- devise (3.1.1)
+ devise (3.2.1)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
@@ -59,7 +59,7 @@ GEM
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.0)
+ json (1.8.1)
kgio (2.8.1)
mail (2.5.4)
mime-types (~> 1.16)
@@ -69,16 +69,16 @@ GEM
daemons (~> 1.0.10)
gem_plugin (~> 0.2.3)
mono_logger (1.1.0)
- multi_json (1.8.0)
- orm_adapter (0.4.0)
+ multi_json (1.8.2)
+ orm_adapter (0.5.0)
pg (0.17.0)
polyglot (0.3.3)
prototype-rails (3.2.1)
rails (~> 3.2)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-protection (1.5.0)
+ rack-protection (1.5.1)
rack
rack-ssl (1.3.3)
rack
@@ -103,16 +103,16 @@ GEM
rake (10.1.0)
rdoc (3.12.2)
json (~> 1.4)
- redis (3.0.5)
- redis-namespace (1.3.1)
- redis (~> 3.0.0)
+ redis (3.0.6)
+ redis-namespace (1.3.2)
+ redis (~> 3.0.4)
resque (1.25.1)
mono_logger (~> 1.0)
multi_json (~> 1.0)
redis-namespace (~> 1.2)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
- sinatra (1.4.3)
+ sinatra (1.4.4)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
@@ -128,8 +128,8 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.37)
- unicorn (4.6.3)
+ tzinfo (0.3.38)
+ unicorn (4.7.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
View
9 app/controllers/inbound/receiving_assignment_controller.rb
@@ -24,19 +24,19 @@ def dock_door_valid?(dock_door_name, user_id)
end
def lp_valid?(lp)
- lp_valid? = true
+ lp_is_valid = true
@receipt_lines = ReceiptLine.where(:lp => lp)
unless @receipt_lines.empty?
@receipt_lines.each do |receipt_line|
if !(receipt_line.created?)
- lp_valid? = false
+ lp_is_valid = false
break
end
end
else
- lp_valid? = false
+ lp_is_valid = false
end
- lp_valid
+ lp_is_valid
end
def same_lp?(receipt_lines)
@@ -51,7 +51,6 @@ def same_lp?(receipt_lines)
end
def single_dock_door?(receipt_lines)
- dock_door =
end
end
View
12 app/controllers/setup_controller.rb
@@ -12,7 +12,7 @@ def create_company
if @company.save!
@company.create_uoms
@company.create_product_statuses
- redirect_to :controller => 'setup', :action => 'defualt_uom_setup', :company => @company
+ redirect_to defualt_uom_setup_path, :company => @company
else
flash[:notice] = "Error creating company. Please try again."
redirect_to :controller => 'setup', :action => 'index'
@@ -31,10 +31,10 @@ def update_company_uoms
@company = Company.find(params[:company][:id])
if @company.update_attributes(params[:company])
flash[:notice] = "Company updated correctly."
- redirect_to :controller => 'setup', :action => 'create_warehouses', :company => @company
+ redirect_to create_warehouses_path, :company => @company
else
flash[:notice] = "Cannot update company. Please try again."
- redirect_to :controller => 'setup', :action => 'default_uom_setup', :company => @company
+ redirect_to defualt_uom_setup_path, :company => @company
end
end
@@ -47,10 +47,10 @@ def add_warehouse
if @warehouse.save
@warehouse.add_system_parameters
flash[:notice] = "Warehouse has been succesfully created."
- redirect_to :controller => 'setup', :action => 'warehouse_users', :warehouse => @warehouse
+ redirect_to warehouse_users_path, :warehouse => @warehouse
else
flash[:notice] = "Error creating warehouse"
- redirect_to :controller => 'setup', :action => 'create_warehouses', :company => @warehouse.company
+ redirect_to create_warehouses_path, :company => @warehouse.company
end
end
@@ -65,7 +65,7 @@ def add_user
else
flash[:notice] = "Error creating user"
end
- redirect_to :controller => 'setup', :action => 'warehouse_users', :warehouse => @user.warehouse
+ redirect_to warehouse_users_path, :warehouse => @user.warehouse
end
View
2 app/models/shipment_content.rb
@@ -1,6 +1,6 @@
class ShipmentContent < ActiveRecord::Base
- validates :shipment_id, :content_type, :content_id, :presence: true
+ validates :shipment_id, :content_type, :content_id, presence: true
belongs_to :shipment
belongs_to :content, :polymorphic => true
View
BIN vendor/cache/aasm-3.0.22.gem
Binary file not shown.
View
BIN vendor/cache/aasm-3.0.24.gem
Binary file not shown.
View
BIN vendor/cache/arel-3.0.2.gem
Binary file not shown.
View
BIN vendor/cache/arel-3.0.3.gem
Binary file not shown.
View
BIN vendor/cache/devise-3.1.1.gem
Binary file not shown.
View
BIN vendor/cache/devise-3.2.1.gem
Binary file not shown.
View
BIN vendor/cache/json-1.8.0.gem
Binary file not shown.
View
BIN vendor/cache/json-1.8.1.gem
Binary file not shown.
View
BIN vendor/cache/multi_json-1.8.0.gem
Binary file not shown.
View
BIN vendor/cache/multi_json-1.8.2.gem
Binary file not shown.
View
BIN vendor/cache/orm_adapter-0.4.0.gem
Binary file not shown.
View
BIN vendor/cache/orm_adapter-0.5.0.gem
Binary file not shown.
View
BIN vendor/cache/rack-protection-1.5.0.gem
Binary file not shown.
View
BIN vendor/cache/rack-protection-1.5.1.gem
Binary file not shown.
View
BIN vendor/cache/redis-3.0.5.gem
Binary file not shown.
View
BIN vendor/cache/redis-3.0.6.gem
Binary file not shown.
View
BIN vendor/cache/redis-namespace-1.3.1.gem
Binary file not shown.
View
BIN vendor/cache/redis-namespace-1.3.2.gem
Binary file not shown.
View
BIN vendor/cache/sinatra-1.4.3.gem
Binary file not shown.
View
BIN vendor/cache/sinatra-1.4.4.gem
Binary file not shown.
View
BIN vendor/cache/tzinfo-0.3.37.gem
Binary file not shown.
View
BIN vendor/cache/tzinfo-0.3.38.gem
Binary file not shown.
View
BIN vendor/cache/unicorn-4.6.3.gem
Binary file not shown.
View
BIN vendor/cache/unicorn-4.7.0.gem
Binary file not shown.

0 comments on commit 4a86323

Please sign in to comment.