effective_orders 6.13.3 → 6.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7823c5fb7e1f5de56c962426e8ac2f19dcf21eb3ee562652a086db304b1da18
-  data.tar.gz: f9487dfd15d7088bb70c96a865b8ef06e16fe67c986e25df209234e0f40344e8
+  metadata.gz: 6bd29353ae8797a9589a4a80bd592c376f008e82df8c216ec691967e4c4e5a96
+  data.tar.gz: 5bff3315e5bd67b4e23eb90c1fb17e8d5267c9a21d12efe5791230f7f675e729
 SHA512:
-  metadata.gz: c5385f2d84ac47da6a90f54dce6a7abde305a85637f1fa9c15686c5fee5e27f36f9ac20c65355c4e92225a02496cb26e7f009a09bc00a6ba8e3c0bd7423a5619
-  data.tar.gz: fca2f157ed9f4d30b716382b6161653c42867e4d229f14707b6e2f11edbd49eec1d2677ac7ed381d527f025817d1c050dcc27ff8a2127899a330f34abffdbbbf
+  metadata.gz: b8bafbde6a79e146b216f982ee6b292c93966918e9f2d8e74a21b9951d352dbe10c8d57e5380eb9482b3163bb7f5ced4a17b69884c1987d6ca767020e904ddaa
+  data.tar.gz: 76f4706faff04901d8a4061125624560bfcad049bd2be920095c46cc53cf6f7954fb13668a808622135dd95b23f286db5322dea3290b51a7d4dfc22cd237ee6c

data/app/controllers/effective/providers/deluxe_delayed.rb

@@ -23,6 +23,7 @@ module Effective
         end
 
         # Decode the base64 encoded JSON object into a Hash
+        # {"type"=>"Token", "status"=>"success", "data"=>{"token"=>"1983661243624242", "nameOnCard"=>"CardHolder", "expDate"=>"12/24", "maskedPan"=>"424242******4242", "cardType"=>"Visa"}}
         payment_intent = api.decode_payment_intent_payload(payment_intent_payload)
         card_info = api.card_info(payment_intent)
 

data/app/helpers/effective_orders_helper.rb

@@ -119,12 +119,13 @@ module EffectiveOrdersHelper
     end
   end
 
-  def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false, skip_order: false)
+  def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false, skip_order: nil)
     locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace, skip_deferred: skip_deferred, skip_order: skip_order }
     render(partial: 'effective/orders/checkout_step1', locals: locals)
   end
 
-  def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false, skip_order: false)
+  def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false, skip_order: nil)
+    skip_order = order.delayed_payment_date_upcoming? if skip_order.nil?
     locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace, skip_deferred: skip_deferred, skip_order: skip_order }
     render(partial: 'effective/orders/checkout_step2', locals: locals)
   end

data/app/mailers/effective/orders_mailer.rb

@@ -25,6 +25,27 @@ module Effective
       mail(to: @order.emails.first, cc: @order.cc.presence, subject: subject, **headers)
     end
 
+    def order_declined_to_admin(resource, opts = {})
+      raise('expected an Effective::Order') unless resource.kind_of?(Effective::Order)
+
+      @order = resource
+      subject = subject_for(__method__, "Declined Order: ##{@order.to_param}", resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: mailer_admin, subject: subject, **headers)
+    end
+
+    def order_declined_to_buyer(resource, opts = {})
+      raise('expected an Effective::Order') unless resource.kind_of?(Effective::Order)
+
+      @order = resource
+      subject = subject_for(__method__, "Declined Order: ##{@order.to_param}", resource, opts)
+      headers = headers_for(resource, opts)
+
+      # Just to the purchaser. Not everyone.
+      mail(to: @order.emails.first, cc: @order.cc.presence, subject: subject, **headers)
+    end
+
     # This is sent when an admin creates a new order or /admin/orders/new
     # Or when Pay by Cheque or Pay by Phone (deferred payments)
     # Or uses the order action Send Payment Request

data/app/models/effective/deluxe_api.rb

@@ -136,6 +136,7 @@ module Effective
           raise('expected a delayed order') unless order.delayed?
           raise('expected a deferred order') unless order.deferred?
           raise('expected delayed payment intent') unless order.delayed_payment_intent.present?
+          raise('expected a delayed_ready_to_purchase? order') unless order.delayed_ready_to_purchase?
 
           order.update_columns(delayed_payment_purchase_ran_at: now, delayed_payment_purchase_result: nil)
 
@@ -157,8 +158,8 @@ module Effective
 
             puts "Successfully purchased order #{order.id}"
           else
-            order.assign_attributes(delayed_payment_purchase_result: "failed with message: #{Array(payment['responseMessage']).to_sentence.presence || 'none'}.")
-            order.decline!(payment: payment, provider: provider, card: card)
+            order.assign_attributes(delayed_payment_purchase_result: "failed with message: #{Array(payment['responseMessage']).to_sentence.presence || 'none'}")
+            order.decline!(payment: payment, provider: provider, card: card, email: true)
 
             puts "Failed to purchase order #{order.id} #{order.delayed_payment_purchase_result}"
           end
