swiss-crm-activemerchant-v2 1.0.23 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af3a2d531e5ddb1183fdad238a7087a6d77c68e0a3882ccf72c755143c29ca32
-  data.tar.gz: d923b080a1268a0e8143bfb5e81b927e651fdfd2d131db3559348adba04b4ae0
+  metadata.gz: bd8c97a821e37c5f68735206a29b4f9633048aa884cad771c148236924215092
+  data.tar.gz: 8f2a182c09ef9168c09ba8e792338a1ccbee01fbabedd53ac9f0eaff41d6f806
 SHA512:
-  metadata.gz: 3c2629ceac79372e2722b599a8ba02e3f0670d8eebd1c4405e703284d5db4d2cca654d78e89ea1c1b199366d6ddb5ea6cbd44792b83d66f0e6e51cad41bc4f1e
-  data.tar.gz: 74311b6b4d445056f69e18e965bb6cdb337c63ff61c3230d36c45bc419b744646b4167947c326a1f648b85b9b7cfb4667b57bab84eb3cb0ca4f63444b90ecf7c
+  metadata.gz: 9cecc2fd882615b8797c67265d2ce9af85a7a9b7ddea35c16411cb53c68c3852eca2471fd44a4cfb92ba8419640be79f1dd71713eb30bdd858f806748c2bf8f6
+  data.tar.gz: dad2742d5a273f85b5e2d8c8313cd588b25567b86a7ed36cb52805ae064258759c49456890f4ea1ce1944fb671a91de9ef71f5d9eef44cffc558a3c354868b2f

data/lib/active_merchant/billing/gateways/mollie.rb

@@ -16,7 +16,7 @@ module ActiveMerchant #:nodoc:
 
       self.test_url = 'https://api.mollie.com/v2'
       self.live_url = 'https://api.mollie.com/v2'
-      self.supported_countries = %w[NL BE DE FR CH US GB]
+      self.supported_countries = %w[AT BE DE DK FI FR IE IT NL NO PT ES SE CH GB US LU]
       self.default_currency = 'EUR'
       self.supported_cardtypes = %i[visa master american_express]
       self.money_format = :cents
@@ -65,11 +65,11 @@ module ActiveMerchant #:nodoc:
       private
 
       def recurring_payment?(payment_method, options)
-        options[:mollie_customer_id].present? && payment_method.mollie_mandate_id.present?
+        payment_method.mollie_customer_id.present? && payment_method.mollie_mandate_id.present?
       end
 
       def add_customer_to_payment(payment_method, options)
-        return options[:mollie_customer_id] if existing_customer?(options)
+        return payment_method.mollie_customer_id if existing_customer?(payment_method)
 
         customer_response = create_customer(options)
         return customer_response unless customer_response.success?
@@ -77,8 +77,8 @@ module ActiveMerchant #:nodoc:
         customer_response.params['id']
       end
 
-      def existing_customer?(options)
-        options[:mollie_customer_id].present?
+      def existing_customer?(payment_method)
+        payment_method.mollie_customer_id.present?
       end
 
       def create_customer(options)
@@ -97,25 +97,58 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_purchase_data(post, amount, payment_method, options)
-        post[:amount]       = format_amount(amount, options[:currency])
-        post[:description]  = "Order ##{options[:order_id]}"
-        post[:method]       = payment_method.mollie_payment_method
-        post[:sequenceType] = 'first'
-        post[:locale]       = options[:locale]
+        post[:amount]      = format_amount(amount, options[:currency])
+        post[:description] = "Order ##{options[:order_id]}"
+        post[:method]      = payment_method.mollie_payment_method.to_s
+        post[:locale]      = options[:locale]
+
+        unless %w[klarna paypal].include?(post[:method])
+          post[:sequenceType] = 'first'
+        end
 
         add_urls(post, options)
+        add_klarna_lines(post, options) if post[:method] == 'klarna'
       end
 
       def add_recurring_data(post, amount, payment_method, options)
         post[:amount]       = format_amount(amount, options[:currency])
         post[:description]  = "Order ##{options[:order_id]}"
         post[:sequenceType] = 'recurring'
-        post[:customerId]   = options[:mollie_customer_id]
+        post[:customerId]   = payment_method.mollie_customer_id
         post[:mandateId]    = payment_method.mollie_mandate_id
 
         add_urls(post, options)
       end
 
+      def add_klarna_lines(post, options)
+        currency = options[:currency]
+
+        post[:lines] = options[:order_line_items].map do |item|
+          price = item[:price].to_f
+          quantity = item[:quantity].to_i
+          total = item[:final_amount].to_f
+
+          {
+            description: item[:name],
+            quantity: quantity,
+            unitPrice: {
+              currency: currency,
+              value: sprintf('%.2f', price)
+            },
+            totalAmount: {
+              currency: currency,
+              value: sprintf('%.2f', total)
+            },
+            vatRate: item[:vat_rate] || '0.00',
+            vatAmount: {
+              currency: currency,
+              value: item[:vat_amount] || '0.00'
+            },
+            type: item[:type] || 'physical'
+          }
+        end
+      end
+
       def add_refund_data(post, amount, authorization, options)
         post[:amount] = format_amount(amount, options[:currency])
         post[:description] = "Order ##{options[:order_id]} Refund at #{Time.current.to_i}"
@@ -139,7 +172,7 @@ module ActiveMerchant #:nodoc:
       def add_payment_token(post, payment_method, options)
         method = post[:method].to_s.downcase
 
-        return unless %w[creditcard applepay googlepay].include?(method)
+        return if %w[klarna paypal].include?(method)
 
         token = payment_method.mollie_payment_token
         return unless token
@@ -155,11 +188,14 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_addresses(post, options)
-        post[:billingAddress]  = build_address(options[:billing_address])
-        post[:shippingAddress] = build_address(options[:shipping_address])
+        billing_address  = build_address(options[:billing_address], options[:email])
+        shipping_address = build_address(options[:shipping_address])
+
+        post[:billingAddress]  = billing_address
+        post[:shippingAddress] = shipping_address
       end
 
-      def build_address(data)
+      def build_address(data, email)
         return if data.blank?
 
         first_name, last_name = split_names(data[:name])
@@ -175,7 +211,8 @@ module ActiveMerchant #:nodoc:
           city: data[:city],
           region: data[:state],
           country: data[:country],
-          phone: data[:phone]
+          phone: data[:phone],
+          email: email
         }.compact
       end
 
@@ -267,9 +304,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def error_code_from(succeeded, response)
-        return nil if succeeded
+        return nil if succeeded || response['status'] == 'open'
 
-        response['status'] || response['type']
+        response['status']
       end
 
       def authorization_from(response)
@@ -282,6 +319,7 @@ module ActiveMerchant #:nodoc:
 
       def response_type_from(response)
         return 'success' if response['sequenceType'] == 'recurring' && response['status'] == 'paid'
+        return 'failed' if response['sequenceType'] == 'recurring' && %w[failed canceled expired declined].include?(response['status'])
 
         nil
       end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.0.23'
+  VERSION = '1.0.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swiss-crm-activemerchant-v2
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.25
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-07-21 00:00:00.000000000 Z
+date: 2025-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport