effective_classifieds 0.2.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68e3527fba69fa6c8b8c487d99738c1d45f20b4b12fd8daa9ba425a977805015
-  data.tar.gz: a8f587d9a36bd2a37eae7629d0ba9586de7c94ad189e3f8f5d740b766941d950
+  metadata.gz: 0aea0ae02dabe99cdca9471c23c158cdf007f31d7ae2fee4522103c2c3d678d7
+  data.tar.gz: 0f4272176f66730441f1fa4b46e6858dd784ae3b5c95ccd23ef001415f206dfd
 SHA512:
-  metadata.gz: 5ed6350f3d0e6dc2244cf30ccfa0ebcc0aa14f10fe5665ce9f4d993d718169ca3bd9ec6f7eba347803fd14cfecc6fb2ca9d0c4932f6bfa587cb7b370f9bc2e22
-  data.tar.gz: 26d6d75e322bfd4d5e30b635266012e229b2136cfa5a8feac4291fbfcf0280c8d0d352c74babdb5c247ed94c7c4101971ca480a4efb821c9018d87ace94a18bc
+  metadata.gz: f62c3c700c9701fe44c1a2fc9be24f458c2aff875c0f32509d26f367ed8ad30e78b52e7cfb735bb34c5a8fb22908f6c88e81b0858fd3c51c9cda5de8e2242305
+  data.tar.gz: 2eece6889e8473c8acbc3c23a74b924894e89db234845ba0574784da9f0b3f6748ffb6e51596ee877c4f0c44a0a624c6fbfc16c423d901c95e182d73a4ee75e3

data/app/datatables/admin/effective_classified_wizards_datatable.rb

@@ -12,6 +12,8 @@ class Admin::EffectiveClassifiedWizardsDatatable < Effective::Datatable
     col :classified, search: :string
     col :owner
 
+    col :orders
+
     actions_col
   end
 

data/app/datatables/admin/effective_classifieds_datatable.rb

@@ -45,6 +45,8 @@ module Admin
         col :status, search: ['submitted', 'approved']
       end
 
+      col :purchased_order, visible: false
+
       actions_col do |classified|
         dropdown_link_to('View Classified', effective_classifieds.classified_path(classified), target: '_blank')
       end

data/app/datatables/effective_classified_wizards_datatable.rb

@@ -10,7 +10,7 @@ class EffectiveClassifiedWizardsDatatable < Effective::Datatable
       wizard.submitted_at&.strftime('%F') || 'Incomplete'
     end
 
-    col :classified, search: :string, label: 'Title'
+    col :classifieds, search: :string, label: 'Title'
 
     col :owner, visible: false, search: :string
 
@@ -30,7 +30,7 @@ class EffectiveClassifiedWizardsDatatable < Effective::Datatable
   end
 
   collection do
-    EffectiveClassifieds.ClassifiedWizard.deep.where(owner: current_user).left_joins(:classified)
+    EffectiveClassifieds.ClassifiedWizard.deep.where(owner: current_user)
   end
 
 end

data/app/mailers/effective/classifieds_mailer.rb

@@ -7,7 +7,7 @@ module Effective
       raise('expected an Effective::Classified') unless resource.kind_of?(Effective::Classified)
 
       @classified = resource
-      subject = subject_for(:classified_submitted, 'Classified Submitted', resource, opts)
+      subject = subject_for(__method__, 'Classified Submitted', resource, opts)
       headers = headers_for(resource, opts)
 
       mail(to: mailer_admin, subject: subject, **headers)

data/app/models/concerns/effective_classifieds_classified_wizard.rb

@@ -19,6 +19,7 @@ module EffectiveClassifiedsClassifiedWizard
 
   included do
     acts_as_tokened
+    acts_as_purchasable_parent
 
     acts_as_statused(
       :draft,      # Just Started
@@ -29,9 +30,13 @@ module EffectiveClassifiedsClassifiedWizard
       start: 'Start',
       classified: 'Classified',
       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
@@ -39,8 +44,8 @@ module EffectiveClassifiedsClassifiedWizard
     accepts_nested_attributes_for :owner
 
     # Effective Namespace
-    has_one :classified, class_name: 'Effective::Classified', inverse_of: :classified_wizard, dependent: :destroy
-    accepts_nested_attributes_for :classified, reject_if: :all_blank, allow_destroy: true
+    has_many :classifieds, class_name: 'Effective::Classified', inverse_of: :classified_wizard, dependent: :destroy
+    accepts_nested_attributes_for :classifieds, reject_if: :all_blank, allow_destroy: true
 
     effective_resource do
       # Acts as Statused
@@ -50,13 +55,16 @@ module EffectiveClassifiedsClassifiedWizard
       # Dates
       submitted_at           :datetime
 
+      # Pricing
+      price_category          :string
+
       # Acts as Wizard
       wizard_steps           :text, permitted: false
 
       timestamps
     end
 
-    scope :deep, -> { includes(:classified) }
+    scope :deep, -> { includes(:classifieds) }
     scope :sorted, -> { order(:id) }
 
     scope :in_progress, -> { where.not(status: [:submitted]) }
@@ -71,6 +79,30 @@ module EffectiveClassifiedsClassifiedWizard
     with_options(if: -> { current_step == :classified }) do
       validates :classified, presence: true
     end
+
+    # All Fees and Orders
+    def submit_fees
+      classifieds
+    end
+
+    def after_submit_purchased!
+      # Nothing to do
+    end
+
+    # Overrides the acts_as_purchasable_wizard submit!
+    def submit!
+      raise('already submitted') if was_submitted?
+
+      if checkout_required?
+        raise('expected a purchased order') unless submit_order&.purchased?
+        wizard_steps[:checkout] ||= Time.zone.now
+      end
+
+      wizard_steps[:submitted] = Time.zone.now
+      classified.submit! unless classified.was_submitted?
+
+      submitted!
+    end
   end
 
   # Instance Methods
@@ -86,19 +118,39 @@ module EffectiveClassifiedsClassifiedWizard
     submitted?
   end
 
-  # Called on the Review / Summary Step
-  # But we actually want to submit it
-  def summary!
-    submit!
+  def checkout_required?
+    required_steps.include?(:billing) && required_steps.include?(:checkout)
+  end
+
+  def no_checkout_required?
+    required_steps.exclude?(:billing) && required_steps.exclude?(:checkout)
   end
 
-  def submit!
-    raise('already submitted') if was_submitted?
+  def classified
+    classifieds.first
+  end
 
-    classified.submit! unless classified.was_submitted?
+  def build_classified
+    classifieds.build(owner: owner)
+  end
 
-    wizard_steps[:submitted] = Time.zone.now
-    submitted!
+  def assign_pricing
+    raise('to be implemented by including class')
+    # classified.assign_attributes(price: price, qb_item_name: qb_item_name, tax_exempt: tax_exempt)
+  end
+
+  # After the configure Classified step
+  def classified!
+    assign_pricing() if classified.present?
+    raise('expected classified to have a price') if classified.price.blank?
+
+    save!
+  end
+
+  # This is the review/summary step. Last one if we're not doing checkout
+  def summary!
+    return submit! if no_checkout_required?
+    save!
   end
 
 end

data/app/models/effective/classified.rb

@@ -7,6 +7,7 @@ module Effective
     attr_accessor :current_user
 
     acts_as_slugged
+    acts_as_purchasable
     log_changes if respond_to?(:log_changes)
     acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
 
@@ -17,6 +18,7 @@ module Effective
     # When submitted through the wizard
     belongs_to :classified_wizard, polymorphic: true, optional: true
 
+    has_one_attached :file
     has_rich_text :body
 
     acts_as_statused(
@@ -53,6 +55,10 @@ module Effective
 
       archived           :boolean
 
+      price         :integer
+      tax_exempt    :boolean
+      qb_item_name  :string
+
       timestamps
     end
 
@@ -103,7 +109,7 @@ module Effective
 
     # Automatically approve submissions created by admins outside the submissions wizard
     before_validation(if: -> { new_record? && classified_wizard.blank? }) do
-      assign_attributes(status: :approved)
+      assign_attributes(status: :approved, price: 0)
     end
 
     validates :title, presence: true, length: { maximum: 200 }
@@ -133,6 +139,10 @@ module Effective
       self.errors.add(:category, 'is invalid') unless Array(EffectiveClassifieds.categories).include?(category)
     end
 
+    validate(if: -> { file.attached? && !Rails.env.test? }) do
+      self.errors.add(:file, 'expected a .pdf file') unless file.content_type == 'application/pdf'
+    end
+
     def to_s
       title.presence || 'New Classified'
     end

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

@@ -7,6 +7,12 @@
     = tab 'Access' do
       = render '/admin/classifieds/form_access', classified: classified
 
+    - if classified.classified_wizard.present?
+      = tab 'Orders' do
+        %h2 Orders
+        - datatable = Admin::EffectiveOrdersDatatable.new(parent: classified.classified_wizard, owner: classified.owner, user: classified.owner, total: false)
+        = render_datatable(datatable, simple: true)
+
     - if classified.respond_to?(:log_changes_datatable)
       = tab 'Logs' do
         = render_inline_datatable(classified.log_changes_datatable)

data/app/views/admin/classifieds/_form_classified.html.haml

@@ -1,3 +1,4 @@
 = effective_form_with(model: [:admin, classified], engine: true) do |f|
   = render('effective/classifieds/fields', f: f, classified: f.object)
+
   = effective_submit(f)

data/app/views/effective/classified_wizards/_additional_fields.html.haml

@@ -0,0 +1 @@
+- # Intentionally Blank

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

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

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

@@ -0,0 +1,15 @@
+= render 'layout' do
+  = render 'effective/classified_wizards/content', resource: resource
+
+  - raise('expected owner to respond to billing_address') unless resource.owner.respond_to?(:billing_address)
+
+  = card do
+    = 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 |fo|
+        = effective_address_fields(fo, :billing)
+
+      %p.text-muted * Not all classifieds require a fee and we ask for a billing address for future use
+
+      = f.save 'Save and Continue'

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

@@ -0,0 +1,5 @@
+= render 'layout' do
+  = render 'effective/classified_wizards/content', resource: resource
+
+  = card do
+    = 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/classified_wizards/classified.html.haml

@@ -6,7 +6,7 @@
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id
 
-        = f.fields_for :classified, (f.object.classified || f.object.build_classified) do |fc|
+        = f.fields_for :classifieds, (f.object.classified || f.object.build_classified) do |fc|
           = fc.hidden_field :id
 
           = fc.hidden_field :owner_id, value: f.object.owner_id
@@ -14,4 +14,6 @@
 
           = render('effective/classifieds/fields', f: fc, classified: fc.object)
 
+        = render('effective/classified_wizards/additional_fields', f: f, classified_wizard: f.object)
+
         = f.save 'Save and Continue'

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

@@ -1,14 +1,29 @@
 = render 'layout' do
   = render 'effective/classified_wizards/content', resource: resource
 
+  - classified = resource.classified
+
   - raise('expected a submitted classified_wizard') unless resource.was_submitted?
+  - raise('expected a submitted classified') unless classified.was_submitted?
+
+  - if resource.checkout_required?
+    - raise('expected a purchased classified submit_order') unless resource.submit_order&.purchased?
 
   .alert.alert-warning.mb-4
-    Successfully submitted on #{resource.submitted_at.strftime('%F')}.
+    This classified was submitted on #{classified.submitted_at.strftime('%F')}.
+
+  - unless classified.approved?
+    = card do
+      %p Your classified must still be approved before it will be displayed.
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
 
   = render 'effective/classified_wizards/summary', classified_wizard: resource
   = render 'effective/classified_wizards/classified_wizard', classified_wizard: resource
 
+  - if resource.orders.present?
+    .mb-4
+      = collapse('Show orders...', card_class: 'my-2') do
+        = render 'effective/classified_wizards/orders', classified_wizard: resource
+
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary'

data/app/views/effective/classifieds/_classified.html.haml

@@ -17,14 +17,19 @@
             to
             #{classified.end_on&.strftime('%F')}
 
-        - if classified.website.present?
+        - if classified.location.present?
           %tr
             %th Location
             %td= classified.location
 
         %tr
           %th Description
-          %td= classified.body
+          %td= classified.body.to_s
+
+        - if classified.file.attached?
+          %tr
+            %th Attachment
+            %td= link_to(classified.file.filename, main_app.url_for(classified.file), target: '_blank')
 
         %tr
           %th Company

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

@@ -21,8 +21,12 @@
 - if f.object.persisted? && !f.object.draft?
   = f.check_box :archived, label: 'Yes, this classified is archived and will not be displayed'
 
-= f.rich_text_area :body, label: 'Body content', hint: 'The main body content of your classified ad. Be sure to include all relevant information!'
+- if defined?(EffectiveArticleEditor)
+  = f.article_editor :body, label: 'Body content', hint: 'The main body content of your classified ad. Be sure to include all relevant information!'
+- else
+  = f.rich_text_area :body, label: 'Body content', hint: 'The main body content of your classified ad. Be sure to include all relevant information!'
 
+= f.file_field :file, label: 'Attach PDF'
 
 %h2.mt-5.mb-0 Contact Information
 %p

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

@@ -30,6 +30,12 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
 
       t.boolean :archived, default: false
 
+      # 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
 
@@ -52,6 +58,9 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
       # Dates
       t.datetime :submitted_at
 
+      # Pricing
+      t.string :price_category
+
       t.datetime :updated_at
       t.datetime :created_at
     end

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: effective_orders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_resources
   requirement: !ruby/object:Gem::Requirement
@@ -195,12 +209,16 @@ files:
 - app/views/admin/classifieds/_form.html.haml
 - app/views/admin/classifieds/_form_access.html.haml
 - app/views/admin/classifieds/_form_classified.html.haml
+- app/views/effective/classified_wizards/_additional_fields.html.haml
 - app/views/effective/classified_wizards/_classified.html.haml
 - app/views/effective/classified_wizards/_classified_wizard.html.haml
 - app/views/effective/classified_wizards/_content.html.haml
 - app/views/effective/classified_wizards/_dashboard.html.haml
 - app/views/effective/classified_wizards/_layout.html.haml
+- app/views/effective/classified_wizards/_orders.html.haml
 - app/views/effective/classified_wizards/_summary.html.haml
+- app/views/effective/classified_wizards/billing.html.haml
+- app/views/effective/classified_wizards/checkout.html.haml
 - app/views/effective/classified_wizards/classified.html.haml
 - app/views/effective/classified_wizards/start.html.haml
 - app/views/effective/classified_wizards/submitted.html.haml