Merge branch 'update-donation-page' into 'master'

Update the donations page

See merge request openlp/website!33

pages/donate.rst

@@ -27,8 +27,8 @@ help us out, please consider donating to our cause.
       <div class="col-lg-4 col-md-4 col-sm-6 col-xs-12">  
         <h3>PayPal <small>(Preferred)</small></h3>
         <p>You can donate via PayPal by clicking the button.</p>
-        <p class="small text-info">You will be guided to create a PayPal account if you don't have one already.</p>
         <p><a class="btn btn-primary" href="https://paypal.me/raoulsnyman"><i class="fa fa-fw fa-paypal"></i> Donate via PayPal</a></p>
+        <p class="small text-info">You will be guided to create a PayPal account if you don't have one already.</p>
       </div>
       <div class="col-lg-4 col-md-4 col-sm-6 col-xs-12">  
         <h3>Bitcoin</h3>
@@ -41,24 +41,8 @@ help us out, please consider donating to our cause.
       <div class="col-lg-4 col-md-4 col-sm-6 col-xs-12">  
         <h3>Credit Card</h3>
         <p>We also accept donations via debit or credit card.</p>
-        <form id="donate" class="form" role="form" action="donate-cc.php" method="POST">
+        <script async src="https://js.stripe.com/v3/buy-button.js"></script>
-          <input type="hidden" name="token" id="token">
+        <stripe-buy-button buy-button-id="buy_btn_1MjEIzF4wrjjReq2DT6uSRgi" publishable-key="pk_live_GWIWaLW8W53LNTthomxAyO5w"></stripe-buy-button>
-          <input type="hidden" name="return-url" id="return-url">
-          <div class="form-group">
-            <label class="sr-only" for="donate-amount">Amount</label>
-            <div class="input-group">
-              <span class="input-group-addon notranslate">$</span>
-              <input type="number" value="10" class="form-control" name="amount" id="amount">
-              <span class="input-group-addon notranslate">.00</span>
-            </div>
-          </div>
-          <div class="form-group">
-            <button type="submit" id="donate-button" class="btn btn-primary"><i class="fa fa-fw fa-credit-card"></i> Donate to OpenLP</button>
-            <div class="pull-right">
-              <a href="https://stripe.com" title="Credit card donations processed by Stripe"><img src="/images/powered_by_stripe.png" alt="Credit card donations processed by Stripe"></a>
-            </div>
-          </div>
-        </form>
       </div>
     </div>
     <hr>
@@ -75,20 +59,24 @@ them already.
 .. table::
    :class: table
 
-   +-----------------------------------+---------+---------+-----------+------------+
+   +------------------------------------------------------------------+-------------------+--------------+--------------+------------------+
-   | Item                              | Cost    | Covered | Purchased | Keywords   |
+   | Item                                                             | Cost              | Covered      | Purchased    |       Keywords   |
-   +===================================+=========+=========+===========+============+
+   +==================================================================+===================+==============+==============+==================+
-   | `Extra RAM for virtual machines`_ | $39.99  | $0      | Yes       | RAM        |
+   | `Extra RAM for virtual machines`_                                | $39.99            | $39.99       | Yes          | RAM              |
-   +-----------------------------------+---------+---------+-----------+------------+
+   +------------------------------------------------------------------+-------------------+--------------+--------------+------------------+
-   | `4K monitor for Hi DPI testing`_  | $169.99 | $0      | Yes       | 4K Monitor |
+   | `4K monitor for Hi DPI testing`_                                 | $169.99           | $65.00       | Yes          | 4K Monitor       |
-   +-----------------------------------+---------+---------+-----------+------------+
+   +------------------------------------------------------------------+-------------------+--------------+--------------+------------------+
-   | `Refurbished Apple M1 Mac Mini`_  | $469.00 | $0      | No        | M1 Mac     |
+   | |ss| Refurbished Apple M1 Mac Mini |se|  *(no longer available)* | |ss| $469.00 |se| | |ss| $0 |ss| | |ss| No |se| | |ss| M1 Mac |se| |
-   +-----------------------------------+---------+---------+-----------+------------+
+   +------------------------------------------------------------------+-------------------+--------------+--------------+------------------+
+   | `Apple M2 Mac Mini`_                                             | $599.00           | $0           | No           | M2 Mac           |
+   +------------------------------------------------------------------+-------------------+--------------+--------------+------------------+
+
 
 If you feel led to give for something specifically, please feel free to use the keywords when you
 donate. Below are ways to get hold of us:
 
 * If you use PayPal, add the keywords in the message
+* If you use your credit card, add the keywords in the keywords field
 * You can direct message `Raoul`_ via `your Inbox`_ on the `forums`_
 * You can `come into IRC`_ and let "superfly", "TRB143" or "tgc" know your amount and keywords
 
@@ -111,6 +99,7 @@ Here's a breakdown of our regular costs:
 .. _Extra RAM for virtual machines: https://www.amazon.com/dp/B08H7T81YV?psc=1&ref=ppx_yo2ov_dt_b_product_details
 .. _4K monitor for Hi DPI testing: https://www.amazon.com/gp/product/B08MXQ4NJ9/ref=ppx_od_dt_b_asin_title_s00?ie=UTF8&psc=1
 .. _Refurbished Apple M1 Mac Mini: https://www.apple.com/shop/product/FGNR3LL/A/refurbished-mac-mini-apple-m1-chip-with-8%E2%80%91core-cpu-and-8%E2%80%91core-gpu
+.. _Apple M2 Mac Mini: https://www.apple.com/shop/buy-mac/mac-mini/apple-m2-chip-with-8-core-cpu-and-10-core-gpu-256gb
 .. _Raoul: https://forums.openlp.org/profile/raoul
 .. _your Inbox: https://forums.openlp.org/messages/inbox
 .. _forums: https://forums.openlp.org/
@@ -122,3 +111,10 @@ Here's a breakdown of our regular costs:
 .. _openlp.io: https://openlp.io/
 .. _Tip Jar at Open Bar by Dave Dugdale: https://www.flickr.com/photos/davedugdale/5025601209/
 
+.. |ss| raw:: html
+
+   <strike>
+
+.. |se| raw:: html
+
+   </strike>