spree_komoju 0.0.8 → 0.0.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/spree/konbini.rb +4 -0
  3. data/app/views/spree/checkout/payment/_komoju_konbini.html.erb +2 -0
  4. data/app/views/spree/checkout/payment/_komoju_pay_easy.html.erb +2 -0
  5. data/app/views/spree/orders/_bank_transfer.html.erb +7 -9
  6. data/app/views/spree/orders/_konbini.html.erb +15 -11
  7. data/app/views/spree/orders/_pay_easy.html.erb +12 -15
  8. data/config/locales/en.yml +30 -0
  9. data/config/locales/ja.yml +55 -5
  10. data/spree_komoju.gemspec +1 -1
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bb8062887d2830cda89312433b059e9a6ce409fe
4
- data.tar.gz: 092d3002a410b03e59218451348cfee70a7d7f98
3
+ metadata.gz: 4161c0f07a305702ff5bfe53062b9aaed16ecff8
4
+ data.tar.gz: 9f90e81d35826a557ea2fa006cbd1bbba66ef53a
5
5
  SHA512:
6
- metadata.gz: ade99fbb0577c77055f6bbc5b786b2f9de03e1b2eb285203b32273a71eb8495a7c2be397884d95b2d89addbb4d5e8b8192a8c25f35525d454c0c158665e8b826
7
- data.tar.gz: 82af313e501f40ed1a589717bccab38ffce42b75cad1480a599fc9f93acb5237a02c0c6c7fdfe3ccc6f7f3b79e5cad19d2edd99c6c753aa0bccfa8fb5faf2a7e
6
+ metadata.gz: 44498bce01fa6debfddbd5c9bb14d1c37face5a2a26b7501a57df533c009a20e14c8b14bb58e45314e39990db0c0a80d854c5a28094af7dce2da03996781bf89
7
+ data.tar.gz: 58039b2111639344d23b058a68fd2b2499236e63401a7f856d9bb0a14794feb6d5d3f5fa6d7185629a6c9918aa46cbdb5169acab972fd5d6e77dae7c44a9143f
data/app/models/spree/konbini.rb CHANGED
@@ -19,5 +19,9 @@ module Spree
19
19
  def imported
20
20
  false
21
21
  end
22
+
23
+ def two_codes?
24
+ %w[lawson family-mart ministop].include?(convenience)
25
+ end
22
26
  end
23
27
  end
data/app/views/spree/checkout/payment/_komoju_konbini.html.erb CHANGED
@@ -8,4 +8,6 @@
8
8
  <span><%= Spree.t("conveniences.#{store}") %></span>
9
9
  </label><br />
10
10
  <% end %>
11
+ <br/>
12
+ <p><i><%= Spree.t("payment_fee", fee: "185円") %></i></p>
11
13
  </div>
data/app/views/spree/checkout/payment/_komoju_pay_easy.html.erb CHANGED
@@ -33,4 +33,6 @@
33
33
  <%= text_field_tag "#{param_prefix}[given_name_kana]", "", { id: "given_name_kana", class: 'form-control required'} %>
34
34
  </div>
35
35
  </div>
36
+ <br/>
37
+ <p><i><%= Spree.t("payment_fee", fee: "190円") %></i></p>
36
38
  </div>
data/app/views/spree/orders/_bank_transfer.html.erb CHANGED
@@ -1,18 +1,16 @@
1
1
  <div>
2
2
  <p>
3
- Thank you for your order. Instructions have been sent to your e-mail address.<br/>
4
- You can find a link with instructions on how to pay below:
3
+ <%= Spree.t(:bank_transfer_order_thanks) %><br/>
4
+ <%= Spree.t(:bank_transfer_instructions) %>
5
5
  </p>
6
6
 
7
7
  <%= link_to source.instructions_url do %>
8
- How to make a bank transfer payment
8
+ <%= Spree.t(:bank_transfer_how_to_pay) %>
9
9
  <% end %>
10
10
  </div>
11
11
  <br>
12
12
 
13
- <div class='alert alert-info' role='alert'>
14
- <h4>Order ID</h4>
15
- <p><%= source.order_id %></p>
16
- <h4>End Date</h4>
17
- <p><%= source.expires_at %></p>
18
- </div>
13
+ <table class="table table-condensed table-bordered">
14
+ <tr class="info"><td><%= Spree::BankTransfer.human_attribute_name(:order_id) %></td><td><%= source.order_id %></td></tr>
15
+ <tr class="info"><td><%= Spree::BankTransfer.human_attribute_name(:expires_at) %></td><td><%= source.expires_at %></td></tr>
16
+ </table>
data/app/views/spree/orders/_konbini.html.erb CHANGED
@@ -1,17 +1,21 @@
1
+ <% store_name = Spree.t("conveniences.#{source.convenience}") %>
2
+ <% receipt_number = Spree.t("konbini_receipt_number.#{source.convenience}") %>
1
3
  <div>
2
- Thank you for your order. Instructions have been sent to your e-mail address.<br>
3
- To complete a payment at <%= source.convenience.camelcase %>, Receipt Number and Confirmation Number are required.<br>
4
+ <%= Spree.t(:konbini_order_thanks) %><br>
5
+ <%= Spree.t("konbini_instructions.#{source.convenience}", receipt_number: receipt_number) %><br>
4
6
  <br>
5
7
  <%= link_to source.instructions_url do %>
6
- How to make a payment at <%= source.convenience.camelcase %>
8
+ <%= Spree.t(:konbini_how_to_pay, convenience: store_name) %>
7
9
  <% end %>
10
+
11
+ <br><br>
12
+ <p><b><%= Spree.t(:payment_fee, fee: "185円") %></b></p>
8
13
  </div>
9
14
  <br>
10
- <div class='alert alert-info' role='alert'>
11
- <h4>Receipt Number</h4>
12
- <p><%= source.receipt %></p>
13
- <h4>Confirmation Number</h4>
14
- <p><%= source.confirmation_code %></p>
15
- <h4>End Date</h4>
16
- <p><%= source.expires_at %></p>
17
- </div>
15
+ <table class="table table-condensed table-bordered">
16
+ <tr class="info"><td><%= receipt_number %></td><td><strong><%= source.receipt %></strong></td></tr>
17
+ <% if source.two_codes? %>
18
+ <tr class="info"J><td><%= Spree.t(:konbini_confirmation_number) %></td><td><strong><%= source.confirmation_code %></strong></td></tr>
19
+ <% end %>
20
+ <tr class="info"><td><%= Spree.t(:konbini_end_date) %></td><td><strong><%= source.expires_at %></strong></td></tr>
21
+ </table>
data/app/views/spree/orders/_pay_easy.html.erb CHANGED
@@ -1,24 +1,21 @@
1
1
  <div>
2
2
  <p>
3
- Thank you for your order. Instructions have been sent to your e-mail address.<br/>
4
- Please follow the link below to complete your purchase:
3
+ <%= Spree.t(:payeasy_order_thanks) %><br/>
4
+ <%= Spree.t(:payeasy_instructions) %>
5
5
  </p>
6
6
 
7
7
  <%= link_to source.instructions_url do %>
8
- How to pay with PayEasy
8
+ <%= Spree.t(:payeasy_how_to_pay) %>
9
9
  <% end %>
10
+
11
+ <br><br>
12
+ <p><b><%= Spree.t(:payment_fee, fee: "190円") %></b></p>
10
13
  </div>
11
14
  <br>
12
15
 
13
- <div class='alert alert-info' role='alert'>
14
- <dl>
15
- <dt>Bank Number</dt>
16
- <dd><%= source.bank_id %></dd>
17
- <dt>Customer Number</dt>
18
- <dd><%= source.customer_id %></dd>
19
- <dt>Confirmation Number</dt>
20
- <dd><%= source.confirmation_id %></dd>
21
- <dt>Expiry Date</dt>
22
- <dd><%= l source.expires_at.in_time_zone("Tokyo"), format: :short %></dd>
23
- </dl>
24
- </div>
16
+ <table class="table table-condensed table-bordered">
17
+ <tr class="info"><td><%= Spree::PayEasy.human_attribute_name(:bank_id) %></td><td><%= source.bank_id %></td></tr>
18
+ <tr class="info"><td><%= Spree::PayEasy.human_attribute_name(:customer_id) %></td><td><%= source.customer_id %></td></tr>
19
+ <tr class="info"><td><%= Spree::PayEasy.human_attribute_name(:confirmation_id) %></td><td><%= source.confirmation_id %></td></tr>
20
+ <tr class="info"><td><%= Spree::PayEasy.human_attribute_name(:expires_at) %></td><td><%= source.expires_at %></td></tr>
21
+ </table>
data/config/locales/en.yml CHANGED
@@ -1,5 +1,6 @@
1
1
  en:
2
2
  spree:
3
+ payment_fee: "Note: There is an additional %{fee} fee when paying with this payment method."
3
4
  pay_easy: Pay Easy
4
5
  bank_transfer: Bank Transfer
5
6
  web_money: WebMoney
@@ -18,6 +19,35 @@ en:
18
19
  given_name_kana: First Name (Katakana)
19
20
  family_name_kana: Last Name (Katakana)
20
21
  prepaid_number: Prepaid Number
22
+ konbini_receipt_number:
23
+ circle-k: Receipt Number
24
+ daily-yamazaki: Receipt Number
25
+ family-mart: Receipt Number
26
+ lawson: Receipt Number
27
+ ministop: Receipt Number
28
+ seven-eleven: Receipt Number
29
+ sunkus: Receipt Number
30
+ konbini_confirmation_number: Confirmation Number
31
+ konbini_end_date: End Date
32
+ komoju_order_thanks: &komoju-order-thanks
33
+ Thank you for your order. Instructions have been sent to your e-mail address.
34
+ konbini_order_thanks: *komoju-order-thanks
35
+ bank_transfer_order_thanks: *komoju-order-thanks
36
+ konbini_instructions:
37
+ one_code: &komoju-konbini-instructions-one-code
38
+ To complete your payment, your %{receipt_number} is required.
39
+ two_codes: &komoju-konbini-instructions-two-codes
40
+ To complete your payment, your %{receipt_number} and confirmation number are required.
41
+ lawson: *komoju-konbini-instructions-two-codes
42
+ family-mart: *komoju-konbini-instructions-two-codes
43
+ mini-stop: *komoju-konbini-instructions-two-codes
44
+ sunkus: *komoju-konbini-instructions-one-code
45
+ circle-k: *komoju-konbini-instructions-one-code
46
+ daily-yamazaki: *komoju-konbini-instructions-one-code
47
+ seven-eleven: *komoju-konbini-instructions-one-code
48
+ konbini_how_to_pay: How to make a payment at %{convenience}
49
+ bank_transfer_instructions: "You can find a link with instructions on how to pay below:"
50
+ bank_transfer_how_to_pay: How to make a bank transfer payment
21
51
  komoju:
22
52
  attributes: &komoju-payment-details
23
53
  email: Email
data/config/locales/ja.yml CHANGED
@@ -1,5 +1,6 @@
1
1
  ja:
2
2
  spree:
3
+ payment_fee: "※ お支払い金額は、商品代金と「決済手数料: %{fee}」を合計した金額となります。"
3
4
  pay_easy: Pay Easy
4
5
  conveniences:
5
6
  lawson: ローソン
@@ -15,10 +16,59 @@ ja:
15
16
  family_name: 姓
16
17
  given_name_kana: 名 (カタカナ)
17
18
  family_name_kana: 姓 (カタカナ)
