<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[6866] sites/trunk/wordpressfoundation.org/public_html/content/plugins/wpf-stripe/wpf-stripe.php: WPF Stripe: Add a button for giving single donations.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/6866">6866</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6866","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-03-12 22:21:07 +0000 (Mon, 12 Mar 2018)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WPF Stripe: Add a button for giving single donations.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressfoundationorgpublic_htmlcontentpluginswpfstripewpfstripephp">sites/trunk/wordpressfoundation.org/public_html/content/plugins/wpf-stripe/wpf-stripe.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressfoundationorgpublic_htmlcontentpluginswpfstripewpfstripephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpressfoundation.org/public_html/content/plugins/wpf-stripe/wpf-stripe.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpressfoundation.org/public_html/content/plugins/wpf-stripe/wpf-stripe.php 2018-03-12 22:21:03 UTC (rev 6865)
+++ sites/trunk/wordpressfoundation.org/public_html/content/plugins/wpf-stripe/wpf-stripe.php   2018-03-12 22:21:07 UTC (rev 6866)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,6 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPress_Foundation\Stripe;
</span><span class="cx" style="display: block; padding: 0 10px"> use Exception;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use Stripe\Stripe, Stripe\Customer, Stripe\Charge;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) || die();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,48 +94,75 @@
</span><span class="cx" style="display: block; padding: 0 10px">                </form>
</span><span class="cx" style="display: block; padding: 0 10px">        </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        <p>Or make a one-time donation in the amount of your choosing:</p>
+
+       <div class="one-time-donation">
+               <form action="" method="POST">
+                       <label>$
+                               <input type="number" class="amount" name="amount" min="1" />
+                       </label>
+
+                       <script
+                               src="https://checkout.stripe.com/checkout.js"
+                               class="stripe-button"
+                               data-key="<?php echo esc_html( STRIPE_PUBLIC_KEY ); ?>"
+                               data-image="<?php echo esc_url( $image ); ?>"
+                               data-name="WordPress Foundation"
+                               data-description="One-Time Donation"
+                               data-label="Give once"
+                               data-zip-code="true"
+                               data-billing-address="true">
+                       </script>
+               </form>
+       </div>
+
</ins><span class="cx" style="display: block; padding: 0 10px">         <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        return ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_shortcode( 'wpfstripe', __NAMESPACE__ . '\render_donate_shortcode' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'init', __NAMESPACE__ . '\check_subscribe' );
-function check_subscribe() {
-       if ( !empty( $_POST ) && isset( $_POST['stripeToken'] ) ) {
-               process_payments();
-       }
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> function process_payments() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        global $wpf_success_url, $wpf_fail_url;
-
-       // no token, nothing to do
-       if ( empty( $_POST['stripeToken'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $_POST['stripeEmail'], $_POST['stripeToken'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 return;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        require_once('stripe-php/init.php');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once( __DIR__ . '/stripe-php/init.php' );
+       Stripe::setApiKey( STRIPE_SECRET_KEY );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        \Stripe\Stripe::setApiKey( STRIPE_SECRET_KEY );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ try {
+               if ( isset( $_POST['wpf_plan'] ) ) {
+                       $params = array(
+                               'source' => $_POST['stripeToken'],
+                               'email'  => $_POST['stripeEmail'],
+                               'plan'   => $_POST['wpf_plan'],      // Subscribe the new Customer to the plan at the same time.
+                       );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        try
-       {
-               $customer = \Stripe\Customer::create(array(
-                       'email' => $_POST['stripeEmail'],
-                       'source'  => $_POST['stripeToken'],
-                       'plan' => $_POST['wpf_plan'],
-                       ));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 Customer::create( $params );
+               } elseif ( isset( $_POST['amount'] ) ) {
+                       $params = array(
+                               'source'        => $_POST['stripeToken'],
+                               'receipt_email' => $_POST['stripeEmail'],
+                               'amount'        => $_POST['amount'] * 100,   // Convert dollars to pennies.
+                               'currency'      => 'USD',
+                               'description'   => 'WordPress Foundation donation',
+                       );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp_redirect( $wpf_success_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 Charge::create( $params );
+               } else {
+                       wp_die( 'Unsupported form action' );
+               }
+
+               $redirect_url = home_url( 'successful-donation/'  );
+       } catch ( Exception $exception ) {
+               log( $exception->getMessage(), $params );
+               $redirect_url = home_url( 'unsuccessful-donation/');
+       } finally {
+               wp_safe_redirect( $redirect_url );
</ins><span class="cx" style="display: block; padding: 0 10px">                 exit;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        catch(Exception $e)
-       {
-               wp_redirect( $wpf_fail_url );
-               exit;
-       }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'init', __NAMESPACE__ . '\process_payments' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Output CSS for the `[wpfstripe]` shortcode.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,11 +179,54 @@
</span><span class="cx" style="display: block; padding: 0 10px">        <style>
</span><span class="cx" style="display: block; padding: 0 10px">                .stripe-button-el {
</span><span class="cx" style="display: block; padding: 0 10px">                        text-transform: none;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        float: left;
-                       margin: 8px;
</del><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               .subscription-plans .stripe-button-el {
+                       margin: 0 12px 12px 0;
+               }
+
+                       @media screen and ( min-width: 415px ) {
+                               .subscription-plans {
+                                       display: flex;
+                                       flex-wrap: wrap;
+                                       justify-content: space-around;
+                               }
+                       }
+
+               .one-time-donation {
+                       margin-top: .5em;
+               }
+
+               .one-time-donation form {
+                       margin-top: .5em;
+                       text-align: center;
+               }
+
+                       .amount {
+                               position: relative;
+                               top: 3px;
+                               width: 5em;
+                               margin-right: .5em;
+                               padding: 1px 5px;
+                               text-align: center;
+                       }
</ins><span class="cx" style="display: block; padding: 0 10px">         </style>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', __NAMESPACE__ . '\custom_styles' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Log an error message.
+ *
+ * @param string $error_message
+ * @param array  $data
+ */
+function log( $error_message, $data ) {
+       trigger_error( sprintf(
+               '%s error: %s. Data: %s',
+               __FUNCTION__,
+               $error_message,
+               wp_json_encode( $data )
+       ) );
+}
</ins></span></pre>
</div>
</div>

</body>
</html>