spree_mollie_gateway 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 785a4f3e96e91da89386b6e7f12d9916303c00dcfb4acc8e0e6cdefefc184274
-  data.tar.gz: 9cb65667775353fb1ab80197c1163f7a9c7ed6611602ec42d8ec51c043cb894e
+  metadata.gz: 4e2cca6790b23f484d63d21c1a4fd7b2bf0395669451747997ea74defc395bb1
+  data.tar.gz: b72b07e1cd8f1031778836a93921bd7051b3a8342cff0fad5391b3251421f85b
 SHA512:
-  metadata.gz: bed74ed98aab91919c41988214901c60b87c990c1a099d9ba5e7df47cfc7204f5567de1ecf0c6630681a13065f9b4915f22eece38e8122d364748a3c0ca9094c
-  data.tar.gz: e5ec9096cb268de67b1b61f90e1b6ba9ac56b721a84ce478955c878b819571dfd77a7afebe45a34640807076468740d7cefd5a0cd86a644f949d31608ef9f621
+  metadata.gz: 496d9da85c83ccaae696231b382595e9967a8ee78c9e5a2e5fc6181aec5d5ff789e636123265e80f2d5bf3d6758d4e3c7d15d2004aab2df6c80811740cae2a47
+  data.tar.gz: c46c73fccbd1f90d853bb7ddcdcc6637911e52bd99338d7376cfad33397df95c47bd6fa0b30096130e706400360b4ca379df240d53eae60a591f5f804c794ecf

data/README.md

@@ -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
@@ -105,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/models/spree/order_decorator.rb

@@ -27,7 +27,7 @@ Spree::Order.class_eval do
   end
 
   def is_paid_with_mollie?
-    payments.collect(&:payment_method).any? {|pm| pm.type == 'Spree::Gateway::MollieGateway'}
+    payments.any? && payments.last&.payment_method&.type == 'Spree::Gateway::MollieGateway'
   end
 
   def send_confirmation_email!

data/app/views/spree/admin/orders/index.html.erb

@@ -50,21 +50,21 @@
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_state_eq, Spree.t(:status) %>
-            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]}, { include_blank: true }, class: 'select2 js-filterable' %>
+            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.map { |s| [Spree.t("order_state.#{s.name}"), s.value] }, {include_blank: true}, class: 'select2 js-filterable' %>
           </div>
         </div>
 
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
-            <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2 js-filterable' %>
+            <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map { |s| [Spree.t("payment_states.#{s}"), s] }, {include_blank: true}, class: 'select2 js-filterable' %>
           </div>
         </div>
 
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
-            <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2 js-filterable' %>
+            <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map { |s| [Spree.t("shipment_states.#{s}"), s] }, {include_blank: true}, class: 'select2 js-filterable' %>
           </div>
         </div>
 
@@ -107,14 +107,14 @@
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
-            <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2' %>
+            <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), {include_blank: true}, class: 'select2' %>
           </div>
         </div>
 
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_store_id_in, Spree.t(:store) %>
-            <%= f.select :store_id_in, Spree::Store.order("#{Spree::Store.table_name}.name").pluck(:name, :id), { include_blank: true }, class: 'select2' %>
+            <%= f.select :store_id_in, Spree::Store.order("#{Spree::Store.table_name}.name").pluck(:name, :id), {include_blank: true}, class: 'select2' %>
           </div>
         </div>
 
@@ -159,19 +159,19 @@
     <thead>
     <tr data-hook="admin_orders_index_headers">
       <% if @show_only_completed %>
-        <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :completed_at, I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order') %></th>
       <% else %>
-        <th><%= sort_link @search, :created_at,     I18n.t(:created_at, scope: 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :created_at, I18n.t(:created_at, scope: 'activerecord.attributes.spree/order') %></th>
       <% end %>
-      <th><%= sort_link @search, :number,           I18n.t(:number, scope: 'activerecord.attributes.spree/order') %></th>
+      <th><%= sort_link @search, :number, I18n.t(:number, scope: 'activerecord.attributes.spree/order') %></th>
       <th><%= sort_link @search, :considered_risky, I18n.t(:considered_risky, scope: 'activerecord.attributes.spree/order') %></th>
-      <th><%= sort_link @search, :state,            I18n.t(:state, scope: 'activerecord.attributes.spree/order') %></th>
-      <th><%= sort_link @search, :payment_state,    I18n.t(:payment_state, scope: 'activerecord.attributes.spree/order') %></th>
+      <th><%= sort_link @search, :state, I18n.t(:state, scope: 'activerecord.attributes.spree/order') %></th>
+      <th><%= sort_link @search, :payment_state, I18n.t(:payment_state, scope: 'activerecord.attributes.spree/order') %></th>
       <% if Spree::Order.checkout_step_names.include?(:delivery) %>
         <th><%= sort_link @search, :shipment_state, I18n.t(:shipment_state, scope: 'activerecord.attributes.spree/order') %></th>
       <% end %>
-      <th><%= sort_link @search, :email,            I18n.t(:email, scope: 'activerecord.attributes.spree/order') %></th>
-      <th><%= sort_link @search, :total,            I18n.t(:total, scope: 'activerecord.attributes.spree/order') %></th>
+      <th><%= sort_link @search, :email, I18n.t(:email, scope: 'activerecord.attributes.spree/order') %></th>
+      <th><%= sort_link @search, :total, I18n.t(:total, scope: 'activerecord.attributes.spree/order') %></th>
       <th data-hook="admin_orders_index_header_actions" class="actions"></th>
     </tr>
     </thead>
@@ -192,12 +192,17 @@
           <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_state_eq" data-ransack-value="<%= order.state %>"></span>
         </td>
         <td>
-          <% if order.payments.count > 0 && order.payments.last.source.present? %>
-            <% if order.payments.last.after_pay_method? && order.payments.last.authorized? %>
-              <span class="label label-authorized"><%= link_to 'authorized', admin_order_payments_path(order) %></span>
-            <% else %>
-              <span class="label label-<%= order.payments.last.source.status %>"><%= link_to order.payments.last.source.status, admin_order_payments_path(order) %></span>
+          <% if order.is_paid_with_mollie? %>
+            <% if order.payments.count > 0 && order.payments.last.source.present? %>
+              <% if order.payments.last.after_pay_method? && order.payments.last.authorized? %>
+                <span class="label label-authorized"><%= link_to 'authorized', admin_order_payments_path(order) %></span>
+              <% else %>
+                <span class="label label-<%= order.payments.last.source.status %>"><%= link_to order.payments.last.source.status, admin_order_payments_path(order) %></span>
+              <% end %>
             <% end %>
+          <% else %>
+            <span class="label label-<%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></span>
+            <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_payment_state_eq" data-ransack-value="<%= order.payment_state %>"></span>
           <% end %>
         </td>
         <% if Spree::Order.checkout_step_names.include?(:delivery) %>

data/lib/spree_mollie_gateway/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_mollie_gateway
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Vernon de Goede
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-07 00:00:00.000000000 Z
+date: 2019-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_backend
@@ -399,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Mollie payments for Spree Commerce.