From a153ad569a0ff9fda10f3c3769c37d6aea200100 Mon Sep 17 00:00:00 2001 From: Lebbeous Fogle-Weekley Date: Thu, 19 Sep 2013 09:51:47 -0400 Subject: [PATCH 1/1] DB upgrade script for Stripe payments; seed data; minor template fixes Signed-off-by: Lebbeous Fogle-Weekley Conflicts: Open-ILS/src/templates/opac/myopac/main_payment_form.tt2 Signed-off-by: Remington Steed Signed-off-by: Dan Wells --- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 8 +-- .../Pg/upgrade/XXXX.data.stripe-payments.sql | 51 +++++++++++++++++++ .../opac/myopac/main_payment_form.tt2 | 13 +++-- Open-ILS/src/templates/opac/parts/stripe.tt2 | 4 +- 4 files changed, 64 insertions(+), 12 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.stripe-payments.sql diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index 964389c1d1..04f3883f3c 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -3752,7 +3752,7 @@ INSERT into config.org_unit_setting_type 'Name default credit processor', 'coust', 'label'), oils_i18n_gettext('credit.processor.default', - 'This might be "AuthorizeNet", "PayPal", etc.', + 'This might be "AuthorizeNet", "PayPal", "PayflowPro", or "Stripe".', 'coust', 'description'), 'string', null) @@ -3873,11 +3873,11 @@ INSERT into config.org_unit_setting_type 'coust', 'description'), 'string', null) -,( 'credit.processor.stripe.privatekey', 'credit', - oils_i18n_gettext('credit.processor.stripe.privatekey', +,( 'credit.processor.stripe.secretkey', 'credit', + oils_i18n_gettext('credit.processor.stripe.secretkey', 'Stripe secret key', 'coust', 'label'), - oils_i18n_gettext('credit.processor.stripe.privatekey', + oils_i18n_gettext('credit.processor.stripe.secretkey', 'Stripe secret key', 'coust', 'description'), 'string', null) diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.stripe-payments.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.stripe-payments.sql new file mode 100644 index 0000000000..25a3a4137f --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.stripe-payments.sql @@ -0,0 +1,51 @@ +BEGIN; + + +-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + + +-- cheat sheet for enabling Stripe payments: +-- 'credit.payments.allow' must be true, and among other things it drives the +-- opac to render a payment form at all +-- NEW 'credit.processor.stripe.enabled' must be true (kind of redundant but +-- my fault for setting the precedent with c.p.{authorizenet|paypal|payflowpro}.enabled) +-- 'credit.default.processor' must be 'Stripe' +-- NEW 'credit.processor.stripe.pubkey' must be set +-- NEW 'credit.processor.stripe.secretkey' must be set + +INSERT into config.org_unit_setting_type +( name, grp, label, description, datatype, fm_class ) VALUES + + ( 'credit.processor.stripe.enabled', 'credit', + oils_i18n_gettext('credit.processor.stripe.enabled', + 'Enable Stripe payments', + 'coust', 'label'), + oils_i18n_gettext('credit.processor.stripe.enabled', + 'Enable Stripe payments', + 'coust', 'description'), + 'bool', null) + +,( 'credit.processor.stripe.pubkey', 'credit', + oils_i18n_gettext('credit.processor.stripe.pubkey', + 'Stripe publishable key', + 'coust', 'label'), + oils_i18n_gettext('credit.processor.stripe.pubkey', + 'Stripe publishable key', + 'coust', 'description'), + 'string', null) + +,( 'credit.processor.stripe.secretkey', 'credit', + oils_i18n_gettext('credit.processor.stripe.secretkey', + 'Stripe secret key', + 'coust', 'label'), + oils_i18n_gettext('credit.processor.stripe.secretkey', + 'Stripe secret key', + 'coust', 'description'), + 'string', null) +; + +UPDATE config.org_unit_setting_type +SET description = 'This might be "AuthorizeNet", "PayPal", "PayflowPro", or "Stripe".' +WHERE name = 'credit.processor.default' AND description = 'This might be "AuthorizeNet", "PayPal", etc.'; -- don't clobber local edits or i18n + +COMMIT; diff --git a/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2 b/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2 index e04e664c19..7d4740d796 100644 --- a/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2 +++ b/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2 @@ -5,7 +5,6 @@ myopac_main_page = "payment_form"; last_chance = CGI.param("last_chance"); - use_stripe = ctx.get_org_setting(ctx.user.home_ou.id, 'opac.processor.stripe.enabled'); %]

[% l('Pay Fines') %]

[% IF ctx.fines.balance_owed <= 0 %] @@ -29,7 +28,7 @@
[% FOR xact IN CGI.param('xact') %] @@ -40,7 +39,7 @@ [% END %] [% IF use_stripe %] - [% ENDIF %] + [% END %] @@ -141,7 +140,7 @@ data-stripe="number" [% ELSE %] name="number" - [% ENDIF %] + [% END %] /> @@ -152,7 +151,7 @@ data-stripe="cvc" [% ELSE %] name="cvv2" - [% ENDIF %] + [% END %] /> @@ -163,7 +162,7 @@ data-stripe="exp_month" [% ELSE %] name="expire_month" - [% END IF %] + [% END %] > @@ -188,7 +187,7 @@ data-stripe="exp_year" [% ELSE %] name="expire_year" - [% ENDIF %] + [% END %] > [% year = date.format(date.now, '%Y'); y = year; diff --git a/Open-ILS/src/templates/opac/parts/stripe.tt2 b/Open-ILS/src/templates/opac/parts/stripe.tt2 index e857fffbe5..feeba12746 100644 --- a/Open-ILS/src/templates/opac/parts/stripe.tt2 +++ b/Open-ILS/src/templates/opac/parts/stripe.tt2 @@ -1,5 +1,7 @@ [%- PROCESS "opac/parts/header.tt2"; - IF myopac_main_page == "payment_form" AND ctx.get_org_setting(ctx.user.home_ou.id, 'opac.processor.stripe.enabled')%] +IF myopac_main_page == "payment_form" AND +ctx.get_org_setting(ctx.user.home_ou.id, 'credit.processor.stripe.enabled') AND ctx.get_org_setting(ctx.user.home_ou.id, 'credit.processor.default') == 'Stripe'; + use_stripe = 1; %]