effective_classifieds 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb0cfd942db297b12029c3482f9640b4016070b23293a8920f09cf7308b9f511
-  data.tar.gz: 5677c6e19346e790344bf5dfaca5d411a06ec089e660a6fb0c13f19481b3393e
+  metadata.gz: 7791ff5277633953b3d9d43f9cdf8521954411ef5eb00ece46e14386cff7b0f4
+  data.tar.gz: '083ed5e9866481fc5513262496053f5ba4f5ea3b597d7d5a7218035dd75ecda5'
 SHA512:
-  metadata.gz: 2af2f02865c7961f045b3f259e6ba238b5b8f1485a72645771f278806a929887256971e8ca71e5d220e1e5f41cd04abd0354325ac72b380956d6e9b4e755b10d
-  data.tar.gz: 0c80ae59bf92b7777cc0924a08c950a8687aee561ebe4901d4fe7023d8023f10ad03897eb68e29edcafac462fbc405911e9eccd8055a86b4c0b08e31bbe54017
+  metadata.gz: fe6fc5ad68ad34f5c34915a997b08cb8550d8245e254d25b8c2e0f121e88e58b7d9af2918e0f4207e98746ad0040e00268fb88772956453121a82d0eaec63c9b
+  data.tar.gz: d8503e3830fdedbf1b7ac6d01df2050c134ce23dd7fc5151462218572620fd02df1b8f754e9bc1b4e200c7640278a4a93ff1f3de1a599faa647a9c6a4ebf607c

data/app/controllers/effective/classifieds_controller.rb

@@ -14,9 +14,8 @@ module Effective
       if EffectiveResources.authorized?(self, :admin, :effective_classifieds)
         flash.now[:warning] = [
           'Hi Admin!',
-          ('You are viewing a hidden classified.' unless @classified.published?),
-          'Click here to',
-          ("<a href='#{effective_classifieds.edit_admin_classified_path(@classified)}' class='alert-link'>edit classified settings</a>.")
+          ('You are viewing a hidden posting.' unless @classified.published?),
+          ("<a href='#{effective_classifieds.edit_admin_classified_path(@classified)}' class='alert-link'>Click here to edit settings</a>.")
         ].compact.join(' ')
       end
 

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/datatables/effective_classifieds_datatable.rb

@@ -4,16 +4,15 @@ class EffectiveClassifiedsDatatable < Effective::Datatable
     length :all
     order :start_on
 
-    col :start_on, as: :date, label: 'Posted'
+    col :start_on, as: :date, label: 'Published'
+    col :end_on, as: :date, label: 'Closing'
 
     col :title do |classified|
       link_to classified, effective_classifieds.classified_path(classified)
     end
 