18
- activerecord:
19
- attributes:
20
- spree/pay_easy:
21
- given_name_kana: 名 (カタカナ)
22
- family_name_kana: 姓 (カタカナ)
19
+ konbini_receipt_number:
20
+ circle-k: オンライン決済番号
21
+ daily-yamazaki: オンライン決済番号
22
+ family-mart: お客様番号
23
+ lawson: お客様番号
24
+ ministop: お客様番号
25
+ seven-eleven: 払込票番号
26
+ sunkus: オンライン決済番号
27
+ konbini_confirmation_number: 確認番号
28
+ konbini_end_date: お支払い期限
29
+ komoju_order_thanks: &komoju-order-thanks
30
+ "ご注文ありがとうございました。お支払い内容については、メールでもお送りしていますのでご確認ください。"
31
+ konbini_order_thanks: *komoju-order-thanks
32
+ konbini_instructions:
33
+ one_code: &komoju-konbini-instructions-one-code
34
+ "コンビニ決済には『%{receipt_number}』が必要です。"
35
+ two_codes: &komoju-konbini-instructions-two-codes
36
+ "コンビニ決済には『確認番号』と『%{receipt_number}』が必要です。"
37
+ lawson: *komoju-konbini-instructions-two-codes
38
+ family-mart: *komoju-konbini-instructions-two-codes
39
+ mini-stop: *komoju-konbini-instructions-two-codes
40
+ sunkus: *komoju-konbini-instructions-one-code
41
+ circle-k: *komoju-konbini-instructions-one-code
42
+ daily-yamazaki: *komoju-konbini-instructions-one-code
43
+ seven-eleven: *komoju-konbini-instructions-one-code
44
+ konbini_how_to_pay: "%{convenience}の支払方法"
45
+ bank_transfer_order_thanks: *komoju-order-thanks
46
+ bank_transfer_instructions: "銀行振込の支払方法については以下のリンクをご参考ください"
47
+ bank_transfer_how_to_pay: "銀行振込の支払方法"
48
+ payeasy_order_thanks: *komoju-order-thanks
49
+ payeasy_instructions: "PayEasy支払いについては以下のリンクをご参考ください"
50
+ payeasy_how_to_pay: "PayEasyの支払方法"
51
+ komoju:
52
+ attributes: &komoju-payment-details
53
+ email: メール
54
+ phone: 電話番号
55
+ given_name_kana: フリガナ(名)
56
+ family_name_kana: フリガナ(姓)
23
57
  given_name: 名
24
58
  family_name: 姓
59
+ instructions_url: "支払方法ページへの URL"
60
+ prepaid_number: プリペイド番号
61
+ order_id: 振込番号
62
+ expires_at: 有効期限
63
+ bank_id: 収納機関番号
64
+ customer_id: お客様番号
65
+ confirmation_id: 確認番号
66
+ web_money:
67
+ balance_remaining: 不足額
68
+ points: ポイント
69
+ insufficient_funds: "残高不足です"
70
+ activerecord:
71
+ attributes:
72
+ spree/pay_easy: *komoju-payment-details
73
+ spree/web_money: *komoju-payment-details
74
+ spree/bank_transfer: *komoju-payment-details
data/spree_komoju.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
  Gem::Specification.new do |s|
3
3
  s.platform = Gem::Platform::RUBY
4
4
  s.name = 'spree_komoju'
5
- s.version = '0.0.8'
5
+ s.version = '0.0.9'
6
6
  s.summary = 'Spree Komoju Payment Gateway'
7
7
  s.description = 'Spree Payment gateway for Komoju payment gateway'
8
8
  s.authors = ['Masahiro Saito', 'Chris Salzberg', 'Richard Ramsden']
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_komoju
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.8
4
+ version: 0.0.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Masahiro Saito
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2015-12-22 00:00:00.000000000 Z
13
+ date: 2016-02-23 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: spree_core