effective_orders 6.32.0 → 6.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97d5089149494797ab6704bc03da3919a04619ceffe9e51c2f81de5343c6d525
-  data.tar.gz: d4dc29472beac39508adf8bf61c991380b5626a0ad2227b55897b51c500221c0
+  metadata.gz: 0f51ea548ef96074bb66ede0cf1656b1ccf4ac73b810a1b5d41dc84f61ff3d78
+  data.tar.gz: b884d8b50d14ecb6d55f199003c58a903ee9a086b32c65e0fc00ccb1868edbed
 SHA512:
-  metadata.gz: 8508e2cdc5ea25f4d5400f5f1cd8a3b7933179114cfca1005a67ec985094e05091b429223dc215e75286f05ee7abb1bdf815b3be637aa3e218b8e7e722325702
-  data.tar.gz: 31b5c5a272bf5431012f65390a898f8ca6cab6a8d304a023e4829aaa9ca04e686dc5645808141f05a680489691973cc9d8315099c433d8a35b461c75971bc639
+  metadata.gz: 5e8bcb7e9b5d3b9b4eb54d673db566630a125f6fd7224670d56d7094d347035be79d9a74e299b3028e1daec994d80577996c9ec6d7da3e1b91de9720518cf9e0
+  data.tar.gz: 18426d89a198672f566a65be9b82db09ed2131f41d2cc01a3a6581b75ad39df5dec195c411a2d6bf50517a700935d416f0beabba67a419ea126813efcdb68270

data/app/assets/javascripts/effective_orders/providers/helcim.js

@@ -32,13 +32,21 @@ function helcimPayIframeEvent(event) {
       window.removeEventListener('message', helcimPayIframeEvent, false);
 
       let payment = btoa(event.data.eventMessage);
-  
+
       let $form = $('form[data-helcim-checkout]').first();
       $form.find('input[name="helcim[payment]"]').val(payment);
       $form.submit();
-  
+
       $('#helcimCheckout').fadeOut('slow');
       $('#helcim-checkout-loading').text('Thank you! Processing payment information. Please wait...');
     }
+
+    if(event.data.eventStatus == 'ABORTED') {
+      let payment = btoa(event.data.eventMessage);
+
+      let $form = $('form[data-helcim-checkout]').first();
+      $form.find('input[name="helcim[payment]"]').val(payment);
+      $form.submit();
+    }
   }
 };

data/app/controllers/effective/orders_controller.rb

@@ -86,7 +86,7 @@ module Effective
     # Always step1
     def edit
       @order ||= Effective::Order.deep.was_not_purchased.find(params[:id])
-      @page_title ||= view_context.order_page_title(@order)
+      @page_title ||= 'Order Review'
 
       EffectiveResources.authorize!(self, :edit, @order)
     end

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

@@ -17,6 +17,12 @@ module Effective
         # Decode the payment payload
         payment_payload = api.decode_payment_payload(helcim_params[:payment])
 
+        # Check for a declined payment payload
+        if payment_payload == :declined
+          return order_declined(payment: {}, provider: 'helcim', card: nil, declined_url: helcim_params[:declined_url])
+        end
+
+        # Check for an unexpected payment payload
         if payment_payload.blank?
           flash[:danger] = 'Unable to process helcim order without payment. please try again.'
           return order_not_processed(declined_url: helcim_params[:declined_url])

data/app/helpers/effective_orders_helper.rb

@@ -83,16 +83,6 @@ module EffectiveOrdersHelper
     render(partial: 'effective/orders/order', locals: { order: order })
   end
 
-  def order_page_title(order)
-    raise 'expected an order' unless order.kind_of?(Effective::Order)
-
-    if controller.action_name == 'edit'
-      'Order Review'
-    else
-      order.to_s
-    end
-  end
-
   def render_checkout(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil)
     raise 'expected an order' unless order.kind_of?(Effective::Order)
     raise 'unable to checkout an order without a user or organization' if order && (order.user.blank? && order.organization.blank?)

data/app/models/effective/helcim_api.rb

@@ -1,5 +1,7 @@
 # https://devdocs.helcim.com/docs/overview-of-helcimpayjs
 # Effective::HelcimApi.new.health_check
+# use card 4242, expiry 01/28, CVV 209 for a general decline
+
 module Effective
   class HelcimApi
     # All required
@@ -134,12 +136,22 @@ module Effective
     # "invoiceNumber"=>"#26-1760118464",
     # "customerCode"=>"CST0000"}
 
+    # When the payment is aborted, the decoded payload is a string with the error
+    # "HelcimPay.js transaction aborted - \"Transaction declined. DECLINED - Do Not Honor\"
+
     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)
-      raise('expected payment to be a Hash') unless payment.kind_of?(Hash)
+      decoded = (Base64.decode64(payload) rescue nil)
+      payment = (JSON.parse(decoded) rescue nil)
+
+      if payment.blank? && decoded.to_s.downcase.include?('declined')
+        return :declined 
+      end
+
+      raise('expected payment to be a Hash') unless payment.kind_of?(Hash) || payment.blank?
+      return payment if payment.blank?
 
       payment = payment.dig('data', 'data')
       raise('expected payment data') unless payment.kind_of?(Hash)

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.32.0'.freeze
+  VERSION = '6.32.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.32.0
+  version: 6.32.2
 platform: ruby
 authors:
 - Code and Effect
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement