dm_event 4.2.3.2 → 4.2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 073002662f7ff5c6a3f5bda495a7cf1b7fd08555
-  data.tar.gz: 38ccabbe27f63e82baf49ad276eb1faf47dc2880
+  metadata.gz: 166674962a59997e15cc1dd82e97776ea718d6e7
+  data.tar.gz: 14dfe6801c934c2d49f64ee532760138d48e2aac
 SHA512:
-  metadata.gz: 058292d7c65ec0bf8176323c914df3a68a3411a6395e2c94dfe4d9b407ceb2f4e463d5f3ba9974fb5bec7ed7dca8e37ff8613b1c4b039a743f3dcea421c0c86a
-  data.tar.gz: 036be6d7ec7b611939d90ec80fab26d79e043e3f882f993d8a538f38c0f97740b70a0581515956536ae3973acc21c5419b1e0d3d062c55a824497119d2186c01
+  metadata.gz: 2d4c563433c1131e20a8cad5bc2768e033d9dbf3bc94f7f1457d517511a144e2d878c5b8c6e96d1660ee5d223e4e5b022af140adbea611e66041be3e50ed7ba3
+  data.tar.gz: e9f9c5a5fbfac90c1fe75e4363dfedb2acf728f83f080780c9341c27fccec84174fcd84e37f60096871884c7d336788e0bfdde5c13c170cca030ce1a526a4baf

data/app/controllers/dm_event/admin/workshops_controller.rb

@@ -93,7 +93,9 @@ class DmEvent::Admin::WorkshopsController < DmEvent::Admin::AdminController
   def financials
     authorize! :manage_event_finances, @workshop
     @financials = @workshop.financial_details
-    @payments = PaymentHistory.where(owner_type: 'Registration', owner_id: @workshop.registrations.pluck(:id)).includes(:user_profile, owner: [:user_profile])
+    @payments   = PaymentHistory.where(owner_type: 'Registration', owner_id: @workshop.registrations.pluck(:id)).includes(:user_profile, owner: [:user_profile])
+    @unpaid     = @workshop.registrations.unpaid.includes(:user_profile, :workshop_price)
+    @unpaid     = @unpaid.to_a.delete_if {|i| i.payment_owed.zero?}.sort_by {|i| i.full_name.downcase}
   end
 
   # Generate a list of all outstanding balances across all workshops

data/app/models/registration.rb

@@ -36,6 +36,7 @@ class Registration < ActiveRecord::Base
   after_initialize              :create_uuid
   before_create                 :set_currency
   after_create                  :set_receipt_code
+  before_save                    :clear_reminder_sent_on, if: :amount_paid_cents_changed?
 
   validates_uniqueness_of       :uuid
   validates_presence_of         :workshop_price_id, if: Proc.new { |reg| reg.workshop.workshop_prices.size > 0}
@@ -48,6 +49,12 @@ class Registration < ActiveRecord::Base
 
 private
 
+  # when a payment is made, we want reset whether a payment reminder has been sent
+  #------------------------------------------------------------------------------
+  def clear_reminder_sent_on
+    self.payment_reminder_sent_on = nil
+  end
+
   # the uuid is used to provide a private url to a customer so that they can access
   # their registration if not logged in.  This is particularly important when
   # a customer registers without having a user account.
@@ -110,12 +117,13 @@ public
   end
   
   # suggested amount of next payment.
-  # if a payment is within 20 of the balance_owed, then they should pay the balance
+  # when it's recurring, they payment should be whatever is needed to bring their
+  # payment plan up to date
   #------------------------------------------------------------------------------
   def payment_owed
-    if workshop_price
-      amount_20 = Money.new(2000, workshop_price.price.currency)
-      (workshop_price.payment_price + amount_20) > balance_owed ? balance_owed : workshop_price.payment_price 
+    if workshop_price && workshop_price.recurring_payments?
+      to_pay = recurring_what_should_be_paid_by_now(0) - amount_paid
+      to_pay.negative? ? Money.new(0, workshop_price.price.currency) : to_pay
     else
       balance_owed
     end
@@ -167,25 +175,43 @@ public
   def unpaid?
     self.accepted? && self.archived_on == nil
   end
-  
+
   # Is it time to send a payment reminder?
-  # Due first 7 days after inital registration.  Then every 14 days after that
+  # Due first 7 days after inital registration (or a payment period).  Then every 14 days after that
   #------------------------------------------------------------------------------
   def payment_reminder_due?
     if preferred_payment_reminder_hold_until.nil? || preferred_payment_reminder_hold_until < Time.now
       time_period = self.payment_reminder_sent_on.nil? ? (self.created_at + 7.days) : (self.payment_reminder_sent_on + 14.days)
-      self.balance_owed > Money.new(0, workshop.base_currency) && time_period < Time.now
+      past_due?(7) ? time_period < Time.now : false
+    else
+      false
+    end
+  end
+
+  # past due means they haven't paid what they should have paid by now
+  #------------------------------------------------------------------------------
+  def past_due?(grace_period_in_days = 7)
+    return false if !balance_owed.positive?
+    if workshop_price.recurring_payments?
+      return amount_paid < recurring_what_should_be_paid_by_now(grace_period_in_days)
+    else
+      return Date.today > (self.created_at + grace_period_in_days.days)
     end
+  end
 
-    # if recurring_period since last paymnet
-    # if 7 days after registration and no payment
-    # if 14 days since last reminder and no payment
-    # if resume_reminders is past
-    # last_payment = payment_histories.order('created_on').last
-    # if workshop_price.recurring?
-    #   if 
+  #------------------------------------------------------------------------------
+  def recurring_what_should_be_paid_by_now(grace_period_in_days = 7)
+    entry = workshop_price.specific_payment_schedule(self.created_at + grace_period_in_days.days, Date.today)
+    entry ? entry[:total_due] : 0
   end
-  
+
+  # date when the most recent payment was due
+  #------------------------------------------------------------------------------
+  def last_payment_due_on
+    entry = workshop_price.specific_payment_schedule(self.created_at, Date.today)
+    entry ? entry[:due_on] : self.created_at.to_date
+  end
+
   # Setup the columns for exporting data as csv.
   #------------------------------------------------------------------------------
   def self.csv_columns(workshop)
@@ -202,9 +228,7 @@ public
     column_definitions <<     ["State",             "item.state.capitalize"]
     column_definitions <<     ["Zipcode",           "item.zipcode"]
     column_definitions <<     ["Country",           "item.country.code"]
-
     column_definitions <<     ['Registered on',     'item.created_at.to_date', 75, {type: 'DateTime', numberformat: 'd mmm, yyyy'}]
-
     column_definitions <<     ["Price",             "item.workshop_price.price.to_f", nil, {type: 'Number', numberformat: '#,##0.00'}]
     column_definitions <<     ["Price Description", "item.workshop_price.price_description"]
     column_definitions <<     ["Price Sub Descr",   "item.workshop_price.sub_description"]

data/app/models/workshop.rb

@@ -180,7 +180,7 @@ class Workshop < ActiveRecord::Base
     success     = failed = 0
     unpaid_list = ( registration_id == 'all' ? registrations.unpaid : registrations.unpaid.where(id: registration_id) )
     unpaid_list.each do |registration|
-      if registration.payment_reminder_due? || registration_id != 'all'
+      if (registration.payment_reminder_due? && registration.payment_owed.positive?) || registration_id != 'all'
         email = PaymentReminderMailer.payment_reminder(registration).deliver_now
         if email
           registration.update_attribute(:payment_reminder_sent_on, Time.now)

data/app/models/workshop_price.rb

@@ -45,7 +45,7 @@ class WorkshopPrice < ActiveRecord::Base
   # Call this method on the attributes before passing into new() or update_attributes()
   #------------------------------------------------------------------------------
   def self.prepare_prices(attributes = {})
-    attributes['price']       = attributes['price'].to_money(attributes['price_currency']) if attributes['price'].present? && attributes['price_currency'].present?
+    attributes['price']       = attributes['price'].to_money(attributes['price_currency'])           if attributes['price'].present? && attributes['price_currency'].present?
     attributes['alt1_price']  = attributes['alt1_price'].to_money(attributes['alt1_price_currency']) if attributes['alt1_price'].present? && attributes['alt1_price_currency'].present?
     attributes['alt2_price']  = attributes['alt2_price'].to_money(attributes['alt2_price_currency']) if attributes['alt2_price'].present? && attributes['alt2_price_currency'].present?
     return attributes
@@ -53,14 +53,14 @@ class WorkshopPrice < ActiveRecord::Base
   
   #------------------------------------------------------------------------------
   def visible?
-    !(disabled? || (!valid_starting_on.nil? && valid_starting_on > Time.now.to_date) || (!valid_until.nil? && valid_until < Time.now.to_date))
+    !(disabled? || (!valid_starting_on.nil? && valid_starting_on > Date.today) || (!valid_until.nil? && valid_until < Date.today))
   end
  
   # If the total_available is nil, then there are unlimited tickets to be sold.  
   # Otherwise, check if we have sold out
   #------------------------------------------------------------------------------
   def sold_out?(num_sold)
