effective_products 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c6308aed4b26bc76f95a87ca13e768885e71ec54a7a66b16b29353677c19868
-  data.tar.gz: 700fcdcb9a93587f76e97ca612f6196d9d7e3dc6cda028040b7b9b6d9128a211
+  metadata.gz: c6b962a8361ef38e6fd53023d4f6cc26a048d14dad3c6764c65c4592aeeb4feb
+  data.tar.gz: bed89486cacc7cc0a6fe02e2e4bd0559134e67198ca688c594375b270ef4f8ad
 SHA512:
-  metadata.gz: 93dd15eb15917a33df26311dd79dc8cdbb681475ac9eeec10422fe38c1ef2d7d4ab5f11af3264df2b0ddd889291c7b07e1115c7f1602fc9aa9d0c2cd2c0ce59e
-  data.tar.gz: 5b3af4f0ab24d58254470acff34a62568b083519d818c5674c5db7ffc07e99759fbc6c0da30d96b48a8e400b2ab3590cf5c9afb7db53ff6f49f580ad7bb78169
+  metadata.gz: 270befc380dfe3fdc3f0b6c93aca1225cd0969322a81ae8f23b0e855335c328f7cff0fac00abdcf5706d7455066366d932fe7409e8a34388c629c147783fe261
+  data.tar.gz: b39a6283d0e81cf2e2204a8aeac6f14f8d52f75683a36cc65d1b1e7cf4ca7f91bc8aed3a64cc35c5130d63ce07a2aade14819e5dfe3f2bd73bc0cd0ab82616d5

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2022 Code and Effect Inc.
+Copyright 2023 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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/ring.rb

@@ -2,6 +2,8 @@
 
 module Effective
   class Ring < ActiveRecord::Base
+    self.table_name = (EffectiveProducts.rings_table_name || :rings).to_s
+
     SIZES = [3, 4, 5, 6, 7, 8]
     TITANIUM_SIZES = [3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
     METALS = ['14k Yellow Gold', 'Sterling Silver', 'Titanium']

data/app/models/effective/ring_wizard.rb

@@ -1,6 +1,6 @@
 module Effective
   class RingWizard < ActiveRecord::Base
-    self.table_name = EffectiveProducts.ring_wizards_table_name.to_s
+    self.table_name = (EffectiveProducts.ring_wizards_table_name || :ring_wizards).to_s
 
     effective_products_ring_wizard
   end

data/app/models/effective/stamp.rb

@@ -2,9 +2,13 @@
 
 module Effective
   class Stamp < ActiveRecord::Base
+    self.table_name = (EffectiveProducts.stamps_table_name || :stamps).to_s
+
     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
@@ -43,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
@@ -66,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
@@ -91,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/models/effective/stamp_wizard.rb

@@ -1,6 +1,6 @@
 module Effective
   class StampWizard < ActiveRecord::Base
-    self.table_name = EffectiveProducts.stamp_wizards_table_name.to_s
+    self.table_name = (EffectiveProducts.stamp_wizards_table_name || :stamp_wizards).to_s
 
     effective_products_stamp_wizard
   end

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/config/effective_products.rb

@@ -1,9 +1,4 @@
 EffectiveProducts.setup do |config|
-  config.rings_table_name = :rings
-  config.ring_wizards_table_name = :ring_wizards
-  config.stamps_table_name = :stamps
-  config.stamp_wizards_table_name = :stamp_wizards
-
   # Layout Settings
   # Configure the Layout per controller, or all at once
   # config.layout = { application: 'application', admin: 'admin' }

data/db/migrate/{01_create_effective_products.rb.erb → 101_create_effective_products.rb}

@@ -1,4 +1,4 @@
-class CreateEffectiveProducts < ActiveRecord::Migration[6.1]
+class CreateEffectiveProducts < ActiveRecord::Migration[6.0]
   def change
     create_table :rings do |t|
       t.integer :owner_id

data/lib/effective_products/version.rb

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

data/lib/generators/effective_products/install_generator.rb

@@ -20,9 +20,7 @@ module EffectiveMemberships
       end
 
       def create_migration_file
-        @products_table_name  = ':' + EffectiveProducts.products_table_name.to_s
-
-        migration_template ('../' * 3) + 'db/migrate/01_create_effective_products.rb.erb', 'db/migrate/create_effective_products.rb'
+        migration_template ('../' * 3) + 'db/migrate/101_create_effective_products.rb', 'db/migrate/create_effective_products.rb'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_products
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-16 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
@@ -271,7 +272,7 @@ files:
 - config/effective_products.rb
 - config/locales/effective_products.en.yml
 - config/routes.rb
-- db/migrate/01_create_effective_products.rb.erb
+- db/migrate/101_create_effective_products.rb
 - db/seeds.rb
 - lib/effective_products.rb
 - lib/effective_products/engine.rb