spree_gateway 3.3.0.rc2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84676fc2262a97bd0bbc98a9b012e2f6134c9f40
-  data.tar.gz: ce475e5de5054ab5df16883dfb76b062359fe2eb
+  metadata.gz: 004df4f3c77bf0c04a3b9d59538ed7dafaea22b6
+  data.tar.gz: a020217f107e4dbee4c3c19a41681458cf8690b8
 SHA512:
-  metadata.gz: c81c97d1cbfd3921d95f3dd2478875968a19644892049e0475074cde69ddc667f8c49683fbe62efd6ee189decf6c7cf64c595b463ce63457b85dc21c8ef55deb
-  data.tar.gz: a1b517f4ac28b10ab1041ce6b8cc976fceb71a328661010b8350807546fd002e79349209468610466cc784283056f161f2fb01d74b4947e2a9ec5727eea10255
+  metadata.gz: 541ed6c0fe8ff8672158525d467c0bb5ce0f29fe19077d9938820e854039373e1698c59519f7f59978e947998012b9a0e027de2791dfb33345ff1ad398dc6b85
+  data.tar.gz: 8b2acfe180f5107865211355993a4d5df8245e7d7a77cd373cc251c8ed68a1df63fb54ce0d82d8d6d4c839cb6db1da4b34860f4b06f35ce5154980e3a1d8e945

data/config/locales/bg.yml

@@ -2,10 +2,3 @@
 bg:
   spree:
     payment_has_been_cancelled: Плащането беше прекъснато.
-    complete_skrill_checkout: Моля довършете Вашето плащане със Skrill преди да продължите
-    skrill: Skrill
-    skrill_transaction: Транзакция
-    skrill_customer_id: Клиентски номер
-    skrill_transaction_id: Номер на транкцията
-    skrill_payment_type: Вид на плащане
-    skrill_payment_currency: Валута

data/config/locales/de.yml

@@ -2,10 +2,3 @@
 de:
   spree:
     payment_has_been_cancelled: Die Zahlung wurde abgebrochen.
-    complete_skrill_checkout: Bitte schliessen Sie die Skrill-Zahlung ab
-    skrill: Skrill
-    skrill_transaction: Transaktion
-    skrill_customer_id: Kunden ID
-    skrill_transaction_id: Transaktions ID
-    skrill_payment_type: Bezahlart
-    skrill_payment_currency: Währung

data/config/locales/en.yml

@@ -2,13 +2,6 @@
 en:
   spree:
     payment_has_been_cancelled: The payment has been cancelled.
-    complete_skrill_checkout: Please complete Skrill checkout before continuing
-    skrill: Skrill
-    skrill_transaction: Transaction
-    skrill_customer_id: Customer ID
-    skrill_transaction_id: Transaction ID
-    skrill_payment_type: Payment Type
-    skrill_payment_currency: Payment Currency
     log_entry:
       braintree:
         message: Message

data/config/locales/sv.yml

@@ -2,10 +2,3 @@
 sv:
   spree:
     payment_has_been_cancelled: Betalningen har avbrutits.
-    complete_skrill_checkout: Var god fyll i Skrill kassan innan du fortsätter
-    skrill: Skrill
-    skrill_transaction: Transaktion
-    skrill_customer_id: Kund ID
-    skrill_transaction_id: Transaktion ID
-    skrill_payment_type: Betalningstyp
-    skrill_payment_currency: Betalningsvaluta

data/lib/spree_gateway/engine.rb

@@ -5,7 +5,6 @@ module SpreeGateway
     config.autoload_paths += %W(#{config.root}/lib)
 
     initializer "spree.gateway.payment_methods", :after => "spree.register.payment_methods" do |app|
-      app.config.spree.payment_methods << Spree::BillingIntegration::Skrill::QuickCheckout
       app.config.spree.payment_methods << Spree::Gateway::AuthorizeNet
       app.config.spree.payment_methods << Spree::Gateway::AuthorizeNetCim
       app.config.spree.payment_methods << Spree::Gateway::BalancedGateway

data/spree_gateway.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_gateway'
-  s.version     = '3.3.0.rc2'
+  s.version     = '3.3.0'
   s.summary     = 'Additional Payment Gateways for Spree Commerce'
   s.description = s.summary
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc2
+  version: 3.3.0
 platform: ruby
 authors:
 - Spree Commerce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -354,7 +354,6 @@ files:
 - README.md
 - Rakefile
 - app/models/spree/billing_integration.rb
-- app/models/spree/billing_integration/skrill/quick_checkout.rb
 - app/models/spree/gateway/authorize_net.rb
 - app/models/spree/gateway/authorize_net_cim.rb
 - app/models/spree/gateway/balanced_gateway.rb
@@ -381,13 +380,10 @@ files:
 - app/models/spree/gateway/stripe_gateway.rb
 - app/models/spree/gateway/usa_epay_transaction.rb
 - app/models/spree/gateway/worldpay.rb
-- app/models/spree/skrill_transaction.rb
 - config/locales/bg.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/sv.yml
-- config/routes.rb
-- db/migrate/20111118164631_create_skrill_transactions.rb
 - db/migrate/20121017004102_update_braintree_payment_method_type.rb
 - db/migrate/20130213222555_update_stripe_payment_method_type.rb
 - db/migrate/20130415222802_update_balanced_payment_method_type.rb
@@ -396,11 +392,8 @@ files:
 - gemfiles/spree_3_1.gemfile
 - gemfiles/spree_3_2.gemfile
 - gemfiles/spree_master.gemfile
-- lib/active_merchant/billing/skrill.rb
 - lib/assets/javascripts/spree/frontend/spree_gateway.js
 - lib/assets/stylesheets/spree/frontend/spree_gateway.css
-- lib/controllers/frontend/spree/checkout_controller_decorator.rb
-- lib/controllers/frontend/spree/skrill_status_controller.rb
 - lib/generators/spree_gateway/install/install_generator.rb
 - lib/spree_gateway.rb
 - lib/spree_gateway/engine.rb
@@ -408,18 +401,10 @@ files:
 - lib/views/backend/spree/admin/log_entries/_stripe.html.erb
 - lib/views/backend/spree/admin/payments/source_forms/_quickcheckout.html.erb
 - lib/views/backend/spree/admin/payments/source_forms/_stripe.html.erb
-- lib/views/backend/spree/admin/payments/source_views/_quickcheckout.html.erb
 - lib/views/backend/spree/admin/payments/source_views/_stripe.html.erb
-- lib/views/frontend/spree/checkout/payment/_quickcheckout.html.erb
 - lib/views/frontend/spree/checkout/payment/_stripe.html.erb
 - script/rails
-- spec/controllers/spree/checkout_controller_spec.rb
-- spec/controllers/spree/skrill_status_controller_spec.rb
-- spec/factories/payment_method_factory.rb
-- spec/factories/skrill_transaction_factory.rb
 - spec/features/stripe_checkout_spec.rb
-- spec/lib/active_merchant/billing_skrill_spec.rb
-- spec/models/billing_integration/skrill_quick_checkout_spec.rb
 - spec/models/gateway/authorize_net_cim_spec.rb
 - spec/models/gateway/authorize_net_spec.rb
 - spec/models/gateway/balanced_gateway_spec.rb
@@ -444,7 +429,6 @@ files:
 - spec/models/gateway/stripe_gateway_spec.rb
 - spec/models/gateway/usa_epay_transaction_spec.rb
 - spec/models/gateway/worldpay_spec.rb
-- spec/models/skrill_transaction_spec.rb
 - spec/spec_helper.rb
 - spec/support/wait_for_stripe.rb
 - spree_gateway.gemspec
@@ -463,24 +447,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Additional Payment Gateways for Spree Commerce
 test_files:
-- spec/controllers/spree/checkout_controller_spec.rb
-- spec/controllers/spree/skrill_status_controller_spec.rb
-- spec/factories/payment_method_factory.rb
-- spec/factories/skrill_transaction_factory.rb
 - spec/features/stripe_checkout_spec.rb
-- spec/lib/active_merchant/billing_skrill_spec.rb
-- spec/models/billing_integration/skrill_quick_checkout_spec.rb
 - spec/models/gateway/authorize_net_cim_spec.rb
 - spec/models/gateway/authorize_net_spec.rb
 - spec/models/gateway/balanced_gateway_spec.rb
@@ -505,6 +483,5 @@ test_files:
 - spec/models/gateway/stripe_gateway_spec.rb
 - spec/models/gateway/usa_epay_transaction_spec.rb
 - spec/models/gateway/worldpay_spec.rb
-- spec/models/skrill_transaction_spec.rb
 - spec/spec_helper.rb
 - spec/support/wait_for_stripe.rb

data/app/models/spree/billing_integration/skrill/quick_checkout.rb

@@ -1,48 +0,0 @@
-module Spree
-  class BillingIntegration::Skrill::QuickCheckout < BillingIntegration
-    preference :merchant_id, :string
-    preference :language, :string, :default => 'EN'
-    preference :currency, :string, :default => 'EUR'
-    preference :payment_options, :string, :default => 'ACC'
-    preference :pay_to_email, :string ,   :default => 'your@merchant.email_here'
-
-    def provider_class
-      ActiveMerchant::Billing::Skrill
-    end
-
-    def redirect_url(order, opts = {})
-      opts.merge! self.preferences
-
-      set_global_options(opts)
-
-      opts[:detail1_text] = order.number
-      opts[:detail1_description] = "Order:"
-
-      opts[:pay_from_email] = order.email
-      opts[:firstname] = order.bill_address.firstname
-      opts[:lastname] = order.bill_address.lastname
-      opts[:address] = order.bill_address.address1
-      opts[:address2] = order.bill_address.address2
-      opts[:phone_number] = order.bill_address.phone.gsub(/\D/,'') if order.bill_address.phone
-      opts[:city] = order.bill_address.city
-      opts[:postal_code] = order.bill_address.zipcode
-      opts[:state] = order.bill_address.state.nil? ? order.bill_address.state_name.to_s : order.bill_address.state.abbr
-      opts[:country] = order.bill_address.country.name
-      opts[:pay_to_email] = self.preferred_pay_to_email
-      opts[:hide_login] = 1
-      opts[:merchant_fields] = 'platform,order_id,payment_method_id'
-      opts[:platform] = 'Spree'
-      opts[:order_id] = order.number
-
-      skrill = self.provider
-      skrill.payment_url(opts)
-    end
-
-    private
-      def set_global_options(opts)
-        opts[:recipient_description] = Spree::Config[:site_name]
-        opts[:payment_methods] = self.preferred_payment_options
-      end
-
-  end
-end

data/app/models/spree/skrill_transaction.rb

@@ -1,19 +0,0 @@
-module Spree
-  class SkrillTransaction < ActiveRecord::Base
-    has_many :payments, :as => :source
-
-    def actions
-      []
-    end
-
-    def self.create_from_postback(params)
-       SkrillTransaction.create(:email => params[:pay_from_email],
-                               :amount => params[:mb_amount],
-                               :currency => params[:mb_currency],
-                               :transaction_id => params[:mb_transaction_id],
-                               :customer_id => params[:customer_id],
-                               :payment_type => params[:payment_type])
-    end
-
-  end
-end

data/config/routes.rb

@@ -1,13 +0,0 @@
-Spree::Core::Engine.add_routes do
-  # Add your extension routes here
-  resources :orders, :only => [] do
-    resource :checkout, :controller => 'checkout' do
-      member do
-        get :skrill_cancel
-        get :skrill_return
-      end
-    end
-  end
-
-  post '/skrill' => 'skrill_status#update'
-end

data/db/migrate/20111118164631_create_skrill_transactions.rb

@@ -1,13 +0,0 @@
-class CreateSkrillTransactions < SpreeExtension::Migration[4.2]
-  def change
-    create_table :spree_skrill_transactions do |t|
-      t.string :email
-      t.float :amount
-      t.string :currency
-      t.integer :transaction_id
-      t.integer :customer_id
-      t.string :payment_type
-      t.timestamps null: true
-    end
-  end
-end

data/lib/active_merchant/billing/skrill.rb

@@ -1,18 +0,0 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
-    class Skrill < Gateway
-
-      def service_url
-        "https://www.moneybookers.com/app/payment.pl"
-      end
-
-      def payment_url(opts)
-        post = PostData.new
-        post.merge! opts
-
-        "#{service_url}?#{post.to_s}"
-      end
-
-    end
-  end
-end

data/lib/controllers/frontend/spree/checkout_controller_decorator.rb

@@ -1,51 +0,0 @@
-module Spree
-  CheckoutController.class_eval do
-    before_action :confirm_skrill, :only => [:update]
-
-    def skrill_return
-
-      unless @order.payments.where(:source_type => 'Spree::SkrillTransaction').present?
-        payment_method = PaymentMethod.find(params[:payment_method_id])
-        skrill_transaction = SkrillTransaction.new
-
-        payment = @order.payments.create({:amount => @order.total,
-                                         :source => skrill_transaction,
-                                         :payment_method => payment_method},
-                                         :without_protection => true)
-        payment.started_processing!
-        payment.pend!
-      end
-
-      @order.update_attributes({:state => "complete", :completed_at => Time.now}, :without_protection => true)
-
-      until @order.state == "complete"
-        if @order.next!
-          @order.update_with_updater!
-          state_callback(:after)
-        end
-      end
-
-      @order.finalize!
-
-      flash.notice = Spree.t(:order_processed_successfully)
-      redirect_to completion_route
-    end
-
-    def skrill_cancel
-      flash[:error] = Spree.t(:payment_has_been_cancelled)
-      redirect_to edit_order_path(@order)
-    end
-
-    private
-    def confirm_skrill
-      return unless (params[:state] == "payment") && params[:order] && params[:order][:payments_attributes]
-
-      payment_method = PaymentMethod.find(params[:order][:payments_attributes].first[:payment_method_id])
-      if payment_method.kind_of?(BillingIntegration::Skrill::QuickCheckout)
-        #TODO confirming payment method
-        redirect_to edit_order_checkout_url(@order, :state => 'payment'),
-                    :notice => Spree.t(:complete_skrill_checkout)
-      end
-    end
-  end
-end

data/lib/controllers/frontend/spree/skrill_status_controller.rb

@@ -1,39 +0,0 @@
-module Spree
-  class SkrillStatusController < ApplicationController
-    def update
-      @order = Order.find_by_number!(params[:order_id])
-      payment_method = PaymentMethod.find(params[:payment_method_id])
-      skrill_transaction = SkrillTransaction.create_from_postback params
-
-      payment = @order.payments.where(:state => "pending",
-                                      :payment_method_id => payment_method).first
-
-      if payment
-        payment.source = skrill_transaction
-        payment.save
-      else
-        payment = @order.payments.create(:amount => @order.total,
-                                         :source => skrill_transaction,
-                                         :payment_method => payment_method)
-      end
-
-      payment.started_processing!
-
-       unless payment.completed?
-        case params[:status]
-          when "0"
-            payment.pend #may already be pending
-          when "2" #processed / captured
-            payment.complete!
-          when "-1", "-2"
-            payment.failure!
-          else
-            raise "Unexpected payment status"
-        end
-      end
-
-      render :text => ""
-    end
-
-  end
-end

data/lib/views/backend/spree/admin/payments/source_views/_quickcheckout.html.erb

@@ -1,39 +0,0 @@
-<fieldset>
-  <legend><%= Spree.t(:skrill) %></legend>
-
-  <table class="index">
-    <tr>
-      <th colspan="6"><%= Spree.t(:skrill_transaction) %></th>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:email) %>:</label></td>
-      <td>
-        <%= payment.source.email %>
-      </td>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:skrill_customer_id) %>:</label></td>
-      <td>
-        <%= payment.source.customer_id %>
-      </td>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:skrill_transaction_id) %>:</label></td>
-      <td>
-        <%= payment.source.transaction_id %>
-      </td>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:skrill_payment_type) %>:</label></td>
-      <td>
-        <%= payment.source.payment_type %>
-      </td>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:skrill_payment_currency) %>:</label></td>
-      <td>
-        <%= payment.source.currency %>
-      </td>
-    </tr>
-  </table>
-</fieldset>

