End of day commit

config/initializers/devise.rb

@@ -186,7 +186,7 @@ Devise.setup do |config|
   # Time interval you can reset your password with a reset password key.
   # Don't put a too small interval or your users won't have the time to
   # change their passwords.
-  config.reset_password_within = 6.hours
+  config.reset_password_within = 6.days
 
   # ==> Configuration for :encryptable
   # Allow you to use another encryption algorithm besides bcrypt (default). You can use

config/initializers/monkey_patches.rb

@@ -0,0 +1,5 @@
+class NilClass
+  def include?(*args)
+    false
+  end
+end

config/locales/models.en.yml

@@ -3,6 +3,7 @@ en:
     models:
       user: User
       supplier: Restaurant
+      new_supplier: New restaurant
       table: Table
       list: List
       product: Product
@@ -15,6 +16,7 @@ en:
       plural:
         user: Users
         supplier: Restaurants
+        new_supplier: New restaurants
         table: Tables
         list: Lists
         product: Products
@@ -67,3 +69,6 @@ en:
         created_at: Created
       user:
         email: 'E-mail'
+      employee:
+        name: Name
+        email: 'E-mail'

config/locales/models.nl.yml

@@ -3,6 +3,7 @@ nl:
     models:
       user: Gebruiker
       supplier: Restaurant
+      new_supplier: Nieuw restaurant
       table: Tafel
       list: Lijst
       product: Product
@@ -14,6 +15,7 @@ nl:
       plural:
         user: Gebruikers
         supplier: Restaurants
+        new_supplier: Nieuwe restaurants
         table: Tafels
         list: Lijsten
         product: Producten
@@ -66,3 +68,6 @@ nl:
         created_at: Aangemaakt
       user:
         email: 'E-mail'
+      employee:
+        name: Naam
+        email: 'E-mail'

config/locales/supplier.en.yml

@@ -187,6 +187,9 @@ en:
       destroy:
         modal:
           title: 'Delete ${models.employee} %{name}?'
-      edit:
-        modal:
-          body_header: ''
+      modal:
+        new_title: New ${models.employee}
+        new_title: Edit ${models.employee}
+        body_header: ''
+        close_button: Close
+        save_button: Save

config/locales/supplier.nl.yml

@@ -190,3 +190,9 @@ nl:
       destroy:
         modal:
           title: '${models.employee} %{name} verwijderen?'
+      modal:
+        new_title: ${models.employee} aanmaker
+        new_title: Bewerk ${models.employee}
+        body_header: ''
+        close_button: Cancel
+        save_button: Save

config/routes.rb

@@ -1,7 +1,8 @@
 ALLOWED_LOCALES = /nl|be|de|fr|en/
 Qwaiter::Application.routes.draw do
   devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }
-  devise_for :suppliers, controllers: { confirmations: 'confirmations', registrations: 'registrations' }
+  #devise_for :suppliers, controllers: { confirmations: 'confirmations', registrations: 'registrations' }
+  devise_for :employees
   devise_for :administrators
   namespace :admin do
     resources :users do
@@ -9,7 +10,8 @@ Qwaiter::Application.routes.draw do
         get :test_login
       end
     end
-    resources :suppliers do
+    resources :suppliers
+    resources :employees do
       collection do
         get :test_login
       end
@@ -26,6 +28,8 @@ Qwaiter::Application.routes.draw do
     root to: 'users#index'
   end
 
+  resources :new_suppliers
+
   post '/user_app' => 'dashboard#user_app_log' #TODO: separate high speed app at log.mozo.bar
   post '/user_feedback' => 'user#feedback'