adherent 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17c1aba5959c41cf07802562eb2e1005893ffb39
-  data.tar.gz: f03e39ee8632068ee656d5f54885b07503a1eedd
+  metadata.gz: 03c6c2fdbb1e4d09b7d5afa396738ad058a0935d
+  data.tar.gz: f083ad2281b16506951ce2147b0fe9866773d7ef
 SHA512:
-  metadata.gz: 1041a6ce3ab79fc2a31140b72f5b18e69b9761100de602c4527a32c21b01f9c7c7d8e1caaf3b14b98c5124611cff8049826c1356181f00a61a45d1227956fba1
-  data.tar.gz: 886a6c0470e6399e9510a7bb259852e3ed560efca4f0311976e6858e375d14aee106ef9ce73b4fed7546ae40a87caa60a73b4b454672a97482c6d7aaca0c797d
+  metadata.gz: 038749cc47226ea279f6189e061b601a471f734b784a5b36a2143e9d3623142e438641e73cd32c40844c109384564cd2c064440a49fae1b5d9d67e630709c574
+  data.tar.gz: 344e69be71768f148a39037198d1c242819e403df5e573abcf28d564e9c9ecee8c39d9b9fcf26b0355d89c7928af54b142d79260a93867fa8c60bb149f6585f2

data/app/helpers/adherent/application_helper.rb

@@ -14,10 +14,14 @@ module Adherent
     end
     
     # Pour transformer un montant selon le format numérique français avec deux décimales
-    def two_decimals(montant)
+    def virgule(montant)
       ActionController::Base.helpers.number_with_precision(montant, precision:2) rescue '0,00'
     end
     
+    def two_decimals(montant)
+      sprintf('%0.02f',montant) rescue  '0.00'
+    end
+    
         
     def icon_to_users
       icon_to 'users.png', members_path, title:'Liste des membres' 
@@ -26,7 +30,7 @@ module Adherent
     def list_imputations(payment)
       
       content_tag(:ul) do
-          payment.reglements.map do |r|
+        payment.reglements.map do |r|
           content_tag(:li) do
             imputation_with_actions(payment, r)
           end
@@ -39,8 +43,8 @@ module Adherent
       html << "Adhésion #{reglt.adhesion.member.to_s} pour #{number_to_currency(reglt.amount, locale: :fr)}"
       html << "&nbsp;&nbsp;"
       html << "#{icon_to 'detail.png', payment_reglement_path(pay, reglt)}"
-#      html << "#{icon_to 'imputation-edit.png', edit_payment_reglement_path(pay, reglt), title:'Modifier l\'imputation'}"
-#      html << "#{icon_to 'imputation-delete.png', payment_reglement_path(pay, reglt), title:'Supprimer l\'imputation'}"
+      #      html << "#{icon_to 'imputation-edit.png', edit_payment_reglement_path(pay, reglt), title:'Modifier l\'imputation'}"
+      #      html << "#{icon_to 'imputation-delete.png', payment_reglement_path(pay, reglt), title:'Supprimer l\'imputation'}"
       html.html_safe
     end
     

data/app/views/adherent/allpayments/_payment.html.haml

@@ -3,10 +3,10 @@
     = payment.member.to_s
     = icon_to 'payment.png', member_payments_path(payment.member), title:'Liste des paiements de cet adhérent'
   %td= payment.date
-  %td.numeric= two_decimals payment.amount
+  %td.numeric= virgule payment.amount
   %td= payment.mode
   %td= list_imputations(payment)
-  %td.numeric= two_decimals payment.non_impute
+  %td.numeric= virgule payment.non_impute
 
   %td
     - if (payment.non_impute != 0.0)

data/app/views/adherent/payments/new.html.haml

@@ -0,0 +1,8 @@
+=content_for :menu do
+  = icon_to 'payment.png', member_payments_path(@member) 
+.champ
+  %h3 Enregistrement d'un paiement de #{@member.to_s}
+.row-fluid.inner-champ
+  = render 'form'
+
+

data/lib/adherent/version.rb

@@ -1,3 +1,3 @@
 module Adherent
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end