effective_classifieds 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 297af439da45de0c6884b20e1eae1ab6840a88487c81501783deae61dcaa7c83
-  data.tar.gz: b56b713ddfd6688807492661448bcca2afd6397b41dff3a52584cda4705d3065
+  metadata.gz: e96a880538ec95e1745ec13e6ac7520f9de680e824068182247bde290794b6e4
+  data.tar.gz: 18b832496e4a994383c2dced4291c60b7563b4f772b00dbb401e1a9a2f97e673
 SHA512:
-  metadata.gz: 5ef6644f2ed49177c7c1ed8b9f91c5e7e19fe1ae98c9fdad51e0139fba2cbe2e235b9b5f6633827fef22c089ef62339115c634f6ea558551b655cf5f128465fa
-  data.tar.gz: 2047fc9dcd098292c4516692c35ea11ad6bd89039fb5ebc55222ebe92476e066324e692b525faab02203bfb4a41911995691fc3b14fab8a82360fef515145774
+  metadata.gz: cff4f5bd000f79a03f1342f0e030ca4459a5ed825d512e014547d8aa4cd8744f5aa577bca1c4ba430fa57795017db9d2f20469118e57ab8fd3141e2439f1a5ec
+  data.tar.gz: 0ba27c2ed0d734c3bedf9e034c0f43e63c2f9d5619c071878e158b52510fd8079969ddcb0e3675cb1623ba6e698e48d10d2ce2b86efd6c0c2929df7718594ce5

data/app/controllers/effective/classifieds_controller.rb

@@ -37,7 +37,6 @@ module Effective
           render(json: @classified.for_json.merge(url: url).to_json)
         }
       end
-
     end
 
     private

data/app/datatables/admin/effective_classifieds_datatable.rb

@@ -46,6 +46,7 @@ module Admin
       col :archived
 
       col :status
+      col :tracks_count, label: 'Views'
 
       col :purchased_order, visible: false
 

data/app/datatables/effective_classified_wizards_datatable.rb

@@ -12,6 +12,10 @@ class EffectiveClassifiedWizardsDatatable < Effective::Datatable
 
     col :classifieds, search: :string, label: 'Title'
 
+    col :tracks_count, label: 'Views' do |wizard|
+      wizard.classified&.tracks_count
+    end
+
     col :owner, visible: false, search: :string
 
     col :status, visible: false do |wizard|

data/app/models/effective/classified.rb

@@ -10,6 +10,7 @@ module Effective
     acts_as_slugged
     acts_as_purchasable
     log_changes if respond_to?(:log_changes)
+    acts_as_trackable if respond_to?(:acts_as_trackable)
     acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
 
     # This will be the owner of the classified ad submission
@@ -135,10 +136,14 @@ module Effective
       self.errors.add(:end_on, 'must be after start date') if end_on < start_on
     end
 
+    def end_on_distance
+      date = Time.zone.now
+      ApplicationController.helpers.distance_of_time_in_words(date + EffectiveClassifieds.max_duration, date).gsub('about', '').strip
+    end
+
     validate(if: -> { start_on.present? && end_on.present? && EffectiveClassifieds.max_duration.present? && !importing }) do
       if (end_on - start_on) > EffectiveClassifieds.max_duration
-        distance = ApplicationController.helpers.distance_of_time_in_words(end_on + EffectiveClassifieds.max_duration, end_on).gsub('about', '').strip
-        self.errors.add(:end_on, "must be within #{distance} of start date")
+        self.errors.add(:end_on, "must be within #{end_on_distance} of start date")
       end
     end
 

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

@@ -13,6 +13,11 @@
         - datatable = Admin::EffectiveOrdersDatatable.new(parent: classified.classified_wizard, owner: classified.owner, user: classified.owner, total: false)
         = render_datatable(datatable, simple: true)
 
+    - if classified.class.respond_to?(:acts_as_trackable?)
+      = tab 'Tracks' do
+        - datatable = Admin::EffectiveTracksDatatable.new(owner: classified)
+        = render_datatable(datatable, inline: true, namespace: :admin)
+
     - if classified.respond_to?(:log_changes_datatable)
       = tab 'Logs' do
         = render_inline_datatable(classified.log_changes_datatable)

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

@@ -17,7 +17,7 @@
       = 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. Please enter a date within #{f.object.end_on_distance} of start date"
 
 - if f.object.persisted? && !f.object.draft?
   = f.check_box :archived, label: 'Yes, this posting is archived. It will not be displayed.'

data/config/effective_classifieds.rb

@@ -22,7 +22,7 @@ EffectiveClassifieds.setup do |config|
   config.auto_approve = false
 
   # Can checkout with phone or cheque 'deferred' payment providers
-  config.skip_deferred = false
+  config.skip_deferred = true
 
   # Mailer Settings
   # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings

data/db/migrate/101_create_effective_classifieds.rb

@@ -37,6 +37,9 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.0]
       t.boolean :tax_exempt, default: false
       t.string :qb_item_name
 
+      # Acts as trackable
+      t.integer :tracks_count, default: 0
+
       t.timestamps
     end
 

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.6.6'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-22 00:00:00.000000000 Z
+date: 2024-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_email_templates
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_test_bot
   requirement: !ruby/object:Gem::Requirement