adherent 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4886004175e5dadc3cb3a6afefcc1c3e174007b3
-  data.tar.gz: ca7a080613104ec7a0a31fc8a54402b58e913fcf
+  metadata.gz: f46b619c95046614d77348c16f1722c1c0685689
+  data.tar.gz: 53af5fc158eeefd2ff4de7aa9accb91fc8a6f58e
 SHA512:
-  metadata.gz: 8ebe1f4885984dfbf6db5bb28db12ea75cb47137682fdbd251fcd3782948ad5049e7bf2939d7b9906896db78e0e3f9bce0cc6edbb5836d1783e9b23fe254f8ed
-  data.tar.gz: 4e7c161d5bf8737d8c47b1a85aeb7efd29d3c3264924912776ad2fe6128df51aa4bbfc0920147e47b7de0c4968f1796fc486afccb2964bcad9193efe42c0e604
+  metadata.gz: 5d92233c98a0957408105cc3f7dd0aad60a1a93b0c26211c42085192b2a43b0940797164cb2eae3d80659d56e1824107534efb6bab193049461d78b1f6cee8ac
+  data.tar.gz: a1f744d115859f1993c9bdb6afd62c11fc9f0d10b9d410edd02ab85b83dbb21e64ec26816a56fadd8e5efcfd529dafee12f7a7fa452eecf2cef791ed778a047c

data/app/controllers/adherent/payments_controller.rb

@@ -26,9 +26,11 @@ module Adherent
     end
   
     def edit
+      @payment = @member.payments.find(params[:id])
     end
   
     def show
+      @payment = @member.payments.find(params[:id])
     end
     
     # DELETE /payment/1

data/app/models/adherent/adhesion.rb

@@ -18,9 +18,15 @@ module Adherent
     # un renouvellement d'adhésion
     def self.next_adh_values(adh = nil)
       if adh
-         {:from_date =>I18n.l(adh.read_attribute(:to_date)+1), :to_date=>I18n.l(adh.read_attribute(:to_date).years_since(1))} 
+         {:from_date =>I18n.l(adh.read_attribute(:to_date)+1),
+           :to_date=>I18n.l(adh.read_attribute(:to_date).years_since(1)),
+           amount: adh.amount
+           } 
       else
-         {:from_date=>I18n.l(Date.today), :to_date=>I18n.l(Date.today.years_since(1) - 1)}
+         {:from_date=>I18n.l(Date.today),
+           :to_date=>I18n.l(Date.today.years_since(1) - 1),
+           amount:0
+           }
       end
     end
     
@@ -54,13 +60,14 @@ module Adherent
     end
     
     # ajoute un réglement provenant d'un payment pour un montant donné;
-    # renvoie le montant qui a été effectivement imputé sur cette adhésion.
+    # renvoie le règlement qui a été ajouté.
     def add_reglement(payment_id, montant)
       imputation = [montant, due].min 
       r = reglements.new(amount:imputation)
       r.payment_id = payment_id
       r.save!
-      imputation
+      r
+    
     end
     
     

data/lib/adherent/version.rb

@@ -1,3 +1,3 @@
 module Adherent
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/dummy/app/controllers/application_controller.rb

@@ -6,11 +6,6 @@ class ApplicationController < ActionController::Base
   protected
   
   def find_organism
-    if session[:organism]
-      @organism = Organism.find_by_id(session[:organism])
-    else
-      flash[:alert] = 'Vous devez d\'abord choisir un organisme'
-      redirect_to main_app.organisms_path
-    end
+     @organism = Organism.new(title:'Mon association', status:'Association')
   end
 end

data/test/dummy/app/models/adherent/organism.rb

@@ -0,0 +1,7 @@
+module Adherent
+  class Organism < ActiveRecord::Base
+    attr_accessible :status, :title
+
+    has_many :members, class_name:'Adherent::Member'
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130810081840) do
+ActiveRecord::Schema.define(:version => 20130810074112) do
 
   create_table "adherent_adhesions", :force => true do |t|
     t.date     "from_date"