From 4519c9040e971af747517470ff3b0ce0feaf050e Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 9 Nov 2020 15:42:19 +0100 Subject: [PATCH] suite --- app/models/particular.rb | 2 +- app/views/admin/price_documents/print.html.haml | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/models/particular.rb b/app/models/particular.rb index e276136..ce488c1 100644 --- a/app/models/particular.rb +++ b/app/models/particular.rb @@ -12,7 +12,7 @@ class Particular < ApplicationRecord #validates :firstname, :presence => true, :if => :force_validation validates :email, :presence => true, :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :if => :force_email_validation #validates :address_2, :presence => true, :if => :force_validation - validates :cp, :presence => true, :if => :force_validation + #validates :cp, :presence => true, :if => :force_validation #validates :city, :presence => true, :if => :force_validation validates :country, :presence => true, :if => :force_validation #validates :tel, :presence => true, :if => :force_validation diff --git a/app/views/admin/price_documents/print.html.haml b/app/views/admin/price_documents/print.html.haml index c6e495f..97e0206 100644 --- a/app/views/admin/price_documents/print.html.haml +++ b/app/views/admin/price_documents/print.html.haml @@ -97,8 +97,9 @@ =particular_doc.cp =particular_doc.city - %br - =particular_doc.country + -if false + %br + =particular_doc.country %td{:style => "width:50%;"} %strong Adresse de facturation @@ -133,8 +134,9 @@ =particular_doc.cp =particular_doc.city - %br - =particular_doc.country + -if false + %br + =particular_doc.country