-    (total_available.blank? or total_available == 0) ? false : (num_sold >= total_available)
+    total_available.nil? ? false : (num_sold >= total_available)
   end
   
   #------------------------------------------------------------------------------
@@ -78,12 +78,41 @@ class WorkshopPrice < ActiveRecord::Base
   def recurring_payments?
     recurring_number.to_i > 1
   end
-  
+
+  # return array of when payments should be made.  if `from_date` is specified,
+  # then actual dates are returned.  Otherwise number of days
+  #------------------------------------------------------------------------------
+  def payment_schedule(from_date = nil)
+    schedule = []
+    if recurring_payments?
+      (0...recurring_number).each do |period|
+        xdays = period * recurring_period
+        schedule << {due_on: (from_date ? from_date.to_date + xdays.days : xdays),
+                     period_payment: payment_price,
+                     total_due: (period + 1) * payment_price}
+      end
+      # adjust the last entry
+      schedule.last[:total_due] = price
+      schedule.last[:period_payment] = price - (recurring_number - 1) * payment_price
+    else
+      schedule << {due_on: (from_date ? from_date.to_date : 0), period_payment: payment_price, total_due: payment_price}
+    end
+    schedule
+  end
+
+  # return the payment schedule entry that is before the specified date
+  #------------------------------------------------------------------------------
+  def specific_payment_schedule(from_date, on_date = Date.today)
+    payment_schedule(from_date).reverse.detect {|item| item[:due_on] <= on_date}
+  end
+
+  # return list of currencies used, in a format for a dropdown list
+  # ex: [['USD', 'USD'], ['EUR', 'EUR']]
   #------------------------------------------------------------------------------
   def currency_list
     list = [[price_currency, price_currency]]
     list << [alt1_price_currency, alt1_price_currency] unless alt1_price_currency.blank?
-    list << [alt2_price_currency, alt1_price_currency] unless alt1_price_currency.blank?
+    list << [alt2_price_currency, alt2_price_currency] unless alt2_price_currency.blank?
     return list
   end
   
@@ -95,21 +124,26 @@ class WorkshopPrice < ActiveRecord::Base
   
   # return a bank object filled with the exchange rates, based on the prices.
   # then you can do:  bank.exchange_with(price, 'USD')
+  # note: since JPY doesn't have cents (the price doesn't get multiplied by 100)
+  #   then we need to do that in order to calculate the proper exchange rate
   #------------------------------------------------------------------------------
   def bank
     unless @bank
       @bank = Money::Bank::VariableExchange.new
+      base_cents = price_currency == 'JPY' ? (price_cents.to_f * 100) : price_cents.to_f
       unless alt1_price_currency.blank?
-        @bank.add_rate(price_currency, alt1_price_currency, alt1_price_cents.to_f / price_cents.to_f)
-        @bank.add_rate(alt1_price_currency, price_currency, price_cents.to_f / alt1_price_cents.to_f)
+        alt1_cents = alt1_price_currency == 'JPY' ? (alt1_price_cents.to_f * 100) : alt1_price_cents.to_f
+        @bank.add_rate(price_currency, alt1_price_currency, alt1_cents / base_cents)
+        @bank.add_rate(alt1_price_currency, price_currency, base_cents / alt1_cents)
       end
       unless alt2_price_currency.blank?
-        @bank.add_rate(price_currency, alt2_price_currency, alt2_price_cents.to_f / price_cents.to_f)
-        @bank.add_rate(alt2_price_currency, price_currency, price_cents.to_f / alt2_price_cents.to_f)
+        alt2_cents = alt2_price_currency == 'JPY' ? (alt2_price_cents.to_f * 100) : alt2_price_cents.to_f
+        @bank.add_rate(price_currency, alt2_price_currency, alt2_cents / base_cents)
+        @bank.add_rate(alt2_price_currency, price_currency, base_cents / alt2_cents)
       end
-      unless alt1_price_currency.blank? && alt2_price_currency.blank?
-        @bank.add_rate(alt1_price_currency, alt2_price_currency, alt2_price_cents.to_f / alt1_price_cents.to_f)
-        @bank.add_rate(alt2_price_currency, alt1_price_currency, alt1_price_cents.to_f / alt2_price_cents.to_f)
+      if !alt1_price_currency.blank? && !alt2_price_currency.blank?
+        @bank.add_rate(alt1_price_currency, alt2_price_currency, alt2_cents / alt1_cents)
+        @bank.add_rate(alt2_price_currency, alt1_price_currency, alt1_cents / alt2_cents)
       end
     end
     return @bank