@@ -178,6 +179,27 @@ module Effective
       true
     end
 
+    # This is only used for testing
+    def generate_payment_intent(card: nil, expiry: nil, cvv: nil, encode: false)
+      card ||= '4242 4242 4242 4242'
+      expiry ||= "12/#{Time.zone.now.year - 1998}"
+      cvv ||= '123'
+
+      card_info = { expiry: expiry, cvv: cvv }
+      params = { paymentMethod: { card: { card: card.gsub(" ", '') }.merge(card_info) } }
+
+      response = post('/paymentmethods/token', params: params)
+
+      # Like the delayed_purchase form gives us
+      retval = {
+        type: "Token",
+        status: "success",
+        data: { expDate: card_info[:expiry], cardType: 'Visa', token: response.fetch('token') }
+      }
+
+      encode ? Base64.encode64(retval.to_json) : retval
+    end
+
     protected
 
     def create_payment_params(order, payment_intent)

data/app/models/effective/order.rb

@@ -566,6 +566,12 @@ module Effective
       "Your #{delayed_payment_method} will be charged $#{'%0.2f' % total_to_f} on #{delayed_payment_date.strftime('%F')}"
     end
 
+    def delayed_payment_date_past?
+      return false unless delayed?
+      delayed_payment_date <= Time.zone.now.to_date
+    end
+
+    # This is checked by an effective_orders view helper. When upcoming we only collect card info.
     def delayed_payment_date_upcoming?
       return false unless delayed?
       delayed_payment_date > Time.zone.now.to_date
@@ -576,11 +582,6 @@ module Effective
       delayed_payment_date == Time.zone.now.to_date
     end
 
-    def delayed_payment_date_past?
-      return false unless delayed?
-      delayed_payment_date < Time.zone.now.to_date
-    end
-
     def pending_refund?
       return false if EffectiveOrders.buyer_purchases_refund?
       return false if purchased?
@@ -602,6 +603,16 @@ module Effective
       EffectiveOrders.send_order_receipt_to_buyer
     end
 
+    def send_order_declined_to_admin?
+      return false if free? && !EffectiveOrders.send_order_receipts_when_free
+      EffectiveOrders.send_order_declined_to_admin
+    end
+
+    def send_order_declined_to_buyer?
+      return false if free? && !EffectiveOrders.send_order_receipts_when_free
+      EffectiveOrders.send_order_declined_to_buyer
+    end
+
     def send_payment_request_to_buyer?
       return false if free? && !EffectiveOrders.send_order_receipts_when_free
       return false if refund?
@@ -803,7 +814,8 @@ module Effective
       true
     end
 
-    def decline!(payment: 'none', provider: 'none', card: 'none', validate: true)
+    # We only turn on the email when done by a delayed payment or from a rake script.
+    def decline!(payment: 'none', provider: 'none', card: 'none', validate: true, email: false)
       return false if declined?
       raise('order already purchased') if purchased?
 
@@ -838,9 +850,17 @@ module Effective
 
       raise "Failed to decline order: #{error || errors.full_messages.to_sentence}" unless error.nil?
 
+      send_declined_notifications! if email
+
       true
     end
 
+    def declined_reason
+      return unless declined?
+
+      delayed_payment_purchase_result.presence || 'credit card declined'
+    end
+
     def void!
       raise('already voided') if voided?
       voided!(skip_buyer_validations: true)
@@ -876,6 +896,19 @@ module Effective
       send_refund_notification! if send_refund_notification_to_admin?
     end
 
+    def send_declined_notifications!
+      send_order_declined_to_admin! if send_order_declined_to_admin?
+      send_order_declined_to_buyer! if send_order_declined_to_buyer?
+    end
+
+    def send_order_declined_to_admin!
+      EffectiveOrders.send_email(:order_declined_to_admin, self) if declined?
+    end
+
+    def send_order_declined_to_buyer!
+      EffectiveOrders.send_email(:order_declined_to_buyer, self) if declined?
+    end
+
     def send_order_receipt_to_admin!
       EffectiveOrders.send_email(:order_receipt_to_admin, self) if purchased?
     end

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

@@ -9,7 +9,7 @@
 .effective-order-purchase-actions
   - provider_locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url }
 
-  - if EffectiveOrders.delayed? && order.delayed?
+  - if EffectiveOrders.delayed? && order.delayed_payment_date_upcoming?
     = render partial: '/effective/orders/delayed/form', locals: provider_locals
 
   - elsif EffectiveOrders.free? && order.free?

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

@@ -5,6 +5,7 @@
   = render partial: 'effective/orders/order_header', locals: { order: order }
   = render partial: 'effective/orders/order_payment', locals: { order: order }
   = render partial: 'effective/orders/order_shipping', locals: { order: order }
