spree_komoju 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ea64674cab50e80b6043ca43be33c0a6023bbce
-  data.tar.gz: 0231d2c6bcab54d3286df056ebcc6ddc2ed4667a
+  metadata.gz: fab6019e2802d287ff898d2d70594e9f46a6fac3
+  data.tar.gz: 1ed0ae676b5a76cc97f46ae004f0ffaa56ea7789
 SHA512:
-  metadata.gz: 9f63a3887afaa56661a5c029cc08d3c53473ad8fd7ed7af4d1f19ee22f429a95a21b1f2a1486e15aeb8ccd5fb7b004629194c57e58310a3a3446c147add78946
-  data.tar.gz: 3fe280708bdb7b80d18d172f95d744b16e50a186ff1cb489ede01aec1b458444e12e8c35f48ceecb1322a57c8a29adaeccf833411acc40fc2509cd03cd3b0cad
+  metadata.gz: d7a6d1fc42a4bbd4aaee6824aa6fc2ba2a4e8ccc9f1331cdc4f420886ab4034e4c8c9f3570cb9b112fcd3804e983a97e8a44c3b7eb6a2c911ea5e5a01be8613d
+  data.tar.gz: 61c9167f7503d82ebad69619ad138af3a90728320e07628d82ca5ac3dcad350e1a4d17f2c32c375ba8229a244243840f7ced248e22418b33db6b85004fa68c58

data/app/models/spree/bank_transfer.rb

@@ -22,5 +22,9 @@ module Spree
     def instructions_partial_path
       "spree/orders/bank_transfer"
     end
+
+    def imported
+      false
+    end
   end
 end

data/app/models/spree/gateway/komoju_bank_transfer.rb

@@ -17,8 +17,9 @@ module Spree
       source.update!(
         expires_at:  response.params["payment_deadline"].to_time,
         order_id:    response.params["payment_details"]["order_id"],
-        bank_number: response.params["payment_details"]["bank_number"]
-      )
+        bank_number: response.params["payment_details"]["bank_number"],
+        instructions_url: response.params["payment_details"]["instructions_url"]
+      ) if response.success?
       response
     end
   end

data/app/models/spree/gateway/komoju_credit_card.rb

@@ -37,5 +37,9 @@ module Spree
         end
       end
     end
+
+    def payment_profiles_supported?
+      true
+    end
   end
 end

data/app/models/spree/komoju_gateway.rb

@@ -15,17 +15,13 @@ module Spree
     end
 
     def payment_profiles_supported?
-      true
+      false
     end
 
     def supports?(source)
       true
     end
 
-    # no-op, override where necessary
-    def create_profile(payment)
-    end
-
     # We need to change shipping, tax, subtotal and discount from cents to dollar for Komoju gateway.
     # Because, Komoju gateway supports JPY currency only.
     #

data/app/views/spree/orders/_bank_transfer.html.erb

@@ -1,10 +1,18 @@
 <div>
-  Thank you for your order. Instructions have been sent to your e-mail address.<br>
-<br>
-  <h4>Banktransfer ID: <%= source.order_id %></h4>
-  The Banktransfer ID is very important! Please make a note of it and bring it with you when you go to pay at the ATM.<br>
-  If you have chosen to use bank transfer payment, please use a bank transfer form which your bank offers, or please remit at ATM.<br>
+  <p>
+    Thank you for your order. Instructions have been sent to your e-mail address.<br/>
+    You can find a link with instructions on how to pay below:
+  </p>
+
+  <%= link_to source.instructions_url do %>
+    How to make a bank transfer payment
+  <% end %>
+</div>
 <br>
-  Please make sure to include your banktransfer ID in the payer's name. Please enter your banktransfer ID shown in this email in front of your name as Payer when remitting.<br>
-  Please see the confirmation email for further payment instructions.
+
+<div class='alert alert-info' role='alert'>
+  <h4>Order ID</h4>
+  <p><%= source.order_id %></p>
+  <h4>End Date</h4>
+  <p><%= source.expires_at %></p>
 </div>

data/db/migrate/20151207084412_add_spree_bank_transfers_instruction_url.rb

@@ -0,0 +1,5 @@
+class AddSpreeBankTransfersInstructionUrl < ActiveRecord::Migration
+  def change
+    add_column :spree_bank_transfers, :instructions_url, :string
+  end
+end

data/lib/active_merchant/billing/gateways/komoju.rb

@@ -75,6 +75,8 @@ module ActiveMerchant #:nodoc:
           else
             post[:customer] = payment
           end
+        else
+          post[:payment_details] = payment
         end
       end
 

data/spec/models/spree/gateway/komoju_bank_transfer_spec.rb

@@ -5,6 +5,7 @@ describe Spree::Gateway::KomojuBankTransfer, type: :model do
 
   describe "#authorize" do
     let(:money) { 1000.0 }
+    let(:currency) { "JPY" }
     let(:source) do
       Spree::BankTransfer.create!(
         email: "email",
@@ -14,8 +15,7 @@ describe Spree::Gateway::KomojuBankTransfer, type: :model do
         family_name_kana: "family_name_kana"
       )
     end
