From ef164ef2946a85328329e8aab6c5a47f31d9fd3e Mon Sep 17 00:00:00 2001
From: "Jonathan S. Katz" <jonathan.katz@excoventures.com>
Date: Thu, 28 Feb 2019 14:09:58 -0500
Subject: [PATCH] Re-enable donation form for the SPI account.

---
 templates/pages/about/donate.html        |  2 --
 templates/pages/about/donate_pg_org.html | 38 ++++++++----------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/templates/pages/about/donate.html b/templates/pages/about/donate.html
index ddfa3bdc..24b2e6d3 100644
--- a/templates/pages/about/donate.html
+++ b/templates/pages/about/donate.html
@@ -4,13 +4,11 @@
 
 <h1>Donate <i class="far fa-money-bill-alt"></i></h1>
 
-{% comment %}
 <h2>General PostgreSQL efforts</h2>
 <p>PostgreSQL is an affiliated project of <a href="http://www.spi-inc.org/">Software in the Public Interest.</a> Funds donated to PostgreSQL are used
 to sponsor general PostgreSQL efforts. These funds are managed by the Fund raising group. <a href="/about/donate_pg_org/">Donate to
 PostgreSQL.</a>
 </p>
-{% endcomment %}
 
 <h2>PostgreSQL Europe (PgEU)</h2>
 <p>PostgreSQL Europe is a European region non profit focusing on the support of other PostgreSQL groups in Europe.
diff --git a/templates/pages/about/donate_pg_org.html b/templates/pages/about/donate_pg_org.html
index 4bb00f94..d0e2c1f7 100644
--- a/templates/pages/about/donate_pg_org.html
+++ b/templates/pages/about/donate_pg_org.html
@@ -6,32 +6,20 @@
 
 <p>PostgreSQL donations are managed by the <a href="https://wiki.PostgreSQL.org/wiki/SponsorShip">funds group</a>. The money donated goes to many vital services that the PostgreSQL community needs including advocacy materials, conference expenses, legal expenses, and travel costs.</p>
 
-<h2>Donate by Credit Card</h2>
-<p>Credit card transactions are currently unavailable.</p>
-{% comment %}
-<p>PostgreSQL donations are processed via Paysimple (third party) and deposited
-  into the PostgreSQL account at Software in the Public Interest (SPI).</p>
-
-<form method="post" action="https://www.usaepay.com/interface/epayform/">
-  <input name="UMdescription" value="PostgreSQL General Contribution" type="hidden" />
-  <input name="UMkey" value="faI13GX2IiFk4j415yTWXIGo7i3Hb6M5" type="hidden" />
-  <input name="UMcommand" value="sale" type="hidden" />
-  <div class="form-group">
-    <select id="donate_amount" class="form-control" name="UMamount" size="7">
-       <option value="10.00">10.00 USD</option>
-       <option value="25.00">25.00 USD</option>
-       <option value="50.00">50.00 USD</option>
-       <option value="100.00">100.00 USD</option>
-       <option value="250.00">250.00 USD</option>
-       <option value="500.00">500.00 USD</option>
-       <option value="1000.00">1000.00 USD</option>
-    </select>
-  </div>
-  <div class="submit-row">
-    <input class="btn btn-primary cp_button_609397530555" type="submit" value="Donate via SPI" />
-  </div>
+<h2>Donate by Credit Card / PayPal</h2>
+<p>
+  PostgreSQL donations are processed via Paysimple (third party) and deposited
+  into the <a href="http://spi-inc.org/projects/postgresql/" target="_blank">PostgreSQL account at Software in the Public Interest (SPI)</a>.
+  You can click the button below, which will redirect you to PayPal where your
+  donation will be processed:
+</p>
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+  <fieldset>
+    <input type="hidden" name="cmd" value="_s-xclick">
+    <input type="hidden" name="hosted_button_id" value="J2S96PW9NMCDS">
+    <input class="btn btn-primary" type="submit" name="submit" value="Donate by Credit Card" />
+  </fieldset>
 </form>
-{% endcomment %}
 
 <h2>For other amounts or to donate via American, Canadian Check or Money Order:</h2>
 <p>Donations can also be made by mailing a check or sending a money order to Software in the Public Interest, Inc.</p>
-- 
2.39.5