effective_classifieds 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c468d322f47a4191356c1f7bfa55c598ef3ddcb0a1770083ef53e62745d7e8c1
-  data.tar.gz: d178bba98e606daae6faed532924a109dcd431b58edbed8817e759fc02bc7632
+  metadata.gz: f08a97cd9079f6baa93e5fc992db40dbeb951cbfe067614a06996770ef83d49c
+  data.tar.gz: 1ec2f2ca6b22fa02e6bf2ab43f008a886cd414f5b146a299278b04b57f6220b0
 SHA512:
-  metadata.gz: 07decbc51f2546fd0e15a2e3ab64c94ce38916fb9b55999a9f38e0709eba936aad535bfdda894db24b2331bda3d84ac3e8d5d7f7698abccafcfa390be7b5b742
-  data.tar.gz: 14e1a65cfa4322c509f6364d3adc047d3f86ae52a99005d47c31b924dc704d98cdd54041120be9449f96cb9c76dbb00cb5b521f590bcba00af42d6e4ad41983d
+  metadata.gz: 211355aecad1c8ce668aa4caed147d0304f695baeb531dc3951046bdf82c7027349671ff8032f364366e6a067506d82c86c24da7209a3d43a03d4726cb8c29b1
+  data.tar.gz: 8dd8f720c87fd1d5b17c56f700bb38c18bb0552bba6cf30195c6a5881f499e03b95a379b92a2d95e9fcee1da529919d48690fc0f68d1d7a62ef2bfad42358e40

data/app/controllers/admin/classifieds_controller.rb

@@ -5,6 +5,9 @@ module Admin
 
     include Effective::CrudController
 
+    page_title(only: :index) { EffectiveClassifieds.classifieds_label }
+    page_title(only: :new) { "New #{EffectiveClassifieds.classifieds_label} Posting" }
+
     submit :save, 'Save'
     submit :save, 'Save and View', redirect: -> { effective_classifieds.classified_path(resource) }
     submit :approve, 'Approve'

data/app/datatables/admin/effective_classifieds_datatable.rb

@@ -8,6 +8,7 @@ module Admin
         scope :approved
       end
 
+      scope :draft
       scope :published
     end
 
@@ -39,11 +40,10 @@ module Admin
       col :email
       col :phone
 
+      col :status
       col :archived
 
-      unless EffectiveClassifieds.auto_approve
-        col :status, search: ['submitted', 'approved']
-      end
+      col :status
 
       col :purchased_order, visible: false
 
@@ -53,7 +53,7 @@ module Admin
     end
 
     collection do
-      Effective::Classified.all.where.not(status: :draft)
+      Effective::Classified.all
     end
 
     def categories

data/app/models/effective/classified.rb

@@ -5,6 +5,7 @@ module Effective
     self.table_name = EffectiveClassifieds.classifieds_table_name.to_s
 
     attr_accessor :current_user
+    attr_accessor :importing
 
     acts_as_slugged
     acts_as_purchasable
@@ -118,11 +119,13 @@ module Effective
 
     validates :start_on, presence: true
     validates :end_on, presence: true
-    validates :location, presence: true
 
-    validates :organization, presence: true
-    validates :email, presence: true
-    validates :phone, presence: true
+    with_options(unless: -> { importing }) do
+      validates :location, presence: true
+      validates :organization, presence: true
+      validates :email, presence: true
+      validates :phone, presence: true
+    end
 
     validate(if: -> { start_on.present? && end_on.present? }) do
       self.errors.add(:end_on, 'must be after start date') if end_on < start_on
@@ -147,6 +150,10 @@ module Effective
       title.presence || 'New Classified'
     end
 
+    def purchasable_name
+      "Posting - #{to_s}"
+    end
+
     def published?
       return false unless approved?
       return false if archived?

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

@@ -10,13 +10,13 @@
 
 .row
   .col-lg-6
-    = f.date_field :start_on, label: "Start",
-      hint: 'The posting will be displayed starting after this date.',
-      input_js: { minDate: minDate.strftime('%F') }
+    - if f.object.new_record?
+      = f.date_field :start_on, label: "Start", hint: 'The posting will be displayed starting after this date.', input_js: { minDate: minDate.strftime('%F') }
+    - else
+      = f.date_field :start_on, label: "Start", hint: 'The posting will be displayed starting after this date.'
 
   .col-lg-6
-    = f.date_field :end_on, label: "Expire",
-      hint: 'The posting will no longer be displayed after this date.'
+    = f.date_field :end_on, label: "Expire", 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 posting is archived. It will not be displayed.'

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.4.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails