spree_mollie_gateway 3.0.4 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c069e4bd370bef6757ea00e6831b4a1505501547407f0ecb9367952ea9b8095
-  data.tar.gz: 1694c20563b96d5825ed22e1e54f6528a8572fce50ed53eb1ab8b8f86ca7c9b4
+  metadata.gz: 0d99dc1316999eb3638366a484c34ac0a957c2c60cc0e5a83c458529d6c5e047
+  data.tar.gz: 250ebd469c3ad54569871f72ae750be6c0eefaa531b586d80b42c15758bb68eb
 SHA512:
-  metadata.gz: 4e14424f2951612a4397f81d8ad029741b4923eee1295e50c4d169cb71cdf5cc43442609eea6680bc4a6c5dab724c672a97ce3530f170b71a71e624fbc00cb6c
-  data.tar.gz: 277ef361f5467f758e8585ea1f8ebf79d07200c6eec038986bd22db14a9279db4697a6ccb3106a91677dc371ca7f8886b4cbbf86a567de1b60ad786d64441804
+  metadata.gz: 65a3d37600816a59d2d5f6e01843fb637ce8fefe015773108c754fc7f6d8d5091207105859843249588bf70a6e5c30749fafc6af8caf9ee5a44c8ef333f3ff14
+  data.tar.gz: 1a6de43b2782619dacb83a8f5d5e071b377a6126523c9c631202bef29a0ca130fb3b03d3b3d9460aba5f8d52b8040153433bbd170bc47190d8eaf1792c4638fe

data/.gitignore

@@ -14,3 +14,5 @@ Gemfile.lock
 *.gem
 spec/dummy
 .bundle/
