From 128dc118c4ebea23e589f69dca9c449d72a91453 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Fri, 30 Jul 2021 09:58:21 +0200 Subject: [PATCH] =?UTF-8?q?Probl=C3=A8me=20nombre=20de=20primes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/public/my_account/index.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/public/my_account/index.html.haml b/app/views/public/my_account/index.html.haml index ccd248b..5023bdc 100644 --- a/app/views/public/my_account/index.html.haml +++ b/app/views/public/my_account/index.html.haml @@ -130,8 +130,8 @@ - -c = current_p_customer.m_odr_primes.where(:state => ["En attente de roulage", "Virement envoyé"]).where("created_at >= ? or created_at <= ?", Date.today.beginning_of_year, Date.today.end_of_year).count - -ca = current_p_customer.m_odr_primes.where(:state => ["En attente de roulage"]).where("created_at >= ? or created_at <= ?", Date.today.beginning_of_year, Date.today.end_of_year).count + -c = current_p_customer.m_odr_primes.where(:state => ["En attente de roulage", "Virement envoyé"]).where("created_at >= ? and created_at <= ?", Date.today.beginning_of_year, Date.today.end_of_year).count + -ca = current_p_customer.m_odr_primes.where(:state => ["En attente de roulage"]).where("created_at >= ? and created_at <= ?", Date.today.beginning_of_year, Date.today.end_of_year).count -if c > 0 %br %br @@ -167,7 +167,7 @@ -if current_p_customer.m_odr_primes.count > 0 %table.table - =render current_p_customer.m_odr_primes.where("created_at >= ? or created_at <= ?", Date.today.beginning_of_year, Date.today.end_of_year) + =render current_p_customer.m_odr_primes.where("created_at >= ? and created_at <= ?", Date.today.beginning_of_year, Date.today.end_of_year) -else .empty