solidus_nexio 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61f3fcbac26957d33c4b2ee7180cd2281321eab0f24830fcfc8d6fb5efc60c6e
-  data.tar.gz: 10f8e6f1442cb03b3a3df79d6e19ac9ede054c802d8c7836371c6dc65966816a
+  metadata.gz: 2d42e6c9bd11c430df53a34790fb27135858dfe7778993d92ac498852c4c644c
+  data.tar.gz: 42f80e061a67fe362189b09574a088c00dca9a9c955d2b81d60185642a8604cb
 SHA512:
-  metadata.gz: 94b0ba895640b8d7d490968a5e8a40a172a178a091c22cb8c6bc9f295fe90c39541d717e9ba1eeb011bafac195b3926e47bda6ae2cb4f67f3852421e157110d4
-  data.tar.gz: b2aa9cea065f1f41cbc24672bf80af58b6f300e6b59bc33f1f489d3e8909693b444c48f17465ae3a82b029b8ab7b8793f6e09a280a2aed86d047a757d1dc67d8
+  metadata.gz: a5f82c368b378841a8e8e5fe9aa7471a53ad6d09d79ba34a6a76441fccfb0286ef3581b449da21db5bcb3756e54744c810706fa18e56774cf1ade446be4a6213
+  data.tar.gz: 3c9c578fc6846c9add3f4e8d68c063fa2fa57eec71a362f3d5c1e0d343572c9adb3b59d07a6d6c6d19972af09dd5a95b83484ef48872a57172df3306751846b7

data/app/models/solidus_nexio/payment_method.rb

@@ -18,6 +18,14 @@ module SolidusNexio
       gateway.generate_token(options)
     end
 
+    def purchase(money, payment, options = {})
+      super(money, payment, add_transaction_options(options))
+    end
+
+    def authorize(money, payment, options = {})
+      super(money, payment, add_transaction_options(options))
+    end
+
     def store(options)
       card_attrs = options[:card]
                    .slice(:encrypted_number, :number, :name, :month, :year)
@@ -37,5 +45,13 @@ module SolidusNexio
     def gateway_class
       ActiveMerchant::Billing::NexioGateway
     end
+
+    def add_transaction_options(options)
+      result = options.slice(:currency, :billing_address, :shipping_address)
+      if options[:originator].is_a?(::Spree::Payment) && options[:originator].order
+        result.merge!(SolidusNexio::NexioData.purchase(options[:originator].order))
+      end
+      result
+    end
   end
 end

data/app/services/solidus_nexio/nexio_data.rb

@@ -20,6 +20,14 @@ module SolidusNexio
       acc
     end
 
+    def purchase(order)
+      acc = { customer: {} }
+      add_order_data(acc, order)
+      add_order_cart(acc, order)
+      add_customer_data(acc, order)
+      acc
+    end
+
     private
 
     def add_order_data(acc, order)
@@ -53,6 +61,10 @@ module SolidusNexio
       }
     end
 
+    def add_order_cart(acc, order)
+      acc[:order][:line_items] = order.line_items.map { |line_item| line_item_data(line_item) }
+    end
+
     def line_item_data(line_item)
       {
         id: line_item.id,
@@ -64,8 +76,8 @@ module SolidusNexio
 
     if SolidusSupport.combined_first_and_last_name_in_address?
       def address_to_name(address)
-        parts = address.name.split(' ')
-        { first_name: parts[0], last_name: parts[1..-1].join(' ') }
+        name = Spree::Address::Name.new(address.name)
+        { first_name: name.first_name, last_name: name.last_name }
       end
     else
       def address_to_name(address)

data/app/views/spree/admin/payments/source_forms/_nexio_own_form.html.erb

@@ -0,0 +1,11 @@
+<% id = payment_method.id %>
+
+<fieldset class="no-border-bottom" data-payment-method-id="<%= id %>">
+  <div class="field" data-hook="previous_cards">
+    <% if previous_cards.any? %>
+      <% previous_cards.each do |card| %>
+        <label><%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %><br /></label>
+      <% end %>
+    <% end %>
+  </div>
+</fieldset>

data/app/views/spree/admin/payments/source_views/_nexio_own_form.html.erb

@@ -0,0 +1,23 @@
+<fieldset data-hook="credit_card">
+  <legend align="center"><%= payment.payment_method.name %></legend>
+
+  <div class="row">
+    <div class="alpha six columns">
+      <dl>
+        <dt><%= I18n.t("spree.identifier") %>:</dt>
+        <dd><%= payment.number %></dd>
+
+        <% if payment.source.is_a?(Spree::CreditCard) %>
+          <dt><%= Spree::CreditCard.human_attribute_name(:cc_type) %>:</dt>
+          <dd><%= payment.source.cc_type %></dd>
+
+          <dt><%= Spree::CreditCard.human_attribute_name(:name) %>:</dt>
+          <dd><%= payment.source.name %></dd>
+
+          <dt><%= Spree::CreditCard.human_attribute_name(:last_digits) %>:</dt>
+          <dd><%= payment.source.last_digits %></dd>
+        <% end %>
+      </dl>
+    </div>
+  </div>
+</fieldset>

data/lib/solidus_nexio/version.rb

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

data/solidus_nexio.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |spec|
   spec.version       = SolidusNexio::VERSION
   spec.authors       = %w[Whitespectre]
   spec.email         = %w[hello@whitespectre.com]
+  spec.licenses      = %w[MIT]
 
   spec.summary       = 'Solidus integration with Nexio'
   spec.homepage      = 'https://github.com/jalkoby/solidus_nexio'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_nexio
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Whitespectre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,6 +101,7 @@ files:
 - app/models/solidus_nexio/payment_method.rb
 - app/services/solidus_nexio/nexio_data.rb
 - app/views/spree/admin/payments/source_forms/_nexio_own_form.html.erb
+- app/views/spree/admin/payments/source_views/_nexio_own_form.html.erb
 - app/views/spree/checkout/existing_payment/_nexio_own_form.html.erb
 - app/views/spree/checkout/payment/_nexio_own_form.html.erb
 - app/views/spree/shared/_nexio_own_form.html.erb
@@ -112,7 +113,8 @@ files:
 - lib/tasks/solidus_nexio_tasks.rake
 - solidus_nexio.gemspec
 homepage: https://github.com/jalkoby/solidus_nexio
-licenses: []
+licenses:
+- MIT
 metadata:
   homepage_uri: https://github.com/jalkoby/solidus_nexio
   source_code_uri: https://github.com/jalkoby/solidus_nexio