+
+gemfiles/*.lock

data/.travis.yml

@@ -1,10 +1,22 @@
 sudo: false
 dist: trusty
-
 language: ruby
+cache: bundler
 
 rvm:
-  - 2.5.0
+  - 2.5.1
+  - 2.6.5
+
+gemfile:
+  - gemfiles/spree_3_5.gemfile
+  - gemfiles/spree_3_6.gemfile
+  - gemfiles/spree_3_7.gemfile
+  - gemfiles/spree_4_0.gemfile
+
+# Use legacy bundler (1.x) when using Ruby 2.3.x
+before_install:
+  - if [ "USE_LEGACY_BUNDLER" != "false" ]; then gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true; fi
+  - if [ "USE_LEGACY_BUNDLER" != "false" ]; then gem install bundler -v '< 2'; fi
 
 script:
   - bundle exec rake test_app
@@ -16,6 +28,8 @@ deploy:
   on:
     tags: true
     repo: mollie/spree-mollie-gateway
+    rvm: 2.5.1
+    gemfile: gemfiles/spree_3_6.gemfile
   api_key:
     secure: N3+LevY4HZd57cmwfIy6a+E/wX/jCD9Pnqq41/kr6I6iLIMz5xWoU0iDEZEXGhTWmId5O0zxTl2o3w4PiVkH4Onmufv3oLOONexrJeIF5cx/TdWpY36RycA2euVvOGVYMNWGIhslCern4zc8pOTwGpmm8DD8qPTQAV1JPXzbPEiXkxJX0KYm1Vb6v4GTW0q2ghvqY3fzgNaJKVQoEXVrOaXMd/dJDQRjBzbzfF8V2Z779kfOfV5PV/jqheq4bXQYMDBKQUHuTvRMNx0tF4mGgHANp1AXMS4GVbYNyAQNmyd3QnkJHSdKthTTe6nwQoH7oloY4Dbd89fG7Yx7I/kt2Aip3pHMts+4/oVN6QPqe0xe11TeC6yRhi/357I+DCzIk1aRGJ9lkpGQnM+oB54N0yw+htvsd7WE2ac57ixVG0ni39IQciQJ4p3aJzho8z3ui3CNj0p3Y4B4moEIJ3JV3Gg+TEXbzViu9G8j7YIlqw0OpGaaczavfuRSTYkE0QKA4BSqGOG+qsY8ArdvW3KgVohSxHzFR6ubhgT81JvzF6hpS7h7PalOUKA5cr7ha/dB0qL1PYNU6xHQFWiM/ILW5eF6ttQDgzA294U8FoRykG6T9swdVZA5Vd6DZafcu6ofqgyRFGQXzlhq/Hdkocb2W60l5BR4BSq4uoIvmMHXd+8=
 

data/Appraisals

@@ -1,11 +1,19 @@
-appraise 'spree-3-2' do
-  gem 'spree', '~> 3.2.0'
-end
-
 appraise 'spree-3-5' do
+  ENV['USE_LEGACY_BUNDLER'] = 'true'
+
   gem 'spree', '~> 3.5.0'
 end
 
 appraise 'spree-3-6' do
-  gem 'spree', '~> 3.6.1'
+  gem 'spree', '~> 3.6.5'
 end
+
+appraise 'spree-3-7' do
+  gem 'spree', '~> 3.7.2'
+end
+
+appraise 'spree-4-0' do
+  gem 'spree', '~> 4.0.3'
+  gem 'spree_api', '~> 4.0.3'
+  gem 'rails', '~> 6.0.0'
+end

data/CONTRIBUTING.md

@@ -1,7 +1,5 @@
 # Contributing
 
-In the spirit of [free software][1], **everyone** is encouraged to help improve this project.
-
 Here are some ways *you* can contribute:
 
 * by using prerelease versions
@@ -25,4 +23,4 @@ Starting point:
 * Submit your pull request
 
 [1]: http://www.fsf.org/licensing/essays/free-sw.html
-[2]: https://github.com/mollie/spree-mollie-gateway/issues
+[2]: https://github.com/mollie/spree-mollie-gateway/issues

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-gem 'mollie-api-ruby', '~> 4.1.3'
+gem 'mollie-api-ruby', '~> 4.2.0'
 
 # Specify your gem's dependencies in spree_mollie_gateway.gemspec
 gemspec

data/README.md

@@ -37,7 +37,7 @@ Please go to the [signup page](https://www.mollie.com/signup) to create a new Mo
 * Allow returning customers to <a href="https://www.mollie.com/en/features/checkout" title="One-click payments">use their previous payment details</a> and pay instantly.
 
 ## Requirements
-- Spree 3.3.x or newer.  
+- Spree 3.5 or newer.  
 
 ## Installation
 
@@ -84,7 +84,7 @@ If you wish to learn more about our API, please visit the [Mollie API Documentat
 Want to help us make our API client even better? We take [pull requests](https://github.com/mollie/mollie-api-ruby/pulls?utf8=%E2%9C%93&q=is%3Apr), sure. But how would you like to contribute to a technology oriented organization? Mollie is hiring developers and system engineers. [Check out our vacancies](https://jobs.mollie.com/) or [get in touch](mailto:recruitment@mollie.com).
 
 ## License
-[BSD (Berkeley Software Distribution) License](https://opensource.org/licenses/bsd-license.php). Copyright (c) 2014-2018, Mollie B.V.
+[BSD (Berkeley Software Distribution) License](https://opensource.org/licenses/bsd-license.php). Copyright (c) 2014-2019, Mollie B.V.
 
 ## Support
 Contact: [www.mollie.com](https://www.mollie.com) — info@mollie.com — +31 20-612 88 55
@@ -97,7 +97,6 @@ Contact: [www.mollie.com](https://www.mollie.com) — info@mollie.com — +31 20
 + [More information about SOFORT Banking via Mollie](https://www.mollie.com/en/payments/sofort/)
 + [More information about SEPA Bank transfer via Mollie](https://www.mollie.com/en/payments/bank-transfer/)
 + [More information about SEPA Direct debit via Mollie](https://www.mollie.com/en/payments/direct-debit/)
-+ [More information about Bitcoin via Mollie](https://www.mollie.com/en/payments/bitcoin/)
 + [More information about PayPal via Mollie](https://www.mollie.com/en/payments/paypal/)
 + [More information about KBC/CBC Payment Button via Mollie](https://www.mollie.com/en/payments/kbc-cbc/)
 + [More information about Belfius Direct Net via Mollie](https://www.mollie.com/en/payments/belfius)
@@ -106,3 +105,5 @@ Contact: [www.mollie.com](https://www.mollie.com) — info@mollie.com — +31 20
 + [More information about Gift cards via Mollie](https://www.mollie.com/en/payments/gift-cards)
 + [More information about EPS via Mollie](https://www.mollie.com/en/payments/eps)
 + [More information about Giropay via Mollie](https://www.mollie.com/en/payments/giropay)
++ [More information about Apple Pay via Mollie](https://www.mollie.com/en/payments/apple-pay)
++ [More information about Przelewy24 via Mollie](https://www.mollie.com/en/payments/przelewy24)

data/app/controllers/spree/api/v1/shipments_controller_decorator.rb

@@ -1,4 +1,4 @@
-Spree::Api::V1::ShipmentsController.class_eval do
+module Spree::Api::V1::ShipmentsControllerDecorator
   def ship
     unless @shipment.tracking.present?
       # We should enforce entering tracking details, otherwise shipments cannot
@@ -10,3 +10,5 @@ Spree::Api::V1::ShipmentsController.class_eval do
     respond_with(@shipment, default_template: :show)
   end
 end
+
+Spree::Api::V1::ShipmentsController.prepend(Spree::Api::V1::ShipmentsControllerDecorator)

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -20,11 +20,7 @@ module Spree
     end
   end
 
-  CheckoutController.class_eval do
-    prepend CheckoutWithMollie
-
-    private
-
+  module CheckoutControllerDecorator
     def payment_method_id_param
       params[:order][:payments_attributes].first[:payment_method_id]
     end
@@ -38,4 +34,8 @@ module Spree
       (params[:state] === 'payment') && params[:order][:payments_attributes]
     end
   end
+
+  CheckoutController.prepend(CheckoutWithMollie)
+  CheckoutController.prepend(CheckoutControllerDecorator)
+
 end

data/app/models/mollie/client_decorator.rb

@@ -1,4 +1,4 @@
-Mollie::Client.class_eval do
+module Mollie::ClientDecorator
   attr_accessor :version_strings
 
   def initialize(api_key = nil)
@@ -11,3 +11,5 @@ Mollie::Client.class_eval do
     add_version_string OpenSSL::OPENSSL_VERSION.split(' ').slice(0, 2).join '/'
   end
 end
+
+Mollie::Client.prepend(Mollie::ClientDecorator)

data/app/models/spree/address_decorator.rb

@@ -1,4 +1,4 @@
-Spree::Address.class_eval do
+module Spree::AddressDecorator
   def active_merchant_hash
     {
       name: full_name,
@@ -14,3 +14,5 @@ Spree::Address.class_eval do
     }
   end
 end
+
+Spree::Address.prepend(Spree::AddressDecorator)

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

@@ -87,8 +87,40 @@ module Spree
     end
 
     # Create a new Mollie refund
-    def credit(_credit_cents, _payment_id, _options)
-      ActiveMerchant::Billing::Response.new(false, 'Refunding Mollie orders is not yet supported in Spree. Please refund your order via Mollie Dashboard')
+    def credit(credit_cents, payment_id, options)
+      order = options[:originator].try(:payment).try(:order)
+      payment = options[:originator].try(:payment)
+      reimbursement = options[:originator].try(:reimbursement)
+      order_number = order.try(:number)
+      order_currency = order.try(:currency)
+      MollieLogger.debug("Starting refund for order #{order_number}")
+
+      begin
+        if reimbursement
+          mollie_order = ::Mollie::Order.get(payment.source.payment_id, {api_key: get_preference(:api_key)})
+          mollie_order_refund_lines = reimbursement.return_items.map do |ri|
+            line = mollie_order.lines.detect {|line| line.sku == ri.inventory_unit.line_item.mollie_identifier}
+            {id: line.id, quantity: ri.inventory_unit.line_item.quantity} if line
+          end.compact
+          mollie_order.refund!({lines: mollie_order_refund_lines, api_key: get_preference(:api_key)})
+        else
+          ::Mollie::Payment::Refund.create(
+              payment_id: payment_id,
+              amount: {
+                  value: format_money(::Spree::Money.new(credit_cents / 100.0).money),
+                  currency: order_currency
+              },
+              description: "Refund Spree Order ID: #{order_number}",
+              api_key: get_preference(:api_key)
+          )
+        end
+
+        MollieLogger.debug("Successfully refunded #{order.display_total} for order #{order_number}")
+        ActiveMerchant::Billing::Response.new(true, 'Refund successful')
+      rescue ::Mollie::Exception => e
+        MollieLogger.debug("Refund failed for order #{order_number}: #{e.message}")
+        ActiveMerchant::Billing::Response.new(false, 'Refund unsuccessful')
+      end
     end
 
     def authorize(*_args)

data/app/models/spree/line_item_decorator.rb

@@ -1,12 +1,17 @@
-Spree::LineItem.class_eval do
+module Spree::LineItemDecorator
+  extend Spree::DisplayMoney
   money_methods :discount_amount, :vat_amount
 
   def discount_amount
-    adjustments.non_tax.sum(:amount).abs
+    adjustments.eligible.non_tax.sum(:amount).abs
   end
 
   def vat_amount
-    adjustments.tax.sum(:amount).abs
+    adjustments.eligible.tax.sum(:amount).abs
+  end
+
+  def mollie_identifier
+    "#{id}-#{variant.sku}"
   end
 
   def vat_rate
@@ -23,3 +28,5 @@ Spree::LineItem.class_eval do
     end
   end
 end
+
+Spree::LineItem.prepend(Spree::LineItemDecorator)

data/app/models/spree/mollie/order_serializer.rb

@@ -97,7 +97,7 @@ module Spree
 
       def serialize_address(address)
         {
-          streetAndNumber: address[:address1],
+          streetAndNumber: [address[:address1], address[:address2]].join(" "),
           city: address[:city],
           postalCode: address[:zip],
           country: address[:country],
@@ -193,7 +193,7 @@ module Spree
             value: format_money(line.display_vat_amount.money)
           },
           vatRate: line.vat_rate * 100,
-          sku: "#{line.id}-#{line.variant.sku}"
+          sku: line.mollie_identifier
         }
       end
     end

data/app/models/spree/mollie/payment_state_updater.rb

@@ -28,8 +28,12 @@ module Spree
           @spree_payment.source.update(status: @spree_payment.state)
         else
           MollieLogger.debug("Unhandled Mollie payment state received: #{@mollie_order.status}. Therefore we did not update the payment state.")
-          @spree_payment.order.update_attributes(state: 'payment', completed_at: nil)
+          unless @spree_payment.order.paid_or_authorized?
+            @spree_payment.order.update_attributes(state: 'payment', completed_at: nil)
+          end
         end
+
+        @spree_payment.order.update_with_updater!
       end
 
       private
@@ -48,7 +52,7 @@ module Spree
 
       def transition_to_failed!
         @spree_payment.failure! unless @spree_payment.failed?
-        @spree_payment.order.update_attributes(state: 'payment', completed_at: nil)
+        @spree_payment.order.update(state: 'payment', completed_at: nil) unless @spree_payment.order.paid_or_authorized?
         MollieLogger.debug("Mollie order is #{@mollie_order.status} and will be marked as failed")
       end
 

data/app/models/spree/mollie_payment_source.rb

@@ -27,8 +27,6 @@ module Spree
         'SOFORT Banking'
       when ::Mollie::Method::BANKTRANSFER then
         'Bank transfer'
-      when ::Mollie::Method::BITCOIN then
-        'Bitcoin'
       when ::Mollie::Method::PAYPAL then
         'PayPal'
       when ::Mollie::Method::KBC then
@@ -51,8 +49,15 @@ module Spree
         'Klarna Slice it'
       when ::Mollie::Method::KLARNAPAYLATER then
         'Klarna Pay Later'
+      when ::Mollie::Method::PRZELEWY24 then
+        'Przelewy24'
+      when ::Mollie::Method::APPLEPAY then
+        'Apple Pay'
+      # As of May 1st 2019, Bitcoin is no longer supported.
+      when 'bitcoin' then
+        'Bitcoin'
       else
-        'Mollie'
+        'Mollie (Unknown method)'
       end
     end
 

data/app/models/spree/order_decorator.rb

@@ -1,4 +1,5 @@
-Spree::Order.class_eval do
+module Spree::OrderDecorator
+  extend Spree::DisplayMoney
   money_methods :order_adjustment_total, :shipping_discount
 
   # Make sure the order confirmation is delivered when the order has been paid for.
@@ -26,10 +27,26 @@ Spree::Order.class_eval do
     consider_risk
   end
 
+  def is_paid_with_mollie?
+    payments.any? && payments.last&.payment_method&.type == 'Spree::Gateway::MollieGateway'
+  end
+
+  def send_confirmation_email!
+    if !confirmation_delivered? && (paid? || authorized?)
+      deliver_order_confirmation_email
+    end
+  end
+
   def mollie_order
     Spree::Mollie::Order.new(self)
   end
 
+  def successful_payment
+    paid? || payments.any? {|p| p.after_pay_method? && p.authorized?}
+  end
+
+  alias paid_or_authorized? successful_payment
+
   def authorized?
     payments.last.authorized?
   end
@@ -42,3 +59,5 @@ Spree::Order.class_eval do
     order_adjustment_total.abs > 0
   end
 end
+
+Spree::Order.prepend(Spree::OrderDecorator)

data/app/models/spree/payment/gateway_options_decorator.rb

@@ -1,4 +1,4 @@
-Spree::Payment::GatewayOptions.class_eval do
+module Spree::Payment::GatewayOptionsDecorator
   def hash_methods
     %i[
       email
@@ -17,3 +17,5 @@ Spree::Payment::GatewayOptions.class_eval do
     ]
   end
 end
+
+Spree::Payment::GatewayOptions.prepend(Spree::Payment::GatewayOptionsDecorator)

data/app/models/spree/payment/processing_decorator.rb

@@ -1,9 +1,10 @@
-Spree::Payment::Processing.module_eval do
-  def process!(_amount = nil)
+module Spree::Payment::ProcessingDecorator
+  
+  def process!
     if payment_method.is_a? Spree::Gateway::MollieGateway
       process_with_mollie
     else
-      process_with_spree
+      super
     end
   end
 
@@ -11,30 +12,17 @@ Spree::Payment::Processing.module_eval do
     if payment_method.is_a? Spree::Gateway::MollieGateway
       cancel_with_mollie
     else
-      cancel_with_spree
+      super
     end
   end
 
   private
 
-  def cancel_with_spree
-    response = payment_method.cancel(response_code)
-    handle_response(response, :void, :failure)
-  end
-
   def cancel_with_mollie
     response = payment_method.cancel(transaction_id)
     handle_response(response, :void, :failure)
   end
 
-  def process_with_spree
-    if payment_method && payment_method.auto_capture?
-      purchase!
-    else
-      authorize!
-    end
-  end
-
   def process_with_mollie
     amount ||= money.money
     started_processing!
@@ -46,3 +34,5 @@ Spree::Payment::Processing.module_eval do
     handle_response(response, :started_processing, :failure)
   end
 end
+
+Spree::Payment.include(Spree::Payment::ProcessingDecorator)

data/app/models/spree/payment_decorator.rb

@@ -1,4 +1,4 @@
-Spree::Payment.class_eval do
+module Spree::PaymentDecorator
   def transaction_id
     if payment_method.is_a? Spree::Gateway::MollieGateway
       source.transaction_id
@@ -37,3 +37,5 @@ Spree::Payment.class_eval do
     end
   end
 end
+
+Spree::Payment.prepend(Spree::PaymentDecorator)