effective_orders 6.20.0 → 6.21.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/models/concerns/acts_as_purchasable.rb +4 -0
- data/app/models/effective/order.rb +4 -4
- data/app/models/effective/order_email.rb +15 -11
- data/app/views/effective/order_emails/_header.html.haml +17 -13
- data/app/views/effective/order_emails/_info.html.haml +51 -30
- data/app/views/effective/orders/_order_declined.html.haml +1 -1
- data/app/views/effective/orders/_order_deferred.html.haml +11 -7
- data/app/views/effective/orders/_order_payment.html.haml +1 -5
- data/app/views/effective/orders/delayed/_form.html.haml +2 -2
- data/lib/effective_orders/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a44458577b035dfc26494d567ec2e67954c77e7ac446f0ca7acc67045d045180
|
|
4
|
+
data.tar.gz: 3bbaa3f085b4dc5480dabd99837c2a987cbedb793403b87c4971ae71621c988d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a5304f09d475c1f2a040af16241c222d26fccc1cbba151b562238b665f0f0b910839a717f541af64b5b189f86e9a7f0d6e370fe87cfb005dbef744504aa663da
|
|
7
|
+
data.tar.gz: aca3d398a7f6f431bf2a68a8885b5349ae8c0660d167e3977f58ffa66b01705faafc231663c27cc44cb47a66c25056b7b2500719f9f0b8c3d63a651cffe964a3
|
|
@@ -65,6 +65,10 @@ module ActsAsPurchasable
|
|
|
65
65
|
end
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
+
scope :not_purchased_or_deferred, -> {
|
|
69
|
+
where(purchased_order_id: nil).where.not(id: purchased_or_deferred)
|
|
70
|
+
}
|
|
71
|
+
|
|
68
72
|
scope :purchased_or_deferred, -> {
|
|
69
73
|
if respond_to?(:unarchived)
|
|
70
74
|
unarchived.joins(order_items: :order).where(orders: { status: [:purchased, :deferred] })
|
|
@@ -422,16 +422,16 @@ module Effective
|
|
|
422
422
|
elsif purchased?
|
|
423
423
|
'Receipt'
|
|
424
424
|
elsif refund? && (pending? || confirmed?)
|
|
425
|
-
'Pending
|
|
425
|
+
'Pending refund'
|
|
426
426
|
elsif (pending? || confirmed?)
|
|
427
|
-
'Pending
|
|
427
|
+
'Pending order'
|
|
428
428
|
else
|
|
429
429
|
'Order'
|
|
430
430
|
end
|
|
431
431
|
end
|
|
432
432
|
|
|
433
433
|
def total_label
|
|
434
|
-
purchased? ? 'Total
|
|
434
|
+
purchased? ? 'Total paid' : 'Total due'
|
|
435
435
|
end
|
|
436
436
|
|
|
437
437
|
def payment_method
|
|
@@ -582,7 +582,7 @@ module Effective
|
|
|
582
582
|
return unless delayed? && deferred? && delayed_payment_provider?
|
|
583
583
|
return unless delayed_payment_date_upcoming?
|
|
584
584
|
|
|
585
|
-
"Your #{delayed_payment_method} will be charged $#{'%0.2f' % total_to_f} on #{delayed_payment_date.strftime('%
|
|
585
|
+
"Your #{delayed_payment_method} will be charged $#{'%0.2f' % total_to_f} on #{delayed_payment_date.strftime('%A, %B %e, %Y')}."
|
|
586
586
|
end
|
|
587
587
|
|
|
588
588
|
def delayed_payment_date_past?
|
|
@@ -27,14 +27,14 @@ module Effective
|
|
|
27
27
|
# The very first line of the email body
|
|
28
28
|
def header
|
|
29
29
|
if event.present? && order.purchased_or_deferred?
|
|
30
|
-
return "Your tickets have been confirmed" if event_none_waitlisted?
|
|
30
|
+
return "Your tickets have been confirmed!" if event_none_waitlisted?
|
|
31
31
|
return "Some of your tickets have been confirmed, but some are on the waitlist" if event_some_waitlisted?
|
|
32
|
-
return "Your tickets are on the waitlist" if event_all_waitlisted?
|
|
32
|
+
return "Your tickets are on the waitlist!" if event_all_waitlisted?
|
|
33
33
|
end
|
|
34
34
|
|
|
35
|
-
return "Request for
|
|
36
|
-
return "
|
|
37
|
-
return "Your order has been
|
|
35
|
+
return "Request for payment" if payment_request?
|
|
36
|
+
return "Order waiting on payment" if order.deferred?
|
|
37
|
+
return "Your order has been purchased!" if order.purchased?
|
|
38
38
|
return "Your order was declined by the payment processor" if order.declined?
|
|
39
39
|
|
|
40
40
|
# Fallback
|
|
@@ -44,17 +44,21 @@ module Effective
|
|
|
44
44
|
def subject
|
|
45
45
|
if event.present? && order.purchased_or_deferred?
|
|
46
46
|
return "Confirmation - #{event}" if event_none_waitlisted?
|
|
47
|
-
return "Confirmation
|
|
47
|
+
return "Confirmation & Waitlist - #{event}" if event_some_waitlisted?
|
|
48
48
|
return "Waitlist - #{event}" if event_all_waitlisted?
|
|
49
49
|
end
|
|
50
50
|
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
51
|
+
if event.present? && order.declined?
|
|
52
|
+
return "Declined payment - #{event} - Order ##{order.to_param}" if order.declined?
|
|
53
|
+
end
|
|
54
|
+
|
|
55
|
+
return "Payment request - Order ##{order.to_param}" if payment_request?
|
|
56
|
+
return "Waiting on payment - Order ##{order.to_param}" if order.deferred?
|
|
57
|
+
return "Declined payment - Order ##{order.to_param}" if order.declined?
|
|
58
|
+
return "Receipt - Order ##{order.to_param}" if order.purchased?
|
|
55
59
|
|
|
56
60
|
# Fallback
|
|
57
|
-
"Order
|
|
61
|
+
"Order ##{order.to_param}"
|
|
58
62
|
end
|
|
59
63
|
|
|
60
64
|
def payment_request?
|
|
@@ -1,16 +1,20 @@
|
|
|
1
|
-
|
|
1
|
+
.order-emails-header
|
|
2
|
+
%h1= order_email.header
|
|
2
3
|
|
|
3
|
-
|
|
4
|
-
%p
|
|
5
|
-
|
|
6
|
-
%p{style: "margin-bottom: 14px; font-weight: bold; text-align: center;"}= order.declined_reason
|
|
4
|
+
-#- if order.purchased?
|
|
5
|
+
-# %p
|
|
6
|
+
-# %strong Thank you!
|
|
7
7
|
|
|
8
|
-
- if
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
- if order.declined?
|
|
9
|
+
%p
|
|
10
|
+
Please
|
|
11
|
+
= link_to('checkout your order again', effective_orders.order_url(order))
|
|
12
|
+
or contact us if the problem persists.
|
|
13
13
|
|
|
14
|
-
- if event.
|
|
15
|
-
%
|
|
16
|
-
= event
|
|
14
|
+
- if (event = order_email.event).present?
|
|
15
|
+
%h2= event.title
|
|
16
|
+
%p= effective_events_event_schedule(event)
|
|
17
|
+
|
|
18
|
+
- if event.rich_text_confirmation_email.present?
|
|
19
|
+
%hr
|
|
20
|
+
.event-rich-text= event.rich_text_confirmation_email.to_s.html_safe
|
|
@@ -1,70 +1,91 @@
|
|
|
1
1
|
- if order.delayed? && order.deferred? && order.delayed_payment_date_upcoming?
|
|
2
2
|
%hr
|
|
3
|
-
%p{style: "margin-bottom: 4px; font-weight: bold;"} Please note:
|
|
4
3
|
|
|
5
|
-
|
|
6
|
-
%
|
|
7
|
-
|
|
4
|
+
%p
|
|
5
|
+
%strong Important
|
|
6
|
+
|
|
7
|
+
- if order_email.event_all_waitlisted?
|
|
8
|
+
%p
|
|
9
|
+
Your tickets are currently on the waitlist. Should your registration request be accepted, you will receive an event confirmation email letting you know you should plan to attend, along with your payment details. Thank you for your interest – we look forward to seeing you at an event soon!
|
|
10
|
+
|
|
11
|
+
- elsif order_email.event_some_waitlisted?
|
|
12
|
+
%p
|
|
13
|
+
Some of your tickets are currently on the waitlist. Should your waitlisted tickets be accepted, you will receive a new event confirmation email letting you know you of the update, along with your payment details. Thank you for your interest – we look forward to seeing you at an event soon!
|
|
14
|
+
|
|
15
|
+
- elsif order.payment_provider == 'deluxe_delayed'
|
|
16
|
+
%ul
|
|
17
|
+
%li Your credit card will be charged on <strong>#{order.delayed_payment_date.strftime("%A, %B %e, %Y")}</strong>.
|
|
8
18
|
%li Changes and cancellations must be made before this date.
|
|
9
19
|
%li A receipt will be sent after the transaction is completed.
|
|
20
|
+
|
|
10
21
|
- elsif order.payment_provider == 'cheque'
|
|
11
|
-
%ul
|
|
12
|
-
%li Please submit
|
|
13
|
-
%li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %
|
|
22
|
+
%ul
|
|
23
|
+
%li Please submit your cheque payment within 30 days of the invoice date.
|
|
24
|
+
%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.
|
|
14
25
|
%li A receipt will be sent after payment has been received.
|
|
26
|
+
|
|
15
27
|
- elsif order.payment_provider == 'phone'
|
|
16
|
-
%ul
|
|
17
|
-
%li Please phone us
|
|
18
|
-
%li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %
|
|
28
|
+
%ul
|
|
29
|
+
%li Please phone us to submit payment by credit card within 30 days of the invoice date.
|
|
30
|
+
%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.
|
|
19
31
|
%li A receipt will be sent after payment has been received.
|
|
32
|
+
|
|
20
33
|
- elsif order.payment_provider == 'etransfer'
|
|
21
|
-
%ul
|
|
22
|
-
%li Please submit
|
|
23
|
-
%li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %
|
|
34
|
+
%ul
|
|
35
|
+
%li Please submit your etransfer payment within 30 days of the invoice date.
|
|
36
|
+
%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.
|
|
24
37
|
%li A receipt will be sent after payment has been received.
|
|
38
|
+
|
|
25
39
|
- else
|
|
26
40
|
- providers = EffectiveOrders.deferred_providers.to_sentence(last_word_connector: ', or', two_words_connector: ' or ')
|
|
27
|
-
%ul
|
|
41
|
+
%ul
|
|
28
42
|
- if providers.present?
|
|
29
43
|
%li When we receive your #{providers} we will mark your order paid.
|
|
30
|
-
%li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %
|
|
44
|
+
%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.
|
|
31
45
|
%li A receipt will be sent after payment has been received.
|
|
32
46
|
|
|
47
|
+
|
|
33
48
|
- elsif order.deferred?
|
|
34
49
|
%hr
|
|
35
|
-
|
|
50
|
+
|
|
51
|
+
%p
|
|
52
|
+
%strong Important
|
|
36
53
|
|
|
37
54
|
- if order.payment_provider == 'deluxe_delayed'
|
|
38
|
-
%ul
|
|
55
|
+
%ul
|
|
39
56
|
%li Your credit card will be automatically charged.
|
|
40
57
|
%li A receipt will be sent after the transaction is completed.
|
|
41
58
|
- elsif order.payment_provider == 'cheque'
|
|
42
|
-
%ul
|
|
43
|
-
%li Please submit
|
|
59
|
+
%ul
|
|
60
|
+
%li Please submit your cheque within 30 days of the invoice date.
|
|
44
61
|
%li A receipt will be sent after payment has been received.
|
|
45
62
|
- elsif order.payment_provider == 'phone'
|
|
46
|
-
%ul
|
|
47
|
-
%li Please phone us
|
|
63
|
+
%ul
|
|
64
|
+
%li Please phone us to submit payment within 30 days of the invoice date.
|
|
48
65
|
%li A receipt will be sent after payment has been received.
|
|
49
66
|
- elsif order.payment_provider == 'etransfer'
|
|
50
|
-
%ul
|
|
51
|
-
%li Please submit
|
|
67
|
+
%ul
|
|
68
|
+
%li Please submit your etransfer within 30 days of the invoice date.
|
|
52
69
|
%li A receipt will be sent after payment has been received.
|
|
53
70
|
- else
|
|
54
71
|
- providers = EffectiveOrders.deferred_providers.to_sentence(last_word_connector: ', or', two_words_connector: ' or ')
|
|
55
|
-
%ul
|
|
72
|
+
%ul
|
|
56
73
|
- if providers.present?
|
|
57
74
|
%li When we receive your #{providers} we will mark your order paid.
|
|
58
75
|
%li A receipt will be sent after payment has been received.
|
|
59
76
|
|
|
77
|
+
|
|
60
78
|
- elsif order_email.payment_request?
|
|
61
79
|
%hr
|
|
62
|
-
%p{style: "margin-bottom: 4px; font-weight: bold;"} An order has been created on your behalf for the following items.
|
|
63
|
-
%p{style: "margin-bottom: 4px; font-weight: bold;"} Please remit payment at your earliest convenience.
|
|
64
80
|
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
81
|
+
%p
|
|
82
|
+
%strong Important
|
|
83
|
+
|
|
84
|
+
- providers = EffectiveOrders.deferred_providers.to_sentence(last_word_connector: ', and', two_words_connector: ', and ')
|
|
85
|
+
%ul
|
|
86
|
+
%li Please #{link_to('click here', effective_orders.order_url(@order))} to review your order and pay online.
|
|
68
87
|
- if providers.present?
|
|
69
|
-
%li We
|
|
88
|
+
%li We accept credit card, #{providers}.
|
|
70
89
|
%li A receipt will be sent after payment has been received.
|
|
90
|
+
|
|
91
|
+
%hr
|
|
@@ -3,21 +3,25 @@
|
|
|
3
3
|
%table.table
|
|
4
4
|
%thead
|
|
5
5
|
%tr
|
|
6
|
-
%th Payment
|
|
6
|
+
%th Payment method
|
|
7
7
|
%tbody
|
|
8
8
|
%tr
|
|
9
9
|
%td
|
|
10
|
-
- if order.
|
|
11
|
-
|
|
10
|
+
- if order.total == 0
|
|
11
|
+
Your total due is $0. Should your order total change, you will receive a new invoice, along with your payment details.
|
|
12
|
+
|
|
13
|
+
- elsif order.delayed? && order.payment_provider == "deluxe_delayed"
|
|
14
|
+
Your #{order.delayed_payment_method} will automatically be charged on #{order.delayed_payment_date.strftime("%A, %B %e, %Y")}.
|
|
15
|
+
|
|
12
16
|
- else
|
|
13
|
-
|
|
17
|
+
Waiting for payment by #{order.payment_provider}.
|
|
14
18
|
|
|
15
19
|
- if order.payment_provider == "etransfer" && (EffectiveOrders.etransfer[:success] rescue false).present?
|
|
16
|
-
|
|
20
|
+
= EffectiveOrders.etransfer[:success].html_safe
|
|
17
21
|
|
|
18
22
|
- if order.payment_provider == "cheque" && (EffectiveOrders.cheque[:success] rescue false).present?
|
|
19
|
-
|
|
23
|
+
= EffectiveOrders.cheque[:success].html_safe
|
|
20
24
|
|
|
21
25
|
- if order.payment_provider == "phone" && (EffectiveOrders.phone[:success] rescue false).present?
|
|
22
|
-
|
|
26
|
+
= EffectiveOrders.phone[:success].html_safe
|
|
23
27
|
|
|
@@ -3,11 +3,7 @@
|
|
|
3
3
|
%table.table
|
|
4
4
|
%thead
|
|
5
5
|
%tr
|
|
6
|
-
%th
|
|
7
|
-
%th Date Paid
|
|
8
|
-
%th Payment Method
|
|
6
|
+
%th Payment method
|
|
9
7
|
%tbody
|
|
10
8
|
%tr
|
|
11
|
-
%td= price_to_currency(order.total)
|
|
12
|
-
%td= order.purchased_at.in_time_zone(Time.zone).strftime('%b %d, %Y')
|
|
13
9
|
%td= order.payment_method
|
|
@@ -9,11 +9,11 @@
|
|
|
9
9
|
The payment date for this order
|
|
10
10
|
|
|
11
11
|
- if order.delayed_payment_date_upcoming?
|
|
12
|
-
is in #{distance} from now on #{order.delayed_payment_date.strftime("%A, %B %
|
|
12
|
+
is in #{distance} from now on #{order.delayed_payment_date.strftime("%A, %B %e, %Y")}
|
|
13
13
|
- elsif order.delayed_payment_date_today?
|
|
14
14
|
was today
|
|
15
15
|
- else
|
|
16
|
-
was #{distance} ago on #{order.delayed_payment_date.strftime("%A, %B %
|
|
16
|
+
was #{distance} ago on #{order.delayed_payment_date.strftime("%A, %B %e, %Y")}
|
|
17
17
|
|
|
18
18
|
- provider_locals = { order: order, deferred_url: deferred_url, declined_url: declined_url }
|
|
19
19
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: effective_orders
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 6.
|
|
4
|
+
version: 6.21.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Code and Effect
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-02-
|
|
11
|
+
date: 2025-02-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|