-    let(:options) { { login: "api_key", shipping: 100.0, tax: 200.0, subtotal: 800.0, discount: 100.0,
-                      currency: currency } }
+    let(:options) { { login: "api_key", shipping: 100.0, tax: 200.0, subtotal: 800.0, discount: 100.0, currency: currency } }
     let(:details) do
       {
         type: "bank_transfer",
@@ -27,32 +27,64 @@ describe Spree::Gateway::KomojuBankTransfer, type: :model do
         family_name_kana: "family_name_kana"
       }
     end
-    let(:params) { { "payment_deadline" => Time.now.iso8601.to_s, "payment_details" => { "order_id" => "order_id", "bank_transfer" => "bank_transfer" } } }
-    let(:response) { double(ActiveMerchant::Billing::Response, params: params) }
+
+    let(:params) do
+      {
+        "payment_deadline" => Time.now.iso8601.to_s,
+        "payment_details" => {
+          "order_id" => "order_id",
+          "bank_number" => "bank_number",
+          "instructions_url" => "instructions_url"
+        }
+      }
+    end
 
     before do
       allow_any_instance_of(Spree::Gateway::KomojuBankTransfer).to receive(:options) { options }
     end
 
-    context "with currency is USD" do
-      let(:currency) { "USD" }
+    context 'when response is successful' do
+      let(:response) { double(ActiveMerchant::Billing::Response, params: params, success?: true) }
 
-      it "calls ActiveMerchant::Billing::KomojuGateway#purchase with original options" do
-        expect_any_instance_of(ActiveMerchant::Billing::KomojuGateway).to receive(:purchase).with(800.0, details, options) { response }
+      context 'when currency is JPY' do
+        let(:currency) { "JPY" }
 
-        subject.authorize(money, source, options)
+        it 'updates the source payment' do
+          expect_any_instance_of(ActiveMerchant::Billing::KomojuGateway).to receive(:purchase) { response }
+
+          subject.authorize(money, source, options)
+          expect(source.order_id).to eq("order_id")
+          expect(source.instructions_url).to eq("instructions_url")
+          expect(source.bank_number).to eq("bank_number")
+        end
+
+        it "creates a payment with correct active merchant options" do
+          options_converted_to_dollars = { login: "api_key", shipping: 1.0, tax: 2.0, subtotal: 8.0, discount: 1.0, currency: currency }
+          expect_any_instance_of(ActiveMerchant::Billing::KomojuGateway).to receive(:purchase).with(998.0, details, options_converted_to_dollars) { response }
+
+          subject.authorize(money, source, options)
+        end
+      end
+
+      context "when currency is USD" do
+        let(:currency) { "USD" }
+
+        it "creates a payment with correct active merchant options" do
+          expect_any_instance_of(ActiveMerchant::Billing::KomojuGateway).to receive(:purchase).with(800.0, details, options) { response }
+
+          subject.authorize(money, source, options)
+        end
       end
     end
 
-    context "with currency is JPY" do
+    context 'when response is not successful' do
+      let(:response) { double(ActiveMerchant::Billing::Response, params: params, success?: false) }
       let(:currency) { "JPY" }
 
-      it "calls ActiveMerchant::Billing::KomojuGateway#purchase with options converted from cents to dollars" do
-        options_converted_to_dollars = { login: "api_key", shipping: 1.0, tax: 2.0, subtotal: 8.0, discount: 1.0,
-                                         currency: currency }
-        expect_any_instance_of(ActiveMerchant::Billing::KomojuGateway).to receive(:purchase).with(998.0, details, options_converted_to_dollars) { response }
-
+      it 'does not update the source' do
+        expect_any_instance_of(ActiveMerchant::Billing::KomojuGateway).to receive(:purchase) { response }
         subject.authorize(money, source, options)
+        expect(source.instructions_url).to be_nil
       end
     end
   end

data/spree_komoju.gemspec

@@ -2,10 +2,10 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_komoju'
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.summary     = 'Spree Komoju Payment Gateway'
   s.description = 'Spree Payment gateway for Komoju payment gateway'
-  s.authors     = ['Masahiro Saito', 'Chris Salzberg']
+  s.authors     = ['Masahiro Saito', 'Chris Salzberg', 'Richard Ramsden']
   s.required_ruby_version = '>= 2.0.0'
 
   # s.author    = 'You'

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: spree_komoju
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Masahiro Saito
 - Chris Salzberg
+- Richard Ramsden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -202,7 +203,7 @@ files:
 - config/routes.rb
 - db/migrate/20150331051027_create_spree_konbinis.rb
 - db/migrate/20150401074721_create_spree_bank_transfers.rb
-- db/migrate/20151126050103_add_gateway_profile_ids_to_spree_konbinis.rb
+- db/migrate/20151207084412_add_spree_bank_transfers_instruction_url.rb
 - lib/active_merchant/billing/gateways/komoju.rb
 - lib/generators/spree_komoju/install/images/circle-k.png
 - lib/generators/spree_komoju/install/images/daily-yamazaki.png

data/db/migrate/20151126050103_add_gateway_profile_ids_to_spree_konbinis.rb

@@ -1,6 +0,0 @@
-class AddGatewayProfileIdsToSpreeKonbinis < ActiveRecord::Migration
-  def change
-    add_column :spree_konbinis, :gateway_customer_profile_id, :string
-    add_column :spree_konbinis, :gateway_payment_profile_id, :string
-  end
-end