solidus_oxxo_pay 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a67c8525d3ca13b4ef0c58656688a7ce4b0d12926e27bfafef78c7404ee104c
-  data.tar.gz: 19023765bd1f752e8f844fb3e7ca5b4a69a6239ad3d14c6e716e0094027f4020
+  metadata.gz: 948805a97162f094d5c1fd6582e17be907b2c72b238822e3305020dec9054afd
+  data.tar.gz: 296dbdbe258a176534c35bca3dc04b6455d6b6b767babb5ef849c955909a1175
 SHA512:
-  metadata.gz: c73e5c4b115b1b53b7b497ec5ec571e88ec6278ad3b17f485aa5ee908d0439e62529ed1670a3eeb31c45b801085b76c124e452dd55d367333f2c04d5041ec5b6
-  data.tar.gz: cdbaa65fd03881925198e2103773df9a85acb4386f20e610dd50639ab6f685bbcbbbae8a5643c4bb95064f4d2c80ebc550d117581c934e02a5dc2f7b8e84259c
+  metadata.gz: bfb074c36374c87dca424bb320f4a4de8ac7c39810cc342056c0fc8c96860a36396d4b173a7b94acd65e8ff60ec56cef45ec069055c89faa1fe54f6654e6c484
+  data.tar.gz: 3a979d9916105c36d2fd3b665374ebe7507ca2b71687a697326aeccabe3a5ed42a5e98896247a62cf02203b9a95aa7b1b30b672b25f33553c83a93c8fa5f467d

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/app/controllers/spree/conekta_oxxo_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class ConektaOxxoController < StoreController
     skip_before_action :verify_authenticity_token

data/app/helpers/spree/base_helper_decorator.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 module Spree::BaseHelper
   def conekta_oxxo_receipt(order = nil)
-    @order ||= order
-    if @order.paid_with?('Oxxo')
-      response_code = @order.payments&.last.response_code
-      render partial: 'spree/conekta/payments/conekta_oxxo', locals: { order: @order, response_code: response_code }
+    order_oxxo_payments = order&.payments&.
+      where(source_type: 'Spree::ConektaOxxoPayment')
+    if order_oxxo_payments.any?
+      response_code = order_oxxo_payments.last&.response_code
+      render partial: 'spree/conekta/payments/conekta_oxxo',
+        locals: { order: order, response_code: response_code }
     end
   end
 end

data/app/models/spree/conekta_oxxo_payment.rb

@@ -1,20 +1,21 @@
+# frozen_string_literal: true
+
 module Spree
   class ConektaOxxoPayment < Spree::PaymentSource
     attr_accessor :server, :test_mode, :api_key
 
-    def authorize(money, creditcard, gateway_options)
-
-      ::Conekta.api_key = api_key
-      ::Conekta.api_version = "2.0.0"
+    def authorize(_money, source, _gateway_options)
+      Conekta.api_key = api_key
+      Conekta.api_version = '2.0.0'
 
-      order = Spree::Order.find_by(number: creditcard.number)
+      order = Spree::Order.find_by(number: source.number)
 
       begin
-        response = ::Conekta::Order.create(payload(order))
-        creditcard.update_attribute :conekta_order_id, response.id
+        response = Conekta::Order.create(payload(order))
+        source.update_attribute :conekta_order_id, response.id
         ActiveMerchant::Billing::Response.new(true, 'Orden creada satisfactoriamente', {}, parse_response(response))
-      rescue ::Conekta::Error => error
-        ActiveMerchant::Billing::Response.new(false, error.details.map(&:message).join(', '))
+      rescue ::Conekta::Error => e
+        ActiveMerchant::Billing::Response.new(false, e.details.map(&:message).join(', '))
       end
     end
 
@@ -51,46 +52,59 @@ module Spree
     end
 
     private
