spree_mollie_gateway 0.1.1 → 1.0.0.pre.beta3

data/app/models/spree/user_decorator.rb

@@ -1,8 +1,10 @@
-Spree::User.class_eval do
+Spree.user_class.class_eval do
   after_create :create_mollie_customer
 
   def create_mollie_customer
-    mollie_gateway = Spree::PaymentMethod.find_by_type('Spree::Gateway::MollieGateway')
+    # Don't create Mollie customers is spree_auth_devise is not installed.
+    return unless defined? Spree::User
+    mollie_gateway = Spree::PaymentMethod.find_by_type 'Spree::Gateway::MollieGateway'
     mollie_customer = mollie_gateway.create_customer(self)
     update mollie_customer_id: mollie_customer.id
   end

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

@@ -1,12 +1,49 @@
 <ul class="list-group">
   <% payment_method.available_payment_methods.each do |method| %>
-    <div class="radio list-group-item clearfix">
+    <% prefix = "payment_source[#{payment_method.id}]" %>
+    <div class="radio list-group-item">
 
-      <label class="pull-left">
-        <%= radio_button("payment_source[#{payment_method.id}]", :payment_method_name, method.id) %>
+      <label>
+        <%= radio_button(prefix, :payment_method_name, method.id, class: 'js-mollie-payment-method') %>
         <%= image_tag(method.image['normal']) %>
         <%= method.description %>
       </label>
+
+      <%= select_tag "#{prefix}[issuer]", options_for_select(method.issuers.collect {|p| [p['name'], p['id']]}), {class: 'form-control js-mollie-issuers mollie-issuer-list', disabled: true, prompt: 'Select an issuer', data: {method: method.id}} if method.issuers.present? %>
     </div>
   <% end %>
 </ul>
+
+<script type="text/javascript" charset="utf-8">
+    /**
+     * Make sure the issuer select boxes are disabled by default to prevent empty issuer submissions.
+     */
+    var paymentMethodRadioElements = document.querySelectorAll('.js-mollie-payment-method');
+
+    function disableAllIssuerSelectBoxes() {
+        var issuerSelectElements = document.querySelectorAll('.js-mollie-issuers');
+        for (var i = 0; i < issuerSelectElements.length; i++) {
+            issuerSelectElements[i].setAttribute('disabled', 'true');
+        }
+    }
+
+    for (var i = 0; i < paymentMethodRadioElements.length; i++) {
+        paymentMethodRadioElements[i].addEventListener('change', function (e) {
+            disableAllIssuerSelectBoxes();
+            var issuerSelect = document.querySelector('[data-method="' + e.target.value + '"]');
+            if (issuerSelect) {
+                issuerSelect.removeAttribute('disabled');
+            }
+        });
+    }
+</script>
+
+<style type="text/css">
+  .mollie-issuer-list {
+    margin-top: 15px;
+  }
+
+  .mollie-issuer-list[disabled] {
+    display: none;
+  }
+</style>

data/app/views/spree/shared/_payment.html.erb

@@ -11,7 +11,7 @@
   </span>
   <br />
   <span class="full-name"><%= source.name %></span>
-<% elsif source.is_a?(Spree::MollieTransaction) %>
+<% elsif source.is_a?(Spree::MolliePaymentSource) %>
   <span class="full-name"><%= source.name %></span>
 <% else %>
   <%= content_tag(:span, payment.payment_method.name) %>

data/config/routes.rb

@@ -1,6 +1,16 @@
-Spree::Core::Engine.add_routes do
+Spree::Core::Engine.routes.draw do
   resource :mollie, only: [], controller: :mollie do
     post 'update_payment_status/:order_number', action: :update_payment_status, as: 'mollie_update_payment_status'
     get 'validate_payment/:order_number', action: :validate_payment, as: 'mollie_validate_payment'
   end
+
+  namespace :api do
+    namespace :v1 do
+      resources :mollie, only: [] do
+        collection do
+          get :methods
+        end
+      end
+    end
+  end
 end

data/db/migrate/{20180214133044_create_spree_mollie_transactions.rb → 20180214133044_create_spree_mollie_payment_sources.rb}

@@ -1,6 +1,6 @@
-class CreateSpreeMollieTransactions < ActiveRecord::Migration[5.1]
+class CreateSpreeMolliePaymentSources < ActiveRecord::Migration[5.1]
   def change
-    create_table :spree_mollie_transactions do |t|
+    create_table :spree_mollie_payment_sources do |t|
       t.string :payment_id
       t.string :payment_method_name
       t.string :issuer

data/db/migrate/20180301084841_add_mollie_customer_id_to_spree_user.rb

@@ -1,5 +1,6 @@
 class AddMollieCustomerIdToSpreeUser < ActiveRecord::Migration[5.1]
   def change
-    add_column :spree_users, :mollie_customer_id, :string
+    return unless Spree::Gateway::MollieGateway.allow_one_click_payments?
+    add_column Spree.user_class.table_name, :mollie_customer_id, :string
   end
 end

data/docs/api/methods.md

@@ -0,0 +1,61 @@
+# Get Mollie payment methods
+
+Returns a list of Mollie payment methods (and its issuers) which are enabled for your website profile.
+
+## Parameters
+This endpoint behaves just like very other Spree API endpoint. If your endpoints require authentication, make sure you sent the `X-Spree-Token` header.
+
+## Example request
+
+```bash
+curl "http://localhost:3000/api/v1/mollie/methods" \
+     -H 'Content-Type: application/json; charset=utf-8'
+```
+
+## Example response
+
+```bash
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=utf-8
+
+[
+  {
+    "attributes": {
+      "resource": "method",
+      "id": "ideal",
+      "description": "iDEAL",
+      "amount": {
+        "minimum": "0.01",
+        "maximum": "50000.00"
+      },
+      "image": {
+        "normal": "https://www.mollie.com/images/payscreen/methods/ideal.png",
+        "bigger": "https://www.mollie.com/images/payscreen/methods/ideal%402x.png"
+      },
+      "issuers": [
+        {
+          "resource": "issuer",
+          "id": "ideal_TESTNL99",
+          "name": "TBM Bank",
+          "method": "ideal",
+          "image": {
+            "normal": "https://www.mollie.com/images/checkout/v2/ideal-issuer-icons/TESTNL99.png",
+            "bigger": "https://www.mollie.com/images/checkout/v2/ideal-issuer-icons/TESTNL99%402x.png"
+          }
+        }
+      ]
+    },
+    "id": "ideal",
+    "description": "iDEAL",
+    "amount": {
+      "minimum": "0.01",
+      "maximum": "50000.00"
+    },
+    "image": {
+      "normal": "https://www.mollie.com/images/payscreen/methods/ideal.png",
+      "bigger": "https://www.mollie.com/images/payscreen/methods/ideal%402x.png"
+    }
+  }
+]
+
+```

data/docs/api/readme.md

@@ -0,0 +1,7 @@
+# Spree API integration
+
+This gateway seamlessly integrates with the <a href="https://guides.spreecommerce.org/api/">Spree API</a>.
+
+## Endpoints
+
+- <a href="methods.md">Get Mollie payment methods</a>

data/docs/debugging.md

@@ -0,0 +1,26 @@
+# Debugging
+
+The Mollie gateway keeps track of all events which are related to payment details and payment state updates. It uses a separate log, which is located in `log/mollie.log`.
+
+## Example
+
+```
+❯ tail -fn20 log/mollie.log
+D, [2018-03-17T16:48:43.881508 #45974] DEBUG -- : About to create payment for order R066092806-P9ND5B3J
+D, [2018-03-17T16:48:44.081895 #45974] DEBUG -- : Payment tr_12345678 created for order R066092806-P9ND5B3J
+D, [2018-03-17T16:48:44.104215 #45974] DEBUG -- : For order R066092806 redirect user to payment URL: https://www.mollie.com/paymentscreen/issuer/select/ideal
+D, [2018-03-17T16:48:49.488303 #45974] DEBUG -- : Webhook called for payment tr_12345678
+D, [2018-03-17T16:48:49.697996 #45974] DEBUG -- : Updating order state for payment. Payment has state paid
+D, [2018-03-17T16:48:49.788303 #45974] DEBUG -- : Redirect URL visited for order R066092806-P9ND5B3J
+D, [2018-03-17T16:48:50.927236 #45974] DEBUG -- : Created a Mollie Customer for Spree user with ID cst_234890239
+D, [2018-03-17T16:55:13.466887 #45974] DEBUG -- : About to create payment for order R287180370-PAP5KQV3
+D, [2018-03-17T16:55:13.572465 #45974] DEBUG -- : Payment tr_12345678 created for order R287180370-PAP5KQV3
+D, [2018-03-17T16:55:26.796272 #45974] DEBUG -- : Webhook called for payment tr_12345678
+D, [2018-03-17T16:55:28.298622 #45974] DEBUG -- : Updating order state for payment. Payment has state paid
+D, [2018-03-17T16:55:28.384232 #45974] DEBUG -- : Redirect URL visited for order R287180370-PAP5KQV3
+D, [2018-03-17T17:11:06.855310 #45974] DEBUG -- : Webhook called for payment tr_12345678
+D, [2018-03-17T17:11:09.569485 #45974] DEBUG -- : Updating order state for payment. Payment has state expired
+D, [2018-03-18T13:58:14.360501 #54712] DEBUG -- : Starting refund for order R287180370
+D, [2018-03-18T13:58:18.992075 #54712] DEBUG -- : Successfully refunded 0.01 for order R287180370
+D, [2018-03-18T14:12:10.495217 #54712] DEBUG -- : Could not create payment for order R541579556-PEKXA7RN: Unauthorized request
+```

data/lib/spree_mollie_gateway/engine.rb

@@ -1,18 +1,28 @@
-require 'mollie-api-ruby'
-
 module SpreeMollieGateway
   class Engine < ::Rails::Engine