+  = render partial: 'effective/orders/order_declined', locals: { order: order }
   = render partial: 'effective/orders/order_deferred', locals: { order: order }
   = render partial: 'effective/orders/order_notes', locals: { order: order }
   = render partial: 'effective/orders/order_items', locals: { order: order }

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

@@ -0,0 +1,10 @@
+- if order.declined?
+  .effective-order-declined
+    %table.table
+      %thead
+        %tr
+          %th Payment Declined
+      %tbody
+        %tr
+          %td
+            Your card was declined by the payment processor: #{order.declined_reason}

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

@@ -13,4 +13,10 @@
       -# This is set by the deluxe.js javascript on Submit
       = f.hidden_field :payment_intent, required: true
 
+      - if EffectiveOrders.deluxe[:environment] == 'sandbox'
+        .alert.alert-info.mb-4
+          This is the #{Rails.env.upcase} SERVER.
+          %br
+          Use credit card number 4242 4242 4242 4242 with any future expiry and any CVC.
+
       = render('effective/orders/deluxe/element')

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

@@ -7,4 +7,10 @@
   -# This is set by the deluxe.js javascript on Submit
   = f.hidden_field :payment_intent, required: true
 
+  - if EffectiveOrders.deluxe[:environment] == 'sandbox'
+    .alert.alert-info.mb-4
+      This is the #{Rails.env.upcase} SERVER.
+      %br
+      Use credit card number 4242 4242 4242 4242 with any future expiry and any CVC.
+
   = render('effective/orders/deluxe_delayed/element')

data/app/views/effective/orders_mailer/order_declined_to_admin.html.haml

@@ -0,0 +1,2 @@
+%p.effective-orders-receipt-info An order has been declined by the payment processor: #{@order.declined_reason}
+= render(@order, no_order_actions: true)

data/app/views/effective/orders_mailer/order_declined_to_buyer.html.haml

@@ -0,0 +1,2 @@
+%p.effective-orders-receipt-info Your order was declined by the payment processor: #{@order.declined_reason}
+= render(@order, no_order_actions: true)

data/config/effective_orders.rb

@@ -94,9 +94,10 @@ EffectiveOrders.setup do |config|
   # Email settings
   config.send_order_receipt_to_admin = true
   config.send_order_receipt_to_buyer = true
+  config.send_order_declined_to_admin = false
+  config.send_order_declined_to_buyer = false
   config.send_payment_request_to_buyer = true
   config.send_pending_order_invoice_to_buyer = true
-
   config.send_refund_notification_to_admin = true
 
   config.send_order_receipts_when_mark_as_paid = true

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.13.3'.freeze
+  VERSION = '6.14.1'.freeze
 end

data/lib/effective_orders.rb

@@ -32,7 +32,9 @@ module EffectiveOrders
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
 
       # Emails
-      :send_order_receipt_to_admin, :send_order_receipt_to_buyer, :send_payment_request_to_buyer, :send_pending_order_invoice_to_buyer,
+      :send_order_receipt_to_admin, :send_order_receipt_to_buyer, 
+      :send_order_declined_to_admin, :send_order_declined_to_buyer, 
+      :send_payment_request_to_buyer, :send_pending_order_invoice_to_buyer,
       :send_order_receipts_when_mark_as_paid, :send_order_receipts_when_free,
       :send_subscription_events,
       :send_subscription_trialing, :send_subscription_trial_expired,

data/lib/generators/templates/effective_orders_mailer_preview.rb

@@ -11,6 +11,14 @@ class EffectiveOrdersMailerPreview < ActionMailer::Preview
     EffectiveOrders.mailer_klass.order_receipt_to_buyer(build_preview_order)
   end
 
+  def order_declined_to_admin
+    Effective::OrdersMailer.order_declined_to_admin(build_preview_order)
+  end
+
+  def order_declined_to_buyer
+    Effective::OrdersMailer.order_declined_to_buyer(build_preview_order)
+  end
+
   def payment_request_to_buyer
     EffectiveOrders.mailer_klass.payment_request_to_buyer(build_preview_order)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.13.3
+  version: 6.14.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -286,6 +286,7 @@ files:
 - app/views/effective/orders/_layout.html.haml
 - app/views/effective/orders/_order.html.haml
 - app/views/effective/orders/_order_actions.html.haml
+- app/views/effective/orders/_order_declined.html.haml
 - app/views/effective/orders/_order_deferred.html.haml
 - app/views/effective/orders/_order_footer.html.haml
 - app/views/effective/orders/_order_header.html.haml
@@ -325,6 +326,8 @@ files:
 - app/views/effective/orders/show.html.haml
 - app/views/effective/orders/stripe/_element.html.haml
 - app/views/effective/orders/stripe/_form.html.haml
+- app/views/effective/orders_mailer/order_declined_to_admin.html.haml
+- app/views/effective/orders_mailer/order_declined_to_buyer.html.haml
 - app/views/effective/orders_mailer/order_error.html.haml
 - app/views/effective/orders_mailer/order_receipt_to_admin.html.haml
 - app/views/effective/orders_mailer/order_receipt_to_buyer.html.haml