caboose-cms 0.5.83 → 0.5.84

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +8 -8
  2. data/app/controllers/caboose/checkout_controller.rb +2 -1
  3. data/app/controllers/caboose/store_controller.rb +1 -0
  4. data/app/models/caboose/schema.rb +2 -1
  5. data/app/models/caboose/store_config.rb +2 -1
  6. data/app/views/caboose/checkout/#Untitled-1# +3 -0
  7. data/app/views/caboose/store/admin_edit.html.erb +2 -0
  8. data/lib/caboose/version.rb +1 -1
  9. metadata +2 -1
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- M2ZkYjRjZWFlODI5YjIzOTlkYzY2ZDM4NzQ0MDYyNjNhYTU5ZTFlOQ==
4
+ NGZkMTA0YTBhYzRhYjMwZjNjOGI1MDEwNjM5YzBmMDRkYjJlZmIwYQ==
5
5
  data.tar.gz: !binary |-
6
- NTQ1YTE1ODVlYTRmYTU1YTUwNjhjNWI1MmI0NTVmMGMyY2M4OGJjNg==
6
+ NmQ0MjYxYzA2ZGI2ZGIxZWNlMjg5NzVmNmVkYTI0M2MxMTk0OTc5Yw==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MDZhNDQwNmViNTY0MDM5MTg3Y2U3YTNiNzcxMGM4YTAxOGU3ZDQ5ZmYyYWVi
10
- YTdjZDcyMDc4ZGEwNmZhMzQ1OGIyMzAwNDVhYjQ1NTcyZjdiMzQwNjQ3ZGVh
11
- ZjkzYjRkNWQ1ZWRmN2UzNDcyNGM0NjQwMGUxNjIwZGQ4Zjg4ZmE=
9
+ M2FkNjQxNTQyNGIxY2QwODlmYmQxNzdjMjgzZjRkMWFiNzM5ODFkMjc2ZDRm
10
+ ZWRlMmM5Y2M5ZDkyNDBkMDJlNTliNDM5N2U5YWJiN2FhMzVhZWYyNGNmODEw
11
+ NTU4NmJiYmJjMjg1YTViOTkyOTQ3YzdjNzgxOWRlMzIwMTYxYzA=
12
12
  data.tar.gz: !binary |-
13
- ODRkNWRmMTMwOGI0ZjZkNTQ0NzRhMjVlOGRkNmM2NDExM2ZlMDQyMWZlZjNj
14
- N2UyZjc1NzJhNTBiMjhlNjM2MmU5ZmYwMGQ3YThlMzdiMzEwY2FhYTVmYTY2
15
- M2YwZDMyY2FjZmU3MDE4MDIxZmM3NDgzY2UwOTRlYTU0ZTg1NDM=
13
+ ZTJmNTQ4YmJkZWVjMjNmYjNlMzhhMmFlOWQwMTI1NWMzZmI4NDdmMDNlNzYx
14
+ YjQ4ZjM0NDA4NDY3Y2M4Mjc2MDRiNTMzOWYwNGM5ZDI1NDdjZWM3YTkzNWQ2
15
+ OTUzMDU0ZmE3Y2UwNWJiZjkzZTcyYzZjOTU3NzQ4MDhhYWFjMTk=
data/app/controllers/caboose/checkout_controller.rb CHANGED
@@ -82,7 +82,8 @@ module Caboose
82
82
  @order.total,
83
83
  #:relay_url => "#{request.protocol}#{request.host_with_port}/checkout/authnet-relay/#{@order.id}",
84
84
  :relay_response => 'TRUE',
85
- :relay_url => "#{request.protocol}#{request.host_with_port}/checkout/authnet-relay",
85
+ #:relay_url => "#{request.protocol}#{request.host_with_port}/checkout/authnet-relay",
86
+ :relay_url => sc.pp_relay_url,
86
87
  :transaction_type => 'AUTH_ONLY',
87
88
  :test => sc.pp_testing
88
89
  )
data/app/controllers/caboose/store_controller.rb CHANGED
@@ -27,6 +27,7 @@ module Caboose
27
27
  when 'pp_username' then sc.pp_username = value
28
28
  when 'pp_password' then sc.pp_password = value
29
29
  when 'pp_testing' then sc.pp_testing = value
