spree_mollie_gateway 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b16e49392bd3a160b2d95e61bea9144eb0a0dbe6ae90fd1c0538a5c0044fbb2a
-  data.tar.gz: 06a98f8d219b1ac08234e7a47f2b573fd6a36de87007014d6f597532e3aabfd5
+  metadata.gz: 785a4f3e96e91da89386b6e7f12d9916303c00dcfb4acc8e0e6cdefefc184274
+  data.tar.gz: 9cb65667775353fb1ab80197c1163f7a9c7ed6611602ec42d8ec51c043cb894e
 SHA512:
-  metadata.gz: b2966a823fec59efdaa8286329e4df43b25a414e51f7b8b38098b4402880c9fd77088056924e1f668e722f7f335ecf06abd32d9e38d8c6f2859a0c523df156fd
-  data.tar.gz: 1b946e26dc6053ac1a8a9662fbfe3cdcc16f189e90fa34f1fb0c7c124400ec7912e052dd8b3696d0d6760892a7867a01a14172d7697e8e1cb82879d169b527ad
+  metadata.gz: bed74ed98aab91919c41988214901c60b87c990c1a099d9ba5e7df47cfc7204f5567de1ecf0c6630681a13065f9b4915f22eece38e8122d364748a3c0ca9094c
+  data.tar.gz: e5ec9096cb268de67b1b61f90e1b6ba9ac56b721a84ce478955c878b819571dfd77a7afebe45a34640807076468740d7cefd5a0cd86a644f949d31608ef9f621

data/.gitignore

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

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

@@ -2,11 +2,15 @@ Spree::LineItem.class_eval do
   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

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

@@ -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_source.rb

@@ -49,6 +49,10 @@ 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'

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

@@ -9,7 +9,14 @@
         <%= 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? %>
+      <%= 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: t('mollie-gateway.issuers.select'),
+                         data: {method: method.id}
+                     } if method.issuers.present? %>
     </div>
   <% end %>
 </ul>

data/config/locales/de.yml

@@ -0,0 +1,4 @@
+de:
+  mollie-gateway:
+    issuers:
+      select: Wählen Sie einen Bearbeiter

data/config/locales/en.yml

@@ -0,0 +1,4 @@
+en:
+  mollie-gateway:
+    issuers:
+      select: Select an issuer

data/config/locales/es.yml

@@ -0,0 +1,4 @@
+es:
+  mollie-gateway:
+    issuers:
+      select: Seleccione un emisor

data/config/locales/fr.yml

@@ -0,0 +1,4 @@
+fr:
+  mollie-gateway:
+    issuers:
+      select: Sélectionner un émetteur

data/config/locales/it.yml

@@ -0,0 +1,4 @@
+it:
+  mollie-gateway:
+    issuers:
+      select: Seleziona una Banca

data/config/locales/nl.yml

@@ -0,0 +1,4 @@
+nl:
+  mollie-gateway:
+    issuers:
+      select: Selecteer uw bank

data/lib/spree_mollie_gateway/version.rb

@@ -1,3 +1,3 @@
 module SpreeMollieGateway
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_mollie_gateway
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Vernon de Goede
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_backend
@@ -356,6 +356,12 @@ files:
 - app/views/spree/shared/_payment.html.erb
 - bin/console
 - bin/setup
+- config/locales/de.yml
+- config/locales/en.yml
+- config/locales/es.yml
+- config/locales/fr.yml
+- config/locales/it.yml
+- config/locales/nl.yml
 - config/routes.rb
 - db/migrate/20180214133044_create_spree_mollie_payment_sources.rb
 - db/migrate/20180301084841_add_mollie_customer_id_to_spree_user.rb
@@ -393,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Mollie payments for Spree Commerce.