diff --git a/app/assets/javascripts/supplier/app/templates/_list_content.emblem b/app/assets/javascripts/supplier/app/templates/_list_content.emblem index b1d9b8fd..b7890004 100644 --- a/app/assets/javascripts/supplier/app/templates/_list_content.emblem +++ b/app/assets/javascripts/supplier/app/templates/_list_content.emblem @@ -28,7 +28,7 @@ if list.sorted_orders view mark-order-cancelled order=order if showTotal .list-orders-total.total - = t 'total' + = t 'general.total' span.currency= currency list.total else p diff --git a/app/controllers/suppliers/svg_elements_controller.rb b/app/controllers/suppliers/svg_elements_controller.rb index 98d5ff68..d4e29d98 100644 --- a/app/controllers/suppliers/svg_elements_controller.rb +++ b/app/controllers/suppliers/svg_elements_controller.rb @@ -1,7 +1,7 @@ module Suppliers class SvgElementsController < Suppliers::ApplicationController def index - @svg_elements = SvgElement.all + @svg_elements = SvgElement.active render json: @svg_elements, each_serializer: Suppliers::SvgElementSerializer end end diff --git a/app/models/svg_element.rb b/app/models/svg_element.rb index da8c756d..5816fde9 100644 --- a/app/models/svg_element.rb +++ b/app/models/svg_element.rb @@ -3,5 +3,10 @@ class SvgElement include ActiveModel::SerializerSupport include SvgElementDefaults property :snap_code + property :active, type: :boolean, default: true has_many :section_elements + + def self.active + all.select(&:active) + end end diff --git a/app/views/admin/svg_elements/_form.html.slim b/app/views/admin/svg_elements/_form.html.slim index e54de103..e1a575f8 100644 --- a/app/views/admin/svg_elements/_form.html.slim +++ b/app/views/admin/svg_elements/_form.html.slim @@ -5,6 +5,9 @@ = f.row :name .form-label= f.label :name .form-field= f.text_field :name + = f.row :active + .form-label= f.label :active + .form-field= f.check_box :active = f.row :dpm .small-3.columns= f.label :dpm .small-3.columns= f.number_field :dpm diff --git a/config/locales/models.en.yml b/config/locales/models.en.yml index 03260213..d5499218 100644 --- a/config/locales/models.en.yml +++ b/config/locales/models.en.yml @@ -82,6 +82,8 @@ en: from_number: From number to_number: To number created_at: Created + width: Width + height: Height user: email: 'E-mail' employee: diff --git a/config/locales/models.nl.yml b/config/locales/models.nl.yml index 5a51f081..f6cd2d2e 100644 --- a/config/locales/models.nl.yml +++ b/config/locales/models.nl.yml @@ -81,6 +81,8 @@ nl: from_number: Vanaf nummer to_number: Tot nummer created_at: Aangemaakt + width: Breedte + height: Hoogte user: email: 'E-mail' employee: diff --git a/config/locales/supplier.en.yml b/config/locales/supplier.en.yml index 71245de1..2aa17ed0 100644 --- a/config/locales/supplier.en.yml +++ b/config/locales/supplier.en.yml @@ -8,6 +8,7 @@ en: general: destroy: text: 'Are you sure?' + total: Total sign_up: header: | Nice that you want to start using Mozo. diff --git a/config/locales/supplier.nl.yml b/config/locales/supplier.nl.yml index 60e99bc7..fe2f7363 100644 --- a/config/locales/supplier.nl.yml +++ b/config/locales/supplier.nl.yml @@ -8,6 +8,7 @@ nl: general: destroy: text: 'Are you sure?' + total: Total sign_up: header: | Leuk dat je je wilt aanmelden voor Mozo.