effective_products 0.0.2 → 0.0.6

data/lib/effective_products/version.rb

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

data/lib/effective_products.rb

@@ -7,20 +7,20 @@ module EffectiveProducts
 
   def self.config_keys
     [
-      :rings_table_name, :ring_payments_table_name, :ring_payment_class_name,
-      :stamps_table_name, :stamp_payments_table_name, :stamp_payment_class_name,
+      :rings_table_name, :ring_wizards_table_name, :ring_wizard_class_name,
+      :stamps_table_name, :stamp_wizards_table_name, :stamp_wizard_class_name,
       :layout, :use_effective_roles
     ]
   end
 
   include EffectiveGem
 
-  def self.RingPayment
-    ring_payment_class_name&.constantize || Effective::RingPayment
+  def self.RingWizard
+    ring_wizard_class_name&.constantize || Effective::RingWizard
   end
 
-  def self.StampPayment
-    stamp_payment_class_name&.constantize || Effective::StampPayment
+  def self.StampWizard
+    stamp_wizard_class_name&.constantize || Effective::StampWizard
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_products
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -222,29 +222,50 @@ files:
 - app/assets/stylesheets/effective_products.scss
 - app/assets/stylesheets/effective_products/base.scss
 - app/controllers/admin/rings_controller.rb
-- app/controllers/effective/ring_payments_controller.rb
+- app/controllers/admin/stamps_controller.rb
+- app/controllers/effective/ring_wizards_controller.rb
+- app/controllers/effective/stamp_wizards_controller.rb
 - app/datatables/admin/effective_rings_datatable.rb
-- app/datatables/effective_ring_payments_datatable.rb
+- app/datatables/admin/effective_stamps_datatable.rb
+- app/datatables/effective_ring_wizards_datatable.rb
+- app/datatables/effective_stamp_wizards_datatable.rb
 - app/helpers/effective_products_helper.rb
-- app/models/concerns/effective_products_ring_payment.rb
+- app/models/concerns/effective_products_ring_wizard.rb
+- app/models/concerns/effective_products_stamp_wizard.rb
 - app/models/effective/ring.rb
-- app/models/effective/ring_payment.rb
+- app/models/effective/ring_wizard.rb
+- app/models/effective/stamp.rb
+- app/models/effective/stamp_wizard.rb
 - app/views/admin/rings/_ring.html.haml
-- app/views/effective/ring_payments/_content.html.haml
-- app/views/effective/ring_payments/_dashboard.html.haml
-- app/views/effective/ring_payments/_layout.html.haml
-- app/views/effective/ring_payments/_orders.html.haml
-- app/views/effective/ring_payments/_ring.html.haml
-- app/views/effective/ring_payments/_ring_fields.html.haml
-- app/views/effective/ring_payments/_ring_payment.html.haml
-- app/views/effective/ring_payments/_summary.html.haml
-- app/views/effective/ring_payments/billing.html.haml
-- app/views/effective/ring_payments/checkout.html.haml
-- app/views/effective/ring_payments/ring.html.haml
-- app/views/effective/ring_payments/start.html.haml
-- app/views/effective/ring_payments/submitted.html.haml
-- app/views/effective/ring_payments/summary.html.haml
-- app/views/effective/rings/_fields.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
+- app/views/effective/ring_wizards/_layout.html.haml
+- 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_wizard.html.haml
+- app/views/effective/ring_wizards/_summary.html.haml
+- app/views/effective/ring_wizards/billing.html.haml
+- app/views/effective/ring_wizards/checkout.html.haml
+- app/views/effective/ring_wizards/ring.html.haml
+- 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/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_wizard.html.haml
+- app/views/effective/stamp_wizards/_summary.html.haml
+- app/views/effective/stamp_wizards/billing.html.haml
+- app/views/effective/stamp_wizards/checkout.html.haml
+- app/views/effective/stamp_wizards/stamp.html.haml
+- app/views/effective/stamp_wizards/start.html.haml
+- app/views/effective/stamp_wizards/submitted.html.haml
+- app/views/effective/stamp_wizards/summary.html.haml
 - config/effective_products.rb
 - config/routes.rb
 - db/migrate/01_create_effective_products.rb.erb

data/app/controllers/effective/ring_payments_controller.rb

@@ -1,31 +0,0 @@
-module Effective
-  class RingPaymentsController < ApplicationController
-    before_action(:authenticate_user!) if defined?(Devise)
-
-    include Effective::WizardController
-
-    resource_scope -> { EffectiveProducts.RingPayment.deep.where(owner: current_user) }
-
-    # Allow only 1 in-progress application at a time
-    before_action(only: [:new, :show], unless: -> { resource&.done? }) do
-      existing = resource_scope.in_progress.where.not(id: resource).first
-
-      if existing.present?
-        flash[:success] = "You have been redirected to your existing in progress payment"
-        redirect_to effective_products.ring_payment_build_path(existing, existing.next_step)
-      end
-    end
-
-    after_save do
-      flash.now[:success] = ''
-    end
-
-    private
-
-    def permitted_params
-      model = (params.key?(:effective_ring_payment) ? :effective_ring_payment : :ring_payment)
-      params.require(model).permit!.except(:status, :status_steps, :wizard_steps, :submitted_at)
-    end
-
-  end
-end

data/app/models/effective/ring_payment.rb

@@ -1,7 +0,0 @@
-module Effective
-  class RingPayment < ActiveRecord::Base
-    self.table_name = EffectiveProducts.ring_payments_table_name.to_s
-
-    effective_products_ring_payment
-  end
-end

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

@@ -1,27 +0,0 @@
--# In progress payments
-- existing = EffectiveProducts.RingPayment.in_progress.for(current_user).first
-- datatable = EffectiveResources.best('EffectiveRingPaymentsDatatable').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_payment_build_path(existing, existing.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
-    or you can
-    = link_to('Abandon registration', effective_products.ring_payment_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_payment_path, class: 'btn btn-primary'

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

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

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

@@ -1,29 +0,0 @@
-= card('Ring') do
-  - ring = ring_payment.ring
-
-  %table.table.table-sm
-    %tbody
-      %tr
-        %th Contact Info
-        %td
-          #{ring.first_name} #{ring.last_name}
-          %br
-          = mail_to(ring.email)
-          %br
-          = ring.phone
-
-      %tr
-        %th Address
-        %td= ring.shipping_address.to_html
-
-      %tr
-        %th Member Number
-        %td= ring_payment.owner.membership&.number || 'None'
-
-      %tr
-        %th Metal
-        %td= ring.metal
-
-      %tr
-        %th Size
-        %td Size #{ring.size}

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

@@ -1,4 +0,0 @@
-= f.text_field :first_name
-= f.text_field :last_name
-= f.email_field :email
-= f.phone_field :phone

data/app/views/effective/ring_payments/_ring_payment.html.haml

@@ -1,8 +0,0 @@
-.effective-ring-payment
-  - blacklist = ring_payment.class.required_wizard_steps + [:summary]
-  - steps = ring_payment.required_steps - blacklist
-
-  = render "effective/ring_payments/summary", ring_payment: ring_payment
-
-  - steps.select { |step| ring_payment.has_completed_step?(step) }.each do |partial|
-    = render "effective/ring_payments/#{partial}", ring_payment: ring_payment, step: partial

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

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