+
     def payload(order)
       {
-          currency: 'MXN',
-          customer_info: {
-              name: order.ship_address.full_name,
-              email: order.email,
-              phone: order.ship_address.phone
-          },
-          charges: [
-              {
-                  payment_method: {
-                      type: 'oxxo_cash'
-                  }
-              }
-          ],
-          line_items: order_line_items(order),
-          shipping_lines: shipping_lines(order),
-          shipping_contact: {
-              address: {
-                  street1: order.ship_address.address1,
-                  postal_code: order.ship_address.zipcode,
-                  country: 'mx'
-              }
+        currency: 'MXN',
+        customer_info: {
+          name: order.ship_address.full_name,
+          email: order.email,
+          phone: order.ship_address.phone
+        },
+        charges: [
+          {
+            payment_method: {
+              type: 'oxxo_cash'
+            }
           }
+        ],
+        line_items: order_line_items(order),
+        shipping_lines: shipping_lines(order),
+        shipping_contact: {
+          address: {
+            street1: order.ship_address.address1,
+            postal_code: order.ship_address.zipcode,
+            country: 'MX'
+          }
+        }
       }
     end
 
     def order_line_items(order)
-      order.line_items.map { |li| {name: li.product.name, unit_price: (li.price * 100).to_i, quantity: li.quantity} }
+      order.line_items.map do |li|
+        {
+          name: li.product.name,
+          unit_price: (li.price * 100).to_i,
+          quantity: li.quantity
+        }
+      end
     end
 
     def parse_response(response)
       {
-          authorization: response.charges.first.payment_method.reference,
-          conekta_order_id: response.id
+        authorization: response.charges.first.payment_method.reference,
+        conekta_order_id: response.id
       }
     end
 
     def shipping_lines(order)
-      order.shipments.map {|s| {id: s.id, carrier: s.shipping_method.name, amount: (s.cost * 100).to_i} }
+      order.shipments.map do |s|
+        {
+          id: s.id,
+          carrier: s.shipping_method.name,
+          amount: (s.cost * 100).to_i
+        }
+      end
     end
   end
 end

data/app/models/spree/payment_method/conekta_oxxo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class PaymentMethod::ConektaOxxo < Spree::PaymentMethod
     preference :api_key, :string, default: ''

data/app/policies/payment_oxxo_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PaymentOxxoPolicy
   attr_reader :payment
 
@@ -8,7 +10,7 @@ class PaymentOxxoPolicy
   def process(options)
     return unless options[:status].eql?('paid')
 
-    payment.complete if (options[:amount].to_i/100 - payment.amount).abs < 0.01
+    payment.complete if (options[:amount].to_i / 100 - payment.amount).abs < 0.01
     payment.order.updater.update
   end
 end

data/app/views/spree/api/source_views/_conektaoxxo.json.jbuilder

@@ -0,0 +1 @@
+# frozen_string_literal: true

data/app/views/spree/conekta/payments/_conekta_oxxo.html.erb

@@ -1,29 +1,33 @@
-<div class="opps">
-  <div class="opps-header">
-    <div class="opps-info">
-      <div class="opps-brand">
+<div class='opps'>
+  <div class='opps-header'>
+    <div class='opps-info'>
+      <div class='opps-brand'>
         <%= image_tag 'oxxopay_brand.png', alt: 'OXXOPay', class: 'summary-oxxo-image' %>
       </div>
-      <div class="opps-ammount">
-        <h3 class="opps-title">Monto a pagar</h3>
+
+      <div class='opps-ammount'>
+        <h3 class='opps-title'>Monto a pagar</h3>
         <h2><%= order.display_total %> <sup>MXN</sup></h2>
         <p>OXXO cobrará una comisión adicional al momento de realizar el pago.</p>
       </div>
     </div>
-    <div class="opps-reference">
-      <h3 class="opps-reference-title">Referencia</h3>
-      <h1 class="opps-reference"><%= response_code.scan(/.{1,4}/).join('-') %></h1>
+
+    <div class='opps-reference'>
+      <h3 class='opps-reference-title'>Referencia</h3>
+      <h1 class='opps-reference'><%= response_code&.scan(/.{1,4}/)&.join('-') %></h1>
     </div>
   </div>
-  <div class="opps-instructions">
+
+  <div class='opps-instructions'>
     <h3>Instrucciones</h3>
-    <ol class="steps-list">
-      <li>Acude a la tienda OXXO más cercana. <a href="https://www.google.com.mx/maps/search/oxxo/" target="_blank">Encuéntrala aquí</a>.</li>
+
+    <ol class='steps-list'>
+      <li>Acude a la tienda OXXO más cercana. <a href='https://www.google.com.mx/maps/search/oxxo/' target='_blank'>Encuéntrala aquí</a>.</li>
       <li>Indica en caja que quieres realizar un pago de <strong>OXXOPay</strong>.</li>
       <li>Dicta al cajero el número de referencia en esta ficha para que tecleé directamete en la pantalla de venta.</li>
       <li>Realiza el pago correspondiente con dinero en efectivo.</li>
       <li>Al confirmar tu pago, el cajero te entregará un comprobante impreso. <strong>En el podrás verificar que se haya realizado correctamente.</strong> Conserva este comprobante de pago.</li>
     </ol>
-    <div class="opps-footnote">Al completar estos pasos recibirás un correo confirmando tu pago.</div>
+    <div class='opps-footnote'>Al completar estos pasos recibirás un correo confirmando tu pago.</div>
   </div>
 </div>

data/app/views/spree/conekta_oxxo/receipt.html.erb

@@ -1,6 +1,6 @@
 <html>
   <head>
-    <%= stylesheet_link_tag 'oxxo_pay', media: 'all', 'data-turbolinks-track': 'false' %>
+    <%= stylesheet_link_tag 'spree/frontend/solidus_oxxo_pay', media: 'all', 'data-turbolinks-track': 'false' %>
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,700" rel="stylesheet">
   </head>
   <body>
@@ -8,7 +8,7 @@
   </body>
   <script type="text/javascript" charset="utf-8">
       document.addEventListener('DOMContentLoaded', function () {
-          window.print();
+        window.print();
       });
   </script>
 </html>

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Spree::Core::Engine.routes.draw do
   get 'oxxo-pay/receipt', to: 'conekta_oxxo#receipt'
   post 'oxxo-pay', to: 'conekta_oxxo#create'

data/db/migrate/20181121200357_create_conekta_oxxo_payments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateConektaOxxoPayments < ActiveRecord::Migration[5.0]
   def change
     create_table :spree_conekta_oxxo_payments do |t|

data/lib/generators/solidus_oxxo_pay/install/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusOxxoPay
   module Generators
     class InstallGenerator < Rails::Generators::Base

data/lib/solidus_oxxo_pay.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'solidus_core'
 require 'solidus_support'
 require 'deface'

data/lib/solidus_oxxo_pay/engine.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 module SolidusOxxoPay
   class Engine < Rails::Engine
     require 'spree/core'
     isolate_namespace Spree
     engine_name 'solidus_oxxo_pay'
 
+    config.autoload_paths += %W(#{config.root}/lib)
+
     # use rspec for tests
     config.generators do |g|
       g.test_framework :rspec
@@ -11,7 +15,7 @@ module SolidusOxxoPay
 
     initializer 'spree_payment_network.register.payment_methods' do |app|
       app.config.spree.payment_methods << Spree::PaymentMethod::ConektaOxxo
-      app.config.assets.precompile += %w( oxxopay_brand.png )
+      app.config.assets.precompile += %w(oxxopay_brand.png)
     end
 
     def self.activate

data/lib/solidus_oxxo_pay/factories.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
   #

data/lib/solidus_oxxo_pay/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusOxxoPay
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_oxxo_pay
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Magmalabs
@@ -48,16 +48,16 @@ dependencies:
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: conekta
   requirement: !ruby/object:Gem::Requirement
@@ -275,6 +275,7 @@ files:
 - app/policies/payment_oxxo_policy.rb
 - app/views/spree/admin/payments/source_forms/_conektaoxxo.html.erb
 - app/views/spree/admin/payments/source_views/_conektaoxxo.html.erb
+- app/views/spree/api/source_views/_conektaoxxo.json.jbuilder
 - app/views/spree/checkout/payment/_conektaoxxo.html.erb
 - app/views/spree/checkout/payment_label/_conektaoxxo_label.html.erb
 - app/views/spree/conekta/payments/_conekta_oxxo.html.erb