loan calendar selector ok, accountable_repayments scope ok

ekylibre · Apr 27, 2017 · 11321f1 · 11321f1
1 parent 8acd2ea
commit 11321f1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/app/assets/javascripts/backend/loan_date.js.coffee b/app/assets/javascripts/backend/loan_date.js.coffee
@@ -0,0 +1,11 @@
+((E, $) ->
+  'use strict'
+  console.log('test')
+  $(document).ready ->
+    count = 0
+    $('#accounting_date').click ->
+      if count == 0
+        $('#accounting_date').datepicker 'option', maxDate: new Date($.now())
+        $('#accounting_date').datepicker 'show'
+        count++
+) ekylibre, jQuery
diff --git a/app/models/loan_repayment.rb b/app/models/loan_repayment.rb
@@ -58,7 +58,7 @@ class LoanRepayment < Ekylibre::Record::Base
   delegate :currency, :name, to: :loan
 
   scope :accountable_repayments, lambda { |loans_ids, input_date|
-    where('loan_id IN (?) AND accountable = FALSE AND due_on <= ?', loans_ids, input_date)
+    where('loan_id IN (?) AND accountable = FALSE AND due_on <= ? AND due_on <= ?', loans_ids, input_date, Time.zone.today)
   }
 
   before_validation do

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -42,7 +42,7 @@
 
   config.after_initialize do
     Bullet.enable = true
-    Bullet.alert = true
+    # Bullet.alert = true
     Bullet.bullet_logger = true
     Bullet.console = true
     Bullet.add_footer = true