spree_emerchantpay_genesis 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 780dbc4ae182d28335cde135ac8c42c1b1cac4b33408e0018897c9985a218d8d
-  data.tar.gz: 2b2cb5f7934ddefe248bd0e4e59d842016fd92e145b69c90be3e8d42498fc10e
+  metadata.gz: d03b6c21f5bfb4de3af96b24d466070211f38d4f85d25de2106fe933dc1b2818
+  data.tar.gz: 92d30f5025e7b95b4d97cce354b5633eae0d0a6f46f0e587fa360c9319edd73c
 SHA512:
-  metadata.gz: 17f0eb4b85dc0bc53a406ca5e50fe130fbfe18ed0bd508d5c760adad4557e2955dbc6b4bb1cfe9053f29530bb446b481e1ee36224af641f0381d4f12e2f9f201
-  data.tar.gz: e57d6888dff0949ae30618278240027d5fb75a0d2ec1927975f6358090689943041ab3633a1f9f4eb8490279976b180bbf3828618bc66722b6903304b6dbb5d6
+  metadata.gz: ff3ef9718a6aa011ab18c37990e1cb03b69d986d1a14aa1e732a61f70dfb21dace28cad49884de31031ca7355e187c5714a4fd9f6c14d0c3ae1a3e2ebc28f8f4
+  data.tar.gz: eff7ea1473012e5792a8d75eaa56747bcefaae0179824859e8789ced6b3f5724b9fc2b82d8d74e88372733941ebc741ea6c06b51818150d93333742ad52cbed6

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+0.1.10
+-----
+**Features**:
+
+* Improved plugin compatibility with the others
+* Updated project dependencies
+* Updated Threeds CSS used by the Spree Frontend
+
+0.1.9
+-----
+**Features**:
+
+* Added the following Bank Codes support for Online Banking transaction type through the Checkout payment method:
+  * Interac Combined Pay-in (CPI)
+  * Bancontact (BCT)
+  * BLIK (BLK)
+  * SPEI (SE)
+  * Post Finance (PF)
+  * Santander (SN)
+  * Itau (IT)
+  * Bradesco (BR)
+  * Banco do Brasil (BB)
+  * Webpay (WP)
+  * Bancomer (BN)
+  * PSE (PS)
+  * Banco de Occidente (BO)
+  * LatiPay (PID)
+
 0.1.8
 -----
 **Features**:

data/README.md

@@ -9,7 +9,7 @@ This is a Payment Module for Spree eCommerce that gives you the ability to proce
 
 # Requirements
 * Spree Core 4.x (Tested up to 4.8.3)
-* Spree Backend 4.x (Tested up to 4.8.3)
+* Spree Backend 4.x (Tested up to 4.8.4)
 * Spree FrontEnd - Optional (Tested up to 4.8.0)
 * Ruby >= 2.7
 * Ruby on Rails >= 6.1.4
@@ -336,6 +336,20 @@ States:
   * __Neosurf__
   * __Neteller__
   * __Online Banking__
+    * __Interac Combined Pay-in (CPI)__
+    * __Bancontact (BCT)__
+    * __BLIK (BLK)__
+    * __SPEI (SE)__
+    * __Post Finance (PF)__
+    * __Santander (SN)__
+    * __Itau (IT)__
+    * __Bradesco (BR)__
+    * __Banco do Brasil (BB)__
+    * __Webpay (WP)__
+    * __Bancomer (BN)__
+    * __PSE (PS)__
+    * __Banco de Occidente (BO)__
+    * __LatiPay (PID)__
   * __OXXO__
   * __P24__
   * __Pago Facil__

data/app/assets/stylesheets/spree/emerchantpay_threeds.css

@@ -1,7 +1,7 @@
-body {
+body.emp-form-helper-body {
     padding-top: 50px;
 }
-.center {
+.emp-center {
     max-width: 819px;
     height: 423px;
     background-color: #ffffff;
@@ -12,13 +12,13 @@ body {
     justify-content: center;
     align-items: center;
 }
-.center h3 {
+.emp-center h3 {
     font-family: 'Segoe UI', Arial, sans-serif;
     text-align: center;
     font-weight: 500;
     font-size: 2em;
 }
-.center h3 span {
+.emp-center h3 span {
     font-family: 'Segoe UI', Arial, sans-serif;
     display: block;
     text-align: center;
@@ -26,10 +26,10 @@ body {
     font-size: 16px;
     padding-top: 30px;
 }
-.hidden {
+.emp-hidden {
     display: none;
 }
-.screen-logo
+.emp-screen-logo
 {
     width: 152px;
     height: 50px;

data/app/helpers/spree_emerchantpay_genesis/mappers/genesis.rb

@@ -214,7 +214,10 @@ module SpreeEmerchantpayGenesis
 
       # Map WPF Transaction Types
       def transaction_types_attributes(options, source)
-        transaction_types, custom_attributes = wpf_selected_transaction_types options, source
+        transaction_types, custom_attributes = wpf_selected_transaction_types options
+
+        # Make sure to merge to the public_metadata params. Those params can be send via create_payment API call.
+        custom_attributes = source.public_metadata.merge custom_attributes
 
         transaction_types.each do |type|
           next if type.empty?
@@ -248,16 +251,20 @@ module SpreeEmerchantpayGenesis
       end
 
       # Map WPF transaction types selected in the Payment Method Options
-      def wpf_selected_transaction_types(options, source)
+      def wpf_selected_transaction_types(options)
+        bank_codes        = {}
         transaction_types = PaymentMethodHelper.select_options_value options, :transaction_types
         mobile_types      = PaymentMethodHelper.fetch_wpf_mobile_types transaction_types
 
-        custom_attributes = source.public_metadata.merge mobile_types
+        if transaction_types.include? GenesisRuby::Api::Constants::Transactions::ONLINE_BANKING_PAYIN
+          bank_codes = PaymentMethodHelper.fetch_online_banking_bank_codes options
+        end
+
         transaction_types = (transaction_types - Mappers::Transaction.mobile_types_with_payment_sub_types).push(
           *mobile_types.keys
         )
 
-        [transaction_types, custom_attributes]
+        [transaction_types, {}.merge(mobile_types, bank_codes)]
       end
 
     end

data/app/helpers/spree_emerchantpay_genesis/payment_method_helper.rb

@@ -56,6 +56,19 @@ module SpreeEmerchantpayGenesis
         attributes
       end
 
+      # Online Banking supported bank codes list
+      def online_banking_bank_codes
+        %w(CPI BCT BLK SE PF SN IT BR BB WP BN PS BO PID)
+      end
+
+      # Fetch selected bank codes and prepare the structure suitable for the Gateway SDK
+      def fetch_online_banking_bank_codes(options)
+        Hash[
+          GenesisRuby::Api::Constants::Transactions::ONLINE_BANKING_PAYIN,
+          { bank_codes: { bank_code: options[:bank_codes].reject { |code| code.to_s.empty? } } }
+        ]
+      end
+
     end
 
   end

data/app/helpers/spree_emerchantpay_genesis/threeds_helper.rb

@@ -56,7 +56,12 @@ module SpreeEmerchantpayGenesis
 
       # Fetch 3DSv2 Card Holder Shipping Address first used
       def fetch_shipping_address_first_used(shipping_address)
-        return DateTime.now.strftime(SpreeEmerchantpayGenesis::ThreedsHelper::DATE_ISO_FORMAT) if shipping_address.nil?
+        # Code format that suit plugin generation
+        if shipping_address.nil?
+          return DateTime.now.strftime(
+            SpreeEmerchantpayGenesis::ThreedsHelper::DATE_ISO_FORMAT
+          )
+        end
 
         shipping_address.created_at.strftime(SpreeEmerchantpayGenesis::ThreedsHelper::DATE_ISO_FORMAT)
       end

data/app/models/spree/gateway/emerchantpay_checkout.rb

@@ -16,6 +16,11 @@ module Spree
         selected: GenesisRuby::Api::Constants::I18n::EN
       }
     }
+    preference :bank_codes, :multi_select, default: lambda {
+      {
+        values: SpreeEmerchantpayGenesis::PaymentMethodHelper.online_banking_bank_codes
+      }
+    }
 
     delegate :load_data, :load_source, :load_payment, to: :provider
 

data/app/models/spree/payment_decorator.rb

@@ -13,7 +13,9 @@ module Spree
       return unless new_record?
 
       if default_emerchantpay_checkout_source?
-        self.source_attributes = SpreeEmerchantpayGenesis::PaymentMethodHelper.default_checkout_source_attributes order
+        # Code format that suit plugin generation
+        self.source_attributes = SpreeEmerchantpayGenesis::
+            PaymentMethodHelper.default_checkout_source_attributes order
       end
 
       build_default_source if can_build_source?
@@ -23,7 +25,8 @@ module Spree
 
     # Check if emerchantpay checkout source should be build with the default source_attributes
     def default_emerchantpay_checkout_source?
-      payment_method.is_a?(Spree::Gateway::EmerchantpayCheckout) && !source_attributes.present?
+      (payment_method&.type == 'Spree::Gateway::EmerchantpayCheckout' ||
+        payment_method&.type == 'Spree::Gateway::EcomprocessingCheckout') && !source_attributes.present?
     end
 
     # Check if can build source

data/app/models/spree_emerchantpay_genesis/genesis_provider.rb

@@ -126,7 +126,10 @@ module SpreeEmerchantpayGenesis
       response_object = genesis_response.response_object
 
       if TransactionHelper.success_result? genesis_response
-        EmerchantpayPaymentsRepository.save_reference_from_transaction original_transaction, response_object[:unique_id]
+        # Code format that suit plugin generation
+        EmerchantpayPaymentsRepository.save_reference_from_transaction(
+          original_transaction, response_object[:unique_id]
+        )
       end
 
       handle_response genesis_request, genesis_response, is_payment: false

data/app/services/spree_emerchantpay_genesis/base/payment_service.rb

@@ -7,11 +7,12 @@ module SpreeEmerchantpayGenesis
 
       # Constructor
       def initialize(params)
-        @params               = params
+        # Alignment that suits plugin generation
+        @params = params
         @emerchantpay_payment = fetch_emerchantapy_payment
-        @order                = load_order
-        @spree_payment        = load_spree_payment
-        @genesis_provider     = initialize_genesis_provider
+        @order = load_order
+        @spree_payment = load_spree_payment
+        @genesis_provider = initialize_genesis_provider
       end
 
       protected

data/app/views/spree/checkout/payment/_emerchantpay_direct.html.erb

@@ -66,11 +66,11 @@
 
 <script type="text/javascript">
     document.addEventListener("DOMContentLoaded", function(){
-        initBrowserParams()
-        initCreditCard()
+        empInitBrowserParams()
+        empInitCreditCard()
     });
 
-    function initCreditCard() {
+    function empInitCreditCard() {
         new Card({
             form: document.getElementById('checkout_form_payment'),
             container: '.emerchantpay-card-wrapper',
@@ -95,8 +95,8 @@
         });
     }
 
-    function initBrowserParams() {
-        document.getElementById('emp_cc_3dsv2_java_enabled').value         = fetchJavaEnabled()
+    function empInitBrowserParams() {
+        document.getElementById('emp_cc_3dsv2_java_enabled').value         = empFetchJavaEnabled()
         document.getElementById('emp_cc_3dsv2_color_depth').value          = screen.colorDepth.toString()
         document.getElementById('emp_cc_3dsv2_language').value             = navigator.language
         document.getElementById('emp_cc_3dsv2_screen_height').value        = screen.height.toString()
@@ -105,7 +105,7 @@
         document.getElementById('emp_cc_3dsv2_user_agent').value           = navigator.userAgent
     }
 
-    function fetchJavaEnabled() {
+    function empFetchJavaEnabled() {
         try {
             return navigator.javaEnabled();
         } catch (e) {

data/app/views/spree/emerchantpay_threeds/method_continue.html.erb

@@ -1,12 +1,12 @@
 <iframe width="1200" height="800" id="threedsMethodIframe" name="threedsMethodIframe" class="hidden">
   <html>
-  <body>
+  <body class="emp-form-helper-body">
   </body>
   </html>
 </iframe>
-<div class="center">
+<div class="emp-center">
   <div class="content">
-    <div class="screen-logo">
+    <div class="emp-screen-logo">
       <%= image_tag 'spree/emerchantpay_logo.png', alt: 'emerchantpay ltd.' %>
     </div>
     <h3>The payment is being processed

data/config/locales/en.yml

@@ -107,6 +107,20 @@ en:
       "no": Norwegian
       da: Danish
       sv: Swedish
+      CPI: Interac Combined Pay-in
+      BCT: Bancontact
+      BLK: BLIK
+      SE: SPEI
+      PF: Post Finance
+      SN: Santander
+      IT: Itau
+      BR: Bradesco
+      BB: Banco do Brasil
+      WP: Webpay
+      BN: Bancomer
+      PS: PSE
+      BO: Banco de Occidente
+      PID: LatiPay
     payment:
       usage: Electronic transaction via Spree eCommerce platform
       reference: Reference transaction via Spree eCommerce platform
@@ -143,3 +157,4 @@ en:
     threeds_allowed: Threeds V2 parameters handling
     enabled: Enabled
     disabled: Disabled
+    bank_codes: Bank Codes

data/db/migrate/{20240306152438_add_checkout_source.rb → 20240306152438_add_emerchantpay_checkout_source.rb}

@@ -1,4 +1,4 @@
-class AddCheckoutSource < ActiveRecord::Migration[6.1]
+class AddEmerchantpayCheckoutSource < ActiveRecord::Migration[6.1]
 
   def up # rubocop:disable Metrics/MethodLength
     create_table 'emerchantpay_checkout_sources', if_not_exists: true do |t|

data/lib/spree_emerchantpay_genesis/version.rb

@@ -1,7 +1,7 @@
 # :nocov:
 module SpreeEmerchantpayGenesis
 
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.1.10'.freeze
 
 end
 # :nocov:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_emerchantpay_genesis
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - emerchantpay ltd.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: genesis_ruby
@@ -28,20 +28,23 @@ dependencies:
   name: securerandom
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: spree_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
@@ -49,6 +52,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
@@ -56,6 +62,9 @@ dependencies:
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
@@ -63,6 +72,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
@@ -70,16 +82,16 @@ dependencies:
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -385,7 +397,7 @@ files:
 - config/routes.rb
 - db/migrate/20230927072418_add_emerchantpay_payments.rb
 - db/migrate/20231128153140_add_callback_status_to_emerchantpay_payments.rb
-- db/migrate/20240306152438_add_checkout_source.rb
+- db/migrate/20240306152438_add_emerchantpay_checkout_source.rb
 - lib/generators/spree_emerchantpay_genesis/install/install_generator.rb
 - lib/spree_emerchantpay_genesis.rb
 - lib/spree_emerchantpay_genesis/engine.rb