effective_products 0.0.6 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe191a8c318148da7f4d5c91a4e8248ad1e46ed79a226fd8549873fbeeac7e58
-  data.tar.gz: e0481a234925beb15a4bde2656f931cfc98466224d4fdaa7cdf0be3e4a85879e
+  metadata.gz: 33912b031a749bc69286e6d5d04a85a67c930237b426389f0fbe890a05707e18
+  data.tar.gz: f2ab6eaf54d5c407ab891370ceaec1d1d25d659730e12c5dd2ad9b5fb3ac7ae8
 SHA512:
-  metadata.gz: 39a16cb225c1dd2f0c575af9eec56d5b8865f928d2acc2cb0990aec35dfd36b1d9af8acb474a3ac53dee78772224520fd3e35949447bbf1d5079c38a904511bb
-  data.tar.gz: a9f3006715674b41ce72da94d2936a87d456a45f08920cc4765ecc5596d69ffa6502a42aeed557c3ca1dd2061e76214d897bb3e91308e8bb5e2ede6790ec5781
+  metadata.gz: 8a258133393608311a4044c421905b90e511af529ba465ba59173482722e01c63d06958434b7ee2d038a955c26205825fbb2b994e23460503ac61545a2e330c2
+  data.tar.gz: 1a6ba5a8f9de60dab801d4c5eb7ad871d3a00e0fe9cc58b25fa751d25c6b2a154ca2eb2880c8dc566556aabe183a15737fccd64905e34a1087bb0b066414d9d2

data/app/controllers/admin/stamps_controller.rb

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

data/app/datatables/admin/effective_stamps_datatable.rb

@@ -16,8 +16,9 @@ module Admin
       col :created_at, as: :date
       col :owner, search: :string
 
-      col(:first_name) { |stamp| stamp.owner.first_name }
-      col(:last_name) { |stamp| stamp.owner.last_name }
+      col :applicant, visible: false
+      col :stamp_wizard, visible: false
+
       col(:email) { |stamp| stamp.owner.email }
       col(:phone) { |stamp| stamp.owner.phone }
 
@@ -25,12 +26,20 @@ module Admin
         stamp.owner.try(:membership).try(:number)
       end
 
-      col :category
       col :name
-      col :name_confirmation
+      col :name_confirmation, visible: false
+
+      col :category, visible: false
 
       col :shipping_address, label: 'Address'
 
+      col :purchased_order, visible: false
+      col :price, visible: false
+      col :tax_exempt, visible: false
+      col :qb_item_name, visible: false
+
+      col :status, visible: false
+
       col :issued_at
 
       actions_col

data/app/models/concerns/effective_products_ring_wizard.rb

@@ -110,9 +110,8 @@ module EffectiveProductsRingWizard
 
   def build_ring
     ring = rings.build(owner: owner)
-    address = owner.try(:shipping_address) || owner.try(:billing_address)
 
-    if address.present?
+    if (address = owner.try(:shipping_address) || owner.try(:billing_address)).present?
       ring.shipping_address = address
     end
 

data/app/models/concerns/effective_products_stamp_wizard.rb

@@ -86,7 +86,7 @@ module EffectiveProductsStampWizard
     end
 
     def after_submit_purchased!
-      # Nothing to do yet
+      stamps.each { |stamp| stamp.submit! }
     end
 
   end
@@ -109,8 +109,13 @@ module EffectiveProductsStampWizard
   end
 
   def build_stamp
-    address = owner.try(:shipping_address) || owner.try(:billing_address)
-    stamps.build(owner: owner, shipping_address: address)
+    stamp = stamps.build(owner: owner)
+
+    if (address = owner.try(:shipping_address) || owner.try(:billing_address)).present?
+      stamp.shipping_address = address
+    end
+
+    stamp
   end
 
   def assign_pricing

data/app/models/effective/stamp.rb

@@ -5,15 +5,24 @@ module Effective
     acts_as_purchasable
     acts_as_addressable :shipping
 
+    acts_as_statused(
+      :draft,     # Built in an application
+      :submitted, # Submitted by an applicant or stamp wizard
+      :issued     # Issued by an admin
+    )
+
     #CATEGORIES = ['Physical', 'Digital-only']
     CATEGORIES = ['Physical']
 
     log_changes if respond_to?(:log_changes)
 
-    # This ring is charged to an owner
+    # This stamp is charged to an owner
     belongs_to :owner, polymorphic: true
 
-    # Through the stamp_wizard
+    # 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
 
     effective_resource do
@@ -25,6 +34,10 @@ module Effective
       # Admin issues stamps
       issued_at          :datetime   # Present when issued by an admin
 
+      # Acts as Statused
+      status            :string
+      status_steps      :text
+
       # Acts as Purchasable
       price             :integer
       qb_item_name      :string
@@ -34,8 +47,13 @@ module Effective
     end
 
     scope :deep, -> { includes(:owner) }
-    scope :ready_to_issue, -> { purchased.where(issued_at: nil) }
-    scope :issued, -> { where.not(issued_at: nil) }
+
+    scope :with_approved_applicants, -> { where(applicant_id: EffectiveMemberships.Applicant.approved) }
+    scope :with_stamp_wizards, -> { where(applicant_id: nil).where.not(stamp_wizard_id: nil) }
+
+    scope :ready_to_issue, -> {
+      with_approved_applicants.or(with_stamp_wizards).purchased.where.not(status: :issued)
+    }
 
     validates :category, presence: true, inclusion: { in: CATEGORIES }
     validates :name, presence: true
@@ -54,16 +72,39 @@ module Effective
     end
 
     def mark_as_issued!
-      update!(issued_at: Time.zone.now)
-    end
-
-    def issued?
-      issued_at.present?
+      issued!
     end
 
     def physical?
       category == 'Physical'
     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?
+      submitted!
+    end
+
+    # This is the Admin Save and Mark Paid action
+    def mark_paid!
+      raise('expected an user with a membership category') unless owner && owner.try(:membership).present?
+
+      category = owner.membership.categories.first
+
+      assign_attributes(
+        price: category.stamp_fee,
+        tax_exempt: category.stamp_fee_tax_exempt,
+        qb_item_name: category.stamp_fee_qb_item_name
+      )
+
+      save!
+      Effective::Order.new(items: self, user: owner).mark_as_purchased!
+    end
+
   end
 end

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

@@ -0,0 +1,12 @@
+= effective_form_with(model: [:admin, stamp], engine: true) do |f|
+  - if f.object.new_record?
+    = f.select :owner, { 'Users' => current_user.class.members.sorted }, polymorphic: true
+  - else
+    = f.static_field :owner
+
+  = render 'effective/stamps/fields', f: f, stamp: f.object
+
+  - if f.object.new_record?
+    = f.submit 'Save and Mark Paid'
+  - else
+    = f.submit 'Save'

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

@@ -0,0 +1,11 @@
+= f.text_field :name
+= f.text_field :name_confirmation, hint: 'must match name'
+
+%h2 Stamp Information
+
+%p Please select a stamp and enter a shipping address.
+
+= f.select :category, Effective::Stamp::CATEGORIES
+
+= f.show_if :category, 'Physical' do
+  = effective_address_fields(f, :shipping)

data/config/routes.rb

@@ -23,7 +23,7 @@ EffectiveProducts::Engine.routes.draw do
       post :mark_as_issued, on: :member
     end
 
-    resources :stamps, only: [:index, :show] do
+    resources :stamps do
       post :mark_as_issued, on: :member
     end
   end

data/db/migrate/01_create_effective_products.rb.erb

@@ -55,6 +55,12 @@ class CreateEffectiveProducts < ActiveRecord::Migration[6.1]
       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
+
       t.string :category
       t.string :name
       t.string :name_confirmation

data/lib/effective_products/version.rb

@@ -1,3 +1,3 @@
 module EffectiveProducts
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_products
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -237,6 +237,7 @@ files:
 - app/models/effective/stamp.rb
 - app/models/effective/stamp_wizard.rb
 - app/views/admin/rings/_ring.html.haml
+- app/views/admin/stamps/_form.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
@@ -266,6 +267,7 @@ files:
 - app/views/effective/stamp_wizards/start.html.haml
 - app/views/effective/stamp_wizards/submitted.html.haml
 - app/views/effective/stamp_wizards/summary.html.haml
+- app/views/effective/stamps/_fields.html.haml
 - config/effective_products.rb
 - config/routes.rb
 - db/migrate/01_create_effective_products.rb.erb