effective_products 0.3.19 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9359afd6341adfc7785cfdab0bb854383be7056444cee9e9c96c3498700e37f3
-  data.tar.gz: 8337933483ebd05733c5a0f40d4992efd63aa016ea5c223a0fda99bcfe0952ad
+  metadata.gz: ae9800b96a6f375ca67ce8dc0f46f0324a33958404debfc3e1fd0d9143db9bbe
+  data.tar.gz: 7160df9d3c521738108b6051ca5c7c1b0274668667351a380597104829fb1ce9
 SHA512:
-  metadata.gz: b37be8fdb808e28a4ce8e9f721708de8fe94b6f9e78f4355ff32aec0adb14db19d208f3e568dcb168c290cb5ac97ce40e5edf4b9409e4a38f55e6293e881a1f9
-  data.tar.gz: d84aa1252cdc276af293caa02e606b81a9d02115683cb2437419f8f1459a68a524be81869ccf121bd650e74b453628df7f8969cbb2b525d396c52c6386263b51
+  metadata.gz: 25c627e59ff932a4fc4be7b5001f9e65bce0c237cdbcd64350f39759a72b87e55f07517e5e3ab118acbb195fa36fc27c65bec615e7bb8e74dccdaaa631318b92
+  data.tar.gz: 0c9edae9f2ddeee94927abbd1788e9bae6f19e131e3acba02b664765970d8be20479005bc1386c45f5e1bd60440466a9d84aa1c90bfc475cbb939e2fce585b46

data/app/controllers/admin/rings_controller.rb

@@ -5,5 +5,6 @@ module Admin
 
     include Effective::CrudController
 
+    submit :mark_paid, 'Save and Mark Paid', redirect: :index
   end
 end

data/app/controllers/admin/stamps_controller.rb

@@ -5,12 +5,6 @@ module Admin
 
     include Effective::CrudController
 
-    # Admin can go straight to submitted
-    submit :mark_as_submitted, 'Save'
     submit :mark_paid, 'Save and Mark Paid', redirect: :index
-
-    on :mark_as_submitted, redirect: :index
-    on :mark_as_issued, redirect: :index
-
   end
 end

data/app/datatables/admin/effective_rings_datatable.rb

@@ -1,20 +1,26 @@
 module Admin
   class EffectiveRingsDatatable < Effective::Datatable
     filters do
-      scope :ready_to_issue
+      scope :submitted
       scope :issued
       scope :all
     end
 
     datatable do
-      order :updated_at
+      order :submitted_at
 
       col :updated_at, visible: false
-      col :created_at, visible: false
+      col :created_at, as: :date, visible: false
       col :id, visible: false
 
-      col :created_at, as: :date
-      col :owner, search: :string
+      col :status
+
+      col :submitted_at, as: :date
+      col :purchased_at, as: :date, visible: false
+      col :issued_at, as: :date, visible: false
+
+      col :owner, label: 'User', search: :string
+      col :parent
 
       col(:first_name) { |ring| ring.owner.first_name }
       col(:last_name) { |ring| ring.owner.last_name }
@@ -25,11 +31,22 @@ module Admin
         ring.owner.try(:membership).try(:number)
       end
 
-      col :shipping_address, label: 'Address'
+      col(:shipping_address, visible: true) { |ring| ring.owner.try(:shipping_address).try(:to_html) }
+      col(:address1, visible: false) { |ring| ring.owner.try(:shipping_address).try(:address1) }
+      col(:address2, visible: false) { |ring| ring.owner.try(:shipping_address).try(:address2) }
+      col(:city, visible: false) { |ring| ring.owner.try(:shipping_address).try(:city) }
+      col(:state_code, visible: false, label: 'Prov') { |ring| ring.owner.try(:shipping_address).try(:state_code) }
+      col(:postal_code, visible: false, label: 'Postal') { |ring| ring.owner.try(:shipping_address).try(:postal_code) }
+      col(:country_code, visible: false, label: 'Country') { |ring| ring.owner.try(:shipping_address).try(:country_code) }
 
       col :size
       col :metal
-      col :issued_at
+
+      col :purchased_order, search: :string, visible: false
+      col :price, as: :price, visible: false
+      col :tax_exempt, visible: false
+      col :qb_item_name, visible: false
+
 
       actions_col
     end

data/app/datatables/admin/effective_stamps_datatable.rb

@@ -1,44 +1,28 @@
 module Admin
   class EffectiveStampsDatatable < Effective::Datatable
     filters do
-      scope :ready_to_issue
-      scope :pending
+      scope :submitted
       scope :issued
       scope :all
     end
 
     datatable do
-      order :purchased_at
+      order :submitted_at
 
       col :updated_at, visible: false
+      col :created_at, as: :date, visible: false
       col :id, visible: false
 
-      col :registered_at, as: :date do |stamp|
-        stamp.applicant.try(:registered_at).try(:strftime, '%F')
-      end
-
-      col :purchased_at, as: :date, visible: false do |stamp|
-        stamp.purchased_order.try(:purchased_at).try(:strftime, '%F')
-      end
+      col :status
 
-      col :created_at, as: :date, visible: false
-      col :created_by
-      col :status, visible: false
-      col :owner, search: :string
+      col :submitted_at, as: :date
+      col :purchased_at, as: :date, visible: false
+      col :issued_at, as: :date, 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 :owner, label: 'User', search: :string
+      col :parent
 
-      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(:email, visible: false) { |stamp| mail_to(stamp.owner.email) }
       col(:phone, visible: false) { |stamp| stamp.owner.phone }
 
       col :member_number, label: 'Member #' do |stamp|
@@ -50,26 +34,19 @@ module Admin
 
       col :category, search: EffectiveProducts.stamp_categories
 
-      if current_user.respond_to?(:shipping_address)
-        col :user_shipping_address, label: "Shipping Address" do |stamp|
-          stamp.owner.try(:shipping_address).try(:to_html)
-        end
-
-        col(:address1, visible: false) { |stamp| stamp&.owner.shipping_address.try(:address1) }
-        col(:address2, visible: false) { |stamp| stamp&.owner.shipping_address.try(:address2) }
-        col(:city, visible: false) { |stamp| stamp&.owner.shipping_address.try(:city) }
-        col(:state_code, visible: false, label: 'Prov') { |stamp| stamp&.owner.shipping_address.try(:state_code) }
-        col(:postal_code, visible: false, label: 'Postal') { |stamp| stamp&.owner.shipping_address.try(:postal_code) }
-        col(:country_code, visible: false, label: 'Country') { |stamp| stamp&.owner.shipping_address.try(:country_code) }
-      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) }
+      col(:address2, visible: false) { |stamp| stamp.owner.try(:shipping_address).try(:address2) }
+      col(:city, visible: false) { |stamp| stamp.owner.try(:shipping_address).try(:city) }
+      col(:state_code, visible: false, label: 'Prov') { |stamp| stamp.owner.try(:shipping_address).try(:state_code) }
+      col(:postal_code, visible: false, label: 'Postal') { |stamp| stamp.owner.try(:shipping_address).try(:postal_code) }
+      col(:country_code, visible: false, label: 'Country') { |stamp| stamp.owner.try(:shipping_address).try(:country_code) }
 
       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 :issued_at, as: :date
-
       actions_col
     end
 

data/app/models/concerns/effective_products_ring_wizard.rb

@@ -44,7 +44,7 @@ module EffectiveProductsRingWizard
     accepts_nested_attributes_for :owner
 
     # Effective Namespace
-    has_many :rings, -> { order(:id) }, class_name: 'Effective::Ring', inverse_of: :ring_wizard, dependent: :destroy
+    has_many :rings, -> { order(:id) }, class_name: 'Effective::Ring', as: :parent, dependent: :destroy
     accepts_nested_attributes_for :rings, reject_if: :all_blank, allow_destroy: true
 
     effective_resource do
@@ -74,7 +74,7 @@ module EffectiveProductsRingWizard
 
     # Ring Step
     validate(if: -> { current_step == :ring }) do
-      self.errors.add(:rings, "can't be blank") unless present_rings.present?
+      errors.add(:rings, "can't be blank") unless present_rings.present?
     end
 
     # All Fees and Orders
@@ -83,14 +83,14 @@ module EffectiveProductsRingWizard
     end
 
     def after_submit_purchased!
-      # Nothing to do yet
+      rings.each { |ring| ring.submit! }
     end
 
   end
 
   # Instance Methods
   def to_s
-    'ring payment'
+    (persisted? || destroyed?) ? "#{model_name.human} ##{id_was}" : model_name.human
   end
 
   def in_progress?
@@ -106,13 +106,7 @@ module EffectiveProductsRingWizard
   end
 
   def build_ring
-    ring = rings.build(owner: owner)
-
-    if (address = owner.try(:shipping_address) || owner.try(:billing_address)).present?
-      ring.shipping_address = address
-    end
-
-    ring
+    rings.build(owner: owner)
   end
 
   def assign_pricing

data/app/models/concerns/effective_products_stamp_wizard.rb

@@ -44,7 +44,7 @@ module EffectiveProductsStampWizard
     accepts_nested_attributes_for :owner
 
     # Effective Namespace
-    has_many :stamps, -> { order(:id) }, class_name: 'Effective::Stamp', inverse_of: :stamp_wizard, dependent: :destroy
+    has_many :stamps, -> { order(:id) }, class_name: 'Effective::Stamp', as: :parent, dependent: :destroy
     accepts_nested_attributes_for :stamps, reject_if: :all_blank, allow_destroy: true
 
     effective_resource do
@@ -69,12 +69,16 @@ module EffectiveProductsStampWizard
 
     scope :for, -> (user) { where(owner: user) }
 
+    before_validation(if: -> { current_step == :stamp && stamp.present? }) do
+      assign_pricing unless stamp.purchased?
+    end
+
     # All Steps validations
     validates :owner, presence: true
 
     # Stamp Step
     validate(if: -> { current_step == :stamp }) do
-      self.errors.add(:stamps, "can't be blank") unless present_stamps.present?
+      errors.add(:stamps, "can't be blank") unless present_stamps.present?
     end
 
     # All Fees and Orders
@@ -92,6 +96,10 @@ module EffectiveProductsStampWizard
     (persisted? || destroyed?) ? "#{model_name.human} ##{id_was}" : model_name.human
   end
 
+  def stamp_categories
+    EffectiveProducts.stamp_categories
+  end
+
   def in_progress?
     draft?
   end
@@ -105,13 +113,7 @@ module EffectiveProductsStampWizard
   end
 
   def build_stamp
-    stamp = stamps.build(owner: owner)
-
-    if (address = owner.try(:shipping_address) || owner.try(:billing_address)).present?
-      stamp.shipping_address = address
-    end
-
-    stamp
+    stamps.build(owner: owner, name: owner.to_s.presence)
   end
 
   def assign_pricing
@@ -124,17 +126,6 @@ module EffectiveProductsStampWizard
     # stamp.assign_attributes(price: price, qb_item_name: qb_item_name, tax_exempt: tax_exempt)
   end
 
-  # After the configure Stamp step
-  def stamp!
-    assign_pricing() if stamp.present?
-    raise('expected stamp to have a price') if stamp.price.blank?
-    save!
-  end
-
-  def stamp_categories
-    EffectiveProducts.stamp_categories
-  end
-
   private
 
   def present_stamps

data/app/models/effective/ring.rb

@@ -9,22 +9,35 @@ module Effective
     METALS = ['14k Yellow Gold', 'Sterling Silver', 'Titanium']
 
     acts_as_purchasable
-    acts_as_addressable :shipping
+
+    acts_as_statused(
+      :draft,     # Built in an application
+      :submitted, # Submitted by a ring wizard
+      :issued     # Issued by an admin
+    )
 
     log_changes if respond_to?(:log_changes)
 
     # This ring is charged to an owner
     belongs_to :owner, polymorphic: true
+    accepts_nested_attributes_for :owner, reject_if: :all_blank
 
-    # Through the ring_wizard
-    belongs_to :ring_wizard, polymorphic: true, optional: true
+    # This could be a RingWizard, or Blank (admin created)
+    belongs_to :parent, polymorphic: true, optional: true
 
     effective_resource do
       size               :integer
       metal              :string
 
+      submitted_at       :datetime
       issued_at          :datetime   # Present when issued by an admin
 
