effective_orders 6.13.2 → 6.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8049636b7c27adef561a64502f766ffb04c2eee32aa20b67f4d23b0a9558750f
-  data.tar.gz: 42f995d287210bbffbc9e8dd51ba7dd0eb80532b2cd29a83b8bb6bf8fb1f0f12
+  metadata.gz: cdbb9b1f68ae5470c0d64b4e7d27ca32cdcd21c99ce4cdcf36cd06182852bf85
+  data.tar.gz: 91732e8679f53cc672cdcf888e79680882cf83fe92a955d95e8a299719eb18ba
 SHA512:
-  metadata.gz: 80972c78f2afd52689269f44afe7db244d7a0f3920de43b0fac5edd875b2e984f38f7c67c69e189fb2d19e0de87d436092a1d41c7e9edf940a0f12f3e531dd60
-  data.tar.gz: c4e54da784e04f5d10433b11ac757a72044fc1e217cdc538248b41eaae24e8b4acac02959e6eb7ddd9eca9e959640139dc8057593f0009495b98e0f7a1ec48a5
+  metadata.gz: 974902ddc3095ec659b94e6af5ad8c45ae29ca52f1fa790cf6f787f22ecbc48d2bf1127c50ca0b9d396471700a928c30c734d8dd812b75a204d6ff1e4cc6f572
+  data.tar.gz: 1b02ad24cb46a6377c68a68dbe705e23a201860f4696ca1122237c5d228e01ee72951a05dd74e4ebda2cc92c41fc2c01e2e1bf7f62881fc51cb58f46abfa543c

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/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

@@ -86,6 +86,17 @@ module Effective
       true
     end
 
+    def purchase_free!(order)
+      raise('expected a free order') unless order.free?
+
+      self.purchase_response = nil
+      payment = { card: "none", details: "free order. no payment required."}
+      self.purchase_response = payment
+
+      # Free is always valid
+      true
+    end
+
     # Create Payment
     def create_payment(order, payment_intent)
       response = post('/payments', params: create_payment_params(order, payment_intent))
@@ -125,13 +136,21 @@ 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)
 
-          purchased = purchase!(order, order.delayed_payment_intent)
-          provider = order.payment_provider
+          purchased = if order.total.to_i > 0
+            purchase!(order, order.delayed_payment_intent)
+          elsif order.free?
+            purchase_free!(order)
+          else
+            raise("Unexpected order amount: #{order.total}")
+          end
+
+          provider = (order.free? ? 'free' : order.payment_provider)
           payment = self.payment()
-          card = payment["card"]
+          card = payment["card"] || payment[:card]
 
           if purchased
             order.assign_attributes(delayed_payment_purchase_result: "success")
@@ -139,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
@@ -152,12 +171,35 @@ module Effective
           ExceptionNotifier.notify_exception(e, data: { order_id: order.id }) if defined?(ExceptionNotifier)
 
           puts "Error purchasing #{order.id}: #{e.message}"
+
+          raise(e) if Rails.env.development? || Rails.env.test?
         end
       end
 
       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

@@ -602,6 +602,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 +813,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 +849,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 +895,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_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.2'.freeze
+  VERSION = '6.14.0'.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.2
+  version: 6.14.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -325,6 +325,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