effective_orders 6.28.2 → 6.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47ebafa3c27a50ea73a56b0ac3e643819baac988873106a2c6e27091c152e37f
-  data.tar.gz: 3ff654f460ff35a33352caa431d6ada535ea87af37cc2c1e4160fbce3f4f5d3d
+  metadata.gz: d2ed83ebfbf108715d418f71ba4e4328f921e7c25bf1089bf14088273423e10a
+  data.tar.gz: 1d425c694ceb2941600bf6645e78375eb094dd9ca243f20c50f5385c6ead6d83
 SHA512:
-  metadata.gz: 3512550572d5a7bc234f15a6db8fa3770bc2b84da42175a65af84547b0363726c03a245642987addafac58e0278dc76305a3aa7916afb92aaeec3999611e30ba
-  data.tar.gz: f47d4c74f99a6f52d5fb2de36915ae3e54c002743b54eb19ee9df7b32d9f44cfcb84d8fab41c483a0400cf09d563f023b4f6ce479c6fa5af8df9392e8934fc15
+  metadata.gz: 939643e123d27170b05fa68b00d3e5a90f774bbe4ea46ffc38fa76d080e123f315d36360ad947146d993b9a790c1fd3fcd7e7ed987a31ba5e10e7bf1941144f1
+  data.tar.gz: d0ba5224ba9c2e787df3c1197f5e25082418fbdf1037260c09c724530b3ad32cfc5666b21de515bc99714b846d2311771fc23dcec9a5bcd24b6191a16f634f3d

data/app/models/effective/helcim_api.rb

@@ -26,10 +26,14 @@ module Effective
       get('/connection-test')
     end
 
-    def get_transaction(id)
+    def get_card_transaction(id)
       get("/card-transactions/#{id}")
     end
 
+    def get_ach_transaction(id)
+      get("/ach/transactions/#{id}").try(:dig, 'transaction')
+    end
+
     # Make the Preload Request
     # https://devdocs.helcim.com/reference/checkout-init
     def initialize_request(order)
@@ -110,6 +114,7 @@ module Effective
     end
 
     # Decode the base64 encoded JSON object that was given from the form into a Hash
+    # For a card transaction
     # {"transactionId"=>"38142732",
     # "dateCreated"=>"2025-08-15 10:10:32",
     # "cardBatchId"=>"4656307",
@@ -126,9 +131,24 @@ module Effective
     # "customerCode"=>"CST1022",
     # "invoiceNumber"=>"#30",
     # "warning"=>""}
+    #
+    # For an ACH transaction
+    # {"transactionId"=>"12345",
+    # "batchId"=>"168333,
+    # "dateCreated"=>"2025-10-10 11:48:47",
+    # "statusAuth"=>"APPROVED",
+    # "statusClearing"=>"OPENED",
+    # "type"=>"WITHDRAWAL",
+    # "amount"=>"1.05",
+    # "currency"=>"CAD",
+    # "approvalCode"=>"1232435435",
+    # "bankAccountNumber"=>"4333434",
+    # "bankToken"=>"3748uzocio7348",
+    # "invoiceNumber"=>"#26-1760118464",
+    # "customerCode"=>"CST0000"}
+
     def decode_payment_payload(payload)
       return if payload.blank?
-
       raise('expected a string') unless payload.kind_of?(String)
 
       payment = (JSON.parse(Base64.decode64(payload)) rescue nil)
@@ -145,7 +165,7 @@ module Effective
       raise('expected a payment Hash') unless payment.kind_of?(Hash)
 
       return true if (payment['status'] == 'APPROVED' && payment['type'] == 'purchase') # CC
-      return true if (payment['bankToken'].present? && payment['type'] == 'WITHDRAWAL') # ACH
+      return true if (payment['bankAccountId'].present? && payment['responseMessage'].to_s.downcase == 'approved') # ACH
 
       false
     end
@@ -157,11 +177,15 @@ module Effective
       transaction_id = payment_payload['transactionId']
       raise('expected a payment_payload with a transactionId') unless transaction_id.present?
 
-      payment = get_transaction(transaction_id)
-      raise('expected an existing card-transaction payment') unless payment.kind_of?(Hash)
+      payment = if payment_payload['cardBatchId'].present? && payment_payload['type'].to_s.downcase == 'purchase'
+        get_card_transaction(transaction_id)
+      elsif payment_payload['batchId'].present? && payment_payload['type'].to_s.downcase == 'withdrawal'
+        get_ach_transaction(transaction_id)
+      end
+
+      raise("expected an existing card-transaction or ach-transaction payment with params #{payment_payload}") unless payment.kind_of?(Hash)
 
-      # Compare the payment (trusted truth) and the payment_payload (untrusted)
-      if payment['transactionId'].to_s != payment_payload['transactionId'].to_s
+      unless (payment['transactionId'].to_s == payment_payload['transactionId'].to_s) || (payment['id'].to_s == payment_payload['transactionId'].to_s)
         raise('expected the payment and payment_payload to have the same transactionId')
       end
 
@@ -190,7 +214,7 @@ module Effective
 
     def verify_payment!(order, payment)
       # Validate order ids
-      unless payment['invoiceNumber'].to_s.start_with?('#' + order.to_param)
+      if payment['invoiceNumber'].present? && !payment['invoiceNumber'].start_with?('#' + order.to_param)
         raise("expected card-transaction invoiceNumber to be the same as the order to_param")
       end
 
