effective_products 0.0.2 → 0.0.6

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

@@ -0,0 +1,27 @@
+-# In progress payments
+- existing = EffectiveProducts.RingWizard.in_progress.for(current_user).first
+- datatable = EffectiveResources.best('EffectiveRingWizardsDatatable').new(self, namespace: :effective)
+
+- if existing.present?
+  %h2 In Progress Ring Payments
+
+  %p Your payment for Professional Ring is incomplete
+
+  %p
+    Please
+    = link_to("Continue payment for #{existing}", effective_products.ring_wizard_build_path(existing, existing.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+    or you can
+    = link_to('Abandon payment', effective_products.ring_wizard_path(existing), 'data-confirm': "Really delete #{existing}?", 'data-method': :delete, class: 'btn btn-danger')
+    to start over.
+
+  %hr
+
+%h2 Ring Payments
+
+- if datatable.present?
+  = render_simple_datatable(datatable)
+- else
+  %p You have no past ring payments. When you do, we'll show them here.
+
+- if existing.blank?
+  %p= link_to 'Order a Professional Ring', effective_products.new_ring_wizard_path, class: 'btn btn-primary'

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

@@ -0,0 +1,4 @@
+- if ring_wizard.submit_order&.purchased?
+  .card.mb-4
+    .card-body
+      = render(ring_wizard.submit_order)

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

@@ -0,0 +1,40 @@
+.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}

data/app/views/effective/{rings/_fields.html.haml → ring_wizards/_ring_fields.html.haml}

@@ -1,14 +1,29 @@
-%h2 Contact Information
 
-= f.text_field :first_name
-= f.text_field :last_name
-= f.email_field :email
-= f.phone_field :phone
-= f.static_field :member_number, value: f.object.owner&.membership&.number || 'None'
+%h2 Member Information
 
-= effective_address_fields(f, :shipping)
+- 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
@@ -37,3 +52,6 @@
 
 = f.select :metal, Effective::Ring::METALS
 = f.select :size, Effective::Ring::TITANIUM_SIZES
+
+%h2 Shipping Information
+= effective_address_fields(f, :shipping)

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

@@ -0,0 +1,3 @@
+.effective-ring-payment
+  - ring_wizard.render_steps.each do |partial|
+    = render "effective/ring_wizards/#{partial}", ring_wizard: ring_wizard, step: partial

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

@@ -0,0 +1,31 @@
+= card('Ring Payment') do
+  - ring = ring_wizard.ring
+
+  %table.table.table-sm
+    %tbody
+      - if request.path.start_with?('/admin')
+        %tr
+          %th Owner
+          %td
+            - url = (polymorphic_admin_path(ring_wizard.owner) rescue "/admin/users/#{ring_wizard.owner.to_param}/edit")
+            = link_to(ring_wizard.owner, url)
+      - else
+        %tr
+          %th Owner
+          %td= ring_wizard.owner
+
+      - if ring_wizard.orders.present?
+        %tr
+          %th Order
+          %td
+            - ring_wizard.orders.each do |order|
+              = link_to(order, effective_orders.order_path(order))
+
+      - if ring_wizard.was_submitted?
+        %tr
+          %th Submitted
+          %td= ring_wizard.submitted_at.strftime('%F')
+
+        %tr
+          %th Issued
+          %td= ring.issued_at&.strftime('%F') || 'Not Issued'

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

@@ -0,0 +1,15 @@
+= render 'layout' do
+  = render 'effective/ring_wizards/content', resource: resource
+
+  - raise('expected owner to respond to billing_address') unless resource.owner.respond_to?(:billing_address)
+
+  = card('Billing Address') do
+    %p Please enter your billing address
+
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
+
+      = f.fields_for(:owner, f.object.owner) do |fu|
+        = effective_address_fields(fu, :billing)
+
+      = f.save 'Save and Continue'

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

@@ -0,0 +1,6 @@
+= render 'layout' do
+  = render 'effective/ring_wizards/content', resource: resource
+
+  .card
+    .card-body
+      = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:submitted), deferred_url: wizard_path(:checkout), declined_url: wizard_path(:checkout))

data/app/views/effective/{ring_payments → ring_wizards}/ring.html.haml

@@ -1,5 +1,5 @@
 = render 'layout' do
-  = render 'effective/ring_payments/content', resource: resource
+  = render 'effective/ring_wizards/content', resource: resource
 
   .card
     .card-body
@@ -7,12 +7,12 @@
         = f.hidden_field :id
 
         = f.fields_for :rings, (f.object.ring || f.object.build_ring) do |fr|