+      created_by_admin   :boolean
+
+      # Acts as Statused
+      status            :string
+      status_steps      :text
+
       # Acts as Purchasable
       price             :integer
       qb_item_name      :string
@@ -33,31 +46,42 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:addresses, owner: [:membership]) }
+    scope :deep, -> { includes(:purchased_order, :parent, owner: [:addresses, :membership]) }
+    scope :ready_to_issue, -> { submitted }
+    scope :not_issued, -> { where.not(status: :issued) }
+    scope :created_by_admin, -> { where(created_by_admin: true) }
 
-    scope :ready_to_issue, -> { purchased.where(issued_at: nil) }
-    scope :issued, -> { where.not(issued_at: nil) }
+    validates :parent, presence: true, unless: -> { created_by_admin? }
 
     validates :metal, presence: true, inclusion: { in: METALS }
-
     validates :size, presence: true
     validates :size, inclusion: { in: TITANIUM_SIZES }, if: -> { metal == 'Titanium' }
     validates :size, inclusion: { in: SIZES }, if: -> { metal != 'Titanium' }
 
+    validate(if: -> { owner.present? }) do
+      errors.add(:owner, "must have a shipping address") unless owner.try(:shipping_address).present?
+    end
+
     def to_s
-      ["Chemist's Ring", (" - #{metal} size #{size}" if metal.present? && size.present?)].compact.join
+      [
+        model_name.human,
+        ("#{metal} size #{size}" if metal.present? && size.present?)
+      ].compact.join(' - ')
     end
 
-    def mark_as_issued!
-      update!(issued_at: Time.zone.now)
+    # Called by a ring wizard when submitted
+    def submit!
+      submitted!
     end
 
-    def submitted?
-      purchased?
+    # Admin action
+    def mark_as_submitted!
+      submitted!
     end
 
-    def issued?
-      issued_at.present?
+    # Admin action
+    def mark_as_issued!
+      issued!
     end
 
   end

data/app/models/effective/stamp.rb

@@ -5,9 +5,6 @@ module Effective
     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
@@ -19,12 +16,10 @@ module Effective
 
     # This stamp is charged to an owner
     belongs_to :owner, polymorphic: true
+    accepts_nested_attributes_for :owner, reject_if: :all_blank
 
-    # Sometimes a stamp is built through an applicant
-    belongs_to :applicant, polymorphic: true, optional: true
-
-    # Other times through the stamp_wizard
-    belongs_to :stamp_wizard, polymorphic: true, optional: true
+    # This could be a StampWizard, an Applicant, a FeePayment, or Blank (admin created)
+    belongs_to :parent, polymorphic: true, optional: true
 
     effective_resource do
       name               :string
@@ -32,9 +27,11 @@ module Effective
 
       category           :string
 
-      # Admin issues stamps
+      submitted_at       :datetime
       issued_at          :datetime   # Present when issued by an admin
 
+      created_by_admin   :boolean
+
       # Acts as Statused
       status            :string
       status_steps      :text
@@ -47,90 +44,59 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:addresses, :purchased_order, owner: [:membership], applicant: [:category, :user], stamp_wizard: [:user]) }
+    scope :deep, -> { includes(:purchased_order, :parent, owner: [:addresses, :membership]) }
+    scope :ready_to_issue, -> { submitted }
     scope :not_issued, -> { where.not(status: :issued) }
+    scope :created_by_admin, -> { where(created_by_admin: true) }
 
-    scope :with_registered_applicants, -> { where(applicant_id: EffectiveMemberships.Applicant.registered) }
-    scope :with_unregistered_applicants, -> { where.not(applicant_id: nil).where.not(applicant_id: EffectiveMemberships.Applicant.registered) }
-
-    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_registered_applicants.or(with_purchased_stamp_wizards).or(created_by_admin).submitted
-    }
-
-    scope :pending, -> { pending_applicant_registration.or(pending_stamp_request_purchase) }
-    scope :pending_applicant_registration, -> { not_issued.with_unregistered_applicants }
-    scope :pending_stamp_request_purchase, -> { not_issued.with_not_purchased_stamp_wizards }
+    validates :parent, presence: true, unless: -> { created_by_admin? }
 
     validates :name, presence: true
     validates :name_confirmation, presence: true
     validates :category, presence: true
