Many supplier features and style upgrades and fixes

config/locales/models.en.yml

@@ -62,6 +62,7 @@ en:
         needs_help: Needs attention
         needs_payment: Wants to pay
         closed_at: Closed at
+        price: Total
       section:
         title: Title
         width: Width
@@ -93,10 +94,11 @@ en:
         width: Width
         height: Height
       user:
-        email: 'E-mail'
+        name: Name
+        email: E-mail
       employee:
         name: Name
-        email: 'E-mail'
+        email: E-mail
         manager: 'Manager?'
         active: 'Active?'
         color: Color

config/locales/models.nl.yml

@@ -60,7 +60,7 @@ nl:
         needs_help: Vraag actief
         needs_payment: Rekening gevraagd
         closed_at: Afgesloten op
-        price: Prijs
+        price: Totaal
       section:
         title: Titel
         width: Breedte
@@ -92,6 +92,7 @@ nl:
         width: Breedte
         height: Hoogte
       user:
+        name: Naam
         email: 'E-mail'
       employee:
         name: Naam

config/locales/supplier.en.yml

@@ -21,7 +21,7 @@ en:
     dashboard:
       title: Dashboard
       active_lists:
-        no_lists: No active ${models.list|downcase}
+        no_lists: No active ${models.plural.list|downcase}
       active_orders:
         no_orders: No active ${models.plural.order|downcase}
     top_menu:
@@ -200,6 +200,8 @@ en:
         title: Change the ${models.table} of the ${models.list}
         subtitle: 'The current ${model.table} number is # %{current_table_number}'
         close_button: Close
+      user_info:
+        title: ${models.user} info
     supplier_status_info:
       title: "%{name} info"
       header: The icons at the top right corner contain information about the current orders
@@ -254,4 +256,6 @@ en:
         link: My schedule
     schedule:
       title: Schedule for %{name}
-    unknown_user_name: "?"
+    user:
+      unknown_name: '?'
+      number_of_lists_at_supplier: Number of ${models.plural.list} at your place

config/locales/supplier.nl.yml

@@ -201,6 +201,8 @@ nl:
         title: Verander de ${models.table} van de ${models.list}
         subtitle: 'De huidige ${model.table} is # %{current_table_number}'
         close_button: Sluiten
+      user_info:
+        title: ${models.user} informatie
     supplier_status_info:
       title: "%{name} info"
       header: The icons at the top right corner contain information about the current orders
@@ -255,4 +257,6 @@ nl:
         link: Mijn schema
     schedule:
       title: Schema voor %{name}
-    unknown_user_name: "?"
+    user:
+      unknown_name: '?'
+      number_of_lists_at_supplier: Aantal ${models.plural.list} hier

config/routes.rb

@@ -57,7 +57,6 @@ Qwaiter::Application.routes.draw do
   #get '/user/index' => 'user#index', as: :user_root
   #get '/user/index.html#' => 'user#index', as: :user_root
   #get '/user/active_list(.:format)' => 'user#active_list', as: :user_active_list
-  #get '/user/list_info' => 'user#list_info', as: :user_list_info, via: [:get, :options]
   #post '/user/needs_help' => 'user#needs_help', as: :user_needs_help
   #post '/user/list_needs_payment' => 'user#list_needs_payment', as: :user_list_needs_payment
   #post '/user/create_list' => 'user#create_list', as: :user_create_list
@@ -73,8 +72,6 @@ Qwaiter::Application.routes.draw do
   #post '/user/reject_join_request' => 'user#reject_join_request'
   #post '/user/approve_join_request' => 'user#approve_join_request'
 
-
-  #post '/user/check_table_join_status' => 'user#check_table_join_status'
   get '/user/obtain_token' => 'user#obtain_token', as: :user_obtain_token
   #post '/user/obtain_token' => 'user#obtain_token', constraints: {format: :json}
   get '/close_window' => 'dashboard#close_window'
@@ -208,7 +205,7 @@ Qwaiter::Application.routes.draw do
   #devise_scope :supplier do
     #get '/:locale/suppliers/sign_up' => 'registrations#new', constraints: {locale: ALLOWED_LOCALES}
   #end
-  scope '(/:locale)', constraints: {locale: ALLOWED_LOCALES}, defaults: { locale: Rails.application.config.i18n.default_locale } do
+  scope '(/:locale)', constraints: {locale: ALLOWED_LOCALES}, defaults: { locale: Rails.application.config.i18n.default_locale.to_s } do
     root to: 'pages#home'
     resources :contact_forms, only: [:create]
     resources :new_suppliers