effective_products 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae26ed6aea0b9a45d6318b110271ff03997aabb754ba030e37c4df9c190dae0
-  data.tar.gz: 193d7af0f641d2881354340f8a695db2c0d41f3f2031ec7942e35578aea06451
+  metadata.gz: c6b962a8361ef38e6fd53023d4f6cc26a048d14dad3c6764c65c4592aeeb4feb
+  data.tar.gz: bed89486cacc7cc0a6fe02e2e4bd0559134e67198ca688c594375b270ef4f8ad
 SHA512:
-  metadata.gz: d4a2055581a7e463a189a46232165290c81becaf45b7f729f548ac9cac0e90a14f57a57d7578cf2ae2aa6c59bc018f1be875e672547d578a537f8bd48e3a0937
-  data.tar.gz: 06ff27e57393210020af6bb53c6f3c550c0dc6f3428115eeb62abeee0993b1a7fec8e936de11c2d86c0f18dd673bec9a9a3e99e29262d0b7bafd5631fb2589a2
+  metadata.gz: 270befc380dfe3fdc3f0b6c93aca1225cd0969322a81ae8f23b0e855335c328f7cff0fac00abdcf5706d7455066366d932fe7409e8a34388c629c147783fe261
+  data.tar.gz: b39a6283d0e81cf2e2204a8aeac6f14f8d52f75683a36cc65d1b1e7cf4ca7f91bc8aed3a64cc35c5130d63ce07a2aade14819e5dfe3f2bd73bc0cd0ab82616d5

data/app/datatables/admin/effective_stamps_datatable.rb

@@ -2,25 +2,37 @@ module Admin
   class EffectiveStampsDatatable < Effective::Datatable
     filters do
       scope :ready_to_issue
+      scope :pending_applicant_approval
+      scope :pending_stamp_request_purchase
       scope :issued
       scope :all
     end
 
     datatable do
-      order :updated_at
+      order :created_at
 
       col :updated_at, visible: false
       col :created_at, visible: false
       col :id, visible: false
 
       col :created_at, as: :date
+      col :status, visible: false
       col :owner, search: :string
 
-      col :applicant, visible: false
-      col :stamp_wizard, visible: false
+      col(:applicant, search: :string) do |stamp|
+        if stamp.applicant.present?
+          link_to(stamp.applicant, effective_memberships.edit_admin_applicant_path(stamp.applicant)) + ' ' + badges(stamp.applicant.status)
+        end
+      end
 
-      col(:email) { |stamp| mail_to stamp.owner.email }
-      col(:phone) { |stamp| stamp.owner.phone }
+      col(:stamp_wizard, search: :string) do |stamp|
+        if stamp.stamp_wizard.present?
+          stamp.stamp_wizard.to_s + ' ' + badges(stamp.stamp_wizard.status)
+        end
+      end
+
+      col(:email, visible: false) { |stamp| mail_to stamp.owner.email }
+      col(:phone, visible: false) { |stamp| stamp.owner.phone }
 
       col :member_number, label: 'Member #' do |stamp|
         stamp.owner.try(:membership).try(:number)
@@ -31,21 +43,20 @@ module Admin
 
       col :category, search: EffectiveProducts.stamp_categories
 
-      col :shipping_address, visible: false
-      col(:address1) { |stamp| stamp.shipping_address.try(:address1) }
-      col(:address2) { |stamp| stamp.shipping_address.try(:address2) }
-      col(:city) { |stamp| stamp.shipping_address.try(:city) }
-      col(:state_code, label: 'Prov') { |stamp| stamp.shipping_address.try(:state_code) }
-      col(:postal_code, label: 'Postal') { |stamp| stamp.shipping_address.try(:postal_code) }
-      col(:country_code, label: 'Country') { |stamp| stamp.shipping_address.try(:country_code) }
+      col :shipping_address
+      col(:address1, visible: false) { |stamp| stamp.shipping_address.try(:address1) }
+      col(:address2, visible: false) { |stamp| stamp.shipping_address.try(:address2) }
+      col(:city, visible: false) { |stamp| stamp.shipping_address.try(:city) }
+      col(:state_code, visible: false, label: 'Prov') { |stamp| stamp.shipping_address.try(:state_code) }
+      col(:postal_code, visible: false, label: 'Postal') { |stamp| stamp.shipping_address.try(:postal_code) }
+      col(:country_code, visible: false, label: 'Country') { |stamp| stamp.shipping_address.try(:country_code) }
 
-      col :purchased_order, visible: false
+      col :purchased_order, search: :string, visible: false
       col :price, as: :price, visible: false
       col :tax_exempt, visible: false
       col :qb_item_name, visible: false
 
-      col :status, visible: false
-      col :issued_at
+      col :issued_at, as: :date
 
       actions_col
     end

data/app/models/concerns/effective_products_stamp_wizard.rb

@@ -92,7 +92,7 @@ module EffectiveProductsStampWizard
 
   # Instance Methods
   def to_s
-    'stamp request'
+    persisted? ? "#{model_name.human} ##{id}" : model_name.human
   end
 
   def in_progress?

data/app/models/effective/stamp.rb

@@ -7,6 +7,8 @@ module Effective
     acts_as_purchasable
     acts_as_addressable :shipping
 
