effective_products 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11a058d2af660cecc167db7c68d34813d400bb65d4fe71c983dd543b77f1bf74
-  data.tar.gz: c815c2d731ed89a9700d6f32e694c512af60b7a7404d8fc173cd7c497cf6508d
+  metadata.gz: e74238b949c2002ffd532f7b4a941f8d8cee5e95c32c7195baa81239ed103dc8
+  data.tar.gz: ae82acec74f21a38bdcfd1e7da9225c79b2b3871f0977b22832d6b84490b4ce4
 SHA512:
-  metadata.gz: 6d80c772b8bf58c9902d551f2d05d13829cb5490e5c1cd584e076466ef699bf1a50b1d2ed75c4584fa5da0bd02d05dea37efccfd986471da465bdea098c4065c
-  data.tar.gz: 18d173346225ff749ab36406bb8ad552e2c102fb1d860d4c40ecf91bc974736633f9549fd7a0dfcd8893960ff6c5a570c7f6e32b3b1ce1cdac09c08d58d94f27
+  metadata.gz: bb9987e2605b3c1f81ba771ea785eca19f4eb169024cf7a22645ddc0cf53e30eeb11ef1d66199f9ff6313efe2b5289f1b04cd4b3a2d43a908f703e30ed6ad364
+  data.tar.gz: '072629bc4c54d07109f5be7c76746d655e2a189e0fbb4f9dbb91622fe8f38e8053cd499cecee167c4cf024e50a359b062e3d4975a1edbc1cad3dc708174b6ced'

data/app/controllers/admin/stamps_controller.rb

@@ -5,7 +5,12 @@ module Admin
 
     include Effective::CrudController
 
-    submit :mark_paid, 'Save and Mark Paid'
+    # 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_stamps_datatable.rb

@@ -19,7 +19,7 @@ module Admin
       col :applicant, visible: false
       col :stamp_wizard, visible: false
 
-      col(:email) { |stamp| stamp.owner.email }
+      col(:email) { |stamp| mail_to stamp.owner.email }
       col(:phone) { |stamp| stamp.owner.phone }
 
       col :member_number, label: 'Member #' do |stamp|
@@ -29,17 +29,22 @@ module Admin
       col :name
       col :name_confirmation, visible: false
 
-      col :category, visible: false
+      col :category, search: EffectiveProducts.stamp_categories
 
-      col :shipping_address, label: 'Address'
+      col :shipping_address, visible: false
+      col(:address1) { |stamp| stamp.shipping_address.try(:address1) }
+      col(:address2) { |stamp| stamp.shipping_address.try(:address2) }
+      col(:city) { |stamp| stamp.shipping_address.try(:city) }
+      col(:state_code, label: 'Prov') { |stamp| stamp.shipping_address.try(:state_code) }
+      col(:postal_code, label: 'Postal') { |stamp| stamp.shipping_address.try(:postal_code) }
+      col(:country_code, label: 'Country') { |stamp| stamp.shipping_address.try(:country_code) }
 
       col :purchased_order, visible: false
-      col :price, visible: false
+      col :price, as: :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/datatables/effective_stamp_wizards_datatable.rb

@@ -10,7 +10,7 @@ class EffectiveStampWizardsDatatable < Effective::Datatable
       resource.submitted_at&.strftime('%F') || 'Incomplete'
     end
 
-    col :owner, visible: false, search: :ststamp
+    col :owner, visible: false, search: :string
     col :status, visible: false
     col :orders, action: :show
 

data/app/models/concerns/effective_products_ring_wizard.rb

@@ -119,7 +119,7 @@ module EffectiveProductsRingWizard
   end
 
   def assign_pricing
-    raise('to be implemented by including class')
+    raise('assign_pricing() to be implemented by including class')
 
     # raise('expected a persisted ring') unless ring&.persisted?
 

data/app/models/concerns/effective_products_stamp_wizard.rb

@@ -88,7 +88,6 @@ module EffectiveProductsStampWizard
     def after_submit_purchased!
       stamps.each { |stamp| stamp.submit! }
     end
-
   end
 
   # Instance Methods
@@ -119,7 +118,7 @@ module EffectiveProductsStampWizard
   end
 
   def assign_pricing
-    raise('to be implemented by including class')
+    raise('assign_pricing() to be implemented by including class')
 
     # price = (stamp.physical? ? 100_00 : 50_00)
     # qb_item_name = "Professional Stamp"

data/app/models/effective/ring.rb

@@ -31,7 +31,8 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:owner) }
+    scope :deep, -> { includes(:addresses, owner: [:membership]) }
+
     scope :ready_to_issue, -> { purchased.where(issued_at: nil) }
     scope :issued, -> { where.not(issued_at: nil) }
 
@@ -49,6 +50,10 @@ module Effective
       update!(issued_at: Time.zone.now)
     end
 
+    def submitted?
+      purchased?
+    end
+
     def issued?
       issued_at.present?
     end

data/app/models/effective/stamp.rb

@@ -11,9 +11,6 @@ module Effective
       :issued     # Issued by an admin
     )
 