data/lib/views/frontend/spree/checkout/payment/_quickcheckout.html.erb

@@ -1,26 +0,0 @@
-<p data-hook="skrill_quick_checkout"></p>
-
-<%
-opts = {}
-opts[:transaction_id] = "#{@order.number}"
-opts[:amount] = @order.total
-opts[:return_url] = skrill_return_order_checkout_url(@order, :token => @order.guest_token,
-                                                             :payment_method_id => payment_method.id)
-opts[:cancel_url] = skrill_cancel_order_checkout_url(@order, :token => @order.guest_token)
-opts[:status_url] = skrill_url
-opts[:payment_method_id] = payment_method.id
-%>
-
-<style>
-  iframe.skrill_frame{
-    border: 0px;
-    width: 500px;
-    height: 500px;
-  }
-</style>
-
-<fieldset id="skrill_payment__<%= payment_method.id %>" data-hook>
-  <legend><%= Spree.t(:payment_information) %></legend>
-  <iframe id="skrill_frame_<%= payment_method.id %>"
-          class="skrill_frame" src="<%= payment_method.redirect_url @order, opts %>"></iframe>
-</fieldset>

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe Spree::CheckoutController do
-  context '#skrill_return' do
-    specify do
-    end
-  end
-
-  context '#skrill_cancel' do
-    specify do
-    end
-  end
-end