-    validates :shipping_address, presence: true, unless: -> { category == 'Digital-only' }
 
     validate(if: -> { name.present? && name_confirmation.present? }) do
       errors.add(:name_confirmation, "doesn't match name") unless name == name_confirmation
     end
 
-    validate(if: -> { admin_action }) do
-      errors.add(:owner_id, "must have a membership") unless owner && owner.try(:membership).present?
+    validate(if: -> { owner.present? }, unless: -> { category == 'Digital-only' }) do
+      errors.add(:owner, "must have a shipping address") unless owner.try(:shipping_address).present?
     end
 
     def to_s
-      [
-        model_name.human, 
-        ('Replacement' if stamp_wizard_id_was.present?), 
-        '-',
-        name.presence, 
-        ("- #{category}" if category.present?)
-      ].compact.join(' ')
+      [model_name.human, name.presence, category.presence].compact.join(' - ')
     end
 
+    # Called by a stamp wizard, applicant or fee payment when submitted
+    def submit!
+      submitted!
+    end
+
+    # Admin action
     def mark_as_submitted!
       submitted!
     end
 
+    # Admin action
     def mark_as_issued!
       issued!
     end
 
-    def created_by_admin?
-      stamp_wizard_id.blank? && applicant_id.blank?
-    end
-
-    # Called by an application when submitted
-    # Called by a stamp wizard when submitted
-    def submit!
-      raise('expected a purchased order') unless (purchased? || applicant&.submit_order&.purchased?)
-      submitted!
-    end
-
     # This is the Admin Save and Mark Paid action
     def mark_paid!
-      assign_attributes(admin_action: true)
+      category = owner&.membership&.category
 
-      category = owner&.membership&.categories&.first
+      assign_attributes(
+        price: (category&.stamp_fee || 0),
+        tax_exempt: (category&.stamp_fee_tax_exempt || false),
+        qb_item_name: (category&.stamp_fee_qb_item_name || 'Professional Stamp')
+      )
 
-      if category.present?
-        assign_attributes(
-          price: category.stamp_fee,
-          tax_exempt: category.stamp_fee_tax_exempt,
-          qb_item_name: category.stamp_fee_qb_item_name
-        )
-      end
+      submit!
 
-      submitted! # Will fail with invalid owner membership anyway
-
-      if category.present?
-        Effective::Order.new(items: self, user: owner).mark_as_purchased!
-      end
+      Effective::Order.new(items: self, user: owner).mark_as_purchased!
 
       true
     end
-
   end
 end

data/app/views/admin/rings/_ring.html.haml

@@ -1,48 +1,17 @@
-%table.table
-  %tbody
-    %tr
-      %th Owner
-      %td
-        - url = (edit_polymorphic_path(ring.owner) rescue "/admin/users/#{ring.owner.to_param}/edit")
-        = link_to(ring.owner, url)
+= effective_table_with(ring) do |f|
+  = f.content_for :owner, label: 'User' do
+    - owner = f.object.owner
 
-    %tr
-      %th Purchased Order
-      %td
-        - if ring.purchased_order.present?
-          = link_to(ring.purchased_order, effective_orders.admin_order_path(ring.purchased_order))
+    = owner.to_s
 
-    %tr
-      %th Contact
-      %td
-        - owner = ring.owner
+    - if owner.try(:email).present?
+      %br
+      = mail_to(owner.email)
 
-        = owner.to_s
+    - if owner.try(:phone).present?
+      %br
+      = owner.phone
 
-        - 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}
-
-    %tr
-      %th Address
-      %td= ring.shipping_address.to_html
-
-    %tr
-      %th Size
-      %td= ring.size
-
-    %tr
-      %th Metal
-      %td= ring.metal
-
-    %tr
-      %th Issued At
-      %td= ring.issued_at&.strftime('%F') || 'Not Issued'
+    - if owner.try(:membership).try(:number).present?
+      %br
+      Member Number #{owner.membership.number}

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

@@ -1,23 +1,23 @@
 = effective_form_with(model: [:admin, stamp], engine: true) do |f|
+  - f.object.owner_type ||= current_user.class.name
+  = f.hidden_field :owner_type
+
   - if inline_datatable?
     = f.hidden_field :owner_id
-    = f.hidden_field :owner_type
-
   - else
-    - ajax_url = (effective_resources.users_effective_ajax_index_path unless Rails.env.test?)
-    - f.object.owner_type ||= current_user.class.name
-
-    = f.hidden_field :owner_type
+    - ajax_url = (effective_resources.users_effective_ajax_index_path(scope: :members) unless Rails.env.test?)
 
     = 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'
 
+  - if f.object.new_record?
+    = f.hidden_field :created_by_admin, value: true
+
   #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'
+    - if f.object.new_record?
+      = f.submit 'Save and Mark Paid'
+    - else
+      = effective_submit(f)

data/app/views/effective/ring_wizards/_ring.html.haml

@@ -1,40 +1,3 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= ring_wizard.wizard_step_title(:ring)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:ring)) if edit_effective_wizard?
-
-    - ring = ring_wizard.ring
-    - owner = ring_wizard.owner
-
-    %table.table.table-sm
-      %tbody
-        %tr
-          %th Owner
-          %td
-            = 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}
-
-        %tr
-          %th Address
-          %td= ring.shipping_address.to_html
-
-        %tr
-          %th Metal
-          %td= ring.metal
-
-        %tr
-          %th Size
-          %td Size #{ring.size}
+= wizard_card(ring_wizard) do
+  = effective_table_with(ring_wizard.ring) do |f|
+    = render('effective/rings/fields', f: f)

data/app/views/effective/ring_wizards/_ring_fields.html.haml

@@ -1,57 +1,2 @@
-
-%h2 Member Information
-
-- owner = f.object.owner
-
-%p
-  = 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}
-
-%h2 Ring Information
-%p
-  The 14k Yellow Gold and Sterling Silver rings will have the association's letters as well as your membership number engraved inside the band.
-  Titanium rings do not come engraved.
-
-%p Please choose your desired metal and ring size:
-
-%table.table
-  %thead
-    %th Ring Size
-    %th Composition
-    %th.order_price Cost
-  %tbody
-    %tr
-      %td 3-8
-      %td 14k Yellow Gold
-      %td.order_price $425.00 + GST
-    %tr
-      %td 3-8
-      %td Sterling Silver
-      %td.order_price $175.00 + GST
-    %tr
-      %td 3-13
-      %td Titanium
-      %td.order_price $50.00 + GST
-
-%ul
-  %li 14k Yellow Gold and Sterling Silver rings are available in sizes 3 - 8.
-  %li Titanium rings are available in sizes 3 - 13.
-
-%p Please select a ring metal and size:
-
-= f.select :metal, Effective::Ring::METALS
-= f.select :size, Effective::Ring::TITANIUM_SIZES
-
-%h2 Shipping Information
-= effective_address_fields(f, :shipping)
+= f.fields_for(:rings, f.object.ring || f.object.build_ring) do |fr|
+  = render 'effective/rings/fields', f: fr, parent: resource

data/app/views/effective/ring_wizards/_ring_requirements.html.haml

@@ -0,0 +1 @@
+-# Ring Requirements

data/app/views/effective/ring_wizards/ring.html.haml

@@ -1,18 +1,12 @@
 = render 'layout' do
   = render 'effective/ring_wizards/content', resource: resource
 
-  .card
-    .card-body
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+  = card do
+    .mb-2= render('ring_requirements', ring_wizard: resource)
 
-        = f.fields_for :rings, (f.object.ring || f.object.build_ring) do |fr|
-          = fr.hidden_field :ring_wizard_id
-          = fr.hidden_field :ring_wizard_type
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
 
-          = fr.hidden_field :owner_id
-          = fr.hidden_field :owner_type
+      = render('effective/ring_wizards/ring_fields', f: f)
 
-          = render('effective/ring_wizards/ring_fields', f: fr)
-
-        = f.save 'Save and Continue'
+      = f.save 'Save and Continue'

data/app/views/effective/rings/_fields.html.haml

@@ -0,0 +1,12 @@
+= f.hidden_field :parent_id
+= f.hidden_field :parent_type
+
+= f.hidden_field :owner_id
+= f.hidden_field :owner_type
+
+= f.select :metal, Effective::Ring::METALS
+= f.select :size, Effective::Ring::TITANIUM_SIZES
+
+- if f.object.owner.present?
+  = f.fields_for(:owner) do |fu|
+    = effective_address_fields(fu, :shipping, skip_same_as_billing: true)

data/app/views/effective/rings/_ring.html.haml

@@ -0,0 +1,23 @@
+%table.table.table-sm.table-striped.table-hover
+  %tbody
+    %tr
+      %th Metal
+      %td= ring.metal
+
+    %tr
+      %th Size
+      %td= ring.size
+
+    - if ring.owner.try(:shipping_address).present?
+      %tr
+        %th Shipping Address
+        %td= ring.owner.shipping_address.to_html
+
+    - if ring.was_submitted?
+      %tr
+        %th Submitted
+        %td= ring.submitted_at&.strftime('%F') || '-'
+
+      %tr
+        %th Issued
+        %td= ring.issued_at&.strftime('%F') || 'Not Issued'

data/app/views/effective/stamp_wizards/_stamp_fields.html.haml

@@ -0,0 +1,2 @@
+= f.fields_for(:stamps, f.object.stamp || f.object.build_stamp) do |fs|
+  = render 'effective/stamps/fields', f: fs, parent: resource

data/app/views/effective/stamp_wizards/_stamp_requirements.html.haml

@@ -1 +1 @@
-%p Stamp Requirements
+- # Stamp Requirements

data/app/views/effective/stamp_wizards/stamp.html.haml

@@ -7,13 +7,6 @@
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
 
-      = f.fields_for :stamps, (f.object.stamp || f.object.build_stamp) do |fr|
-        = fr.hidden_field :stamp_wizard_id
-        = fr.hidden_field :stamp_wizard_type
-
-        = fr.hidden_field :owner_id
-        = fr.hidden_field :owner_type
-
-        = render('effective/stamps/fields', f: fr, parent: resource)
+      = render('effective/stamp_wizards/stamp_fields', f: f)
 
       = f.save 'Save and Continue'

data/app/views/effective/stamps/_fields.html.haml

@@ -1,4 +1,9 @@
-- f.object.shipping_address ||= (f.object.owner.try(:shipping_address) || f.object.owner.try(:billing_address))
+= f.hidden_field :parent_id
+= f.hidden_field :parent_type
+
+= f.hidden_field :owner_id
+= f.hidden_field :owner_type
+
 - f.object.name ||= f.object.owner.to_s
 
 = f.text_field :name
@@ -7,4 +12,6 @@
 - collection = local_assigns[:parent].try(:stamp_categories) || EffectiveProducts.stamp_categories
 = f.select :category, collection
 
-= effective_address_fields(f, :shipping)
+- if f.object.owner.present?
+  = f.fields_for(:owner) do |fu|
+    = effective_address_fields(fu, :shipping, skip_same_as_billing: true)

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

@@ -0,0 +1,27 @@
+%table.table.table-sm.table-striped.table-hover
+  %tbody
+    %tr
+      %th Name
+      %td= stamp.name
+
+    %tr
+      %th Name Confirmation
+      %td= stamp.name_confirmation
+
+    %tr
+      %th Category
+      %td= stamp.category
+
+    - if stamp.owner.try(:shipping_address).present?
+      %tr
+        %th Shipping Address
+        %td= stamp.owner.shipping_address.to_html
+
+    - if stamp.was_submitted?
+      %tr
+        %th Submitted
+        %td= stamp.submitted_at&.strftime('%F') || '-'
+
+      %tr
+        %th Issued
+        %td= stamp.issued_at&.strftime('%F') || 'Not Issued'

data/db/migrate/101_create_effective_products.rb

@@ -4,14 +4,22 @@ class CreateEffectiveProducts < ActiveRecord::Migration[6.0]
       t.integer :owner_id
       t.string :owner_type
 
-      t.integer :ring_wizard_id
-      t.string :ring_wizard_type
+      # This could be a RingWizard, or Blank (admin created)
+      t.integer :parent_id
+      t.string :parent_type
 
       t.integer :size
       t.string :metal
 
