effective_products 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fcdbeb5c90fb3b4d7a67d83deb961d25f7158229300d3afc56d936441b79ca0
-  data.tar.gz: 7cce45fb0b386fd6389d60294e53a854d44f3b764d71a77d9603679b550cc00a
+  metadata.gz: 3dc771ff3044d1e94868f560e22f8109b9c5d2daf9dc9d10f6904c7def5761cb
+  data.tar.gz: a62fa8ce36db37c1853d30b1b13713626908565ee8e51eef7f1c2e18aacc8499
 SHA512:
-  metadata.gz: 1783696edd49f896da317f8e73fdf8a884a5cca7697d71e233376d7fa0c75603133049454d6a40ffa205f260b02a6f101e6069ced13555b6f4eae311d12acc93
-  data.tar.gz: 8ef6e547e4d29ca9346604b59631ff5e30354727d77173d815330e8dfc640288c7ae6d6898a7acfb079d193ad07b8316e09e4d02e267b585097326bd2f9fa1f6
+  metadata.gz: 332000cfc71e3677d70fd46ceb177a24f15d8425d1bc3926c89812e71bca1c85e993c18e50ef16c4a14c0a58a208635251b392ce6548309ec3f1322ebb814378
+  data.tar.gz: 52141a466fc83a8a2387b0d8115af3d1077daf862c794dff259d57da870109a15e7be2c80e5fbac41501bb694b21c1f2042761837483b38e3057cd1c26f1cd1c

data/app/datatables/admin/effective_stamps_datatable.rb

@@ -20,8 +20,22 @@ module Admin
       col :issued_at, as: :date, visible: false
 
       col :owner, label: 'User', search: :string
-      col :parent
-
+      val(:current_category, label: 'Current Category', search: category_search_collection, sort: false, visible: false) do |stamp|
+        stamp.owner.try(:membership).try(:categories).to_a.map(&:to_s).presence
+      end.search do |collection, term, _, index|
+        collection.select { |row| Array(row[index]).include?(term.to_s) }
+      end
+      val(:applicant_category, label: 'Applicant Category', search: category_search_collection, sort: false, visible: false) do |stamp|
+        stamp.applicant_categories.presence
+      end.search do |collection, term, _, index|
+        collection.select { |row| Array(row[index]).include?(term.to_s) }
+      end
+      val(:applicant_status, label: 'Applicant Status', search: applicant_status_search_collection, sort: false, visible: false) do |stamp|
+        stamp.applicant_statuses.presence
+      end.search do |collection, term, _, index|
+        collection.select { |row| Array(row[index]).include?(term.to_s) }
+      end
+      col :parent, badge: false, visible: false
       col(:email, visible: false) { |stamp| mail_to(stamp.owner.email) }
       col(:phone, visible: false) { |stamp| stamp.owner.phone }
 
@@ -32,7 +46,9 @@ module Admin
       col :name
       col :name_confirmation, visible: false
 
-      col :category, search: EffectiveProducts.stamp_categories
+      col :stamp_category, search: EffectiveProducts.stamp_categories do |stamp|
+        stamp.category
+      end
 
       col(:shipping_address, visible: true) { |stamp| stamp.owner.try(:shipping_address).try(:to_html) }
       col(:address1, visible: false) { |stamp| stamp.owner.try(:shipping_address).try(:address1) }
@@ -53,5 +69,19 @@ module Admin
     collection do
       Effective::Stamp.deep.all
     end
+
+    def category_search_collection
+      return false unless defined?(EffectiveMemberships)
+      return false unless view.current_user.class.try(:effective_memberships_user?)
+
+      EffectiveMemberships.Category.sorted.map(&:to_s)
+    end
+
+    def applicant_status_search_collection
+      return false unless defined?(EffectiveMemberships)
+      return false unless view.current_user.class.try(:effective_memberships_user?)
+
+      EffectiveMemberships.Applicant.const_get(:STATUSES).map { |status| status.to_s.humanize }
+    end
   end
 end

data/app/models/effective/stamp.rb

@@ -67,6 +67,38 @@ module Effective
       [model_name.human, name.presence, category.presence].compact.join(' - ')
     end
 
+    def applicant_status
+      applicant_statuses.to_sentence.presence
+    end
+
+    def applicant_category
+      applicant_categories.to_sentence.presence
+    end
+
+    def applicant_categories
+      linked_applicants
+        .filter_map { |applicant| applicant.try(:category) }
+        .map(&:to_s)
+        .uniq
+    end
+
+    def applicant_statuses
+      linked_applicants
+        .filter_map { |applicant| applicant.try(:status).presence }
+        .map { |status| status.to_s.humanize }
+        .uniq
+    end
+
+    def linked_applicants
+      if parent.class.try(:effective_memberships_applicant?)
+        [parent]
+      elsif parent.respond_to?(:registration_applicants)
+        Array(parent.registration_applicants)
+      else
+        []
+      end
+    end
+
     # Called by a stamp wizard, applicant or fee payment when submitted
     def submit!
       submitted!

data/app/views/admin/stamps/_stamp.html.haml

@@ -1,17 +1,22 @@
 = effective_table_with(stamp) do |f|
-  = f.content_for :owner, label: 'User' do
-    - owner = f.object.owner
+  = f.belongs_to :owner, label: 'User'
+  = render 'effective/stamps/fields', f: f, stamp: f.object
 
-    = owner.to_s
-
-    - if owner.try(:email).present?
-      %br
-      = mail_to(owner.email)
-
-    - if owner.try(:phone).present?
-      %br
-      = owner.phone
-
-    - if owner.try(:membership).try(:number).present?
-      %br
-      Member Number #{owner.membership.number}
+  = f.text_field :status
+  = f.datetime_field :submitted_at
+  = f.datetime_field :purchased_at
+  = f.datetime_field :issued_at
+  = f.belongs_to :parent
+  = f.text_field :applicant_status, label: 'Applicant Status'
+  = f.email_field :email, value: (f.object.owner.try(:email).presence || '-')
+  = f.text_field :phone, value: (f.object.owner.try(:phone).presence || '-')
+  = f.text_field :member_number, label: 'Member #', value: (f.object.owner.try(:membership).try(:number).presence || '-')
+  = f.text_field :current_category, label: 'Current Category', value: (f.object.owner.try(:membership).try(:categories).to_a.to_sentence.presence || '-')
+  = f.text_field :applicant_category, label: 'Applicant Category', value: (f.object.applicant_category || '-')
+  = f.belongs_to :purchased_order
+  = f.price_field :price
+  = f.boolean_row :tax_exempt
+  = f.text_field :qb_item_name
+  = f.datetime_field :created, label: 'Created at', value: (f.object.created_at || '-')
+  = f.datetime_field :updated, label: 'Updated at', value: (f.object.updated_at || '-')
+  = f.text_field :id

data/lib/effective_products/version.rb

@@ -1,3 +1,3 @@
 module EffectiveProducts
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_products
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Code and Effect
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.37.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.37.0
 - !ruby/object:Gem::Dependency
   name: effective_orders
   requirement: !ruby/object:Gem::Requirement