-          = fr.hidden_field :ring_payment_id
-          = fr.hidden_field :ring_payment_type
+          = fr.hidden_field :ring_wizard_id
+          = fr.hidden_field :ring_wizard_type
 
           = fr.hidden_field :owner_id
           = fr.hidden_field :owner_type
 
-          = render('effective/ring_payments/ring_fields', f: fr)
+          = render('effective/ring_wizards/ring_fields', f: fr)
 
         = f.save 'Save and Continue'

data/app/views/effective/{ring_payments → ring_wizards}/start.html.haml

@@ -1,5 +1,5 @@
 = render 'layout' do
-  = render 'effective/ring_payments/content', resource: resource
+  = render 'effective/ring_wizards/content', resource: resource
 
   .card
     .card-body

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

@@ -0,0 +1,16 @@
+= render 'layout' do
+  = render 'effective/ring_wizards/content', resource: resource
+
+  - raise('expected a submitted resource') unless resource.was_submitted?
+  - raise('expected a purchased resource submit_order') unless resource.submit_order&.purchased?
+
+  .alert.alert-warning.mb-4
+    Successfully paid on #{resource.submit_order.purchased_at.strftime('%F')}.
+
+  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
+
+  = render 'effective/ring_wizards/summary', ring_wizard: resource
+  = render 'effective/ring_wizards/ring_wizard', ring_wizard: resource
+  = render 'effective/ring_wizards/orders', ring_wizard: resource
+
+  = link_to 'Return to Dashboard', root_path, class: 'btn btn-lg btn-primary'

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

@@ -0,0 +1,8 @@
+= render 'layout' do
+  = render 'effective/ring_wizards/content', resource: resource
+
+  = render 'effective/ring_wizards/ring_wizard', ring_wizard: resource
+
+  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+    = f.hidden_field :id
+    = f.submit 'Save and Continue', class: 'btn btn-primary'

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

@@ -0,0 +1,10 @@
+- all_steps_content = resource.try(:rich_text_all_steps_content)
+- step_content = resource.try("rich_text_#{step}_content")
+
+- if all_steps_content.present?
+  .card.mb-4
+    .card-body= all_steps_content
+
+- if step_content.present?
+  .card.mb-4
+    .card-body= step_content

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

