effective_orders 6.8.1 → 6.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b17d6da43052c30b3dc2e8b4ed1cb60722737444cdbc9246ebe8c1649500d9b7
-  data.tar.gz: 15463f7b06e80a2c4af84951338cedbc11f1f235e83daae1ca440f89d6ed6f7e
+  metadata.gz: 88c9d1fefa60868996b14e1692372e7a9d8c8305f0996e450d9d350b93f91815
+  data.tar.gz: 569988b3e2f1c9ac7ef088088e326a557d0628dc695e5c1b1d9e682c0ed398df
 SHA512:
-  metadata.gz: 74c5371ed6996eb16b848fb534da9f65671467e8c163ab6bf4802c9c8485c44782991401ba089f69db8494b3b315e6aab42f919920af1c2f1a4b5b9d2104b062
-  data.tar.gz: be68655d47cc0efb3ea00fce27fe750e4a5d862e0be4ebfc2e734c607cd476a3184533369410328361602e7ca4f65396ce31b890debdc290f2ea1e825e124296
+  metadata.gz: 6c7de9e5194eb2e9f3a6bcdb8c6213ef38ffc1ffd6ea0673b593f84fe078d91ce79f8e08ecbeb2b7b9afd1310c61caf3b9aa470f9c2ba24442f4730815e5e534
+  data.tar.gz: e9f88ec610fe1b0b79110fd48061a8b3c79aeb6d224cfab36f2db042d6a5e2726c847833a2045f248529403f71ec5888cfcbd699ed7da94c3343015526a1827b

data/app/assets/javascripts/effective_orders/providers/moneris_checkout.js.coffee

@@ -15,15 +15,15 @@ this.MonerisCheckoutForm ||= class MonerisCheckoutForm
     @form.addClass('initialized')
 
   mount: ->
+    @moneris.setMode(@data.environment)
     @moneris.setCheckoutDiv('monerisCheckout')
 
     @moneris.setCallback('page_loaded', @pageLoaded)
     @moneris.setCallback('cancel_transaction', @cancelTransaction)
-    @moneris.setCallback('error_event', @errorEvent)
     @moneris.setCallback('payment_receipt', @paymentReceipt)
     @moneris.setCallback('payment_complete', @paymentComplete)
+    @moneris.setCallback('error_event', @errorEvent) # This one might be custom, no longer referenced in docs.
 
-    @moneris.setMode(@data.environment)
     @moneris.startCheckout(@data.ticket)
 
   success: (payload) ->

data/app/datatables/admin/effective_orders_datatable.rb

@@ -55,6 +55,10 @@ module Admin
         col :email, visible: false
       end
 
+      if attributes[:organization_id].blank?
+        col :organization
+      end
+
       col :parent, visible: false, search: :string
 
       col :cc, visible: false
@@ -111,10 +115,14 @@ module Admin
         user_klass = (attributes[:user_type].constantize if attributes[:user_type].present?)
         user_klass ||= current_user.class
 
-        user = user_klass.find(attributes[:user_id])
+        user = user_klass.where(id: attributes[:user_id]).first!
         scope = scope.where(user: user)
       end
 
+      if attributes[:organization_id].present? && attributes[:organization_type].present?
+        scope = scope.where(organization_id: attributes[:organization_id], organization_type: attributes[:organization_type])
+      end
+
       if attributes[:parent_id].present? && attributes[:parent_type].present?
         scope = scope.where(parent_id: attributes[:parent_id], parent_type: attributes[:parent_type])
       end

data/app/helpers/effective_moneris_checkout_helper.rb

@@ -16,7 +16,7 @@ module EffectiveMonerisCheckoutHelper
       # Optional
       order_no: order.transaction_id, # Has to be unique. This is order number, billing name and Time.now
       cust_id: order.user_id,
-      language: 'en',
+      language: :en,
 
       contact_details: {
         first_name: moneris_checkout_scrub(order.billing_first_name),

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.8.1'.freeze
+  VERSION = '6.9.0'.freeze
 end

data/lib/effective_orders.rb

@@ -278,16 +278,16 @@ module EffectiveOrders
 
   def self.moneris_checkout_script_url
     case EffectiveOrders.moneris_checkout.fetch(:environment)
-    when 'prod' then 'https://gateway.moneris.com/chkt/js/chkt_v1.00.js'
-    when 'qa' then 'https://gatewayt.moneris.com/chkt/js/chkt_v1.00.js'
+    when 'prod' then 'https://gateway.moneris.com/chktv2/js/chkt_v2.00.js'
+    when 'qa' then 'https://gatewayt.moneris.com/chktv2/js/chkt_v2.00.js'
     else raise('unexpected EffectiveOrders.moneris_checkout :environment key. Please check your config/initializers/effective_orders.rb file')
     end
   end
 
   def self.moneris_request_url
     case EffectiveOrders.moneris_checkout.fetch(:environment)
-    when 'prod' then 'https://gateway.moneris.com/chkt/request/request.php'
-    when 'qa' then 'https://gatewayt.moneris.com/chkt/request/request.php'
+    when 'prod' then 'https://gateway.moneris.com/chktv2/request/request.php'
+    when 'qa' then 'https://gatewayt.moneris.com/chktv2/request/request.php'
     else raise('unexpected EffectiveOrders.moneris_checkout :environment key. Please check your config/initializers/effective_orders.rb file')
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.8.1
+  version: 6.9.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails