diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb index cade1d34d7..4464c8e009 100644 --- a/app/models/spree/product_decorator.rb +++ b/app/models/spree/product_decorator.rb @@ -23,10 +23,9 @@ Spree::Product.class_eval do attr_accessible :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value attr_accessible :inherits_properties, :sku - # validates_presence_of :variants, unless: :new_record?, message: "Product must have at least one variant" validates_presence_of :supplier - validates :primary_taxon, presence: { message: I18n.t("validation_msg_product_category_cant_be_blank") } - validates :tax_category_id, presence: { message: I18n.t("validation_msg_tax") }, if: "Spree::Config.products_require_tax_category" + validates :primary_taxon, presence: true + validates :tax_category_id, presence: true, if: "Spree::Config.products_require_tax_category" validates_presence_of :variant_unit validates_presence_of :variant_unit_scale, diff --git a/config/locales/en.yml b/config/locales/en.yml index 3248089f88..33e90029e8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -34,6 +34,8 @@ en: email: Customer E-Mail spree/payment: amount: Amount + spree/product: + primary_taxon: Product Category order_cycle: orders_close_at: Close date errors: @@ -2392,8 +2394,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using enterprise_fee_by: "%{type} fee by %{role} %{enterprise_name}" validation_msg_relationship_already_established: "^That relationship is already established." validation_msg_at_least_one_hub: "^At least one hub must be selected" - validation_msg_product_category_cant_be_blank: "^Product Category cant be blank" - validation_msg_tax: "^Tax Category is required" validation_msg_tax_category_cant_be_blank: "^Tax Category can't be blank" validation_msg_is_associated_with_an_exising_customer: "is associated with an existing customer" content_configuration_pricing_table: "(TODO: Pricing table)"