effective_products 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2992b6b0b12c9492acc501695ca38ffd7a8bd12afbd3c428eaf7c2be16f62cfb
-  data.tar.gz: c40613e452d37c8b98617a7d13274b5c5968a7b4ea235a1581938826cfd447fa
+  metadata.gz: fe191a8c318148da7f4d5c91a4e8248ad1e46ed79a226fd8549873fbeeac7e58
+  data.tar.gz: e0481a234925beb15a4bde2656f931cfc98466224d4fdaa7cdf0be3e4a85879e
 SHA512:
-  metadata.gz: 8528fc8d11c0e4d71d635e6a05afb2e455425a35439637638b5d074da5538e2e0fa7e68b28e569c71c9fc918acd2665f89595b519df7a15dbd0d36a3b69dd274
-  data.tar.gz: 6cf09696ebbe1d0e9b534c128130647b2c73d9599d9961b082d0f7d96cc40f7a89b206ee6f8e54f969ce4678cdff3cf273ed5a380791f4733aa7bdc8e70a1987
+  metadata.gz: 39a16cb225c1dd2f0c575af9eec56d5b8865f928d2acc2cb0990aec35dfd36b1d9af8acb474a3ac53dee78772224520fd3e35949447bbf1d5079c38a904511bb
+  data.tar.gz: a9f3006715674b41ce72da94d2936a87d456a45f08920cc4765ecc5596d69ffa6502a42aeed557c3ca1dd2061e76214d897bb3e91308e8bb5e2ede6790ec5781

data/app/controllers/admin/stamps_controller.rb

@@ -0,0 +1,9 @@
+module Admin
+  class StampsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_products) }
+
+    include Effective::CrudController
+
+  end
+end

data/app/controllers/effective/ring_wizards_controller.rb

@@ -0,0 +1,10 @@
+module Effective
+  class RingWizardsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+
+    include Effective::WizardController
+
+    resource_scope -> { EffectiveProducts.RingWizard.deep.where(owner: current_user) }
+
+  end
+end

data/app/controllers/effective/stamp_wizards_controller.rb

@@ -0,0 +1,10 @@
+module Effective
+  class StampWizardsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+
+    include Effective::WizardController
+
+    resource_scope -> { EffectiveProducts.StampWizard.deep.where(owner: current_user) }
+
+  end
+end

data/app/datatables/admin/effective_rings_datatable.rb

@@ -16,11 +16,10 @@ module Admin
       col :created_at, as: :date
       col :owner, search: :string
 
-      col :first_name
-      col :last_name
-
-      col :email
-      col :phone
+      col(:first_name) { |ring| ring.owner.first_name }
+      col(:last_name) { |ring| ring.owner.last_name }
+      col(:email) { |ring| ring.owner.email }
+      col(:phone) { |ring| ring.owner.phone }
 
       col :member_number, label: 'Member #' do |ring|
         ring.owner.try(:membership).try(:number)

data/app/datatables/admin/effective_stamps_datatable.rb

@@ -0,0 +1,43 @@
+module Admin
+  class EffectiveStampsDatatable < Effective::Datatable
+    filters do
+      scope :ready_to_issue
+      scope :issued
+      scope :all
+    end
+
+    datatable do
+      order :updated_at
+
+      col :updated_at, visible: false
+      col :created_at, visible: false
+      col :id, visible: false
+
+      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(:email) { |stamp| stamp.owner.email }
+      col(:phone) { |stamp| stamp.owner.phone }
+
+      col :member_number, label: 'Member #' do |stamp|
+        stamp.owner.try(:membership).try(:number)
+      end
+
+      col :category
+      col :name
+      col :name_confirmation
+
+      col :shipping_address, label: 'Address'
+
+      col :issued_at
+
+      actions_col
+    end
+
+    collection do
+      Effective::Stamp.deep.all
+    end
+  end
+end

data/app/datatables/{effective_ring_payments_datatable.rb → effective_ring_wizards_datatable.rb}

@@ -1,5 +1,5 @@
 # Dashboard Ring Payments
-class EffectiveRingPaymentsDatatable < Effective::Datatable
+class EffectiveRingWizardsDatatable < Effective::Datatable
   datatable do
     order :created_at
 
@@ -20,17 +20,17 @@ class EffectiveRingPaymentsDatatable < Effective::Datatable
 
     actions_col(actions: []) do |resource|
       if resource.draft?
-        dropdown_link_to('Continue', effective_products.ring_payment_build_path(resource, reource.next_step), 'data-turbolinks' => false)
-        dropdown_link_to('Delete', effective_products.ring_payment_path(resource), 'data-confirm': "Really delete #{resource}?", 'data-method': :delete)
+        dropdown_link_to('Continue', effective_products.ring_wizard_build_path(resource, reource.next_step), 'data-turbolinks' => false)
+        dropdown_link_to('Delete', effective_products.ring_wizard_path(resource), 'data-confirm': "Really delete #{resource}?", 'data-method': :delete)
       else
-        dropdown_link_to('Show', effective_products.ring_payment_path(resource))
+        dropdown_link_to('Show', effective_products.ring_wizard_path(resource))
       end
     end
 
   end
 
   collection do
-    EffectiveProducts.RingPayment.deep.done.where(owner: current_user)
+    EffectiveProducts.RingWizard.deep.done.where(owner: current_user)
   end
 
 end

data/app/datatables/effective_stamp_wizards_datatable.rb

@@ -0,0 +1,36 @@
+# Dashboard Stamp Payments
+class EffectiveStampWizardsDatatable < Effective::Datatable
+  datatable do
+    order :created_at
+
+    col :token, visible: false
+    col :created_at, visible: false
+
+    col(:submitted_at, label: 'Submitted on') do |resource|
+      resource.submitted_at&.strftime('%F') || 'Incomplete'
+    end
+
+    col :owner, visible: false, search: :ststamp
+    col :status, visible: false
+    col :orders, action: :show
+
+    col(:issued_at, label: 'Issued on') do |resource|
+      resource.stamp.issued_at&.strftime('%F') || '-'
+    end
+
+    actions_col(actions: []) do |resource|
+      if resource.draft?
+        dropdown_link_to('Continue', effective_products.stamp_wizard_build_path(resource, reource.next_step), 'data-turbolinks' => false)
+        dropdown_link_to('Delete', effective_products.stamp_wizard_path(resource), 'data-confirm': "Really delete #{resource}?", 'data-method': :delete)
+      else
+        dropdown_link_to('Show', effective_products.stamp_wizard_path(resource))
+      end
+    end
+
+  end
+
+  collection do
+    EffectiveProducts.StampWizard.deep.done.where(owner: current_user)
+  end
+
+end

data/app/helpers/effective_products_helper.rb

@@ -1,3 +1,2 @@
 module EffectiveProductsHelper
-
 end

data/app/models/concerns/{effective_products_ring_payment.rb → effective_products_ring_wizard.rb}

@@ -1,28 +1,20 @@
 # frozen_string_literal: true
 
-# EffectiveProductsRingPayment
+# EffectiveProductsRingWizard
 #
-# Mark your owner model with effective_products_ring_payment to get all the includes
+# Mark your owner model with effective_products_ring_wizard to get all the includes
 
-module EffectiveProductsRingPayment
+module EffectiveProductsRingWizard
   extend ActiveSupport::Concern
 
   module Base
-    def effective_products_ring_payment
-      include ::EffectiveProductsRingPayment
+    def effective_products_ring_wizard
+      include ::EffectiveProductsRingWizard
     end
   end
 
   module ClassMethods
-    def effective_products_ring_payment?; true; end
-
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
-    def required_wizard_steps
-      [:start, :billing, :checkout, :submitted]
-    end
+    def effective_products_ring_wizard?; true; end
   end
 
   included do
@@ -52,7 +44,7 @@ module EffectiveProductsRingPayment
     accepts_nested_attributes_for :owner
 
     # Effective Namespace
-    has_many :rings, -> { order(:id) }, class_name: 'Effective::Ring', inverse_of: :ring_payment, dependent: :destroy
+    has_many :rings, -> { order(:id) }, class_name: 'Effective::Ring', inverse_of: :ring_wizard, dependent: :destroy
     accepts_nested_attributes_for :rings, reject_if: :all_blank, allow_destroy: true
 
     has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order', dependent: :nullify
@@ -83,7 +75,7 @@ module EffectiveProductsRingPayment
     # All Steps validations
     validates :owner, presence: true
 
-    # Tickets Step
+    # Ring Step
     validate(if: -> { current_step == :ring }) do
       self.errors.add(:rings, "can't be blank") unless present_rings.present?
     end
@@ -117,14 +109,7 @@ module EffectiveProductsRingPayment
   end
 
   def build_ring
-    ring = rings.build(
-      owner: owner,
-      first_name: owner.try(:first_name),
-      last_name: owner.try(:last_name),
-      email: owner.try(:email),
-      phone: owner.try(:phone)
-    )
-
+    ring = rings.build(owner: owner)
     address = owner.try(:shipping_address) || owner.try(:billing_address)
 
     if address.present?
@@ -135,23 +120,29 @@ module EffectiveProductsRingPayment
   end
 
   def assign_pricing
-    price = case ring.metal
-      when '14k Yellow Gold' then 450_00
-      when 'Sterling Silver' then 175_00
-      when 'Titanium' then 50_00
-      else
-        raise "unexpected ring metal: #{ring.metal || 'none'}"
-      end
-
-    qb_item_name = "Chemist's Ring"
-    tax_exempt = false
-
-    ring.assign_attributes(price: price, qb_item_name: qb_item_name, tax_exempt: tax_exempt)
+    raise('to be implemented by including class')
+
+    # raise('expected a persisted ring') unless ring&.persisted?
+
+    # price = case ring.metal
+    #   when '14k Yellow Gold' then 450_00
+    #   when 'Sterling Silver' then 175_00
+    #   when 'Titanium' then 50_00
+    #   else
+    #     raise "unexpected ring metal: #{ring.metal || 'none'}"
+    #   end
+
+    # qb_item_name = "Professional Ring"
+    # tax_exempt = false
+
+    # ring.assign_attributes(price: price, qb_item_name: qb_item_name, tax_exempt: tax_exempt)
   end
 
   # After the configure Ring step
   def ring!
     assign_pricing() if ring.present?
+    raise('expected ring to have a price') if ring.price.blank?
+
     save!
   end
 

data/app/models/concerns/effective_products_stamp_wizard.rb

