dm_event 4.2.3.3 → 4.2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 166674962a59997e15cc1dd82e97776ea718d6e7
-  data.tar.gz: 14dfe6801c934c2d49f64ee532760138d48e2aac
+  metadata.gz: b6820c04a7d61a158f16abbb81b16e9c0a2dd4d3
+  data.tar.gz: 40500432e4de874f91b699717d0d2202de9201f3
 SHA512:
-  metadata.gz: 2d4c563433c1131e20a8cad5bc2768e033d9dbf3bc94f7f1457d517511a144e2d878c5b8c6e96d1660ee5d223e4e5b022af140adbea611e66041be3e50ed7ba3
-  data.tar.gz: e9f9c5a5fbfac90c1fe75e4363dfedb2acf728f83f080780c9341c27fccec84174fcd84e37f60096871884c7d336788e0bfdde5c13c170cca030ce1a526a4baf
+  metadata.gz: f84c61d0f840394afbc62a8eb97b2b5e88724928f3e03aef8663b6e5d5ec7d3a092f12cfd43abf84620d8343766811481b113983fe0a7b1328d4b0250bd841e8
+  data.tar.gz: 9cde796a672582ea1dc66b6b753205add4357f015332d8459ac3f481c4a3ffeacb62f75db5d81c201c43dc5347849fe6626742f8fa0c09e11c90bd398f48ba4a

data/app/models/registration.rb

@@ -129,6 +129,20 @@ public
     end
   end
   
+  # when a customer wants to make a payment, they should either charged the amount
+  # for this month (which could be less than the normal monthly amount), or the
+  # standard monthly amount, or whatever the balance_owed is
+  #------------------------------------------------------------------------------
+  def make_payment_now_amount
+    if payment_owed.positive?
+      payment_owed
+    elsif workshop_price.payment_price < balance_owed
+      workshop_price.payment_price
+    else
+      balance_owed
+    end
+  end
+  
   # Return the number of items specified, in particular the number of items in 
   # a particular state
   #------------------------------------------------------------------------------

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

@@ -91,7 +91,11 @@
           </ul>
           <table class="accounting" style="width: 100%">
             <tr>
-              <th>Price</th>
+              <th>Price
+                <% if @registration.workshop_price.recurring_payments? %>
+                    <span style="font-weight: normal"></br>On a payment plan</span>
+                <% end %>
+              </th>
               <td><%= @registration.price.format %></td>
             </tr>
             <tr>
@@ -108,11 +112,7 @@
             </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 %>
-                </th>
+                <th>Payment Owed</th>
                 <td class="text-info"><%= @registration.payment_owed.format %></td>
               </tr>
               <tr>
@@ -214,9 +214,17 @@
           <% end %>
         </div>
         <div class="col-md-3 col-sm-3">
+          <ul class="statistics">
+            <% color = @registration.balance_owed.positive? ? :danger : :success %>
+            <li><%= stat_block_small label: 'Balance', number: @registration.balance_owed.format(no_cents_if_whole: true), color_type: color, icon: 'icon-coin', percent: 100 %></li>
+          </ul>
           <table class="accounting" style="width: 100%">
             <tr>
-              <th>Price</th>
+              <th>Price
+                <% if @registration.workshop_price.recurring_payments? %>
+                    <span style="font-weight: normal"></br>On a payment plan</span>
+                <% end %>
+              </th>
               <td><%= @registration.price.format %></td>
             </tr>
             <tr>
@@ -233,11 +241,7 @@
             </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 %>
-                </th>
+                <th>Payment Owed</th>
                 <td class="text-info"><%= @registration.payment_owed.format %></td>
               </tr>
               <tr>

data/app/views/dm_event/payments/_registrations_paypal_standard.html.erb

@@ -1,5 +1,5 @@
 <% payment_service_for @registration.receipt_code, current_account.preferred_paypal_merchant_id,
-        amount:   @registration.payment_owed.amount,
+        amount:   @registration.make_payment_now_amount,
         currency: @registration.payment_owed.currency.iso_code,
         service:  :paypal do |service|
           service.customer            :first_name => @registration.first_name,

data/app/views/dm_event/payments/_registrations_sofort.html.erb

@@ -2,7 +2,7 @@
         credential2:  current_account.preferred_sofort_project_id,
         credential3:  current_account.preferred_sofort_project_password,
         credential4:  '',  #--- notification password
-        amount:       @registration.payment_owed,
+        amount:       @registration.make_payment_now_amount,
         currency:     @registration.payment_owed.currency.iso_code,
         service: :directebanking do |service|
           service.item_name         @registration.workshop.title

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm_event
 version: !ruby/object:Gem::Version
-  version: 4.2.3.3
+  version: 4.2.3.4
 platform: ruby
 authors:
 - Brett Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3.3
+        version: 4.2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3.3
+        version: 4.2.3.4
 - !ruby/object:Gem::Dependency
   name: dm_cms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3.3
+        version: 4.2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3.3
+        version: 4.2.3.4
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -421,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Part of MokshaCms, Event Engine