diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c418dccc..b41a365d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,24 @@ - - + + + + + + + + + + + + + + + + + + @@ -22,31 +38,71 @@ - - - - - - - - - - - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62,44 +118,22 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -141,8 +175,13 @@ @@ -281,6 +320,90 @@ + + + + + + - @@ -697,17 +826,6 @@ - - - - - - - - - - - @@ -779,62 +897,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -851,10 +913,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/controllers/commissioners_controller.rb b/app/controllers/origami/commissioners_controller.rb similarity index 93% rename from app/controllers/commissioners_controller.rb rename to app/controllers/origami/commissioners_controller.rb index a1204de2..4b1d1ca4 100644 --- a/app/controllers/commissioners_controller.rb +++ b/app/controllers/origami/commissioners_controller.rb @@ -1,5 +1,5 @@ -class CommissionersController < ApplicationController - before_action :set_commissioner, only: [:show, :edit, :update, :destroy] +class Origami::CommissionersController < BaseOrigamiController + # before_action :set_commissioner, only: [:show, :edit, :update, :destroy] # GET /commissioners # GET /commissioners.json diff --git a/app/controllers/commissions_controller.rb b/app/controllers/origami/commissions_controller.rb similarity index 87% rename from app/controllers/commissions_controller.rb rename to app/controllers/origami/commissions_controller.rb index 706e3459..19c6332e 100644 --- a/app/controllers/commissions_controller.rb +++ b/app/controllers/origami/commissions_controller.rb @@ -1,5 +1,5 @@ -class CommissionsController < ApplicationController - before_action :set_commission, only: [:show, :edit, :update, :destroy] +class Origami::CommissionsController < BaseOrigamiController + # before_action :set_commission, only: [:show, :edit, :update, :destroy] # GET /commissions # GET /commissions.json @@ -56,7 +56,7 @@ class CommissionsController < ApplicationController def destroy @commission.destroy respond_to do |format| - format.html { redirect_to commissions_url, notice: 'Commission was successfully destroyed.' } + format.html { redirect_to origami_commissions_path, notice: 'Commission was successfully destroyed.' } format.json { head :no_content } end end diff --git a/app/views/commissioners/_commissioner.json.jbuilder b/app/views/origami/commissioners/_commissioner.json.jbuilder similarity index 100% rename from app/views/commissioners/_commissioner.json.jbuilder rename to app/views/origami/commissioners/_commissioner.json.jbuilder diff --git a/app/views/commissioners/_form.html.erb b/app/views/origami/commissioners/_form.html.erb similarity index 100% rename from app/views/commissioners/_form.html.erb rename to app/views/origami/commissioners/_form.html.erb diff --git a/app/views/commissioners/edit.html.erb b/app/views/origami/commissioners/edit.html.erb similarity index 100% rename from app/views/commissioners/edit.html.erb rename to app/views/origami/commissioners/edit.html.erb diff --git a/app/views/commissioners/index.html.erb b/app/views/origami/commissioners/index.html.erb similarity index 100% rename from app/views/commissioners/index.html.erb rename to app/views/origami/commissioners/index.html.erb diff --git a/app/views/commissioners/index.json.jbuilder b/app/views/origami/commissioners/index.json.jbuilder similarity index 100% rename from app/views/commissioners/index.json.jbuilder rename to app/views/origami/commissioners/index.json.jbuilder diff --git a/app/views/commissioners/new.html.erb b/app/views/origami/commissioners/new.html.erb similarity index 100% rename from app/views/commissioners/new.html.erb rename to app/views/origami/commissioners/new.html.erb diff --git a/app/views/commissioners/show.html.erb b/app/views/origami/commissioners/show.html.erb similarity index 100% rename from app/views/commissioners/show.html.erb rename to app/views/origami/commissioners/show.html.erb diff --git a/app/views/commissioners/show.json.jbuilder b/app/views/origami/commissioners/show.json.jbuilder similarity index 100% rename from app/views/commissioners/show.json.jbuilder rename to app/views/origami/commissioners/show.json.jbuilder diff --git a/app/views/commissions/_commission.json.jbuilder b/app/views/origami/commissions/_commission.json.jbuilder similarity index 100% rename from app/views/commissions/_commission.json.jbuilder rename to app/views/origami/commissions/_commission.json.jbuilder diff --git a/app/views/commissions/_form.html.erb b/app/views/origami/commissions/_form.html.erb similarity index 72% rename from app/views/commissions/_form.html.erb rename to app/views/origami/commissions/_form.html.erb index 40c96de7..70ce85f2 100644 --- a/app/views/commissions/_form.html.erb +++ b/app/views/origami/commissions/_form.html.erb @@ -1,4 +1,4 @@ -<%= simple_form_for(@commission) do |f| %> +<%= simple_form_for([:origami,@commission]) do |f| %> <%= f.error_notification %>
diff --git a/app/views/commissions/edit.html.erb b/app/views/origami/commissions/edit.html.erb similarity index 100% rename from app/views/commissions/edit.html.erb rename to app/views/origami/commissions/edit.html.erb diff --git a/app/views/commissions/index.html.erb b/app/views/origami/commissions/index.html.erb similarity index 74% rename from app/views/commissions/index.html.erb rename to app/views/origami/commissions/index.html.erb index f1e174ec..1c6e5eff 100644 --- a/app/views/commissions/index.html.erb +++ b/app/views/origami/commissions/index.html.erb @@ -13,7 +13,7 @@ <% @commissions.each do |commission| %> <%= link_to 'Show', commission %> - <%= link_to 'Edit', edit_commission_path(commission) %> + <%= link_to 'Edit', edit_origami_commission_path(commission) %> <%= link_to 'Destroy', commission, method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> @@ -22,4 +22,4 @@
-<%= link_to 'New Commission', new_commission_path %> +<%= link_to 'New Commission', new_origami_commission_path %> diff --git a/app/views/commissions/index.json.jbuilder b/app/views/origami/commissions/index.json.jbuilder similarity index 100% rename from app/views/commissions/index.json.jbuilder rename to app/views/origami/commissions/index.json.jbuilder diff --git a/app/views/commissions/new.html.erb b/app/views/origami/commissions/new.html.erb similarity index 60% rename from app/views/commissions/new.html.erb rename to app/views/origami/commissions/new.html.erb index 797e7367..522a45ea 100644 --- a/app/views/commissions/new.html.erb +++ b/app/views/origami/commissions/new.html.erb @@ -2,4 +2,4 @@ <%= render 'form', commission: @commission %> -<%= link_to 'Back', commissions_path %> +<%= link_to 'Back', origami_commissions_path %> diff --git a/app/views/commissions/show.html.erb b/app/views/origami/commissions/show.html.erb similarity index 100% rename from app/views/commissions/show.html.erb rename to app/views/origami/commissions/show.html.erb diff --git a/app/views/commissions/show.json.jbuilder b/app/views/origami/commissions/show.json.jbuilder similarity index 100% rename from app/views/commissions/show.json.jbuilder rename to app/views/origami/commissions/show.json.jbuilder diff --git a/config/routes.rb b/config/routes.rb index 0b3f94a9..99c6672e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,8 +2,6 @@ require 'sidekiq/web' Rails.application.routes.draw do - resources :commissions - resources :commissioners root 'home#index' mount Sidekiq::Web => '/kiq' @@ -171,6 +169,8 @@ Rails.application.routes.draw do post '/:sale_id/get_customer' => "customers#get_customer" resources :addorders + resources :commissions + resources :commissioners end #--------- Waiter/Ordering Station ------------#