@@ -205,12 +229,12 @@ module Effective
     # Takes a payment_intent and returns the card info we can store
     def card_info(payment)
       # Return the authorization params merged with the card info
-      last4 = payment['cardNumber'].to_s.last(4)
-      card = payment['cardType'].to_s.downcase
+      last4 = (payment['cardNumber'] || payment['bankAccountL4L4']).to_s.last(4)
 
-      card = 'ACH' if card.blank? && payment['bankToken'].present?
+      card = payment['cardType'].to_s.downcase
+      card = 'ACH' if card.blank? && payment['bankAccountId'].present?
 
-      active_card = "**** **** **** #{last4} #{card}" if last4.present?
+      active_card = "**** **** **** #{last4} #{card}".strip if last4.present?
 
       { 'active_card' => active_card, 'card' => card }.compact
     end

data/app/models/effective/order.rb

@@ -949,6 +949,10 @@ module Effective
       EffectiveOrders.send_email(:order_email_to_admin, self) if EffectiveOrders.send_order_receipt_to_admin
     end
 
+    def send_event_registrants_cancelled_email!
+      EffectiveOrders.send_email(:order_email, self, event_registrants_cancelled: true)
+    end
+
     def log_changes_formatted_value(attribute, value)
       "#{value.to_s.first(8)}...#{value.to_s.last(4)}" if attribute == :delayed_payment_intent && value.present?
     end
@@ -1042,7 +1046,7 @@ module Effective
         when 'm', 'mc', 'master', 'mastercard' then 'MasterCard'
         when 'a', 'ax', 'american', 'americanexpress' then 'American Express'
         when 'd', 'discover' then 'Discover'
-        when 'ach' then 'ACH Payment'
+        when 'ach' then 'ACH'
         else payment_card.to_s
       end
 

data/app/models/effective/order_email.rb

@@ -27,6 +27,7 @@ module Effective
     # The very first line of the email body
     def header
       if event.present? && order.purchased_or_deferred?
+        return "Your tickets have been cancelled" if event_registrants_cancelled?
         return "Your tickets have been confirmed!" if event_none_waitlisted?
         return "Some of your tickets have been confirmed, but some are on the waitlist" if event_some_waitlisted?
         return "Your tickets are on the waitlist!" if event_all_waitlisted?
@@ -43,6 +44,7 @@ module Effective
 
     def subject
       if event.present? && order.purchased_or_deferred?
+        return "Tickets cancelled - #{event}" if event_registrants_cancelled?
         return "Receipt - Order ##{order.to_param}" if order.purchased? && order.delayed_payment_date_past?
         return "Confirmation - #{event}" if event_none_waitlisted?
         return "Confirmation & Waitlist - #{event}" if event_some_waitlisted?
@@ -103,5 +105,10 @@ module Effective
       return false unless event_registrants.present?
       event_registrants.all? { |er| er.waitlisted_not_promoted? || er.archived? }
     end
+
+    def event_registrants_cancelled?
+      opts[:event_registrants_cancelled] == true
+    end
+
   end
 end

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

@@ -1,4 +1,14 @@
-- if order.delayed? && order.deferred? && order.delayed_payment_date_upcoming? 
+- if order_email.event_registrants_cancelled?
+  %hr
+
+  %p
+    %strong Important
+
+  %ul
+    %li No payments will be made for these tickets.
+    %li If payment has already been made, we will issue a refund.
+
+- elsif order.delayed? && order.deferred? && order.delayed_payment_date_upcoming? 
   %hr
 
   %p

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

@@ -0,0 +1,9 @@
+.effective-order-items
+  - present_order_items = order.order_items.select(&:archived?)
+
+  %p
+    %strong Cancelled tickets
+
+  %ul
+    - present_order_items.each do |item|
+      %li= item.name.html_safe

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

@@ -1,6 +1,11 @@
 - # This is the order email
 = render('effective/order_emails/header', order_email: order_email, order: order)
 = render('effective/order_emails/info', order_email: order_email, order: order)
-= render('effective/order_emails/items', order_email: order_email, order: order)
+
+- if order_email.event_registrants_cancelled?
+  = render('effective/order_emails/items_cancelled', order_email: order_email, order: order)
+- else
+  = render('effective/order_emails/items', order_email: order_email, order: order)
+
 = render('effective/order_emails/signature', order_email: order_email, order: order)
 

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

@@ -1,3 +1,2 @@
 .effective-orders-footer
-  .mb-4.text-center
-    %p If you have any questions, please contact us or call right away.
+  -# Intentionally left blank

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.28.2'.freeze
+  VERSION = '6.29.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.28.2
+  version: 6.29.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-07 00:00:00.000000000 Z
+date: 2025-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -292,6 +292,7 @@ files:
 - app/views/effective/order_emails/_header.html.haml
 - app/views/effective/order_emails/_info.html.haml
 - app/views/effective/order_emails/_items.html.haml
+- app/views/effective/order_emails/_items_cancelled.html.haml
 - app/views/effective/order_emails/_order_email.html.haml
 - app/views/effective/order_emails/_signature.html.haml
 - app/views/effective/orders/_checkout_actions.html.haml