@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+# EffectiveProductsStampWizard
+#
+# Mark your owner model with effective_products_stamp_wizard to get all the includes
+
+module EffectiveProductsStampWizard
+  extend ActiveSupport::Concern
+
+  module Base
+    def effective_products_stamp_wizard
+      include ::EffectiveProductsStampWizard
+    end
+  end
+
+  module ClassMethods
+    def effective_products_stamp_wizard?; true; end
+  end
+
+  included do
+    acts_as_purchasable_parent
+    acts_as_tokened
+
+    acts_as_statused(
+      :draft,      # Just Started
+      :submitted   # All done
+    )
+
+    acts_as_wizard(
+      start: 'Start',
+      stamp: 'Select Stamp',
+      summary: 'Review',
+      billing: 'Billing Address',
+      checkout: 'Checkout',
+      submitted: 'Submitted'
+    )
+
+    acts_as_purchasable_wizard
+
+    log_changes(except: :wizard_steps) if respond_to?(:log_changes)
+
+    # Application Namespace
+    belongs_to :owner, polymorphic: true
+    accepts_nested_attributes_for :owner
+
+    # Effective Namespace
+    has_many :stamps, -> { order(:id) }, class_name: 'Effective::Stamp', inverse_of: :stamp_wizard, dependent: :destroy
+    accepts_nested_attributes_for :stamps, reject_if: :all_blank, allow_destroy: true
+
+    has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order', dependent: :nullify
+    accepts_nested_attributes_for :orders
+
+    effective_resource do
+      # Acts as Statused
+      status                 :string, permitted: false
+      status_steps           :text, permitted: false
+
+      # Dates
+      submitted_at           :datetime
+
+      # Acts as Wizard
+      wizard_steps           :text, permitted: false
+
+      timestamps
+    end
+
+    scope :deep, -> { includes(:owner, :orders, :stamps) }
+    scope :sorted, -> { order(:id) }
+
+    scope :in_progress, -> { where.not(status: [:submitted]) }
+    scope :done, -> { where(status: [:submitted]) }
+
+    scope :for, -> (user) { where(owner: user) }
+
+    # 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?
+    end
+
+    # All Fees and Orders
+    def submit_fees
+      stamps
+    end
+
+    def after_submit_purchased!
+      # Nothing to do yet
+    end
+
+  end
+
+  # Instance Methods
+  def to_s
+    'stamp payment'
+  end
+
+  def in_progress?
+    draft?
+  end
+
+  def done?
+    submitted?
+  end
+
+  def stamp
+    stamps.first
+  end
+
+  def build_stamp
+    address = owner.try(:shipping_address) || owner.try(:billing_address)
+    stamps.build(owner: owner, shipping_address: address)
+  end
+
+  def assign_pricing
+    raise('to be implemented by including class')
+
+    # price = (stamp.physical? ? 100_00 : 50_00)
+    # qb_item_name = "Professional Stamp"
+    # tax_exempt = false
+
+    # 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
+
+  private
+
+  def present_stamps
+    stamps.reject(&:marked_for_destruction?)
+  end
+
+end

data/app/models/effective/ring.rb

@@ -14,15 +14,10 @@ module Effective
     # This ring is charged to an owner
     belongs_to :owner, polymorphic: true
 
-    # Through the ring_payment
-    belongs_to :ring_payment, polymorphic: true, optional: true
+    # Through the ring_wizard
+    belongs_to :ring_wizard, polymorphic: true, optional: true
 
     effective_resource do
-      first_name        :string
-      last_name         :string
-      phone             :string
-      email             :string
-
       size               :integer
       metal              :string
 
@@ -40,11 +35,6 @@ module Effective
     scope :ready_to_issue, -> { purchased.where(issued_at: nil) }
     scope :issued, -> { where.not(issued_at: nil) }
 
-    validates :first_name, presence: true
-    validates :last_name, presence: true
-    validates :phone, presence: true
-    validates :email, presence: true, email: true
-
     validates :metal, presence: true, inclusion: { in: METALS }
 
     validates :size, presence: true
@@ -63,17 +53,5 @@ module Effective
       issued_at.present?
     end
 
-    # This is the Admin Save and Mark Paid action
-    def mark_paid!
-      raise('expected a blank ring payment') if ring_payment.present?
-
-      save!
-
-      order = Effective::Order.new(items: self, user: owner)
-      order.purchase!(skip_buyer_validations: true, email: false)
-
-      true
-    end
-
   end
 end

data/app/models/effective/ring_wizard.rb

@@ -0,0 +1,7 @@
+module Effective
+  class RingWizard < ActiveRecord::Base
+    self.table_name = EffectiveProducts.ring_wizards_table_name.to_s
+
+    effective_products_ring_wizard
+  end
+end

data/app/models/effective/stamp.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Effective
+  class Stamp < ActiveRecord::Base
+    acts_as_purchasable
+    acts_as_addressable :shipping
+
+    #CATEGORIES = ['Physical', 'Digital-only']
+    CATEGORIES = ['Physical']
+
+    log_changes if respond_to?(:log_changes)
+
+    # This ring is charged to an owner
+    belongs_to :owner, polymorphic: true
+
+    # Through the stamp_wizard
+    belongs_to :stamp_wizard, polymorphic: true, optional: true
+
+    effective_resource do
+      name               :string
+      name_confirmation  :string
+
+      category           :string
+
+      # Admin issues stamps
+      issued_at          :datetime   # Present when issued by an admin
+
+      # Acts as Purchasable
+      price             :integer
+      qb_item_name      :string
+      tax_exempt        :boolean
+
+      timestamps
+    end
+
+    scope :deep, -> { includes(:owner) }
+    scope :ready_to_issue, -> { purchased.where(issued_at: nil) }
+    scope :issued, -> { where.not(issued_at: nil) }
+
+    validates :category, presence: true, inclusion: { in: CATEGORIES }
+    validates :name, presence: true
+    validates :name_confirmation, presence: true
+
+    validate(if: -> { name.present? && name_confirmation.present? }) do
+      self.errors.add(:name_confirmation, "doesn't match name") unless name == name_confirmation
+    end
+
+    validate(if: -> { physical? }) do
+      self.errors.add(:shipping_address, "can't be blank when physical stamp") unless shipping_address.present?
+    end
+
+    def to_s
+      ['Professional Stamp', *name.presence].join(' ')
+    end
+
+    def mark_as_issued!
+      update!(issued_at: Time.zone.now)
+    end
+
+    def issued?
+      issued_at.present?
+    end
+
+    def physical?
+      category == 'Physical'
+    end
+
+  end
+end

data/app/models/effective/stamp_wizard.rb

@@ -0,0 +1,7 @@
+module Effective
+  class StampWizard < ActiveRecord::Base
+    self.table_name = EffectiveProducts.stamp_wizards_table_name.to_s
+
+    effective_products_stamp_wizard
+  end
+end

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

@@ -11,30 +11,38 @@
       %td
         - if ring.purchased_order.present?
           = link_to(ring.purchased_order, effective_orders.admin_order_path(ring.purchased_order))
+
     %tr
-      %th First Name
-      %td= ring.first_name
-    %tr
-      %th Last Name
-      %td= ring.last_name
-    %tr
-      %th Phone
-      %td= ring.phone
-    %tr
-      %th Email
-      %td= ring.email
-    %tr
-      %th Member Number
-      %td= ring.owner.try(:membership).try(:number) || '-'
+      %th Contact
+      %td
+        - owner = ring.owner
+
+        = 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 Size
       %td= ring.size
+
     %tr
       %th Metal
       %td= ring.metal
+
     %tr
       %th Issued At
-      %td= ring.issued_at
+      %td= ring.issued_at&.strftime('%F') || 'Not Issued'

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

@@ -0,0 +1,53 @@
+%table.table
+  %tbody
+    %tr
+      %th Owner
+      %td
+        - url = (edit_polymorphic_path(stamp.owner) rescue "/admin/users/#{stamp.owner.to_param}/edit")
+        = link_to(stamp.owner, url)
+
+    %tr
+      %th Purchased Order
+      %td
+        - if stamp.purchased_order.present?
+          = link_to(stamp.purchased_order, effective_orders.admin_order_path(stamp.purchased_order))
+
+    %tr
+      %th Contact
+      %td
+        - owner = stamp.owner
+
+        = 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
+      %td= stamp.physical? ? 'Physical' : 'Digital Only'
+
+    - if stamp.shipping_address.present?
+      %tr
+        %th Address
+        %td= stamp.shipping_address.to_html
+
+    %tr
+      %th Name on Stamp
+      %td= stamp.name
+
+    %tr
+      %th Name Confirmation
+      %td= stamp.name_confirmation
+
+    %tr
+      %th Issued At
+      %td= stamp.issued_at&.strftime('%F') || 'Not Issued'