data/app/views/dm_event/admin/registrations/_form.html.erb

@@ -38,6 +38,8 @@
         <div class="col-md-6 col-sm-6">
           <% if @registration.workshop_price %>
             <dl class="block">
+              <dt class="text-info">Registered On</dt>
+              <dd><%= format_date(@registration.created_at) %></dd>
               <dt class="text-info">Price</dt>
               <dd><%= price_details(@registration.workshop_price) %></dd>
               <% if @registration.payment_comment %>
@@ -106,13 +108,17 @@
             </tr>
             <% if @registration.payment_owed.positive? %>
               <tr class="section">
-                <th>Next Payment Amount
+                <th>Payment Owed
                   <% if @registration.workshop_price.recurring_payments? %>
                       <span style="font-weight: normal"></br>On a payment plan</span>
                   <% end %>
                 </th>
                 <td class="text-info"><%= @registration.payment_owed.format %></td>
               </tr>
+              <tr>
+                <th>Payment Due On</th>
+                <td class="text-info"><%= format_date(@registration.last_payment_due_on) %></td>
+              </tr>
             <% end %>
           </table>
         </div>
@@ -171,39 +177,77 @@
 
     <%#--- Payments Tab %>
     <div class="tab-pane fade" id="payment_tab">
-      <%= subsection title: 'Recorded Payments' do %>
-        <table class="table table-condensed table-gradient table-hover" style="margin-bottom: 20px;">
-          <thead>
+      <div class="row">
+        <div class="col-md-9 col-sm-9">
+          <%= subsection title: 'Recorded Payments' do %>
+            <table class="table table-condensed table-gradient table-hover" style="margin-bottom: 20px;">
+              <thead>
+                <tr>
+                  <th width="100">Date</th>
+                  <th>Description</th>
+                  <th width="75">Paid</th>
+                  <th width="100">Method</th>
+                  <th width="18"><%= icons(:edit) %></th>
+                </tr>
+              </thead>
+              <tbody>
+                <% @registration.payment_histories.order('created_on ASC').each do |payment| %>
+                  <tr>
+                    <td><%= format_date(payment.payment_date) %></td>
+                    <td><%= payment.item_ref %></td>
+                    <td><%= payment.total.format(no_cents_if_whole: true, symbol: true) %></td>
+                    <td><%= payment.payment_method %></td>
+                    <td>
+                      <% if payment.user_profile #--- only allow editing of manual payments %>
+                        <%= link_to(icons('icon-pencil3'), '#', data: { toggle: "modal", target: "#edit_payment_#{payment.id}"}, title: 'Edit Payment') %>
+                      <% end %>
+                    </td>
+                  </tr>
+                <% end %>
+              </tbody>
+            </table>
+            <%= link_to 'Add Payment', '#', data: { toggle: "modal", target: "#enter_new_payment"}, title: 'Add Payment', class: "btn btn-xs btn-primary" %>
+            <%= link_to 'Customer Payment Page', @registration.payment_url, target: '_blank', class: 'btn btn-xs btn-default' %>
+            <% if @registration.payment_owed.positive? %>
+              &nbsp;&nbsp;Next payment should be: <span class="text-info"><%= @registration.payment_owed.format %></span>
+            <% end %>
+          <% end %>
+        </div>
+        <div class="col-md-3 col-sm-3">
+          <table class="accounting" style="width: 100%">
             <tr>
-              <th width="100">Date</th>
-              <th>Description</th>
-              <th width="75">Paid</th>
-              <th width="100">Method</th>
-              <th width="18"><%= icons(:edit) %></th>
+              <th>Price</th>
+              <td><%= @registration.price.format %></td>
             </tr>