-    #CATEGORIES = ['Physical', 'Digital-only']
-    CATEGORIES = ['Physical']
-
     log_changes if respond_to?(:log_changes)
 
     # This stamp is charged to an owner
@@ -46,37 +43,39 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:owner) }
+    scope :deep, -> { includes(:addresses, owner: [:membership]) }
 
     scope :with_approved_applicants, -> { where(applicant_id: EffectiveMemberships.Applicant.approved) }
     scope :with_stamp_wizards, -> { purchased.where(applicant_id: nil).where.not(stamp_wizard_id: nil) }
+    scope :created_by_admin, -> { where(applicant_id: nil, stamp_wizard_id: nil) }
 
     scope :ready_to_issue, -> {
-      with_approved_applicants.or(with_stamp_wizards).where.not(status: :issued)
+      with_approved_applicants.or(with_stamp_wizards).or(created_by_admin).where.not(status: :issued)
     }
 
-    validates :category, presence: true, inclusion: { in: CATEGORIES }
     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
       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?
+    validate(if: -> { category.present? }) do
+      self.errors.add(:category, "is not included") unless EffectiveProducts.stamp_categories.include?(category)
     end
 
     def to_s
-      ['Professional Stamp', *name.presence].join(' ')
+      [model_name.human, *name.presence].join(' ')
     end
 
-    def mark_as_issued!
-      issued!
+    def mark_as_submitted!
+      submitted!
     end
 
-    def physical?
-      category == 'Physical'
+    def mark_as_issued!
+      issued!
     end
 
     def created_by_admin?
@@ -102,7 +101,7 @@ module Effective
         qb_item_name: category.stamp_fee_qb_item_name
       )
 
-      save!
+      submitted!
       Effective::Order.new(items: self, user: owner).mark_as_purchased!
     end
 

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

@@ -1,12 +1,21 @@
 = 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
+  - if inline_datatable?
+    = f.hidden_field :owner_id
+    = f.hidden_field :owner_type
+
   - else
-    = f.static_field :owner
+    - ajax_url = (@select2_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+    - f.object.owner_type ||= current_user.class.name
 
-  = render 'effective/stamps/fields', f: f, stamp: f.object
+    = 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.submit 'Save and Mark Paid'
-  - else
-    = f.submit 'Save'
+  #effective-stamps-ajax
+    = render 'effective/stamps/fields', f: f, stamp: f.object
+
+    = f.submit do
+      = f.save 'Save'
+
+      - if f.object.new_record?
+        = f.save 'Save and Mark Paid'

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

@@ -1,53 +1,17 @@
-%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)
+= effective_table_with(stamp) do |f|
+  = f.content_for :owner, label: 'User' do
+    - owner = f.object.owner
 
-    %tr
-      %th Purchased Order
-      %td
-        - if stamp.purchased_order.present?
-          = link_to(stamp.purchased_order, effective_orders.admin_order_path(stamp.purchased_order))
+    = owner.to_s
 
-    %tr
-      %th Contact
-      %td
-        - owner = stamp.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
-      %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'
+    - if owner.try(:membership).try(:number).present?
+      %br
+      Member Number #{owner.membership.number}

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

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

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

@@ -1,11 +1,11 @@
 -# In progress
 - existing = EffectiveProducts.StampWizard.in_progress.for(current_user).first
-- datatable = EffectiveResources.best('EffectiveStampWizardsDatatable').new(self, namespace: :effective)
+- completed = EffectiveResources.best('EffectiveStampWizardsDatatable').new(self, namespace: :effective)
 
-- if existing.present?
-  %h2 In Progress Stamp Requests
+%h2= ets(EffectiveProducts.StampWizard)
 
-  %p Your request for Professional Stamp is incomplete
+- if existing.present?
+  %p Your request is in progress.
 
   %p
     Please
@@ -16,14 +16,13 @@
 
   %hr
 
-%h2 Stamp Replacement Requests
-
 = yield
 
-- if datatable.present?
-  = render_simple_datatable(datatable)
+- if completed.present?
+  %p You have completed these past #{ets(EffectiveProducts.StampWizard).downcase}:
+  = render_simple_datatable(completed)
 - else
-  %p You have no past professional stamp replacement requests. When you do, we'll show them here.
+  %p You have no past #{ets(EffectiveProducts.StampWizard).downcase}. When you do, we'll show them here.
 
 - if existing.blank?
-  %p= link_to 'Start Stamp Replacement Request', effective_products.new_stamp_wizard_path, class: 'btn btn-primary'
+  %p= link_to "Start #{et(EffectiveProducts.StampWizard)}", effective_products.new_stamp_wizard_path, class: 'btn btn-primary'

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

@@ -1,45 +1,18 @@
-.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?
+= wizard_card(stamp_wizard) do
+  = effective_table_with(stamp_wizard.stamp, only: [:owner, :category, :shipping_address, :name, :name_confirmation]) do |f|
+    = f.content_for :owner, label: 'User' do
+      - owner = f.object.owner
 
-    - stamp = stamp_wizard.stamp
-    - owner = stamp_wizard.owner
+      = owner.to_s
 
-    %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(:email).present?
+        %br
+        = mail_to(owner.email)
 
-            - if owner.try(:phone).present?
-              %br
-              = owner.phone
+      - 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
+      - if owner.try(:membership).try(:number).present?
+        %br
+        Member Number #{owner.membership.number}

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

@@ -0,0 +1 @@
+%p Stamp Requirements

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

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

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

@@ -1,6 +1,6 @@
-= card('Stamp Payment') do
-  - stamp = stamp_wizard.stamp
+- stamp = stamp_wizard.stamp
 
+= card(et(stamp)) do
   %table.table.table-sm
     %tbody
       - if request.path.start_with?('/admin')

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

@@ -3,9 +3,7 @@
 
   - 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
-
+  = card do
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
 

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

@@ -1,18 +1,19 @@
 = 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
+  = card do
+    .mb-2= render('stamp_requirements', stamp_wizard: resource)
 
-        = 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
+    = 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
+      = 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
 
-          = render('effective/stamp_wizards/stamp_fields', f: fr)
+        = fr.hidden_field :owner_id
+        = fr.hidden_field :owner_type
 
-        = f.save 'Save and Continue'
+        = render('effective/stamps/fields', f: fr)
+
+      = f.save 'Save and Continue'

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

@@ -5,7 +5,7 @@
     .card-body
       %p Welcome #{current_user}!
 
-      %p You are about to request a replacement Professional Stamp.
+      %p You are about to request a replacement #{et(Effective::Stamp)}.
 
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id

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

@@ -4,13 +4,16 @@
   - 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')}.
+  .alert.alert-success.mb-4
+    Successfully submitted on #{resource.submit_order.purchased_at.strftime('%F')}.
 
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
+  .mb-4= link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
 
   = 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'
+  .mb-4
+    = collapse('Show order...', card_class: 'my-2') do
+      = render 'effective/stamp_wizards/orders', stamp_wizard: resource
+
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

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

@@ -1,11 +1,15 @@
+- f.object.shipping_address ||= (f.object.owner.try(:shipping_address) || f.object.owner.try(:billing_address))
+- f.object.name ||= f.object.owner.to_s
+
 = 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.
+- collection = EffectiveProducts.stamp_categories
 
-= f.select :category, Effective::Stamp::CATEGORIES
+- if collection.length == 1
+  = f.hidden_field :category, value: collection.first
+- else
+  = f.select :category, collection
 
-= f.show_if :category, 'Physical' do
-  = effective_address_fields(f, :shipping)
+%h4 Shipping address
+= effective_address_fields(f, :shipping)

data/config/effective_products.rb

@@ -12,6 +12,9 @@ EffectiveProducts.setup do |config|
   # config.ring_wizards_class_name = 'Effective::RingWizard'
   # config.stamp_wizards_class_name = 'Effective::StampWizard'
 
+  # The available stamp categories
+  config.stamp_categories = ['Physical', 'Digital-only', 'Stamp', 'Stamp and Certificate']
+
   # Use effective roles. Not sure what this does yet.
   config.use_effective_roles = true
 

data/config/locales/effective_products.en.yml

@@ -0,0 +1,12 @@
+en:
+  effective_products:
+    name: 'Stamps and Rings'
+
+  activerecord:
+    models:
+      # Application namespace
+      app/stamp_wizard: 'Stamp Replacement Request'
+
+      # Effective namespace
+      effective/stamp: 'Professional Stamp'
+      effective/ring: 'Professional Ring'

data/config/routes.rb

@@ -20,10 +20,12 @@ EffectiveProducts::Engine.routes.draw do
     resources :ring_wizards, except: [:new, :create, :show]
 
     resources :rings, only: [:index, :show] do
+      post :mark_as_submitted, on: :member
       post :mark_as_issued, on: :member
     end
 
     resources :stamps do
+      post :mark_as_submitted, on: :member
       post :mark_as_issued, on: :member
     end
   end

data/lib/effective_products/version.rb

@@ -1,3 +1,3 @@
 module EffectiveProducts
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/effective_products.rb

@@ -9,6 +9,7 @@ module EffectiveProducts
     [
       :rings_table_name, :ring_wizards_table_name, :ring_wizard_class_name,
       :stamps_table_name, :stamp_wizards_table_name, :stamp_wizard_class_name,
+      :stamp_categories,
       :layout, :use_effective_roles
     ]
   end
@@ -23,4 +24,8 @@ module EffectiveProducts
     stamp_wizard_class_name&.constantize || Effective::StampWizard
   end
 
+  def self.stamp_categories
+    Array(config[:stamp_categories])
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_products
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-26 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -258,7 +258,7 @@ files:
 - 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
 - app/views/effective/stamp_wizards/billing.html.haml
@@ -269,6 +269,7 @@ files:
 - app/views/effective/stamp_wizards/summary.html.haml
 - app/views/effective/stamps/_fields.html.haml
 - config/effective_products.rb
+- config/locales/effective_products.en.yml
 - config/routes.rb
 - db/migrate/01_create_effective_products.rb.erb
 - db/seeds.rb

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

@@ -1,45 +0,0 @@
-%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)