Merge branch 'master' of uflows.com:/var/git/qwaiter

config/locales/en.yml

@@ -78,3 +78,5 @@ en:
   selected_products:
     clear: Clear
     order: Order
+  product_variant:
+    add_product_variant: Add ${models.product_variant}

config/locales/models.en.yml

@@ -9,6 +9,7 @@ en:
       product: Product
       order: Order
       product_category: Product category
+      product_variant: Variant
       section: Section
       join_request: Join request
       user_feedback: User feedback
@@ -26,6 +27,7 @@ en:
         product: Products
         order: Orders
         product_category: Product categories
+        product_variant: Variants
         section: Sections
         join_request: Join requests
         user_feedback: User feedbacks
@@ -52,6 +54,8 @@ en:
         visible: Visible?
         created_at: Created
         image: Image
+      product_variant:
+        name: Name
       list:
         created_at: Created
         state: Status

config/locales/models.nl.yml

@@ -9,6 +9,7 @@ nl:
       product: Product
       order: Bestelling
       product_category: Product categorie
+      product_variant: Variant
       section: Afdeling
       join_request: Deelname verzoek
       employee: Werknemer
@@ -25,6 +26,7 @@ nl:
         product: Producten
         order: Bestellingen
         product_category: Product categorieen
+        product_variant: Varianten
         section: Afdelingen
         join_request: Deelname verzoeken
         employee: Werknemers
@@ -50,6 +52,8 @@ nl:
         active: "Actief?"
         created_at: Aangemaakt
         image: Afbeelding
+      product_variant:
+        name: Naam
       list:
         created_at: Aangemaakt
         state: Status

config/locales/nl.yml

@@ -76,6 +76,8 @@ nl:
   selected_products:
     clear: Leegmaken
     order: Bestellen
+  product_variant:
+    add_product_variant: ${models.product_variant} toevoegen
   views:
     pagination:
       first: "« Eerste"

config/routes.rb

@@ -139,6 +139,7 @@ Qwaiter::Application.routes.draw do
         get :preview_products
       end
     end
+    resources :product_variants
     resources :lists do
       collection do
         get :active