From 2e83114c3f1f3ff463f8715fe531e829c76bedd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A9?= Date: Fri, 24 Sep 2021 12:30:19 +0200 Subject: [PATCH] Update sorecop text table --- app/models/sorecop_tax.rb | 4 ++-- .../sorecop_taxes/_sorecop_tax.html.haml | 20 ++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/models/sorecop_tax.rb b/app/models/sorecop_tax.rb index 518bb01..061dd00 100644 --- a/app/models/sorecop_tax.rb +++ b/app/models/sorecop_tax.rb @@ -8,8 +8,8 @@ class SorecopTax < ApplicationRecord :critere_min => {:name => "Critère mini (Go)", :reorder => true}, :critere_max => {:name => "Critère maxi (Go)", :reorder => true}, :fixed_price => {:name => "Prix forfaitaire", :reorder => true, :format => :boolean}, - :sorecop_cat => {:name => "Catégorie SORECOP", :reorder => false}, - :price => {:name => "Prix", :reorder => false}, + :sorecop_cat => {:name => "Catégorie SORECOP",member_label: :name, :reorder => false}, + :price => {:name => "Prix", :reorder => false, as: :currency}, :actions => {:name => "Actions", :reorder => true} } end diff --git a/app/views/admin/sorecop_taxes/_sorecop_tax.html.haml b/app/views/admin/sorecop_taxes/_sorecop_tax.html.haml index c35450f..684f550 100644 --- a/app/views/admin/sorecop_taxes/_sorecop_tax.html.haml +++ b/app/views/admin/sorecop_taxes/_sorecop_tax.html.haml @@ -1,11 +1,25 @@ %tr#sorecop_tax_row{:id => sorecop_tax.id} -tr = {} - -tr[:sorecop_cat] = capture do + -tr[:critere_min] = capture do %td - = sorecop_tax.sorecop_cat.name + = sorecop_tax.critere_min + Go + + -tr[:critere_max] = capture do + %td + = sorecop_tax.critere_max + Go + + -tr[:fixed_price] = capture do + %td.text-center + -if sorecop_tax.fixed_price + =ic("check-square-o") + -else + =ic("square-o") + + - -tr[:actions] = capture do %td.actions = link_to i(:"trash-o"), [:admin, sorecop_tax], method: :delete, data: { confirm: 'Voulez-vous vraiment supprimer cet enregistrement ? ' } , :remote => true