+      t.datetime :submitted_at
       t.datetime :issued_at
 
+      t.boolean :created_by_admin, default: false
+
+      # Acts as Statused
+      t.string :status
+      t.text :status_steps
+
       # Acts as purchasable
       t.integer :purchased_order_id
       t.integer :price
@@ -21,15 +29,15 @@ class CreateEffectiveProducts < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
+    add_index :rings, [:owner_id, :owner_type]
+    add_index :rings, [:parent_id, :parent_type]
+
     create_table :ring_wizards do |t|
       t.string :token
 
       t.integer :owner_id
       t.string :owner_type
 
-      t.integer :user_id
-      t.string :user_type
-
       # Acts as Statused
       t.string :status
       t.text :status_steps
@@ -52,21 +60,24 @@ class CreateEffectiveProducts < ActiveRecord::Migration[6.0]
       t.integer :owner_id
       t.string :owner_type
 
-      t.integer :stamp_wizard_id
-      t.string :stamp_wizard_type
-
-      t.integer :applicant_id
-      t.string :applicant_type
-
-      t.string :status
-      t.text :status_steps
+      # This could be a StampWizard, an Applicant, a FeePayment, or Blank (admin created)
+      t.integer :parent_id
+      t.string :parent_type
 
-      t.string :category
       t.string :name
       t.string :name_confirmation
 
+      t.string :category
+
+      t.datetime :submitted_at
       t.datetime :issued_at
 
+      t.boolean :created_by_admin, default: false
+
+      # Acts as Statused
+      t.string :status
+      t.text :status_steps
+
       # Acts as purchasable
       t.integer :purchased_order_id
       t.integer :price
@@ -76,15 +87,15 @@ class CreateEffectiveProducts < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
+    add_index :stamps, [:owner_id, :owner_type]
+    add_index :stamps, [:parent_id, :parent_type]
+
     create_table :stamp_wizards do |t|
       t.string :token
 
       t.integer :owner_id
       t.string :owner_type
 
-      t.integer :user_id
-      t.string :user_type
-
       # Acts as Statused
       t.string :status
       t.text :status_steps

data/lib/effective_products/version.rb

@@ -1,3 +1,3 @@
 module EffectiveProducts
-  VERSION = '0.3.19'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_products
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-11 00:00:00.000000000 Z
+date: 2026-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -246,6 +246,7 @@ files:
 - app/views/effective/ring_wizards/_orders.html.haml
 - app/views/effective/ring_wizards/_ring.html.haml
 - app/views/effective/ring_wizards/_ring_fields.html.haml
+- app/views/effective/ring_wizards/_ring_requirements.html.haml
 - app/views/effective/ring_wizards/_ring_wizard.html.haml
 - app/views/effective/ring_wizards/_summary.html.haml
 - app/views/effective/ring_wizards/billing.html.haml
@@ -254,11 +255,14 @@ files:
 - app/views/effective/ring_wizards/start.html.haml
 - app/views/effective/ring_wizards/submitted.html.haml
 - app/views/effective/ring_wizards/summary.html.haml
+- app/views/effective/rings/_fields.html.haml
+- app/views/effective/rings/_ring.html.haml
 - app/views/effective/stamp_wizards/_content.html.haml
 - app/views/effective/stamp_wizards/_dashboard.html.haml
 - app/views/effective/stamp_wizards/_layout.html.haml
 - app/views/effective/stamp_wizards/_orders.html.haml
 - app/views/effective/stamp_wizards/_stamp.html.haml
+- app/views/effective/stamp_wizards/_stamp_fields.html.haml
 - app/views/effective/stamp_wizards/_stamp_requirements.html.haml
 - app/views/effective/stamp_wizards/_stamp_wizard.html.haml
 - app/views/effective/stamp_wizards/_summary.html.haml
@@ -269,6 +273,7 @@ files:
 - app/views/effective/stamp_wizards/submitted.html.haml
 - app/views/effective/stamp_wizards/summary.html.haml
 - app/views/effective/stamps/_fields.html.haml
+- app/views/effective/stamps/_stamp.html.haml
 - config/effective_products.rb
 - config/locales/effective_products.en.yml
 - config/routes.rb