data/spec/controllers/spree/skrill_status_controller_spec.rb

@@ -1,8 +0,0 @@
-require 'spec_helper'
-
-describe Spree::SkrillStatusController do
-  context '#update' do
-    specify do
-    end
-  end
-end

data/spec/factories/payment_method_factory.rb

@@ -1,5 +0,0 @@
-FactoryGirl.define do
-  factory :skrill_quick_checkout, class: Spree::BillingIntegration::Skrill::QuickCheckout do
-    name 'Skrill - Quick Checkout'
-  end
-end

data/spec/factories/skrill_transaction_factory.rb

@@ -1,10 +0,0 @@
-FactoryGirl.define do
-  factory :skrill_transaction, class: Spree::SkrillTransaction do
-    email ''
-    amount 0.0
-    currency 'USD'
-    transaction_id nil
-    customer_id nil
-    payment_type nil
-  end
-end

data/spec/lib/active_merchant/billing_skrill_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe ActiveMerchant::Billing::Skrill do
-  let(:url) { 'https://www.moneybookers.com/app/payment.pl' }
-
-  context '.service_url' do
-    it 'return its url' do
-      expect(subject.service_url).to eq url
-    end
-  end
-
-  context '.payment_url' do
-    it 'prepend options to url' do
-      options = { 'hi' => 'you' }
-      expect(subject.payment_url(options)).to eq "#{url}?hi=you"
-    end
-  end
-end

data/spec/models/billing_integration/skrill_quick_checkout_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe Spree::BillingIntegration::Skrill::QuickCheckout, focus: true do
-  let(:quick_checkout) { create(:skrill_quick_checkout) }
-
-  context '.provider_class' do
-    it 'is a Billing::Skrill class' do
-      expect(quick_checkout.provider_class).to eq ::ActiveMerchant::Billing::Skrill
-    end
-  end
-end

data/spec/models/skrill_transaction_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe Spree::SkrillTransaction do
-  let(:skrill_transaction) { create(:skrill_transaction) }
-
-  context '.actions' do
-    it { expect(subject.actions).to match_array([]) }
-  end
-end