effective_memberships 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 223d0bdf9ce08beacd79d4fdeb3e184878bb9e9cdb8b5964aa1c4ace9f1d2735
-  data.tar.gz: 158b570a8dc933b247245e450c74a78c63877ece8f35a59b1e400b0fdb017b43
+  metadata.gz: 2648e82170c5076854831eebdbaf7f972cbfeaf69076280253ad345ca1ac53db
+  data.tar.gz: 385ddec71ae2103c4f33c08dd732b52b13f87535b0a44c11131389c47b854703
 SHA512:
-  metadata.gz: b8e3fe9641f2826a4df557f1817163d719bb53112a835b3a5456ea7020283f360e4bcdc99d75c1a79256f6515b2fa05f5a2c0001b6eb1ecfa988dd09eba8eb5d
-  data.tar.gz: 013d39152828dce9d873e1eb1f1bb9f3a42aa83fc31105e020adbd47734f42902eec0659ff661b1fd4e8bd1983a389374848847221b6aec35dcbb8bfb5552661
+  metadata.gz: a581b0e79010b252b6e12cf3763d67eee879da8e4661f06c456b037dbcb220c1640d424f246c9d8a210e5d89acfe098fd61cc8a39d947aed46b30ca270ce934c
+  data.tar.gz: e45c087b0f7f9ea6fa7c2f03593b43da7a6d4451e39447d29ebdc7053422856b97dae45a28977cfb759170d5f278fb3046821070072176050fb551e07a1c4ccb

data/app/models/concerns/effective_memberships_registrar.rb

@@ -207,9 +207,10 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
-  def fees_paid!(owner, date: nil)
+  def fees_paid!(owner, date: nil, order_attributes: nil)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('expected a member') unless owner.membership.present?
+    raise('expected a Hash of attributes') if order_attributes.present? && !order_attributes.kind_of?(Hash)
 
     # Date
     date ||= Time.zone.now
@@ -219,6 +220,7 @@ module EffectiveMembershipsRegistrar
 
     if owner.outstanding_fee_payment_fees.present?
       order = Effective::Order.new(items: owner.outstanding_fee_payment_fees, user: owner)
+      order.assign_attributes(order_attributes) if order_attributes.present?
       order.mark_as_purchased!
     end
 

data/app/models/effective/registrar_action.rb

@@ -20,6 +20,12 @@ module Effective
     # Assign
     attr_accessor :category_ids
 
+    # Mark Fees Paid - Order Attributes
+    attr_accessor :payment_provider
+    attr_accessor :payment_card
+    attr_accessor :note_to_buyer
+    attr_accessor :note_internal
+
     # All Action Validations
     validates :current_action, presence: true
     validates :current_user, presence: true
@@ -65,7 +71,7 @@ module Effective
 
     def fees_paid!
       update!(current_action: :fees_paid)
-      EffectiveMemberships.Registrar.fees_paid!(owner)
+      EffectiveMemberships.Registrar.fees_paid!(owner, order_attributes: order_attributes)
     end
 
     def remove!
@@ -103,6 +109,15 @@ module Effective
       EffectiveMemberships.Category.where(id: @category_ids) if @category_ids
     end
 
+    def order_attributes
+      {
+        payment_provider: @payment_provider.presence,
+        payment_card: @payment_card.presence,
+        note_to_buyer: @note_to_buyer.presence,
+        note_internal: @note_internal.presence
+      }.compact
+    end
+
     def skip_fees?
       EffectiveResources.truthy?(@skip_fees)
     end

data/app/views/admin/registrar_actions/_form_fees_paid.html.haml

@@ -25,6 +25,22 @@
       = f.check_box :current_action, label: 'Yes, mark this members fees paid in full'
 
       = f.show_if :current_action, true do
+        - if fees.blank?
+          %p There are no outstanding fee payment fees, so no order will be created.
+        - else
+          %p An order will be created and marked as paid with the following information:
+
+          = f.select :payment_provider, EffectiveOrders.admin_payment_providers, required: true
+
+          = f.text_field :payment_card,
+            label: 'Payment card type, cheque or transaction number',
+            hint: 'Do not enter credit card numbers here, or anywhere.'
+
+          .row
+            .col
+              = f.text_area :note_to_buyer, hint: 'This message will be displayed to the buyer on the receipt.'
+            .col
+              = f.text_area :note_internal, hint: 'For or internal admin use only. This note will never be displayed to the buyer.'
 
         = f.submit 'Mark Fees Paid', border: false, center: true,
           'data-confirm': "Really mark #{f.object.owner} fees paid?"

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails