effective_orders 6.21.0 → 6.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97151cf216b4f8b8d58f6516b4ec25670c9d3f0f0584bd2c5e148af880c29966
-  data.tar.gz: c662d0b7d645e8c8a73d2ce7db652a0c5b1de51a7814415d72c0d8c75dcc2ab8
+  metadata.gz: a44458577b035dfc26494d567ec2e67954c77e7ac446f0ca7acc67045d045180
+  data.tar.gz: 3bbaa3f085b4dc5480dabd99837c2a987cbedb793403b87c4971ae71621c988d
 SHA512:
-  metadata.gz: 816cf35587e725a2c626cfe5b5b90c0aa0abcad36d876f9bc07ef5dda91433af2b61f2016d51916d589eca85f06fc0eec82793ef9116f4841b80b233a12c25bc
-  data.tar.gz: 3969c1bee85ab1ce17bb2181360ae55caaf3d6b6795f6541b976540622076373c8e204db7ea18d1915ac02e9566e8ef6f2a27719073ea6424398b851eb10ae68
+  metadata.gz: a5304f09d475c1f2a040af16241c222d26fccc1cbba151b562238b665f0f0b910839a717f541af64b5b189f86e9a7f0d6e370fe87cfb005dbef744504aa663da
+  data.tar.gz: aca3d398a7f6f431bf2a68a8885b5349ae8c0660d167e3977f58ffa66b01705faafc231663c27cc44cb47a66c25056b7b2500719f9f0b8c3d63a651cffe964a3

data/app/models/concerns/acts_as_purchasable.rb

@@ -65,6 +65,10 @@ module ActsAsPurchasable
       end
     }
 
+    scope :not_purchased_or_deferred, -> { 
+      where(purchased_order_id: nil).where.not(id: purchased_or_deferred)
+    }
+
     scope :purchased_or_deferred, -> { 
       if respond_to?(:unarchived)
         unarchived.joins(order_items: :order).where(orders: { status: [:purchased, :deferred] }) 

data/app/models/effective/order.rb

@@ -582,7 +582,7 @@ module Effective
       return unless delayed? && deferred? && delayed_payment_provider?
       return unless delayed_payment_date_upcoming?
 
-      "Your #{delayed_payment_method} will be charged $#{'%0.2f' % total_to_f} on #{delayed_payment_date.strftime('%F')}"
+      "Your #{delayed_payment_method} will be charged $#{'%0.2f' % total_to_f} on #{delayed_payment_date.strftime('%A, %B %e, %Y')}."
     end
 
     def delayed_payment_date_past?

data/app/views/effective/order_emails/_header.html.haml

@@ -1,11 +1,11 @@
 .order-emails-header
   %h1= order_email.header
 
-  - if order.purchased?
-    %p
-      %strong Thank you!
+  -#- if order.purchased?
+  -#  %p
+  -#    %strong Thank you!
 
-  - elsif order.declined?
+  - if order.declined?
     %p
       Please
       = link_to('checkout your order again', effective_orders.order_url(order))

data/app/views/effective/order_emails/_info.html.haml

@@ -14,26 +14,26 @@
 
   - elsif order.payment_provider == 'deluxe_delayed'
     %ul
-      %li Your credit card will be charged on <strong>#{order.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>.
+      %li Your credit card will be charged on <strong>#{order.delayed_payment_date.strftime("%A, %B %e, %Y")}</strong>.
       %li Changes and cancellations must be made before this date.
       %li A receipt will be sent after the transaction is completed.
 
   - elsif order.payment_provider == 'cheque'
     %ul
       %li Please submit your cheque payment within 30 days of the invoice date.
-      %li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>, whichever is first, to make changes and cancellations.
+      %li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %e, %Y")}</strong>, whichever is first, to make changes and cancellations.
       %li A receipt will be sent after payment has been received.
 
   - elsif order.payment_provider == 'phone'
     %ul
       %li Please phone us to submit payment by credit card within 30 days of the invoice date.
-      %li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>, whichever is first, to make changes and cancellations.
+      %li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %e, %Y")}</strong>, whichever is first, to make changes and cancellations.
       %li A receipt will be sent after payment has been received.
 
   - elsif order.payment_provider == 'etransfer'
     %ul
       %li Please submit your etransfer payment within 30 days of the invoice date.
-      %li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>, whichever is first, to make changes and cancellations.
+      %li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %e, %Y")}</strong>, whichever is first, to make changes and cancellations.
       %li A receipt will be sent after payment has been received.
 
   - else
@@ -41,7 +41,7 @@
     %ul
       - if providers.present?
         %li When we receive your #{providers} we will mark your order paid.
-      %li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>, whichever is first, to make changes and cancellations.
+      %li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %e, %Y")}</strong>, whichever is first, to make changes and cancellations.
       %li A receipt will be sent after payment has been received.
 
 

data/app/views/effective/orders/_order_deferred.html.haml

@@ -11,7 +11,7 @@
               Your total due is $0. Should your order total change, you will receive a new invoice, along with your payment details.
 
             - elsif order.delayed? && order.payment_provider == "deluxe_delayed"
-              Your #{order.delayed_payment_method} will automatically be charged on #{order.delayed_payment_date.strftime("%A, %B %d, %Y")}.
+              Your #{order.delayed_payment_method} will automatically be charged on #{order.delayed_payment_date.strftime("%A, %B %e, %Y")}.
 
             - else
               Waiting for payment by #{order.payment_provider}.

data/app/views/effective/orders/delayed/_form.html.haml

@@ -9,11 +9,11 @@
         The payment date for this order
 
         - if order.delayed_payment_date_upcoming?
-          is in #{distance} from now on #{order.delayed_payment_date.strftime("%A, %B %d, %Y")}
+          is in #{distance} from now on #{order.delayed_payment_date.strftime("%A, %B %e, %Y")}
         - elsif order.delayed_payment_date_today?
           was today
         - else
-          was #{distance} ago on #{order.delayed_payment_date.strftime("%A, %B %d, %Y")}
+          was #{distance} ago on #{order.delayed_payment_date.strftime("%A, %B %e, %Y")}
     
     - provider_locals = { order: order, deferred_url: deferred_url, declined_url: declined_url }
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.21.0'.freeze
+  VERSION = '6.21.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.21.0
+  version: 6.21.1
 platform: ruby
 authors:
 - Code and Effect