-    col :end_on, as: :date, label: 'Expires', visible: false
-
-    col :organization, visible: false
-    col :location, visible: false
+    col :organization
+    col :location
 
     col :body, visible: false
     col :website, visible: false

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
@@ -27,11 +28,15 @@ module EffectiveClassifiedsClassifiedWizard
 
     acts_as_wizard(
       start: 'Start',
-      classified: 'Classified',
+      classified: 'Posting',
       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,11 +79,35 @@ 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
   def to_s
-    'classified ad submission'
+    'posting submission'
   end
 
   def in_progress?
@@ -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

@@ -1,5 +1,5 @@
 = tabs do
-  = tab 'Classified' do
+  = tab 'Posting' do
     = render 'admin/classifieds/form_classified', classified: classified
 
   - if classified.persisted?
@@ -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_access.html.haml

@@ -1,10 +1,10 @@
 = effective_form_with(model: classified, url: classified.persisted? ? effective_classifieds.admin_classified_path(classified.id) : effective_classifieds.admin_classifieds_path) do |f|
-  = f.check_box :authenticate_user, label: 'Yes, the user must be be signed in to view this classified', hint: 'Sign up is required to register for any classified'
+  = f.check_box :authenticate_user, label: 'Yes, the user must be be signed in to view', hint: 'Sign up is required to register for any classified'
 
   - if EffectiveClassifieds.use_effective_roles
     = f.checks :roles, EffectiveRoles.roles_collection(f.object)
 
   %p.text-hint
-    * leave blank for a regular public classified that anyone can view
+    * Do not select a role to allow anyone with an account to view
 
   = f.submit

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/_classified.html.haml

@@ -7,4 +7,4 @@
         = link_to('Edit', wizard_path(:classified)) if edit_effective_wizard?
 
     - classified = classified_wizard.classified
-    = render 'effective/classifieds/classified', classified: classified
+    = render 'effective/classifieds/summary', classified: classified

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

@@ -5,10 +5,9 @@
   - datatable = EffectiveResources.best('EffectiveClassifiedWizardsDatatable').new(self, namespace: :effective)
 
   - if submission.present?
-    %h2 In-progress Classified Ads
+    %h2 In-progress Postings
 
-    %p
-      Your submission for #{submission.classified.presence || 'a classified'} is incomplete.
+    %p Your posting submission is incomplete:
 
     %p
       Please
@@ -19,12 +18,12 @@
 
     %hr
 
-  %h2 Classified Ads
+  %h2= EffectiveClassifieds.classifieds_label
 
   - if datatable.present?
     = render_simple_datatable(datatable)
   - else
-    %p You don't have any classified ads. When you do, we'll show them here.
+    %p You don't have any postings. When you do, we'll show them here.
 
   - if submission.blank?
-    %p= link_to 'Submit New Classified Ad', effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
+    %p= link_to "Submit New #{EffectiveClassifieds.classifieds_label} Posting", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'

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

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

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/_summary.html.haml

@@ -1,30 +1,29 @@
-= card('Classified Ad') do
-  - classified = classified_wizard.classified
+- classified = classified_wizard.classified
 
-  %table.table.table-sm
-    %tbody
-      %tr
-        %th.border-0 Classified
-        %td.border-0
+%table.table.table-sm
+  %tbody
+    %tr
+      %th.border-0 Posting
+      %td.border-0
 
-          - if classified&.published?
-            = link_to(classified, effective_classifieds.classified_path(classified), target: '_blank')
-          - else
-            = classified.presence || 'Classified was deleted'
+        - if classified&.published?
+          = link_to(classified, effective_classifieds.classified_path(classified), target: '_blank')
+        - else
+          = classified.presence || 'Posting was deleted'
 
-      - if request.path.start_with?('/admin')
-        %tr
-          %th Owner
-          %td
-            - url = (polymorphic_admin_path(classified_wizard.owner) rescue "/admin/users/#{classified_wizard.owner.to_param}/edit")
-            = link_to(classified_wizard.owner, url)
-      - else
-        %tr
-          %th Owner
-          %td= classified_wizard.owner
+    - if request.path.start_with?('/admin')
+      %tr
+        %th Owner
+        %td
+          - url = (polymorphic_admin_path(classified_wizard.owner) rescue "/admin/users/#{classified_wizard.owner.to_param}/edit")
+          = link_to(classified_wizard.owner, url)
+    - else
+      %tr
+        %th Owner
+        %td= classified_wizard.owner
 
-      - if classified&.was_submitted?
-        %tr
-          %th Status
-          %td
-            %span.badge.badge-secondary= classified.status
+    - if classified&.was_submitted?
+      %tr
+        %th Status
+        %td
+          %span.badge.badge-secondary= classified.status

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 postings 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/start.html.haml

@@ -3,13 +3,12 @@
 
   .card
     .card-body
-      %p
-        Welcome #{current_user}!
+      %p Welcome #{current_user}!
 
       %p
-        You can use this wizard to post a new classified ad.
+        You can use this wizard to submit a new #{EffectiveClassifieds.classifieds_label} posting.
         Your progress will be saved as you move through the wizard.
-        Once the ad published you will be able to come back and edit/change the details.
+        Once your posting is published you are able to come back and edit the details.
 
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id

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 posting was submitted on #{classified.submitted_at.strftime('%F')}.
+
+  - unless classified.approved?
+    .alert.alert-danger.mb-4
+      Your posting 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/classified_wizards/summary.html.haml

@@ -5,4 +5,4 @@
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id
-    = f.submit 'Submit Classified Ad', class: 'btn btn-primary'
+    = f.submit "Submit #{EffectiveClassifieds.classifieds_label} Posting", class: 'btn btn-primary'

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

@@ -1,46 +1,49 @@
-.card
-  .card-body
-    %table.table.effective-classified-table
-      %tbody
-        %tr
-          %th Category
-          %td= classified.category
-
-        %tr
-          %th Title
-          %td= classified.title
-
-        %tr
-          %th Available
-          %td
-            #{classified.start_on&.strftime('%F')}
-            to
-            #{classified.end_on&.strftime('%F')}
-
-        - if classified.website.present?
-          %tr
-            %th Location
-            %td= classified.location
-
-        %tr
-          %th Description
-          %td= classified.body
-
-        %tr
-          %th Company
-          %td= classified.organization
-
-        - if classified.website.present?
-          %tr
-            %th Website
-            %td= link_to(classified.website, classified.website, target: '_blank')
-
-        - if classified.email.present?
-          %tr
-            %th Email
-            %td= mail_to(classified.email)
-
-        - if classified.phone.present?
-          %tr
-            %th Phone
-            %td= classified.phone
+%table.table.effective-classified-table
+  %tbody
+    %tr
+      %th Category
+      %td= classified.category
+
+    %tr
+      %th Title
+      %td= classified.title
+
+    %tr
+      %th Available
+      %td
+        #{classified.start_on&.strftime('%F')}
+        to
+        #{classified.end_on&.strftime('%F')}
+
+    - if classified.location.present?
+      %tr
+        %th Location
+        %td= classified.location
+
+    %tr
+      %th Description
+      %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
+      %td= classified.organization
+
+    - if classified.website.present?
+      %tr
+        %th Website
+        %td= link_to(classified.website, classified.website, target: '_blank')
+
+    - if classified.email.present?
+      %tr
+        %th Email
+        %td= mail_to(classified.email)
+
+    - if classified.phone.present?
+      %tr
+        %th Phone
+        %td= classified.phone

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

@@ -1,4 +1,4 @@
-%h2 Classifieds
+%h2= EffectiveClassifieds.classifieds_label
 
 - published = Effective::Classified.classifieds(user: current_user).count
 
@@ -6,6 +6,6 @@
   - datatable = EffectiveClassifiedsDatatable.new(self, namespace: :effective)
   = render_datatable(datatable, simple: true)
 - else
-  %p There are no active classified ads. When there are, we'll show them here.
+  %p There are no active postings. When there are, we'll show them here.
 
-%p= link_to 'View All Classifieds', effective_classifieds.classifieds_path, class: 'btn btn-primary'
+%p= link_to 'View All', effective_classifieds.classifieds_path, class: 'btn btn-primary'

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

@@ -1,5 +1,5 @@
 = f.select :category, EffectiveClassifieds.categories, required: true
-= f.text_field :title
+= f.text_field :title, label: "#{EffectiveClassifieds.classifieds_label} Posting Title"
 = f.text_field :location
 
 - if f.object.persisted? || f.object.errors.include?(:slug)
@@ -11,20 +11,22 @@
 .row
   .col-lg-6
     = f.date_field :start_on, label: "Start",
-      hint: 'The classified ad will be displayed starting after this date.',
+      hint: 'The posting will be displayed starting after this date.',
       input_js: { minDate: minDate.strftime('%F') }
 
   .col-lg-6
     = f.date_field :end_on, label: "Expire",
-      hint: 'The classified ad will no longer be displayed after this date.'
+      hint: 'The posting will no longer be displayed after this date.'
 
 - if f.object.persisted? && !f.object.draft?
-  = f.check_box :archived, label: 'Yes, this classified is archived and will not be displayed'
+  = f.check_box :archived, label: 'Yes, this posting is archived. It will not be displayed.'
 
 - 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!'
+  = f.article_editor :body, label: 'Description', hint: 'The content of your posting. 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.rich_text_area :body, label: 'Description', hint: 'The content of your posting. Be sure to include all relevant information!'
+
+= f.file_field :file, label: 'Attach PDF'
 
 %h2.mt-5.mb-0 Contact Information
 %p

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

@@ -0,0 +1,2 @@
+.effective-classifieds
+  = yield

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

@@ -0,0 +1,49 @@
+%table.table.effective-classified-table
+  %tbody
+    %tr
+      %th Category
+      %td= classified.category
+
+    %tr
+      %th Title
+      %td= classified.title
+
+    %tr
+      %th Available
+      %td
+        #{classified.start_on&.strftime('%F')}
+        to
+        #{classified.end_on&.strftime('%F')}
+
+    - if classified.location.present?
+      %tr
+        %th Location
+        %td= classified.location
+
+    %tr
+      %th Description
+      %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
+      %td= classified.organization
+
+    - if classified.website.present?
+      %tr
+        %th Website
+        %td= link_to(classified.website, classified.website, target: '_blank')
+
+    - if classified.email.present?
+      %tr
+        %th Email
+        %td= mail_to(classified.email)
+
+    - if classified.phone.present?
+      %tr
+        %th Phone
+        %td= classified.phone

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

@@ -1,8 +1,9 @@
-.resource-buttons
-  = link_to 'Submit New Classified Ad', effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
+= render 'layout' do
+  .resource-buttons
+    = link_to "Submit New #{EffectiveClassifieds.classifieds_label} Posting", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
 
-= card do
-  - if @datatable.present?(self)
-    = render_datatable(@datatable, simple: true)
-  - else
-    %p There are no active classified ads. When there are, we'll show them here.
+  = card do
+    - if @datatable.present?(self)
+      = render_datatable(@datatable, simple: true)
+    - else
+      %p There are no active postings. When there are, we'll show them here.

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

@@ -1,8 +1,8 @@
 .effective-classified
   - unless @classified.published?
-    .alert.alert-warning.mb-4 This classified is currently unavailable.
+    .alert.alert-warning.mb-4 This posting is currently unavailable.
 
   = render 'effective/classifieds/classified', classified: @classified
 
   .resource-buttons.text-left
-    = link_to 'View All Classifieds', effective_classifieds.classifieds_path, class: 'btn btn-primary'
+    = link_to 'View All', effective_classifieds.classifieds_path, class: 'btn btn-primary'

data/app/views/effective/classifieds_mailer/classified_submitted.html.haml

@@ -1,9 +1,9 @@
 %p Hello Admin!
 
 - if @classified.published?
-  %p The following classified ad has been submitted and is published online:
+  %p The following posting has been submitted and is published online:
 - else
-  %p The following classified ad has been submitted and is awaiting your approval:
+  %p The following posting has been submitted and is awaiting your approval:
 
 %hr
 
@@ -13,8 +13,8 @@
 %hr
 
 - unless @classified.approved?
-  %p= link_to('Approve Classified Ad', effective_classifieds.edit_admin_classified_path(@classified))
+  %p= link_to('Approve Posting', effective_classifieds.edit_admin_classified_path(@classified))
 
-%p= link_to('View Classified Ad', effective_classifieds.classified_path(@classified))
+%p= link_to('View Posting', effective_classifieds.classified_path(@classified))
 
 %p Have a great day!

data/config/effective_classifieds.rb

@@ -12,6 +12,9 @@ EffectiveClassifieds.setup do |config|
   # Classified Settings
   # config.classified_wizard_class_name = 'Effective::ClassifiedWizard'
 
+  # Page title like Classifieds or Job Board
+  config.classifieds_label = 'Classifieds'
+
   # Pagination length on the Classified#index page
   config.per_page = :all
 

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.3.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/lib/effective_classifieds.rb

@@ -10,7 +10,7 @@ module EffectiveClassifieds
       :classifieds_table_name, :classified_wizards_table_name,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
       :layout, :categories, :per_page, :use_effective_roles, :max_duration, :auto_approve,
-      :classified_wizard_class_name
+      :classified_wizard_class_name, :classifieds_label
     ]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-11-01 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
@@ -209,6 +227,8 @@ files:
 - app/views/effective/classifieds/_dashboard.html.haml
 - app/views/effective/classifieds/_fields.html.haml
 - app/views/effective/classifieds/_form.html.haml
+- app/views/effective/classifieds/_layout.html.haml
+- app/views/effective/classifieds/_summary.html.haml
 - app/views/effective/classifieds/edit.html.haml
 - app/views/effective/classifieds/index.html.haml
 - app/views/effective/classifieds/show.html.haml
@@ -242,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Users submit classified ads for job openings and equipment sales