caboose-cms 0.7.76 → 0.7.77
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f85f96aba339e81a4262e954ad4ae3eb6d7f86e8
|
|
4
|
+
data.tar.gz: 710e6a249034f74d7433893d1289d0d887056305
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 084f9469941e10731d1a3de6280366c4d0482e699b19f17cfa07b2ef7fdd6b33019d128ee4497a8a16052df74dbe7d423473367c5dcad35f4f14ddf36e317353
|
|
7
|
+
data.tar.gz: 93b27aa9852a8c115ac6d415f0daaaa7476c52fc64dcc94a39debd6eaebd8f67391b2e76c6ee1784f094b64b052afcd71a9207f0bf4daf6aa4bbdc382af6c775
|
|
@@ -87,18 +87,17 @@ module Caboose
|
|
|
87
87
|
return
|
|
88
88
|
end
|
|
89
89
|
end
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
case
|
|
93
|
-
when
|
|
94
|
-
|
|
95
|
-
sc = @site.store_config
|
|
90
|
+
|
|
91
|
+
sc = @site.store_config
|
|
92
|
+
case sc.pp_name
|
|
93
|
+
when StoreConfig::PAYMENT_PROCESSOR_AUTHORIZENET
|
|
94
|
+
|
|
96
95
|
@sim_transaction = AuthorizeNet::SIM::Transaction.new(
|
|
97
96
|
sc.authnet_api_login_id,
|
|
98
97
|
sc.authnet_api_transaction_key,
|
|
99
|
-
@order.total,
|
|
100
|
-
#:relay_url => "#{request.protocol}#{request.host_with_port}/checkout/authnet-relay/#{@order.id}",
|
|
98
|
+
@order.total,
|
|
101
99
|
:relay_response => 'TRUE',
|
|
100
|
+
#:relay_url => "#{request.protocol}#{request.host_with_port}/checkout/authnet-relay/#{@order.id}",
|
|
102
101
|
#:relay_url => "#{request.protocol}#{request.host_with_port}/checkout/authnet-relay",
|
|
103
102
|
:relay_url => "#{sc.authnet_relay_domain}/checkout/authnet-relay",
|
|
104
103
|
:transaction_type => 'AUTH_ONLY',
|
|
@@ -106,14 +105,22 @@ module Caboose
|
|
|
106
105
|
)
|
|
107
106
|
@request = request
|
|
108
107
|
@show_relay = params[:show_relay] && params[:show_relay].to_i == 1
|
|
108
|
+
|
|
109
|
+
when StoreConfig::PAYMENT_PROCESSOR_STRIPE
|
|
110
|
+
|
|
111
|
+
Stripe.api_key = sc.stripe_secret_key
|
|
112
|
+
token = params[:stripeToken]
|
|
109
113
|
|
|
110
|
-
when 'payscape'
|
|
111
|
-
@form_url = Caboose::PaymentProcessor.form_url(@order)
|
|
112
114
|
end
|
|
113
115
|
@logged_in_user = logged_in_user
|
|
114
116
|
add_ga_event('Ecommerce', 'Checkout', 'Payment Form')
|
|
115
117
|
end
|
|
116
118
|
|
|
119
|
+
# Step 5 - Stripe Payment Form
|
|
120
|
+
# POST /checkout/stripe-payment
|
|
121
|
+
#def stripe_payment
|
|
122
|
+
#end
|
|
123
|
+
|
|
117
124
|
# GET /checkout/confirm
|
|
118
125
|
def confirm_without_payment
|
|
119
126
|
redirect_to '/checkout' and return if !logged_in?
|
|
@@ -52,6 +52,9 @@ module Caboose
|
|
|
52
52
|
WEIGHT_UNIT_IMPERIAL = 'oz'
|
|
53
53
|
LENGTH_UNIT_METRIC = 'cm'
|
|
54
54
|
LENGTH_UNIT_IMPERIAL = 'in'
|
|
55
|
+
|
|
56
|
+
PAYMENT_PROCESSOR_AUTHORIZENET
|
|
57
|
+
PAYMENT_PROCESSOR_STRIPE
|
|
55
58
|
|
|
56
59
|
def next_order_number
|
|
57
60
|
x = Order.where("order_number is not null").reorder("order_number desc").limit(1).first
|
|
@@ -27,7 +27,13 @@ $(document).ready(function() {
|
|
|
27
27
|
new_model_text: 'New User',
|
|
28
28
|
no_models_text: 'There are no users right now.',
|
|
29
29
|
new_model_fields: [
|
|
30
|
-
{ name: 'email', nice_name: 'Email', type: 'text', width: 400 }
|
|
30
|
+
{ name: 'email', nice_name: 'Email', type: 'text', width: 400 }
|
|
31
|
+
],
|
|
32
|
+
search_fields: [
|
|
33
|
+
{ name: 'first_name_like' , nice_name: 'First name' , type: 'text', width: 400 },
|
|
34
|
+
{ name: 'last_name_like' , nice_name: 'Last name' , type: 'text', width: 400 },
|
|
35
|
+
{ name: 'username_like' , nice_name: 'Username' , type: 'text', width: 400 },
|
|
36
|
+
{ name: 'email_like' , nice_name: 'Email' , type: 'text', width: 400 }
|
|
31
37
|
],
|
|
32
38
|
bulk_import_fields: ['email'],
|
|
33
39
|
bulk_import_url: '/admin/users/bulk'
|
data/lib/caboose/version.rb
CHANGED