effective_classifieds 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 513b026eaa5383f76e9245c493e80db4e046a1a27b066bdfd53dea5c569df640
-  data.tar.gz: fbbc24393ec5435358133a9c94c36de7123ac225660ad2325d5fb8aeae7123f0
+  metadata.gz: dcb913b24db42f767a00e6510007f7cbdd4a23f41cc12250418a7e81328746f9
+  data.tar.gz: 604f561f584ec2199be9641ba9d7a9616f3a496c147c85e3eaa101451265f265
 SHA512:
-  metadata.gz: 98985dcaca1f4f735ef3a6fcb7308bd990b70c109a298d560ca33bb1d3ff186e7ad3e4e543906f9641d047a2e83e6a3481fd5f7ab3c39765bf5461b2a7faed3e
-  data.tar.gz: 4e17489e7d1d7e80dab1ccb823573bd58406c95bc808978478976dbfca52145cd5ab1e6038dee3e2de55f1aafa3008d5881cb8f0c3879f4472d256a91256dbea
+  metadata.gz: 9a05e61dba76290ffeac816e406e72cecf48998311b633c1deb64dcef168ee1e03521725a64c79d8ec3609aec98e1b279c116680bbfcdfac0b1618018c3ac570
+  data.tar.gz: f7c42880255906ef28717bf3cbf93cf4f2e8a66bb9b3396e3052826828543523ff4145bec96e2851617b5a198e2f070d041b37cb42e3c54cbbfca95dd38e98ce

data/app/models/effective/classified.rb

@@ -135,10 +135,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/effective/classified_wizards/checkout.html.haml

@@ -2,4 +2,4 @@
   = 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))
+    = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:submitted), deferred_url: wizard_path(:checkout), declined_url: wizard_path(:checkout), skip_deferred: EffectiveClassifieds.skip_deferred)

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

@@ -9,11 +9,11 @@
   - if resource.checkout_required?
     - raise('expected a purchased classified submit_order') unless resource.submit_order&.purchased?
 
-  .alert.alert-warning.mb-4
+  .alert.alert-success.mb-4
     This #{classified_label.downcase} was submitted on #{classified.submitted_at.strftime('%F')}.
 
   - unless classified.approved?
-    .alert.alert-danger.mb-4
+    .alert.alert-warning.mb-4
       Your #{classified_label.downcase} must still be approved before it will be displayed.
 
   .mb-4= link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

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

@@ -21,6 +21,9 @@ EffectiveClassifieds.setup do |config|
   # Automatically approve classified ad submissions, otherwise require admin approval
   config.auto_approve = false
 
+  # Can checkout with phone or cheque 'deferred' payment providers
+  config.skip_deferred = true
+
   # Mailer Settings
   # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
   #

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.6.5'.freeze
+  VERSION = '0.6.7'.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, :skip_deferred
     ]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2024-04-29 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