@@ -0,0 +1,27 @@
+-# In progress payments
+- existing = EffectiveProducts.StampWizard.in_progress.for(current_user).first
+- datatable = EffectiveResources.best('EffectiveStampWizardsDatatable').new(self, namespace: :effective)
+
+- if existing.present?
+  %h2 In Progress Stamp Payments
+
+  %p Your payment for Professional Stamp is incomplete
+
+  %p
+    Please
+    = link_to("Continue payment for #{existing}", effective_products.stamp_wizard_build_path(existing, existing.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+    or you can
+    = link_to('Abandon payment', effective_products.stamp_wizard_path(existing), 'data-confirm': "Really delete #{existing}?", 'data-method': :delete, class: 'btn btn-danger')
+    to start over.
+
+  %hr
+
+%h2 Stamp Payments
+
+- if datatable.present?
+  = render_simple_datatable(datatable)
+- else
+  %p You have no past stamp payments. When you do, we'll show them here.
+
+- if existing.blank?
+  %p= link_to 'Order a Professional Stamp', effective_products.new_stamp_wizard_path, class: 'btn btn-primary'

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

@@ -0,0 +1,3 @@
+.row
+  .col-lg-3.mb-3= render_wizard_sidebar(resource)
+  .col-lg-9= yield

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

@@ -0,0 +1,4 @@
+- if stamp_wizard.submit_order&.purchased?
+  .card.mb-4
+    .card-body
+      = render(stamp_wizard.submit_order)

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

@@ -0,0 +1,45 @@
+.card
+  .card-body
+    .row
+      .col-sm
+        %h5.card-title= stamp_wizard.wizard_step_title(:stamp)
+      .col-sm-auto.text-right
+        = link_to('Edit', wizard_path(:stamp)) if edit_effective_wizard?
+
+    - stamp = stamp_wizard.stamp
+    - owner = stamp_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 Category
+          %td= stamp.category
+
+        - if stamp.shipping_address.present?
+          %tr
+            %th Address
+            %td= stamp.shipping_address.to_html
+
+        %tr
+          %th Name
+          %td= stamp.name
+
+        %tr
+          %th Name Confirmation
+          %td= stamp.name_confirmation

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

@@ -0,0 +1,45 @@
+%h2 Contact 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 Display Name
+%p Please enter and confirm your name as it should appear on the Professional Stamp.
+
+= f.text_field :name
+= f.text_field :name_confirmation, hint: 'must match name'
+
+%h2 Stamp Information
+
+%table.table
+  %thead
+    %th Stamp
+    %th.order_price Cost
+  %tbody
+    %tr
+      %td Physical
+      %td.order_price $50.00 + GST
+    %tr
+      %td Digital-only
+      %td.order_price $25.00 + GST
+
+%p Please select a stamp:
+
+= f.select :category, Effective::Stamp::CATEGORIES
+
+= f.show_if :category, 'Physical' do
+  = effective_address_fields(f, :shipping)

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

@@ -0,0 +1,3 @@
+.effective-stamp-payment
+  - stamp_wizard.render_steps.each do |partial|
+    = render "effective/stamp_wizards/#{partial}", stamp_wizard: stamp_wizard, step: partial

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

@@ -0,0 +1,31 @@
+= card('Stamp Payment') do
+  - stamp = stamp_wizard.stamp
+
+  %table.table.table-sm
+    %tbody
+      - if request.path.start_with?('/admin')
+        %tr
+          %th Owner
+          %td
+            - url = (polymorphic_admin_path(stamp_wizard.owner) rescue "/admin/users/#{stamp_wizard.owner.to_param}/edit")
+            = link_to(stamp_wizard.owner, url)
+      - else
+        %tr
+          %th Owner
+          %td= stamp_wizard.owner
+
+      - if stamp_wizard.orders.present?
+        %tr
+          %th Order
+          %td
+            - stamp_wizard.orders.each do |order|
+              = link_to(order, effective_orders.order_path(order))
+
+      - if stamp_wizard.was_submitted?
+        %tr
+          %th Submitted
+          %td= stamp_wizard.submitted_at.strftime('%F')
+
+        %tr
+          %th Issued
+          %td= stamp.issued_at&.strftime('%F') || 'Not Issued'

data/app/views/effective/{ring_payments → stamp_wizards}/billing.html.haml

@@ -1,5 +1,5 @@
 = render 'layout' do
-  = render 'effective/ring_payments/content', resource: resource
+  = render 'effective/stamp_wizards/content', resource: resource
 
   - raise('expected owner to respond to billing_address') unless resource.owner.respond_to?(:billing_address)
 

data/app/views/effective/{ring_payments → stamp_wizards}/checkout.html.haml

@@ -1,5 +1,5 @@
 = render 'layout' do
-  = render 'effective/ring_payments/content', resource: resource
+  = render 'effective/stamp_wizards/content', resource: resource
 
   .card
     .card-body

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

@@ -0,0 +1,18 @@
+= render 'layout' do
+  = render 'effective/stamp_wizards/content', resource: resource
+
+  .card
+    .card-body
+      = 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/stamp_wizards/stamp_fields', f: fr)
+
+        = f.save 'Save and Continue'

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

@@ -0,0 +1,16 @@
+= render 'layout' do
+  = render 'effective/stamp_wizards/content', resource: resource
+
+  .card
+    .card-body
+      %p Welcome #{current_user}!
+
+      %p You are about to purchase a Professional Stamp.
+
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
+
+        = f.hidden_field :owner_type
+        = f.hidden_field :owner_id
+
+        = f.save 'Save and Continue'

data/app/views/effective/{ring_payments → stamp_wizards}/submitted.html.haml

@@ -1,5 +1,5 @@
 = render 'layout' do
-  = render 'effective/ring_payments/content', resource: resource
+  = render 'effective/stamp_wizards/content', resource: resource
 
   - raise('expected a submitted resource') unless resource.was_submitted?
   - raise('expected a purchased resource submit_order') unless resource.submit_order&.purchased?
@@ -9,7 +9,8 @@
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
 
-  = render 'effective/ring_payments/ring_payment', ring_payment: resource
-  = render 'effective/ring_payments/orders', ring_payment: resource
+  = render 'effective/stamp_wizards/summary', stamp_wizard: resource
+  = render 'effective/stamp_wizards/stamp_wizard', stamp_wizard: resource
+  = render 'effective/stamp_wizards/orders', stamp_wizard: resource
 
   = link_to 'Return to Dashboard', root_path, class: 'btn btn-lg btn-primary'

data/app/views/effective/{ring_payments → stamp_wizards}/summary.html.haml

@@ -1,7 +1,7 @@
 = render 'layout' do
-  = render 'effective/ring_payments/content', resource: resource
+  = render 'effective/stamp_wizards/content', resource: resource
 
-  = render 'effective/ring_payments/ring_payment', ring_payment: resource
+  = render 'effective/stamp_wizards/stamp_wizard', stamp_wizard: resource
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id

data/config/effective_products.rb

@@ -1,16 +1,16 @@
 EffectiveProducts.setup do |config|
   config.rings_table_name = :rings
-  config.ring_payments_table_name = :ring_payments
+  config.ring_wizards_table_name = :ring_wizards
   config.stamps_table_name = :stamps
-  config.stamp_payments_table_name = :stamp_payments
+  config.stamp_wizards_table_name = :stamp_wizards
 
   # Layout Settings
   # Configure the Layout per controller, or all at once
   # config.layout = { application: 'application', admin: 'admin' }
 
   # Payment Wizard Settings
-  # config.ring_payments_class_name = 'Effective::RingPayment'
-  # config.stamp_payments_class_name = 'Effective::StampPayment'
+  # config.ring_wizards_class_name = 'Effective::RingWizard'
+  # config.stamp_wizards_class_name = 'Effective::StampWizard'
 
   # Use effective roles. Not sure what this does yet.
   config.use_effective_roles = true

data/config/routes.rb

@@ -7,17 +7,25 @@ end
 EffectiveProducts::Engine.routes.draw do
   # Public routes
   scope module: 'effective' do
-    resources :ring_payments, only: [:new, :show, :destroy] do
-      resources :build, controller: :ring_payments, only: [:show, :update]
+    resources :ring_wizards, name: :ring_wizard, only: [:new, :show, :destroy] do
+      resources :build, controller: :ring_wizards, only: [:show, :update]
+    end
+
+    resources :stamp_wizards, name: :stamp_wizard, only: [:new, :show, :destroy] do
+      resources :build, controller: :stamp_wizards, only: [:show, :update]
     end
   end
 
   namespace :admin do
-    resources :ring_payments, except: [:new, :create, :show]
+    resources :ring_wizards, except: [:new, :create, :show]
 
     resources :rings, only: [:index, :show] do
       post :mark_as_issued, on: :member
     end
+
+    resources :stamps, only: [:index, :show] do
+      post :mark_as_issued, on: :member
+    end
   end
 
 end

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

@@ -1,4 +1,101 @@
-class CreateEffectiveProducts < ActiveRecord::Migration[6.0]
+class CreateEffectiveProducts < ActiveRecord::Migration[6.1]
   def change
+    create_table :rings do |t|
+      t.integer :owner_id
+      t.string :owner_type
+
+      t.integer :ring_wizard_id
+      t.string :ring_wizard_type
+
+      t.integer :size
+      t.string :metal
+
+      t.datetime :issued_at
+
+      # Acts as purchasable
+      t.integer :purchased_order_id
+      t.integer :price
+      t.boolean :tax_exempt, default: false
+      t.string :qb_item_name
+
+      t.timestamps
+    end
+
+    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
+
+      # Acts as Wizard
+      t.text :wizard_steps
+
+      # Dates
+      t.datetime :submitted_at
+
+      t.datetime :updated_at
+      t.datetime :created_at
+    end
+
+    add_index :ring_wizards, [:owner_id, :owner_type]
+    add_index :ring_wizards, :status
+    add_index :ring_wizards, :token
+
+    create_table :stamps do |t|
+      t.integer :owner_id
+      t.string :owner_type
+
+      t.integer :stamp_wizard_id
+      t.string :stamp_wizard_type
+
+      t.string :category
+      t.string :name
+      t.string :name_confirmation
+
+      t.datetime :issued_at
+
+      # Acts as purchasable
+      t.integer :purchased_order_id
+      t.integer :price
+      t.boolean :tax_exempt, default: false
+      t.string :qb_item_name
+
+      t.timestamps
+    end
+
+    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
+
+      # Acts as Wizard
+      t.text :wizard_steps
+
+      # Dates
+      t.datetime :submitted_at
+
+      t.datetime :updated_at
+      t.datetime :created_at
+    end
+
+    add_index :stamp_wizards, [:owner_id, :owner_type]
+    add_index :stamp_wizards, :status
+    add_index :stamp_wizards, :token
+
   end
 end

data/lib/effective_products/engine.rb

@@ -10,7 +10,8 @@ module EffectiveProducts
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_products.active_record' do |app|
       ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.extend(EffectiveProductsRingPayment::Base)
+        ActiveRecord::Base.extend(EffectiveProductsRingWizard::Base)
+        ActiveRecord::Base.extend(EffectiveProductsStampWizard::Base)
       end
     end