-          </thead>
-          <tbody>
-            <% @registration.payment_histories.order('created_on ASC').each do |payment| %>
-              <tr>
-                <td><%= format_date(payment.payment_date) %></td>
-                <td><%= payment.item_ref %></td>
-                <td><%= payment.total.format(no_cents_if_whole: true, symbol: true) %></td>
-                <td><%= payment.payment_method %></td>
-                <td>
-                  <% if payment.user_profile #--- only allow editing of manual payments %>
-                    <%= link_to(icons('icon-pencil3'), '#', data: { toggle: "modal", target: "#edit_payment_#{payment.id}"}, title: 'Edit Payment') %>
+            <tr>
+              <th>Discount</th>
+              <td class="text-danger"> - <%= @registration.discount.format %></td>
+            </tr>
+            <tr class="section">
+              <th>Total</th>
+              <td><strong><%= @registration.discounted_price.format %></strong></td>
+            </tr>
+            <tr>
+              <th>Paid</th>
+              <td class="text-success"><%= @registration.amount_paid.format %></td>
+            </tr>
+            <% if @registration.payment_owed.positive? %>
+              <tr class="section">
+                <th>Payment Owed
+                  <% if @registration.workshop_price.recurring_payments? %>
+                      <span style="font-weight: normal"></br>On a payment plan</span>
                   <% end %>
-                </td>
+                </th>
+                <td class="text-info"><%= @registration.payment_owed.format %></td>
+              </tr>
+              <tr>
+                <th>Payment Due On</th>
+                <td class="text-info"><%= format_date(@registration.last_payment_due_on) %></td>
               </tr>
             <% end %>
-          </tbody>
-        </table>
-        <%= link_to 'Add Payment', '#', data: { toggle: "modal", target: "#enter_new_payment"}, title: 'Add Payment', class: "btn btn-xs btn-primary" %>
-        <%= link_to 'Customer Payment Page', @registration.payment_url, target: '_blank', class: 'btn btn-xs btn-default' %>
-        <% if @registration.payment_owed.positive? %>
-          &nbsp;&nbsp;Next payment should be: <span class="text-info"><%= @registration.payment_owed.format %></span>
-        <% end %>
-      <% end %>
+          </table>
+        </div>
+      </div>
       
       <%= subsection title: 'Payment Reminders' do %>
         <%= simple_form_for @registration, url: admin_registration_path,

data/app/views/dm_event/admin/workshops/financials.html.erb

@@ -85,27 +85,34 @@
   </div>
 </div>
 
-<% unpaid = @workshop.registrations.unpaid.order('payment_reminder_sent_on ASC') %>
 <% toolbar = toolbar_btn('Send Payment Reminders', send_payment_reminder_emails_admin_workshop_path(@workshop, registration_id: :all), class: 'btn btn-xs btn-info', method: :patch, data: {confirm: "Are you sure you wish to send a reminder email to those eligible?"}) %>
-<%= panel body: false, title: "#{unpaid.count} Unpaid Participants", toolbar: toolbar do %>
+<%= panel body: false, title: "#{@unpaid.count} Unpaid Participants", toolbar: toolbar do %>
+  <div class="panel-body">
+    <p>Shows those that have missed their payment (either a full payment, or a recurring payment).  If they have made all the payments 
+    up to this point in time, they are not listed.</p>
+    <p>You can send them a payment reminder email at any time using the <em>Send</em> button.  A line is marked in blue if we have detected that
+      they should be sent a payment reminder. <em>Send Payment Reminders</em> will send the email to all persons marked in blue.</p>
+  </div>
   <table class="table table-bordered table-condensed table-striped">
     <thead>
       <tr>
         <th class="receipt_code">Receipt</th>
         <th class="name">Name</th>
-        <th class="cost">Balance</th>
-        <th class="date">Registered</th>
+        <th class="cost">Balance Owed</th>
+        <th class="cost">Payment Due</th>
+        <th class="date">Payment Was Due On</th>
         <th class="date">Reminded</th>
         <th></th>
       </tr>
     </thead>
     <tbody>
-      <% unpaid.each do |registration| -%>
+      <% @unpaid.each do |registration| -%>
         <tr>
           <td class="receipt_code" style="white-space:nowrap"><%= registration.receipt_code %></td>
           <td class="name"><%= link_to registration.full_name, dm_event.edit_admin_registration_path(registration) %> </td>
           <td class="cost"><%= registration.balance_owed.format %><%= content_tag(:span, icons('icon-bubble2 inside-content', size: 12), class: 'pull-right') if registration.private_comments.count > 0 %></td>
-          <td class="date" style="white-space:nowrap"><%= format_date(registration.created_at) %></td>
+          <td class="cost"><%= registration.payment_owed.format %><%= " <sup>R</sup>".html_safe if registration.try(:workshop_price).try(:recurring_payments?) %></td>
+          <td class="date" style="white-space:nowrap"><%= format_date(registration.last_payment_due_on) %></td>
           <td class="date" <%= "style='background-color: #B3D4FD;'".html_safe if registration.payment_reminder_due? %>>
             <% if registration.payment_reminder_sent_on.nil? %>
               not yet