30
+ when 'pp_relay_url' then sc.pp_relay_url = value
30
31
  when 'ups_username' then sc.ups_username = value
31
32
  when 'ups_password' then sc.ups_password = value
32
33
  when 'ups_key' then sc.ups_key = value
data/app/models/caboose/schema.rb CHANGED
@@ -557,7 +557,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
557
557
  [ :pp_name , :string ],
558
558
  [ :pp_username , :string ],
559
559
  [ :pp_password , :string ],
560
- [ :pp_testing , :boolean , { :default => true }],
560
+ [ :pp_testing , :boolean , { :default => true }],
561
+ [ :pp_relay_url , :string ],
561
562
  [ :ups_username , :string ],
562
563
  [ :ups_password , :string ],
563
564
  [ :ups_key , :string ],
data/app/models/caboose/store_config.rb CHANGED
@@ -8,7 +8,8 @@ module Caboose
8
8
  :pp_name,
9
9
  :pp_username,
10
10
  :pp_password,
11
- :pp_testing,
11
+ :pp_testing,
12
+ :pp_relay_url,
12
13
  :ups_username,
13
14
  :ups_password,
14
15
  :ups_key,
data/app/views/caboose/checkout/#Untitled-1# ADDED
@@ -0,0 +1,3 @@
1
+ https://locker-room.biz/checkout/payment?show_relay=1
2
+ https://locker-room.biz/checkout/authnet-relay
3
+ https://lockerroom.caboosecms.com/checkout/authnet-relay
data/app/views/caboose/store/admin_edit.html.erb CHANGED
@@ -9,6 +9,7 @@ sc = @store_config
9
9
  <p><div id='storeconfig_<%= sc.id %>_pp_name' ></div></p>
10
10
  <p><div id='storeconfig_<%= sc.id %>_pp_username' ></div></p>
11
11
  <p><div id='storeconfig_<%= sc.id %>_pp_password' ></div></p>
12
+ <p><div id='storeconfig_<%= sc.id %>_pp_relay_url' ></div></p>
12
13
  <p><div id='storeconfig_<%= sc.id %>_pp_testing' ></div></p>
13
14
 
14
15
  <h2>Fulfillment Contacts</h2>
@@ -69,6 +70,7 @@ $(document).ready(function() {
69
70
  { name: 'pp_username' , nice_name: 'Username' , type: 'text' , value: <%= raw Caboose.json(sc.pp_username ) %>, width: 400 },
70
71
  { name: 'pp_password' , nice_name: 'Password' , type: 'text' , value: <%= raw Caboose.json(sc.pp_password ) %>, width: 400 },
71
72
  { name: 'pp_testing' , nice_name: 'Test Mode' , type: 'checkbox' , value: <%= raw Caboose.json(sc.pp_testing ? 1 : 0 ) %>, width: 400 },
73
+ { name: 'pp_relay_url' , nice_name: 'Relay URL' , type: 'text' , value: <%= raw Caboose.json(sc.pp_relay_url ) %>, width: 400 },
72
74
  { name: 'fulfillment_email' , nice_name: 'Fulfillment Email' , type: 'text' , value: <%= raw Caboose.json(sc.fulfillment_email ) %>, width: 400 },
73
75
  { name: 'shipping_email' , nice_name: 'Shipping Email' , type: 'text' , value: <%= raw Caboose.json(sc.shipping_email ) %>, width: 400 },
74
76
  { name: 'handling_percentage' , nice_name: 'Handling Percentage' , type: 'text' , value: <%= raw Caboose.json(sc.handling_percentage ) %>, width: 400 },
data/lib/caboose/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.5.83'
2
+ VERSION = '0.5.84'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.83
4
+ version: 0.5.84
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
@@ -696,6 +696,7 @@ files:
696
696
  - app/views/caboose/categories/admin_edit.html.erb
697
697
  - app/views/caboose/categories/admin_index.html.erb
698
698
  - app/views/caboose/categories/admin_new.html.erb
699
+ - app/views/caboose/checkout/#Untitled-1#
699
700
  - app/views/caboose/checkout/_address_form.html.erb
700
701
  - app/views/caboose/checkout/_billing_form.html.erb
701
702
  - app/views/caboose/checkout/_cart.html.erb