+    attr_accessor :admin_action
+
     acts_as_statused(
       :draft,     # Built in an application
       :submitted, # Submitted by an applicant or stamp wizard
@@ -45,16 +47,25 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:addresses, owner: [:membership]) }
+    scope :deep, -> { includes(:addresses, :purchased_order, owner: [:membership], applicant: [:category, :user], stamp_wizard: [:user]) }
+    scope :not_issued, -> { where.not(status: :issued) }
 
     scope :with_approved_applicants, -> { where(applicant_id: EffectiveMemberships.Applicant.approved) }
-    scope :with_stamp_wizards, -> { purchased.where(applicant_id: nil).where.not(stamp_wizard_id: nil) }
-    scope :created_by_admin, -> { where(applicant_id: nil, stamp_wizard_id: nil) }
+    scope :with_unapproved_applicants, -> { where.not(applicant_id: nil).where.not(applicant_id: EffectiveMemberships.Applicant.approved) }
+
+    scope :with_purchased_stamp_wizards, -> { purchased.where.not(stamp_wizard_id: nil) }
+    scope :with_not_purchased_stamp_wizards, -> { not_purchased.where.not(stamp_wizard_id: nil) }
+
+    scope :created_by_admin, -> { submitted.where(applicant_id: nil, stamp_wizard_id: nil) }
 
+    # Datatable Scopes
     scope :ready_to_issue, -> {
-      with_approved_applicants.or(with_stamp_wizards).or(created_by_admin).where.not(status: :issued)
+      with_approved_applicants.or(with_purchased_stamp_wizards).or(created_by_admin).submitted
     }
 
+    scope :pending_applicant_approval, -> { not_issued.with_unapproved_applicants }
+    scope :pending_stamp_request_purchase, -> { not_issued.with_not_purchased_stamp_wizards }
+
     validates :name, presence: true
     validates :name_confirmation, presence: true
     validates :category, presence: true
@@ -68,6 +79,10 @@ module Effective
       self.errors.add(:category, "is not included") unless EffectiveProducts.stamp_categories.include?(category)
     end
 
+    validate(if: -> { admin_action }) do
+      self.errors.add(:owner_id, "must have a membership") unless owner && owner.try(:membership).present?
+    end
+
     def to_s
       [model_name.human, *name.presence].join(' ')
     end
@@ -93,6 +108,7 @@ module Effective
 
     # This is the Admin Save and Mark Paid action
     def mark_paid!
+      update!(admin_action: true) # Make sure we have an owner with a membership
       raise('expected an user with a membership category') unless owner && owner.try(:membership).present?
 
       category = owner.membership.categories.first

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

@@ -1,21 +1,8 @@
-= effective_form_with(model: [:admin, stamp], engine: true) do |f|
-  - if inline_datatable?
-    = f.hidden_field :owner_id
-    = f.hidden_field :owner_type
+= tabs do
+  = tab(stamp) do
+    = render 'admin/stamps/form_stamp', stamp: stamp
 
-  - else
-    - ajax_url = (@select2_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
-    - f.object.owner_type ||= current_user.class.name
+  - if stamp.persisted?
+    = tab 'Logs' do
+      = render_inline_datatable(stamp.logs_datatable)
 
-    = f.select :owner_id, current_user.class.all, label: 'User', ajax_url: ajax_url,
-      'data-load-ajax-url': effective_products.new_admin_stamp_path,
-      'data-load-ajax-div': '#effective-stamps-ajax'
-
-  #effective-stamps-ajax
-    = render 'effective/stamps/fields', f: f, stamp: f.object
-
-    = f.submit do
-      = f.save 'Save'
-
-      - if f.object.new_record?
-        = f.save 'Save and Mark Paid'

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

@@ -0,0 +1,23 @@
+= effective_form_with(model: [:admin, stamp], engine: true) do |f|
+  - if inline_datatable?
+    = f.hidden_field :owner_id
+    = f.hidden_field :owner_type
+
+  - else
+    - ajax_url = (@select2_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+    - f.object.owner_type ||= current_user.class.name
+
+    = f.hidden_field :owner_type
+
+    = f.select :owner_id, current_user.class.all, label: 'User', ajax_url: ajax_url,
+      'data-load-ajax-url': effective_products.new_admin_stamp_path,
+      'data-load-ajax-div': '#effective-stamps-ajax'
+
+  #effective-stamps-ajax
+    = render 'effective/stamps/fields', f: f, stamp: f.object
+
+    = f.submit do
+      - if f.object.new_record?
+        = f.save 'Save and Mark Paid'
+      - else
+        = f.save 'Save'

data/lib/effective_products/version.rb

@@ -1,3 +1,3 @@
 module EffectiveProducts
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_products
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -238,6 +238,7 @@ files:
 - app/models/effective/stamp_wizard.rb
 - app/views/admin/rings/_ring.html.haml
 - app/views/admin/stamps/_form.html.haml
+- app/views/admin/stamps/_form_stamp.html.haml
 - app/views/admin/stamps/_stamp.html.haml
 - app/views/effective/ring_wizards/_content.html.haml
 - app/views/effective/ring_wizards/_dashboard.html.haml