solidus_mollie 0.1.0 → 0.9.0

data/app/services/solidus_mollie/process_webhook.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module SolidusMollie
+  # Settlement logic, driven by Mollie's webhook (the source of truth). Looks up
+  # the local payment from the Mollie id, re-fetches the authoritative status
+  # from Mollie, then advances the Spree::Payment and order. Designed to be
+  # idempotent: Mollie may call the webhook several times.
+  class ProcessWebhook
+    class PaymentNotFound < StandardError; end
+
+    def self.call(mollie_payment_id:)
+      new(mollie_payment_id: mollie_payment_id).call
+    end
+
+    def initialize(mollie_payment_id:)
+      @mollie_payment_id = mollie_payment_id
+    end
+
+    def call
+      raise PaymentNotFound, 'missing id' if @mollie_payment_id.to_s.empty?
+
+      source = SolidusMollie::MollieSource.find_by(mollie_payment_id: @mollie_payment_id)
+      raise PaymentNotFound, @mollie_payment_id unless source
+
+      payment = ::Spree::Payment.find_by(source: source)
+      raise PaymentNotFound, "no payment for #{@mollie_payment_id}" unless payment
+
+      remote = payment.payment_method.client.get_payment(@mollie_payment_id)
+      source.update!(status: remote.status)
+
+      settle(payment, remote.status)
+      payment
+    end
+
+    private
+
+    def settle(payment, status)
+      ::ActiveRecord::Base.transaction do
+        if SolidusMollie::PAID_STATUSES.include?(status)
+          mark_paid(payment)
+        elsif SolidusMollie::FAILED_STATUSES.include?(status)
+          mark_failed(payment)
+        end
+        # open / pending / authorized: leave as-is and wait for the next webhook.
+      end
+    end
+
+    def mark_paid(payment)
+      return if payment.completed?
+
+      payment.started_processing! if payment.checkout?
+      payment.complete! unless payment.completed?
+      complete_order(payment.order)
+    end
+
+    def mark_failed(payment)
+      return if payment.failed? || payment.void?
+
+      payment.failure! if payment.pending? || payment.processing? || payment.checkout?
+    end
+
+    def complete_order(order)
+      return unless order.confirm?
+
+      order.complete!
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+<div class="mollie-payment-method" data-payment-method-type="mollie">
+  <p><%= t('solidus_mollie.redirect_notice') %></p>
+</div>

data/config/locales/en.yml

@@ -1,7 +1,6 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
-  activerecord:
-    models:
-      solidus_mollie/paymeny_method: Mollie
+  solidus_mollie:
+    payment_error: "We couldn't start your Mollie payment: %{message}"
+    confirming_payment: "Thanks! We're confirming your payment with Mollie."
+    order_not_found: "Order not found."
+    redirect_notice: "You'll be redirected to Mollie to complete your payment securely."

data/config/routes.rb

@@ -1,17 +1,8 @@
 # frozen_string_literal: true
 
-Spree::Core::Engine.routes.draw do
-  resource :mollie, only: [], controller: :mollie do
-    post 'update_payment_status', action: :update_payment_status, as: 'mollie_update_payment_status'
-    # put 'validate_payment/:order_number', action: :validate_payment, as: 'mollie_validate_payment'
-    get 'validate_payment/:order_number', action: :validate_payment, as: 'mollie_validate_payment'
-  end
-
-  namespace :api, defaults: { format: 'json' } do
-    resources :mollie do
-      member do
-        get :payment_methods
-      end
-    end
-  end
-end
+# Mount onto Spree's engine so the helpers are available as
+# spree.mollie_webhook_url / spree.mollie_return_url.
+::Spree::Core::Engine.routes.draw do
+  post '/mollie/webhook', to: 'solidus_mollie/callbacks#webhook', as: :mollie_webhook
+  get  '/mollie/return',  to: 'solidus_mollie/callbacks#return',  as: :mollie_return
+end

data/db/migrate/20260620143922_create_solidus_mollie_sources.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateSolidusMollieSources < ActiveRecord::Migration[7.1]
+  def change
+    create_table :solidus_mollie_sources do |t|
+      t.string :mollie_payment_id
+      t.string :mollie_method
+      t.string :status
+      t.references :payment_method
+      t.references :user
+      t.timestamps
+    end
+    add_index :solidus_mollie_sources, :mollie_payment_id, unique: true
+  end
+end

data/lib/generators/solidus_mollie/install/install_generator.rb

@@ -1,37 +1,45 @@
 # frozen_string_literal: true
 
+require 'rails/generators'
+
 module SolidusMollie
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      class_option :auto_run_migrations, type: :boolean, default: false
       source_root File.expand_path('templates', __dir__)
 
+      class_option :auto_run_migrations, type: :boolean, default: false
+
       def copy_initializer
         template 'initializer.rb', 'config/initializers/solidus_mollie.rb'
       end
 
-      def add_javascripts
-        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/solidus_mollie\n"
-        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_mollie\n"
-      end
-
-      def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_mollie\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
-        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_mollie\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
-      end
-
-      def add_migrations
-        run 'bin/rails railties:install:migrations FROM=solidus_mollie'
+      def copy_migrations
+        rake 'railties:install:migrations FROM=solidus_mollie'
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Layout/LineLength
+        run_migrations = options[:auto_run_migrations] ||
+                         ['', 'y', 'Y'].include?(ask('Run migrations now? [Yn]'))
         if run_migrations
-          run 'bin/rails db:migrate'
+          rake 'db:migrate'
         else
-          puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
+          say_status :skip, 'migrations (run `rails db:migrate` later)', :yellow
         end
       end
+
+      def show_readme
+        say <<~MSG, :green
+
+          solidus_mollie installed.
+
+          Next steps:
+            1. Add a payment method in the admin (Configuration -> Payment Methods -> New),
+               choosing "SolidusMollie::PaymentMethod" as the provider, and paste your
+               Mollie API key (test_... or live_...).
+            2. Make sure your store is reachable over HTTPS at a public URL so Mollie can
+               reach the webhook at /mollie/webhook (use a tunnel like ngrok in dev).
+        MSG
+      end
     end
   end
 end

data/lib/generators/solidus_mollie/install/templates/initializer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-SolidusMollie.configure do |config|
-  # TODO: Remember to change this with the actual preferences you have implemented!
-  # config.sample_preference = 'sample_value'
-end
+# solidus_mollie configuration.
+#
+# The Mollie API key is configured per payment method in the Solidus admin
+# (Configuration -> Payment Methods), so nothing is required here. This file is
+# a placeholder for any future global settings.

data/lib/solidus_mollie/engine.rb

@@ -1,26 +1,38 @@
 # frozen_string_literal: true
 
-require 'spree/core'
-require 'solidus_mollie'
-
 module SolidusMollie
-  class Engine < Rails::Engine
-    include SolidusSupport::EngineExtensions
-
-    isolate_namespace ::Spree
+  class Engine < ::Rails::Engine
+    include SolidusSupport::EngineExtensions if defined?(SolidusSupport::EngineExtensions)
 
     engine_name 'solidus_mollie'
-    
 
-    # use rspec for tests
-    config.generators do |g|
-      g.test_framework :rspec
+    # NOT isolated: routes are drawn onto Spree's engine (see config/routes.rb)
+    # so helpers resolve as spree.mollie_webhook_url / spree.mollie_return_url.
+
+    # Register the payment method so it appears in the admin "New Payment Method"
+    # provider dropdown.
+    initializer 'solidus_mollie.register_payment_method' do |app|
+      app.reloader.to_prepare do
+        methods = Rails.application.config.spree.payment_methods
+        methods << SolidusMollie::PaymentMethod unless methods.include?(SolidusMollie::PaymentMethod)
+      rescue StandardError => e
+        Rails.logger.warn("[solidus_mollie] could not auto-register payment method: #{e.message}")
+      end
     end
 
-    Spree::PermittedAttributes.source_attributes << :payment_method_id
+    # Prepend our checkout override so confirm-step orders paying with Mollie are
+    # redirected to Mollie's hosted checkout instead of completing synchronously.
+    config.to_prepare do
+      SolidusMollie::Engine.prepare_decorators
+    end
 
-    initializer "register_spree_mollie_payment_method", after: "spree.register.payment_methods" do |app|
-      app.config.spree.payment_methods << Spree::PaymentMethod::Mollie
+    def self.prepare_decorators
+      Spree::CheckoutController.prepend(SolidusMollie::Spree::CheckoutControllerDecorator)
+    rescue NameError
+      Rails.logger.info(
+        '[solidus_mollie] Spree::CheckoutController not found; skipping checkout override. ' \
+        'For an API/headless frontend, call SolidusMollie::CreateOrderPayment yourself.'
+      )
     end
   end
 end

data/lib/solidus_mollie/factories.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :mollie_payment_method, class: 'SolidusMollie::PaymentMethod' do
+    name { 'Mollie' }
+    available_to_admin { true }
+    available_to_users { true }
+    preferences { { api_key: 'test_fakekey', mollie_method: '' } }
+  end
+
+  factory :mollie_source, class: 'SolidusMollie::MollieSource' do
+    association :payment_method, factory: :mollie_payment_method
+    mollie_payment_id { "tr_#{SecureRandom.alphanumeric(10)}" }
+    status { 'open' }
+  end
+end

data/lib/solidus_mollie/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusMollie
-  VERSION = '0.1.0'
+  VERSION = '0.9.0'
 end

data/lib/solidus_mollie.rb

@@ -1,5 +1,13 @@
 # frozen_string_literal: true
 
-require 'solidus_mollie/configuration'
+require 'mollie-api-ruby'
+require 'solidus_core'
 require 'solidus_mollie/version'
 require 'solidus_mollie/engine'
+
+module SolidusMollie
+  # Mollie payment statuses that mean "money has been received".
+  PAID_STATUSES = %w[paid].freeze
+  # Statuses that mean the payment will never succeed and should be failed.
+  FAILED_STATUSES = %w[failed expired canceled].freeze
+end

metadata

@@ -1,161 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: solidus_mollie
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.9.0
 platform: ruby
 authors:
-- Victor ter Hark
-- Dermot Tynan
+- Kalopa Robotics
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2026-04-16 00:00:00.000000000 Z
+date: 2026-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: solidus_core
+  name: mollie-api-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.6.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.6.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: solidus_support
+  name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: mollie-api-ruby
+  name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.19.0
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.19.0
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
-description:
-email: dtynan@kalopa.com
+        version: '2.5'
+description: A Solidus extension that lets your store accept payments through Mollie
+  using their hosted (redirect) checkout and webhooks.
+email:
+- support@kalopa.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".gem_release.yml"
-- ".github/stale.yml"
-- ".github_changelog_generator"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- app/assets/javascripts/spree/backend/solidus_mollie.js
-- app/assets/javascripts/spree/frontend/solidus_mollie.js
-- app/assets/stylesheets/spree/backend/solidus_mollie.css
-- app/assets/stylesheets/spree/frontend/solidus_mollie.css
-- app/controllers/spree/api/mollie_controller.rb
-- app/controllers/spree/mollie_controller.rb
-- app/decorators/models/line_item_decorator.rb
-- app/decorators/models/payment_create_decorator.rb
-- app/models/spree/gateway/mollie_gateway.rb
-- app/models/spree/mollie/order_serializer.rb
-- app/models/spree/mollie/payment_state_updater.rb
-- app/models/spree/mollie_logger.rb
-- app/models/spree/mollie_payment_source.rb
-- app/models/spree/payment_method/mollie.rb
-- app/views/spree/admin/payments/source_forms/_mollie.html.erb
-- app/views/spree/admin/payments/source_views/_mollie.html.erb
-- app/views/spree/api/payments/show.json.jbuilder
-- app/views/spree/api/payments/source_views/_mollie.json.jbuilder
-- bin/console
-- bin/rails
-- bin/rails-engine
-- bin/rails-sandbox
-- bin/rake
-- bin/sandbox
-- bin/setup
+- app/controllers/solidus_mollie/callbacks_controller.rb
+- app/decorators/solidus_mollie/spree/checkout_controller_decorator.rb
+- app/models/solidus_mollie/client.rb
+- app/models/solidus_mollie/mollie_source.rb
+- app/models/solidus_mollie/payment_method.rb
+- app/models/solidus_mollie/response.rb
+- app/services/solidus_mollie/create_order_payment.rb
+- app/services/solidus_mollie/process_webhook.rb
+- app/views/spree/checkout/payment/_mollie.html.erb
 - config/locales/en.yml
 - config/routes.rb
-- db/migrate/20201110194821_create_solidus_mollie_payment_source.rb
+- db/migrate/20260620143922_create_solidus_mollie_sources.rb
 - lib/generators/solidus_mollie/install/install_generator.rb
 - lib/generators/solidus_mollie/install/templates/initializer.rb
 - lib/solidus_mollie.rb
-- lib/solidus_mollie/configuration.rb
 - lib/solidus_mollie/engine.rb
-- lib/solidus_mollie/testing_support/factories.rb
+- lib/solidus_mollie/factories.rb
 - lib/solidus_mollie/version.rb
-- solidus_mollie.code-workspace
-- solidus_mollie.gemspec
-- spec/solidus_mollie_gateway_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/kalopa/solidus_mollie
 licenses:
-- BSD-3-Clause
+- BSD-2-Clause
 metadata:
-  homepage_uri: https://github.com/kalopa/solidus_mollie
-  source_code_uri: https://github.com/kalopa/solidus_mollie
-  changelog_uri: https://github.com/kalopa/solidus_mollie/releases
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
-summary: Accept payments through Mollie using Solidus Storefront
-test_files:
-- spec/solidus_mollie_gateway_spec.rb
-- spec/spec_helper.rb
+summary: Mollie payments for Solidus
+test_files: []

data/.circleci/config.yml

@@ -1,41 +0,0 @@
-version: 2.1
-
-orbs:
-  # Always take the latest version of the orb, this allows us to
-  # run specs against Solidus supported versions only without the need
-  # to change this configuration every time a Solidus version is released
-  # or goes EOL.
-  solidusio_extensions: solidusio/extensions@volatile
-
-jobs:
-  run-specs-with-postgres:
-    executor: solidusio_extensions/postgres
-    steps:
-      - solidusio_extensions/run-tests
-  run-specs-with-mysql:
-    executor: solidusio_extensions/mysql
-    steps:
-      - solidusio_extensions/run-tests
-  lint-code:
-    executor: solidusio_extensions/sqlite-memory
-    steps:
-      - solidusio_extensions/lint-code
-
-workflows:
-  "Run specs on supported Solidus versions":
-    jobs:
-      - run-specs-with-postgres
-      - run-specs-with-mysql
-      - lint-code
-
-  "Weekly run specs against master":
-    triggers:
-      - schedule:
-          cron: "0 0 * * 4" # every Thursday
-          filters:
-            branches:
-              only:
-                - master
-    jobs:
-      - run-specs-with-postgres
-      - run-specs-with-mysql

data/.gem_release.yml

@@ -1,5 +0,0 @@
-bump:
-  recurse: false
-  file: 'lib/solidus_mollie/version.rb'
-  message: Bump SolidusMollie to %{version}
-  tag: true

data/.github/stale.yml

@@ -1,17 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: false
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It might be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

data/.github_changelog_generator

@@ -1,2 +0,0 @@
-issues=false
-exclude-labels=infrastructure

data/.gitignore

@@ -1,20 +0,0 @@
-*.gem
-\#*
-*~
-.#*
-.DS_Store
-.idea
-.project
-.sass-cache
-coverage
-Gemfile.lock
-tmp
-nbproject
-pkg
-*.swp
-spec/dummy
-spec/examples.txt
-/sandbox
-.rvmrc
-.ruby-version
-.ruby-gemset

data/.rspec

@@ -1,2 +0,0 @@
---color
---require spec_helper

data/.rubocop.yml

@@ -1,5 +0,0 @@
-require:
-  - solidus_dev_support/rubocop
-
-AllCops:
-  NewCops: disable

data/CHANGELOG.md

@@ -1 +0,0 @@
-# Changelog

data/Gemfile

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
-
-# Needed to help Bundler figure out how to resolve dependencies,
-# otherwise it takes forever to resolve them.
-# See https://github.com/bundler/bundler/issues/6677
-gem 'rails', '>0.a'
-
-# Provides basic authentication functionality for testing parts of your engine
-gem 'solidus_auth_devise'
-
-case ENV['DB']
-when 'mysql'
-  gem 'mysql2'
-when 'postgresql'
-  gem 'pg'
-else
-  gem 'sqlite3'
-end
-
-gemspec
-
-# Use a local Gemfile to include development dependencies that might not be
-# relevant for the project or for other contributors, e.g. pry-byebug.
-#
-# We use `send` instead of calling `eval_gemfile` to work around an issue with
-# how Dependabot parses projects: https://github.com/dependabot/dependabot-core/issues/1658.
-send(:eval_gemfile, 'Gemfile-local') if File.exist? 'Gemfile-local'

data/Rakefile

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require 'solidus_dev_support/rake_tasks'
-SolidusDevSupport::RakeTasks.install
-
-task default: 'extension:specs'

data/app/assets/javascripts/spree/backend/solidus_mollie.js

@@ -1,2 +0,0 @@
-// Placeholder manifest file.
-// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/backend/all.js'

data/app/assets/javascripts/spree/frontend/solidus_mollie.js

@@ -1,2 +0,0 @@
-// Placeholder manifest file.
-// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/frontend/all.js'