+    require 'spree/core'
+    require 'mollie-api-ruby'
+
     isolate_namespace SpreeMollieGateway
 
     config.autoload_paths += %W(#{config.root}/lib)
 
+    # Use rspec for tests
+    config.generators do |g|
+      g.test_framework :rspec
+    end
+
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
 
-      Rails.application.config.spree.payment_methods << Spree::Gateway::MollieGateway
+      ::Rails.application.config.spree.payment_methods << Spree::Gateway::MollieGateway
       Spree::PermittedAttributes.source_attributes << :payment_method_name
+      Spree::PermittedAttributes.source_attributes << :issuer
+      Spree::Api::ApiHelpers.payment_source_attributes << :payment_method_name
+      Spree::Api::ApiHelpers.payment_source_attributes << :issuer
+      Spree::Api::ApiHelpers.payment_source_attributes << :payment_url
     end
 
     config.to_prepare &method(:activate).to_proc

data/lib/spree_mollie_gateway/factories.rb

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
+  #
+  # Example adding this to your spec_helper will load these Factories for use:
+  # require 'spree_mollie_gateway/factories'
+
+  Dir[Dir.pwd + '/spec/factories/**/*'].each do |factory|
+    require File.expand_path(factory)
+  end
+end

data/lib/spree_mollie_gateway/version.rb

@@ -1,3 +1,3 @@
 module SpreeMollieGateway
-  VERSION = '0.1.1'
+  VERSION = '1.0.0-beta3'
 end

data/spree_mollie_gateway.gemspec

@@ -1,17 +1,16 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "spree_mollie_gateway/version"
+require 'spree_mollie_gateway/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "spree_mollie_gateway"
+  spec.name          = 'spree_mollie_gateway'
   spec.version       = SpreeMollieGateway::VERSION
-  spec.authors       = ["Vernon de Goede"]
-  spec.email         = ["vernon@mollie.com"]
+  spec.authors       = ['Vernon de Goede']
+  spec.email         = ['vernon@mollie.com']
 
   spec.summary       = %q{Mollie payments for Spree Commerce.}
   spec.description   = %q{Mollie payment gateway for Spree Commerce.}
-  spec.homepage      = "https://www.mollie.com"
+  spec.homepage      = 'https://www.mollie.com'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -25,13 +24,29 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+
+  spree_version = '>= 3.1.0', '< 4.0'
+  spec.add_dependency 'spree_core', spree_version
+  spec.add_dependency 'spree_backend', spree_version
+  spec.add_dependency 'spree_frontend', spree_version
+  spec.add_dependency 'spree_extension'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'factory_bot'
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-rails', '~> 3.7.2'
+  spec.add_development_dependency 'ffaker'
+  spec.add_development_dependency 'sass-rails'
+  spec.add_development_dependency 'selenium-webdriver'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'mysql2'
+  spec.add_development_dependency 'coffee-rails'
+  spec.add_development_dependency 'database_cleaner'
 
   spec.add_runtime_dependency 'mollie-api-ruby', '~> 3.1', '>= 3.1.3'
 end

metadata

@@ -1,15 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: spree_mollie_gateway
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0.pre.beta3
 platform: ruby
 authors:
 - Vernon de Goede
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: spree_core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: spree_backend
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: spree_frontend
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: spree_extension
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +140,132 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.2
+- !ruby/object:Gem::Dependency
+  name: ffaker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mollie-api-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -82,16 +296,21 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- app/controllers/spree/api/v1/mollie_controller.rb
 - app/controllers/spree/checkout_controller_decorator.rb
 - app/controllers/spree/mollie_controller.rb
-- app/models/mollie/provider.rb
+- app/models/mollie/client_decorator.rb
 - app/models/spree/gateway/mollie_gateway.rb
-- app/models/spree/mollie_transaction.rb
+- app/models/spree/mollie_logger.rb
+- app/models/spree/mollie_payment_source.rb
+- app/models/spree/order_decorator.rb
 - app/models/spree/payment/processing_decorator.rb
+- app/models/spree/payment_decorator.rb
 - app/models/spree/user_decorator.rb
 - app/views/spree/admin/payments/source_forms/_molliegateway.html.erb
 - app/views/spree/admin/payments/source_views/_molliegateway.html.erb
@@ -100,11 +319,15 @@ files:
 - bin/console
 - bin/setup
 - config/routes.rb
-- db/migrate/20180214133044_create_spree_mollie_transactions.rb
+- db/migrate/20180214133044_create_spree_mollie_payment_sources.rb
 - db/migrate/20180301084841_add_mollie_customer_id_to_spree_user.rb
+- docs/api/methods.md
+- docs/api/readme.md
+- docs/debugging.md
 - lib/generators/spree_mollie_gateway/install/install_generator.rb
 - lib/spree_mollie_gateway.rb
 - lib/spree_mollie_gateway/engine.rb
+- lib/spree_mollie_gateway/factories.rb
 - lib/spree_mollie_gateway/version.rb
 - spree_mollie_gateway.gemspec
 homepage: https://www.mollie.com
@@ -122,12 +345,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Mollie payments for Spree Commerce.