diff --git a/Gemfile b/Gemfile index fdba13e9..c219a302 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ end #gem 'sqlite3' - # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.0.2' +gem 'rails', '~> 5.1.0' # Use mysql as the database for Active Record gem 'mysql2', '>= 0.3.18', '< 0.5' #gem 'pg' @@ -34,7 +34,7 @@ gem 'spreadsheet' gem 'to_xls-rails' #Reporting gem -gem 'compendium' +#gem 'compendium' # Use jquery as the JavaScript library diff --git a/Gemfile.lock b/Gemfile.lock index 4cb481ae..9504f5a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,53 +1,53 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.2) - actionpack (= 5.0.2) - nio4r (>= 1.2, < 3.0) + actioncable (5.1.1) + actionpack (= 5.1.1) + nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.2) - actionpack (= 5.0.2) - actionview (= 5.0.2) - activejob (= 5.0.2) + actionmailer (5.1.1) + actionpack (= 5.1.1) + actionview (= 5.1.1) + activejob (= 5.1.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.2) - actionview (= 5.0.2) - activesupport (= 5.0.2) + actionpack (5.1.1) + actionview (= 5.1.1) + activesupport (= 5.1.1) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.2) - activesupport (= 5.0.2) + actionview (5.1.1) + activesupport (= 5.1.1) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.2) - activesupport (= 5.0.2) + activejob (5.1.1) + activesupport (= 5.1.1) globalid (>= 0.3.6) - activemodel (5.0.2) - activesupport (= 5.0.2) - activerecord (5.0.2) - activemodel (= 5.0.2) - activesupport (= 5.0.2) - arel (~> 7.0) - activesupport (5.0.2) + activemodel (5.1.1) + activesupport (= 5.1.1) + activerecord (5.1.1) + activemodel (= 5.1.1) + activesupport (= 5.1.1) + arel (~> 8.0) + activesupport (5.1.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - arel (7.1.4) - autoprefixer-rails (6.7.7) + arel (8.0.0) + autoprefixer-rails (7.1.1) execjs bcrypt (3.1.11) + bindex (0.5.0) bootstrap (4.0.0.alpha6) autoprefixer-rails (>= 6.0.3) sass (>= 3.4.19) builder (3.2.3) byebug (9.0.6) - chunky_png (1.3.8) coffee-rails (4.2.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.2.x) @@ -55,37 +55,12 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - collection_of (1.0.5) - activesupport (>= 3.0.0) - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.5) - sass (>= 3.2, < 3.5) - compass-rails (3.0.2) - compass (~> 1.0.0) - sass-rails (< 5.1) - sprockets (< 4.0) - compendium (1.1.3.4) - collection_of (= 1.0.5) - compass-rails (>= 1.0.0) - inheritable_attr (>= 1.0.0) - rails (>= 3.0.0) - sass-rails (>= 3.0.0) concurrent-ruby (1.0.5) connection_pool (2.2.1) cups (0.0.7) - database_cleaner (1.5.3) - debug_inspector (0.0.2) + database_cleaner (1.6.1) diff-lcs (1.3) - erubis (2.7.0) + erubi (1.6.0) execjs (2.7.0) factory_girl (4.8.0) activesupport (>= 3.0.0) @@ -95,17 +70,15 @@ GEM faker (1.7.3) i18n (~> 0.5) ffi (1.9.18) - font-awesome-rails (4.7.0.1) - railties (>= 3.2, < 5.1) - globalid (0.3.7) - activesupport (>= 4.1.0) + font-awesome-rails (4.7.0.2) + railties (>= 3.2, < 5.2) + globalid (0.4.0) + activesupport (>= 4.2.0) i18n (0.8.1) - inheritable_attr (1.0.0) + jbuilder (2.6.4) activesupport (>= 3.0.0) - jbuilder (2.6.3) - activesupport (>= 3.0.0, < 5.2) - multi_json (~> 1.2) - jquery-rails (4.2.2) + multi_json (>= 1.2) + jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -114,18 +87,18 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.4) + mail (2.6.5) mime-types (>= 1.16, < 4) method_source (0.8.2) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.1.0) - minitest (5.10.1) + minitest (5.10.2) multi_json (1.12.1) - mysql2 (0.4.5) + mysql2 (0.4.6) nio4r (2.0.0) - nokogiri (1.7.1) + nokogiri (1.7.2) mini_portile2 (~> 2.1.0) pdf-core (0.7.0) prawn (2.2.2) @@ -134,32 +107,32 @@ GEM prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) puma (3.8.2) - rack (2.0.1) + rack (2.0.3) rack-cors (0.4.1) - rack-protection (1.5.3) + rack-protection (2.0.0) rack rack-test (0.6.3) rack (>= 1.0) - rails (5.0.2) - actioncable (= 5.0.2) - actionmailer (= 5.0.2) - actionpack (= 5.0.2) - actionview (= 5.0.2) - activejob (= 5.0.2) - activemodel (= 5.0.2) - activerecord (= 5.0.2) - activesupport (= 5.0.2) + rails (5.1.1) + actioncable (= 5.1.1) + actionmailer (= 5.1.1) + actionpack (= 5.1.1) + actionview (= 5.1.1) + activejob (= 5.1.1) + activemodel (= 5.1.1) + activerecord (= 5.1.1) + activesupport (= 5.1.1) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.2) + railties (= 5.1.1) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.2) - activesupport (>= 4.2.0, < 6.0) - nokogiri (~> 1.6) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.2) - actionpack (= 5.0.2) - activesupport (= 5.0.2) + railties (5.1.1) + actionpack (= 5.1.1) + activesupport (= 5.1.1) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -168,25 +141,25 @@ GEM rb-inotify (0.9.8) ffi (>= 0.5.0) redis (3.3.3) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) ruby-ole (1.2.12.1) - sass (3.4.23) + sass (3.4.24) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -197,17 +170,17 @@ GEM activesupport (>= 3.2.1) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) - sidekiq (4.2.10) + sidekiq (5.0.0) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (~> 3.2, >= 3.2.1) - simple_form (3.4.0) - actionpack (> 4, < 5.1) - activemodel (> 4, < 5.1) + redis (~> 3.3, >= 3.3.3) + simple_form (3.5.0) + actionpack (> 4, < 5.2) + activemodel (> 4, < 5.2) spreadsheet (1.1.4) ruby-ole (>= 1.0) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) @@ -224,18 +197,18 @@ GEM tilt (2.0.7) to_xls-rails (1.3.1) spreadsheet (>= 0.8.5) - ttfunk (1.5.0) + ttfunk (1.5.1) turbolinks (5.0.1) turbolinks-source (~> 5) - turbolinks-source (5.0.0) - tzinfo (1.2.2) + turbolinks-source (5.0.3) + tzinfo (1.2.3) thread_safe (~> 0.1) - uglifier (3.1.8) + uglifier (3.2.0) execjs (>= 0.3.0, < 3) - web-console (3.4.0) + web-console (3.5.1) actionview (>= 5.0) activemodel (>= 5.0) - debug_inspector + bindex (>= 0.4.0) railties (>= 5.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) @@ -249,7 +222,6 @@ DEPENDENCIES bootstrap (~> 4.0.0.alpha3) byebug coffee-rails (~> 4.2) - compendium cups (~> 0.0.7) database_cleaner factory_girl_rails (~> 4.0) @@ -263,7 +235,7 @@ DEPENDENCIES prawn-table puma (~> 3.0) rack-cors - rails (~> 5.0.2) + rails (~> 5.1.0) rspec-rails (~> 3.5) sass-rails (~> 5.0) schema_to_scaffold diff --git a/config/routes.rb b/config/routes.rb index 26fe9935..bdec7c17 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -61,9 +61,9 @@ Rails.application.routes.draw do namespace :origami do root "home#index" get "/:booking_id" => "home#show" do #origami/:booking_id will show - resources :payments, only: [:index, :create ] #add payment by payment_method - resources :discounts, only: [:index, :create ] #add discount type - resources :customers, only: [:index, :create ] #add customer type + resources :payments, only: [:index, :new, :create ] #add payment by payment_method + resources :discounts, only: [:index,:new, :create ] #add discount type + resources :customers, only: [:index,:new, :create ] #add customer type end end