Changeset 2051367

Timestamp:

03/15/2019 04:28:09 PM (7 years ago)

Author:

pderksen

Message:

Committing 2.1.0

Location:

stripe/trunk

Files:

• assets/css/_mixins.scss (modified) (4 diffs)
• assets/css/_variables.scss (added)
• assets/css/admin-all-pages.min.css (modified) (1 diff)
• assets/css/admin.css (modified) (5 diffs)
• assets/css/admin.min.css (modified) (1 diff)
• assets/css/admin.scss (modified) (6 diffs)
• assets/css/chosen.min.css (modified) (1 diff)
• assets/css/public.css (modified) (3 diffs)
• assets/css/public.min.css (modified) (1 diff)
• assets/css/public.scss (modified) (4 diffs)
• assets/js/admin.js (modified) (13 diffs)
• assets/js/admin.min.js (modified) (1 diff)
• assets/js/public.js (modified) (5 diffs)
• assets/js/public.min.js (modified) (1 diff)
• assets/js/shared.js (modified) (3 diffs)
• assets/js/shared.min.js (modified) (1 diff)
• assets/js/upgrade-link.min.js (modified) (1 diff)
• assets/js/vendor/jquery.validate.js (deleted)
• assets/js/vendor/jquery.validate.min.js (deleted)
• includes/core/abstracts/field.php (modified) (2 diffs)
• includes/core/abstracts/form.php (modified) (8 diffs)
• includes/core/admin/assets.php (modified) (2 diffs)
• includes/core/admin/fields/custom-html.php (added)
• includes/core/admin/metaboxes/settings.php (modified) (9 diffs)
• includes/core/admin/metaboxes/views/partials (added)
• includes/core/admin/metaboxes/views/partials/company-info-settings.php (added)
• includes/core/admin/metaboxes/views/tabs/tab-custom-form-fields.php (added)
• includes/core/admin/metaboxes/views/tabs/tab-payment-options.php (modified) (2 diffs)
• includes/core/admin/metaboxes/views/tabs/tab-stripe-checkout.php (added)
• includes/core/admin/notices.php (modified) (3 diffs)
• includes/core/admin/pages.php (modified) (1 diff)
• includes/core/admin/pages/general.php (modified) (1 diff)
• includes/core/admin/pages/keys.php (modified) (6 diffs)
• includes/core/admin/pages/main.php (modified) (5 diffs)
• includes/core/assets.php (modified) (7 diffs)
• includes/core/errors.php (modified) (1 diff)
• includes/core/forms/default-form.php (modified) (5 diffs)
• includes/core/forms/fields/payment-button.php (modified) (1 diff)
• includes/core/functions/countries.php (added)
• includes/core/functions/shared.php (modified) (10 diffs)
• includes/core/main.php (modified) (1 diff)
• includes/core/objects.php (modified) (2 diffs)
• includes/core/payments/charge.php (modified) (1 diff)
• includes/core/payments/customer.php (modified) (2 diffs)
• includes/core/payments/details.php (modified) (2 diffs)
• includes/core/payments/payment.php (modified) (3 diffs)
• includes/core/payments/stripe-api.php (modified) (2 diffs)
• includes/core/shortcodes.php (modified) (1 diff)
• includes/core/stripe-connect (added)
• includes/core/stripe-connect/admin.php (added)
• includes/core/stripe-connect/functions.php (added)
• includes/old/stripe-checkout.php (modified) (1 diff)
• includes/promos/promo-loader.php (modified) (1 diff)
• includes/promos/views/generic-tab-promo.php (modified) (1 diff)
• includes/promos/views/sidebar.php (modified) (1 diff)
• readme.txt (modified) (5 diffs)
• stripe-checkout.php (modified) (4 diffs)
• uninstall.php (modified) (2 diffs)
• vendor/composer/autoload_psr4.php (modified) (1 diff)
• vendor/composer/autoload_static.php (modified) (2 diffs)
• vendor/composer/installed.json (modified) (2 diffs)
• vendor/composer/installers (deleted)
• vendor/stripe/stripe-php/CHANGELOG.md (modified) (1 diff)
• vendor/stripe/stripe-php/LICENSE (modified) (1 diff)
• vendor/stripe/stripe-php/VERSION (modified) (1 diff)
• vendor/stripe/stripe-php/composer.json (modified) (1 diff)
• vendor/stripe/stripe-php/examples (deleted)
• vendor/stripe/stripe-php/init.php (modified) (6 diffs)
• vendor/stripe/stripe-php/lib/Account.php (modified) (13 diffs)
• vendor/stripe/stripe-php/lib/AccountLink.php (added)
• vendor/stripe/stripe-php/lib/ApiOperations/NestedResource.php (modified) (3 diffs)
• vendor/stripe/stripe-php/lib/ApiRequestor.php (modified) (6 diffs)
• vendor/stripe/stripe-php/lib/ApplicationFee.php (modified) (4 diffs)
• vendor/stripe/stripe-php/lib/Card.php (modified) (3 diffs)
• vendor/stripe/stripe-php/lib/Charge.php (modified) (2 diffs)
• vendor/stripe/stripe-php/lib/Checkout (added)
• vendor/stripe/stripe-php/lib/Checkout/Session.php (added)
• vendor/stripe/stripe-php/lib/Collection.php (modified) (2 diffs)
• vendor/stripe/stripe-php/lib/Customer.php (modified) (7 diffs)
• vendor/stripe/stripe-php/lib/Error/OAuth/OAuthBase.php (modified) (1 diff)
• vendor/stripe/stripe-php/lib/Event.php (modified) (2 diffs)
• vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php (modified) (6 diffs)
• vendor/stripe/stripe-php/lib/Invoice.php (modified) (5 diffs)
• vendor/stripe/stripe-php/lib/Issuing/Authorization.php (modified) (1 diff)
• vendor/stripe/stripe-php/lib/PaymentIntent.php (modified) (2 diffs)
• vendor/stripe/stripe-php/lib/Person.php (modified) (1 diff)
• vendor/stripe/stripe-php/lib/Product.php (modified) (1 diff)
• vendor/stripe/stripe-php/lib/Radar (added)
• vendor/stripe/stripe-php/lib/Radar/ValueList.php (added)
• vendor/stripe/stripe-php/lib/Radar/ValueListItem.php (added)
• vendor/stripe/stripe-php/lib/Refund.php (modified) (1 diff)
• vendor/stripe/stripe-php/lib/RequestTelemetry.php (added)
• vendor/stripe/stripe-php/lib/Review.php (added)
• vendor/stripe/stripe-php/lib/Source.php (modified) (1 diff)
• vendor/stripe/stripe-php/lib/Stripe.php (modified) (3 diffs)
• vendor/stripe/stripe-php/lib/Subscription.php (modified) (2 diffs)
• vendor/stripe/stripe-php/lib/SubscriptionItem.php (modified) (1 diff)
• vendor/stripe/stripe-php/lib/SubscriptionSchedule.php (added)
• vendor/stripe/stripe-php/lib/SubscriptionScheduleRevision.php (added)
• vendor/stripe/stripe-php/lib/Transfer.php (modified) (4 diffs)
• vendor/stripe/stripe-php/lib/TransferReversal.php (modified) (1 diff)
• vendor/stripe/stripe-php/lib/Util/Util.php (modified) (6 diffs)
• vendor/stripe/stripe-php/phpunit.no_autoload.xml (deleted)
• vendor/stripe/stripe-php/phpunit.xml (deleted)
• vendor/stripe/stripe-php/tests (deleted)

stripe/trunk/assets/css/_mixins.scss

@@ -1 @@
-// Clearfix
+// Fonts
+
+@mixin antialias() {
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}
+
+@mixin font-checkout() {
+    // Font to use in embedded & overlay checkout (text & fields)
+    // Repeated in Elements JS
+    // For Card/Postal fields: https://stripe.com/docs/stripe-js/reference#the-elements-object
+
+    font-family: Roboto, 'Open Sans', Segoe UI, sans-serif;
+    @include antialias();
+}
+
+@mixin font-system() {
+    // System fonts like WordPress admin
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+}
+
+// Misc
 
 @mixin clearfix() {
@@ -19 +40 @@
 }
 
-// Box Sizing
-
 @mixin box-sizing($box-model) {
     -webkit-box-sizing: $box-model; // Safari <= 5
@@ -27 +46 @@
 }
 
-// CSS3 Easing
-
 @mixin easing-transition() {
     -moz-transition: 0.2s all linear;
@@ -34 +51 @@
     transition: 0.2s all linear;
 }
+

stripe/trunk/assets/css/admin-all-pages.min.css

@@ -1 @@
-/*! WP Simple Pay Lite for Stripe - 2.0.12
+/*! WP Simple Pay Lite for Stripe - 2.1.0
  * https://wpsimplepay.com/
- * Copyright (c) Moonstone Media Group 2018
+ * Copyright (c) Moonstone Media Group 2019
  * Licensed GPLv2+ */
 

stripe/trunk/assets/css/admin.css

@@ -11 +11 @@
 
 #simpay-global-settings {
-  margin-right: 310px; }
+  /* Should be 40px more than #simpay-settings-sidebar-right below. */
+  margin-right: 350px; }
   @media (max-width: 768px) {
     #simpay-global-settings {
@@ -24 +25 @@
   #simpay-global-settings #simpay-settings-sidebar-right {
     float: right;
-    width: 270px;
-    margin-right: -290px; }
+    /* Move width down to 270px if extra space not needed. */
+    width: 310px;
+    /* margin-right should be negative of width and subtract another 20px. */
+    margin-right: -330px; }
     @media (max-width: 768px) {
       #simpay-global-settings #simpay-settings-sidebar-right {
@@ -139 +142 @@
   #simpay-form-settings .simpay-panel > table {
     width: 100%; }
+    #simpay-form-settings .simpay-panel > table:last-of-type {
+      margin-bottom: 20px; }
     #simpay-form-settings .simpay-panel > table thead th {
       border-bottom: 1px solid #eee;
@@ -232 +237 @@
 #simpay-global-settings .simpay-docs-link-wrap,
 #simpay-form-settings .simpay-docs-link-wrap {
+  position: absolute;
+  right: 0;
+  bottom: 0;
   color: #666;
-  float: right;
   font-size: 13px;
   font-style: italic;
@@ -303 +310 @@
     .simpay-system-status-report-panel mark.warning {
       color: #ffb900; }
+
+/*
+ * Stripe Connect
+ */
+#wpsp-api-keys-row-hide {
+  display: none; }
+
+.wpsp-stripe-connect {
+  display: inline-block;
+  margin-bottom: 1px;
+  background-image: -webkit-linear-gradient(#28A0E5, #015E94);
+  background-image: -moz-linear-gradient(#28A0E5, #015E94);
+  background-image: -ms-linear-gradient(#28A0E5, #015E94);
+  background-image: linear-gradient(#28A0E5, #015E94);
+  -webkit-font-smoothing: antialiased;
+  border: 0;
+  padding: 1px;
+  height: 30px;
+  text-decoration: none;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
+  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
+  cursor: pointer;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  user-select: none; }
+  .wpsp-stripe-connect span {
+    display: block;
+    position: relative;
+    padding: 0 12px 0 44px;
+    height: 30px;
+    background: #1275FF;
+    background-image: -webkit-linear-gradient(#7DC5EE, #008CDD 85%, #30A2E4);
+    background-image: -moz-linear-gradient(#7DC5EE, #008CDD 85%, #30A2E4);
+    background-image: -ms-linear-gradient(#7DC5EE, #008CDD 85%, #30A2E4);
+    background-image: linear-gradient(#7DC5EE, #008CDD 85%, #30A2E4);
+    font-size: 14px;
+    line-height: 30px;
+    color: white;
+    font-weight: bold;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px; }
+    .wpsp-stripe-connect span:before {
+      content: '';
+      display: block;
+      position: absolute;
+      left: 11px;
+      top: 50%;
+      width: 23px;
+      height: 24px;
+      margin-top: -12px;
+      background-repeat: no-repeat;
+      background-size: 23px 24px; }
+  .wpsp-stripe-connect:active {
+    background: #005D93; }
+    .wpsp-stripe-connect:active span {
+      color: #EEE;
+      background: #008CDD;
+      background-image: -webkit-linear-gradient(#008CDD, #008CDD 85%, #239ADF);
+      background-image: -moz-linear-gradient(#008CDD, #008CDD 85%, #239ADF);
+      background-image: -ms-linear-gradient(#008CDD, #008CDD 85%, #239ADF);
+      background-image: linear-gradient(#008CDD, #008CDD 85%, #239ADF);
+      -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1);
+      -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1);
+      box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1); }
+  .wpsp-stripe-connect span:before,
+  .wpsp-stripe-connect.blue span:before {
+    background-image: url("data:image/png;base64,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"); }
+
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-device-pixel-ratio: 1.5) {
+  .wpsp-stripe-connect span:before, .wpsp-stripe-connect.blue span:before {
+    background-image: url("data:image/png;base64,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"); } }
+
+/* End of Stripe Connect */

stripe/trunk/assets/css/admin.min.css

@@ -1 @@
-/*! WP Simple Pay Lite for Stripe - 2.0.12
+/*! WP Simple Pay Lite for Stripe - 2.1.0
  * https://wpsimplepay.com/
- * Copyright (c) Moonstone Media Group 2018
+ * Copyright (c) Moonstone Media Group 2019
  * Licensed GPLv2+ */
 
-.simpay-clearfix::after,.simpay-clearfix::before{content:" ";display:table}.simpay-clearfix::after{clear:both}.simpay-metabox-title{border:1px solid #eee}#simpay-global-settings{margin-right:310px}@media (max-width:768px){#simpay-global-settings{margin-right:0}}#simpay-global-settings .form-table .payment-details-description-tag{display:inline-block;background:rgba(0,0,0,.07);padding:0 3px}#simpay-global-settings #simpay-settings-left{float:left;width:100%}#simpay-global-settings #simpay-settings-sidebar-right{float:right;width:270px;margin-right:-290px}@media (max-width:768px){#simpay-global-settings #simpay-settings-sidebar-right{float:left;margin-right:0}}#simpay-global-settings #simpay-settings-sidebar-right h3{padding:10px 12px}#simpay-global-settings #simpay-settings-sidebar-right .centered{text-align:center}#simpay-global-settings #simpay-settings-sidebar-right .button-large{font-size:17px;line-height:30px;height:32px}#simpay-global-settings #simpay-settings-sidebar-right .sidebar-heading{font-size:17px}#simpay-global-settings #simpay-settings-sidebar-right .postbox-nobg{position:relative;min-width:255px}#simpay-global-settings #simpay-settings-sidebar-right .sidebar-container .postbox .inside{margin-bottom:0}#simpay-form-settings .inside{margin:0;padding:0}#simpay-form-settings .simpay-tabs{background:#fafafa;border-right:1px solid #eee;box-sizing:border-box;float:left;line-height:1em;margin:0;padding:0 0 10px;position:relative;width:25%}#simpay-form-settings .simpay-tabs li{display:block;margin:0;padding:0}#simpay-form-settings .simpay-tabs li.active a{background-color:#eee;color:#555;position:relative}#simpay-form-settings .simpay-tabs li .simpay-tab-item{border-bottom:1px solid #eee;display:block;line-height:20px;margin:0;padding:10px;text-decoration:none}#simpay-form-settings .simpay-tabs li .simpay-tab-item:focus{box-shadow:none}#simpay-form-settings .simpay-tabs::after{background-color:#fafafa;border-right:1px solid #eee;bottom:-9999em;content:"";display:block;height:9999em;left:0;position:absolute;width:100%}#simpay-form-settings .simpay-panels-wrap{background:#fff;min-height:350px;overflow:hidden}#simpay-form-settings .simpay-panel-field>td{width:82%}#simpay-form-settings .simpay-panel-field>th{font-weight:400;min-width:200px;width:15%}#simpay-form-settings .simpay-panel-field>td,#simpay-form-settings .simpay-panel-field>th{padding:5px 20px 10px 10px;text-align:left;vertical-align:text-top}#simpay-form-settings .simpay-panel-field .simpay-field-text{max-width:500px;width:100%}#simpay-form-settings .simpay-panel-field .error,#simpay-form-settings .simpay-panel-field .simpay-important{color:#a94442;font-weight:400}#simpay-form-settings .simpay-panel-field .simpay-image-preview-wrap{position:relative;margin-top:12px}#simpay-form-settings .simpay-panel-field .simpay-image-preview-wrap .simpay-remove-image-preview{position:absolute;top:-15px;left:-15px;cursor:pointer;background-color:#fff}#simpay-form-settings .simpay-panel-field .simpay-image-preview-wrap .simpay-remove-image-preview::before{font-size:22px;line-height:26px}#simpay-form-settings .simpay-panel-field .simpay-image-preview-wrap .simpay-image-preview{max-height:128px;max-width:128px;border:1px solid #ddd}#simpay-form-settings .simpay-panel{margin-left:25%;max-width:75%;padding-bottom:30px}#simpay-form-settings .simpay-panel>table{width:100%}#simpay-form-settings .simpay-panel>table thead th{border-bottom:1px solid #eee;font-size:14px;font-weight:700;padding:12px 0 15px 10px;text-align:left}#simpay-form-settings .simpay-panel>table>tbody tr:first-child td,#simpay-form-settings .simpay-panel>table>tbody tr:first-child th{padding-top:14px}#simpay-form-settings .simpay-panel>table>tbody tr:last-child td,#simpay-form-settings .simpay-panel>table>tbody tr:last-child th{border-bottom:0;padding-bottom:0}#simpay-form-settings .simpay-panel .simpay-promo-under-box{background-color:#f4f4f4;border:1px solid #e5e5e5;padding:10px 20px;margin:30px 15px}#simpay-form-settings .simpay-panel .simpay-promo-under-box h2{font-size:18px;font-weight:600;margin:0;padding:0}#simpay-form-settings .simpay-panel .simpay-promo-under-box p{font-size:14px}#simpay-form-settings .simpay-panel-hidden{display:none}#simpay-form-settings .chosen-container,#simpay-global-settings .chosen-container{min-width:20em;max-width:30em}#simpay-form-settings .simpay-field.simpay-small-text,#simpay-global-settings .simpay-field.simpay-small-text{width:7em}#simpay-form-settings .simpay-field.simpay-medium-text,#simpay-global-settings .simpay-field.simpay-medium-text{width:15em}#simpay-form-settings .simpay-field-radios>i,#simpay-global-settings .simpay-field-radios>i{margin-left:5px;vertical-align:middle}#simpay-form-settings .simpay-field-radios-inline,#simpay-global-settings .simpay-field-radios-inline{margin:0}#simpay-form-settings .simpay-field-radios-inline>li,#simpay-global-settings .simpay-field-radios-inline>li{display:inline-block;margin-right:10px}#simpay-form-settings .simpay-field-radios-inline>li:last-child,#simpay-global-settings .simpay-field-radios-inline>li:last-child{margin-right:0}#simpay-form-settings .simpay-field-select,#simpay-global-settings .simpay-field-select{max-width:20em!important}#simpay-form-settings .simpay-currency-symbol,#simpay-global-settings .simpay-currency-symbol{background-color:#f2f2f2;border:1px solid #ddd;margin:0;padding:5px 8px;font-size:14px}#simpay-form-settings .simpay-currency-symbol-left,#simpay-global-settings .simpay-currency-symbol-left{border-right:none;margin-right:-4px}#simpay-form-settings .simpay-currency-symbol-right,#simpay-global-settings .simpay-currency-symbol-right{border-left:none;margin-left:-4px}#simpay-form-settings .simpay-amount-input,#simpay-global-settings .simpay-amount-input{margin:0;padding:5px;font-size:14px;width:6em}#simpay-form-settings .simpay-error,#simpay-global-settings .simpay-error{color:red}#simpay-form-settings .simpay-docs-link-wrap,#simpay-global-settings .simpay-docs-link-wrap{color:#666;float:right;font-size:13px;font-style:italic;padding:20px}#simpay-form-settings .simpay-docs-link-wrap a .dashicons-editor-help,#simpay-global-settings .simpay-docs-link-wrap a .dashicons-editor-help{color:#666;text-decoration:none;width:17px;height:17px;font-size:17px;padding-left:4px}#simpay-form-settings .simpay-upgrade-btn,#simpay-global-settings .simpay-upgrade-btn{background-color:#428bca;border:1px solid #2d6ca2;border-radius:5px;color:#fff;display:inline-block;font-size:13px;font-weight:400;padding:5px 10px;text-decoration:none;white-space:nowrap}#simpay-form-settings .simpay-upgrade-btn:hover,#simpay-global-settings .simpay-upgrade-btn:hover{background-color:#037ad0;border:1px solid #025794}#simpay-get-shortcode input.simpay-shortcode{border:1px solid #ddd}#simpay-system-status-report textarea{font-family:monospace;min-height:200px;padding:5px 20px;white-space:pre;width:100%}.simpay-system-status-report-panel{margin:20px 0}.simpay-system-status-report-panel thead th{font-weight:700}.simpay-system-status-report-panel tbody td,.simpay-system-status-report-panel thead th{font-size:14px;vertical-align:top}.simpay-system-status-report-panel tbody .label{width:30%}.simpay-system-status-report-panel tbody tr:nth-child(odd) td{background-color:rgba(0,0,0,.02)}.simpay-system-status-report-panel dl{margin:0;padding:0}.simpay-system-status-report-panel dt{float:left;font-style:italic;margin:0 4px 0 0}.simpay-system-status-report-panel dd{margin:0}.simpay-system-status-report-panel mark{background-color:transparent;font-weight:700}.simpay-system-status-report-panel mark.ok{color:green}.simpay-system-status-report-panel mark.error{color:red}.simpay-system-status-report-panel mark.warning{color:#ffb900}
+.simpay-clearfix::after,.simpay-clearfix::before{content:" ";display:table}.simpay-clearfix::after{clear:both}.simpay-metabox-title{border:1px solid #eee}#simpay-global-settings{margin-right:350px}@media (max-width:768px){#simpay-global-settings{margin-right:0}}#simpay-global-settings .form-table .payment-details-description-tag{display:inline-block;background:rgba(0,0,0,.07);padding:0 3px}#simpay-global-settings #simpay-settings-left{float:left;width:100%}#simpay-global-settings #simpay-settings-sidebar-right{float:right;width:310px;margin-right:-330px}@media (max-width:768px){#simpay-global-settings #simpay-settings-sidebar-right{float:left;margin-right:0}}#simpay-global-settings #simpay-settings-sidebar-right h3{padding:10px 12px}#simpay-global-settings #simpay-settings-sidebar-right .centered{text-align:center}#simpay-global-settings #simpay-settings-sidebar-right .button-large{font-size:17px;line-height:30px;height:32px}#simpay-global-settings #simpay-settings-sidebar-right .sidebar-heading{font-size:17px}#simpay-global-settings #simpay-settings-sidebar-right .postbox-nobg{position:relative;min-width:255px}#simpay-global-settings #simpay-settings-sidebar-right .sidebar-container .postbox .inside{margin-bottom:0}#simpay-form-settings .inside{margin:0;padding:0}#simpay-form-settings .simpay-tabs{background:#fafafa;border-right:1px solid #eee;box-sizing:border-box;float:left;line-height:1em;margin:0;padding:0 0 10px;position:relative;width:25%}#simpay-form-settings .simpay-tabs li{display:block;margin:0;padding:0}#simpay-form-settings .simpay-tabs li.active a{background-color:#eee;color:#555;position:relative}#simpay-form-settings .simpay-tabs li .simpay-tab-item{border-bottom:1px solid #eee;display:block;line-height:20px;margin:0;padding:10px;text-decoration:none}#simpay-form-settings .simpay-tabs li .simpay-tab-item:focus{box-shadow:none}#simpay-form-settings .simpay-tabs::after{background-color:#fafafa;border-right:1px solid #eee;bottom:-9999em;content:"";display:block;height:9999em;left:0;position:absolute;width:100%}#simpay-form-settings .simpay-panels-wrap{background:#fff;min-height:350px;overflow:hidden}#simpay-form-settings .simpay-panel-field>td{width:82%}#simpay-form-settings .simpay-panel-field>th{font-weight:400;min-width:200px;width:15%}#simpay-form-settings .simpay-panel-field>td,#simpay-form-settings .simpay-panel-field>th{padding:5px 20px 10px 10px;text-align:left;vertical-align:text-top}#simpay-form-settings .simpay-panel-field .simpay-field-text{max-width:500px;width:100%}#simpay-form-settings .simpay-panel-field .error,#simpay-form-settings .simpay-panel-field .simpay-important{color:#a94442;font-weight:400}#simpay-form-settings .simpay-panel-field .simpay-image-preview-wrap{position:relative;margin-top:12px}#simpay-form-settings .simpay-panel-field .simpay-image-preview-wrap .simpay-remove-image-preview{position:absolute;top:-15px;left:-15px;cursor:pointer;background-color:#fff}#simpay-form-settings .simpay-panel-field .simpay-image-preview-wrap .simpay-remove-image-preview::before{font-size:22px;line-height:26px}#simpay-form-settings .simpay-panel-field .simpay-image-preview-wrap .simpay-image-preview{max-height:128px;max-width:128px;border:1px solid #ddd}#simpay-form-settings .simpay-panel{margin-left:25%;max-width:75%;padding-bottom:30px}#simpay-form-settings .simpay-panel>table{width:100%}#simpay-form-settings .simpay-panel>table:last-of-type{margin-bottom:20px}#simpay-form-settings .simpay-panel>table thead th{border-bottom:1px solid #eee;font-size:14px;font-weight:700;padding:12px 0 15px 10px;text-align:left}#simpay-form-settings .simpay-panel>table>tbody tr:first-child td,#simpay-form-settings .simpay-panel>table>tbody tr:first-child th{padding-top:14px}#simpay-form-settings .simpay-panel>table>tbody tr:last-child td,#simpay-form-settings .simpay-panel>table>tbody tr:last-child th{border-bottom:0;padding-bottom:0}#simpay-form-settings .simpay-panel .simpay-promo-under-box{background-color:#f4f4f4;border:1px solid #e5e5e5;padding:10px 20px;margin:30px 15px}#simpay-form-settings .simpay-panel .simpay-promo-under-box h2{font-size:18px;font-weight:600;margin:0;padding:0}#simpay-form-settings .simpay-panel .simpay-promo-under-box p{font-size:14px}#simpay-form-settings .simpay-panel-hidden{display:none}#simpay-form-settings .chosen-container,#simpay-global-settings .chosen-container{min-width:20em;max-width:30em}#simpay-form-settings .simpay-field.simpay-small-text,#simpay-global-settings .simpay-field.simpay-small-text{width:7em}#simpay-form-settings .simpay-field.simpay-medium-text,#simpay-global-settings .simpay-field.simpay-medium-text{width:15em}#simpay-form-settings .simpay-field-radios>i,#simpay-global-settings .simpay-field-radios>i{margin-left:5px;vertical-align:middle}#simpay-form-settings .simpay-field-radios-inline,#simpay-global-settings .simpay-field-radios-inline{margin:0}#simpay-form-settings .simpay-field-radios-inline>li,#simpay-global-settings .simpay-field-radios-inline>li{display:inline-block;margin-right:10px}#simpay-form-settings .simpay-field-radios-inline>li:last-child,#simpay-global-settings .simpay-field-radios-inline>li:last-child{margin-right:0}#simpay-form-settings .simpay-field-select,#simpay-global-settings .simpay-field-select{max-width:20em!important}#simpay-form-settings .simpay-currency-symbol,#simpay-global-settings .simpay-currency-symbol{background-color:#f2f2f2;border:1px solid #ddd;margin:0;padding:5px 8px;font-size:14px}#simpay-form-settings .simpay-currency-symbol-left,#simpay-global-settings .simpay-currency-symbol-left{border-right:none;margin-right:-4px}#simpay-form-settings .simpay-currency-symbol-right,#simpay-global-settings .simpay-currency-symbol-right{border-left:none;margin-left:-4px}#simpay-form-settings .simpay-amount-input,#simpay-global-settings .simpay-amount-input{margin:0;padding:5px;font-size:14px;width:6em}#simpay-form-settings .simpay-error,#simpay-global-settings .simpay-error{color:red}#simpay-form-settings .simpay-docs-link-wrap,#simpay-global-settings .simpay-docs-link-wrap{position:absolute;right:0;bottom:0;color:#666;font-size:13px;font-style:italic;padding:20px}#simpay-form-settings .simpay-docs-link-wrap a .dashicons-editor-help,#simpay-global-settings .simpay-docs-link-wrap a .dashicons-editor-help{color:#666;text-decoration:none;width:17px;height:17px;font-size:17px;padding-left:4px}#simpay-form-settings .simpay-upgrade-btn,#simpay-global-settings .simpay-upgrade-btn{background-color:#428bca;border:1px solid #2d6ca2;border-radius:5px;color:#fff;display:inline-block;font-size:13px;font-weight:400;padding:5px 10px;text-decoration:none;white-space:nowrap}#simpay-form-settings .simpay-upgrade-btn:hover,#simpay-global-settings .simpay-upgrade-btn:hover{background-color:#037ad0;border:1px solid #025794}#simpay-get-shortcode input.simpay-shortcode{border:1px solid #ddd}#simpay-system-status-report textarea{font-family:monospace;min-height:200px;padding:5px 20px;white-space:pre;width:100%}.simpay-system-status-report-panel{margin:20px 0}.simpay-system-status-report-panel thead th{font-weight:700}.simpay-system-status-report-panel tbody td,.simpay-system-status-report-panel thead th{font-size:14px;vertical-align:top}.simpay-system-status-report-panel tbody .label{width:30%}.simpay-system-status-report-panel tbody tr:nth-child(odd) td{background-color:rgba(0,0,0,.02)}.simpay-system-status-report-panel dl{margin:0;padding:0}.simpay-system-status-report-panel dt{float:left;font-style:italic;margin:0 4px 0 0}.simpay-system-status-report-panel dd{margin:0}.simpay-system-status-report-panel mark{background-color:transparent;font-weight:700}.simpay-system-status-report-panel mark.ok{color:green}.simpay-system-status-report-panel mark.error{color:red}.simpay-system-status-report-panel mark.warning{color:#ffb900}#wpsp-api-keys-row-hide{display:none}.wpsp-stripe-connect{display:inline-block;margin-bottom:1px;background-image:-webkit-linear-gradient(#28a0e5,#015e94);background-image:-moz-linear-gradient(#28a0e5,#015e94);background-image:-ms-linear-gradient(#28a0e5,#015e94);background-image:linear-gradient(#28a0e5,#015e94);-webkit-font-smoothing:antialiased;border:0;padding:1px;height:30px;text-decoration:none;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;-moz-box-shadow:0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 0 rgba(0,0,0,.2);cursor:pointer;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.wpsp-stripe-connect span{display:block;position:relative;padding:0 12px 0 44px;height:30px;background:#1275ff;background-image:-webkit-linear-gradient(#7dc5ee,#008cdd 85%,#30a2e4);background-image:-moz-linear-gradient(#7dc5ee,#008cdd 85%,#30a2e4);background-image:-ms-linear-gradient(#7dc5ee,#008cdd 85%,#30a2e4);background-image:linear-gradient(#7dc5ee,#008cdd 85%,#30a2e4);font-size:14px;line-height:30px;color:#fff;font-weight:700;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;text-shadow:0 -1px 0 rgba(0,0,0,.2);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.25);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25);box-shadow:inset 0 1px 0 rgba(255,255,255,.25);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.wpsp-stripe-connect span:before{content:'';display:block;position:absolute;left:11px;top:50%;width:23px;height:24px;margin-top:-12px;background-repeat:no-repeat;background-size:23px 24px}.wpsp-stripe-connect:active{background:#005d93}.wpsp-stripe-connect:active span{color:#eee;background:#008cdd;background-image:-webkit-linear-gradient(#008cdd,#008cdd 85%,#239adf);background-image:-moz-linear-gradient(#008cdd,#008cdd 85%,#239adf);background-image:-ms-linear-gradient(#008cdd,#008cdd 85%,#239adf);background-image:linear-gradient(#008cdd,#008cdd 85%,#239adf);-moz-box-shadow:inset 0 1px 0 rgba(0,0,0,.1);-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.1);box-shadow:inset 0 1px 0 rgba(0,0,0,.1)}.wpsp-stripe-connect span:before,.wpsp-stripe-connect.blue span:before{background-image:url(data:image/png;base64,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)}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min--moz-device-pixel-ratio:1.5),only screen and (min-device-pixel-ratio:1.5){.wpsp-stripe-connect span:before,.wpsp-stripe-connect.blue span:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAwCAYAAABuZUjcAAAKRGlDQ1BJQ0MgUHJvZmlsZQAASA2dlndUFNcXx9/MbC+0XZYiZem9twWkLr1IlSYKy+4CS1nWZRewN0QFIoqICFYkKGLAaCgSK6JYCAgW7AEJIkoMRhEVlczGHPX3Oyf5/U7eH3c+8333nnfn3vvOGQAoASECYQ6sAEC2UCKO9PdmxsUnMPG9AAZEgAM2AHC4uaLQKL9ogK5AXzYzF3WS8V8LAuD1LYBaAK5bBIQzmX/p/+9DkSsSSwCAwtEAOx4/l4tyIcpZ+RKRTJ9EmZ6SKWMYI2MxmiDKqjJO+8Tmf/p8Yk8Z87KFPNRHlrOIl82TcRfKG/OkfJSREJSL8gT8fJRvoKyfJc0WoPwGZXo2n5MLAIYi0yV8bjrK1ihTxNGRbJTnAkCgpH3FKV+xhF+A5gkAO0e0RCxIS5cwjbkmTBtnZxYzgJ+fxZdILMI53EyOmMdk52SLOMIlAHz6ZlkUUJLVlokW2dHG2dHRwtYSLf/n9Y+bn73+GWS9/eTxMuLPnkGMni/al9gvWk4tAKwptDZbvmgpOwFoWw+A6t0vmv4+AOQLAWjt++p7GLJ5SZdIRC5WVvn5+ZYCPtdSVtDP6386fPb8e/jqPEvZeZ9rx/Thp3KkWRKmrKjcnKwcqZiZK+Jw+UyL/x7ifx34VVpf5WEeyU/li/lC9KgYdMoEwjS03UKeQCLIETIFwr/r8L8M+yoHGX6aaxRodR8BPckSKPTRAfJrD8DQyABJ3IPuQJ/7FkKMAbKbF6s99mnuUUb3/7T/YeAy9BXOFaQxZTI7MprJlYrzZIzeCZnBAhKQB3SgBrSAHjAGFsAWOAFX4Al8QRAIA9EgHiwCXJAOsoEY5IPlYA0oAiVgC9gOqsFeUAcaQBM4BtrASXAOXARXwTVwE9wDQ2AUPAOT4DWYgSAID1EhGqQGaUMGkBlkC7Egd8gXCoEioXgoGUqDhJAUWg6tg0qgcqga2g81QN9DJ6Bz0GWoH7oDDUPj0O/QOxiBKTAd1oQNYSuYBXvBwXA0vBBOgxfDS+FCeDNcBdfCR+BW+Bx8Fb4JD8HP4CkEIGSEgeggFggLYSNhSAKSioiRlUgxUonUIk1IB9KNXEeGkAnkLQaHoWGYGAuMKyYAMx/DxSzGrMSUYqoxhzCtmC7MdcwwZhLzEUvFamDNsC7YQGwcNg2bjy3CVmLrsS3YC9ib2FHsaxwOx8AZ4ZxwAbh4XAZuGa4UtxvXjDuL68eN4KbweLwa3gzvhg/Dc/ASfBF+J/4I/gx+AD+Kf0MgE7QJtgQ/QgJBSFhLqCQcJpwmDBDGCDNEBaIB0YUYRuQRlxDLiHXEDmIfcZQ4Q1IkGZHcSNGkDNIaUhWpiXSBdJ/0kkwm65KdyRFkAXk1uYp8lHyJPEx+S1GimFLYlESKlLKZcpBylnKH8pJKpRpSPakJVAl1M7WBep76kPpGjiZnKRcox5NbJVcj1yo3IPdcnihvIO8lv0h+qXyl/HH5PvkJBaKCoQJbgaOwUqFG4YTCoMKUIk3RRjFMMVuxVPGw4mXFJ0p4JUMlXyWeUqHSAaXzSiM0hKZHY9O4tHW0OtoF2igdRzeiB9Iz6CX07+i99EllJWV75RjlAuUa5VPKQwyEYcgIZGQxyhjHGLcY71Q0VbxU+CqbVJpUBlSmVeeoeqryVYtVm1Vvqr5TY6r5qmWqbVVrU3ugjlE3VY9Qz1ffo35BfWIOfY7rHO6c4jnH5tzVgDVMNSI1lmkc0OjRmNLU0vTXFGnu1DyvOaHF0PLUytCq0DqtNa5N03bXFmhXaJ/RfspUZnoxs5hVzC7mpI6GToCOVGe/Tq/OjK6R7nzdtbrNug/0SHosvVS9Cr1OvUl9bf1Q/eX6jfp3DYgGLIN0gx0G3QbThkaGsYYbDNsMnxipGgUaLTVqNLpvTDX2MF5sXGt8wwRnwjLJNNltcs0UNnUwTTetMe0zg80czQRmu836zbHmzuZC81rzQQuKhZdFnkWjxbAlwzLEcq1lm+VzK32rBKutVt1WH60drLOs66zv2SjZBNmstemw+d3W1JZrW2N7w45q52e3yq7d7oW9mT3ffo/9bQeaQ6jDBodOhw+OTo5ixybHcSd9p2SnXU6DLDornFXKuuSMdfZ2XuV80vmti6OLxOWYy2+uFq6Zroddn8w1msufWzd3xE3XjeO2323Ineme7L7PfchDx4PjUevxyFPPk+dZ7znmZeKV4XXE67m3tbfYu8V7mu3CXsE+64P4+PsU+/T6KvnO9632fein65fm1+g36e/gv8z/bAA2IDhga8BgoGYgN7AhcDLIKWhFUFcwJTgquDr4UYhpiDikIxQODQrdFnp/nsE84by2MBAWGLYt7EG4Ufji8B8jcBHhETURjyNtIpdHdkfRopKiDke9jvaOLou+N994vnR+Z4x8TGJMQ8x0rE9seexQnFXcirir8erxgvj2BHxCTEJ9wtQC3wXbF4wmOiQWJd5aaLSwYOHlReqLshadSpJP4iQdT8YmxyYfTn7PCePUcqZSAlN2pUxy2dwd3Gc8T14Fb5zvxi/nj6W6pZanPklzS9uWNp7ukV6ZPiFgC6oFLzICMvZmTGeGZR7MnM2KzWrOJmQnZ58QKgkzhV05WjkFOf0iM1GRaGixy+LtiyfFweL6XCh3YW67hI7+TPVIjaXrpcN57nk1eW/yY/KPFygWCAt6lpgu2bRkbKnf0m+XYZZxl3Uu11m+ZvnwCq8V+1dCK1NWdq7SW1W4anS1/+pDa0hrMtf8tNZ6bfnaV+ti13UUahauLhxZ77++sUiuSFw0uMF1w96NmI2Cjb2b7Dbt3PSxmFd8pcS6pLLkfSm39Mo3Nt9UfTO7OXVzb5lj2Z4tuC3CLbe2emw9VK5YvrR8ZFvottYKZkVxxavtSdsvV9pX7t1B2iHdMVQVUtW+U3/nlp3vq9Orb9Z41zTv0ti1adf0bt7ugT2ee5r2au4t2ftun2Df7f3++1trDWsrD+AO5B14XBdT1/0t69uGevX6kvoPB4UHhw5FHupqcGpoOKxxuKwRbpQ2jh9JPHLtO5/v2pssmvY3M5pLjoKj0qNPv0/+/tax4GOdx1nHm34w+GFXC62luBVqXdI62ZbeNtQe395/IuhEZ4drR8uPlj8ePKlzsuaU8qmy06TThadnzyw9M3VWdHbiXNq5kc6kznvn487f6Iro6r0QfOHSRb+L57u9us9ccrt08rLL5RNXWFfarjpebe1x6Gn5yeGnll7H3tY+p772a87XOvrn9p8e8Bg4d93n+sUbgTeu3px3s//W/Fu3BxMHh27zbj+5k3Xnxd28uzP3Vt/H3i9+oPCg8qHGw9qfTX5uHnIcOjXsM9zzKOrRvRHuyLNfcn95P1r4mPq4ckx7rOGJ7ZOT437j154ueDr6TPRsZqLoV8Vfdz03fv7Db56/9UzGTY6+EL+Y/b30pdrLg6/sX3VOhU89fJ39ema6+I3am0NvWW+738W+G5vJf49/X/XB5EPHx+CP92ezZ2f/AAOY8/wRDtFgAAAIbklEQVRoBdVZa5BURxU+fZ9z57mzs7PvF4i7srAQSCifMVDERC0jYlzUlJalKeGPlCnL/NEfywpWacoiVZRVJIYfGjGUu5bxj5qHFSAYyQOBEsJzYSHDvnd2dp535j66PX1vNgsULDPs1cr2Vs+9e7v79NfnnnP663MJYwwWYxEWI2iOedEClxabxgkBwjEvOuA9PQOOlSw64JMr4vK8GidYYMcOES4tVSEAAZ8FAUqon1GiAJEEEG0CjFB8cTaxZUMAo1gEqQA0UABprAjPbrUwXnkesgqKP8CBk5vDIenrE+BKmwI+MawA1MbCkdV10cBDflXuVmSxQRbFkCAQZ9U2ZTaONyxKcyXDHjMs83ImV3rz6njmDRPMUZB80zAJOuvvsflkXpTP7DrWyeXcYCqk75AEieawrEoty1vrvlcV0ja3VQdb1rVUQVd9EFqqNIj5ZfDJooPBsCnohq2ldDMynC42XZnW7z09lu25lMxDMl34y0gyvTsBwyewc84Z4MEPpWIzF/MBcLLtNzJISmxZU+PmWETbtqGzfvVja5uguyF02+kCIEJUk6Ex4oMV9XP9ZnQT/nZ24it7XrtoJ5LZ7SjAM+Bg2+0ckAOcbBkQIaZFVzY1bGurjezYfn87PNQZ5+13ZaQRXMzH26Lg8ymfUokQdAR59INOc53GQ6q/Jiiua6oJ7+h9uAPua47cHeLrwHEmQRmTGLHV6x4v+JYwWsOFCGRDn6RKem1rPPrkN9Y0uqAXLN4VwCgjYGEE8rBgMAjwKsF9S9WgLa9qjYcf+Po9jXdlGrfC5Wj8Vg0Lf+ZENAFmpGB9TWTLhmUxUD1UDg/gtudRnK+a4RtkgqQyO+RT5LVrmiLgJcN19gcGNojUWriS5yRQm7pcBTc/vyCKdW1RrWwzOTiYhGf+dRUmcgZosgDVfgWaMCS2V2tO+OzG0MiVjdUwiFiYm9a7O4kJAoZEooV9H4T0O0ofODkKr5+6+nY6V3heVZQpv6ZWaz55qSJJnXjtUBW5pT7k8xeK5u+B0PQdBVbQgTLq9HbQYthyNVSmTT6A/nB0aGpF0K99+trY1F7TNI9PZGXkKUVRtYjGZCIOV1dHR4Ynz8FSLV8BrjK6uiAlpLcmco1ipmgpAaU8rfesboCuumBg31uJbx6+qH0uX9D/em0i85xFhaslKZKA8/82RtYDhd/1MkCuBnjxrLgKB0EQSb5oWO+9O1bZrsy3+Kc3dcH+b99b07NuyXe6P9r8z/am+C9lkuqCjo4qGGkQES76qJcuz/2GOlUoFuVsQS+98frlaSeq8Gkqqctrg7Dz853wwrfugUfXtj3W3tJ8oCletRUEXy1SCSSYHhdu41gFqILcZCrzwkvnJmE0U3JtHefiL7eS2l7th11f7IQ9j65aVh+r+nlzbd2TELJrHPLmIXZX3wyBX8MTQMm8PJ0u9Pe9chGQYy9omvXouHu/thJqI+Ef1sZDm0AMBmfPiQsSPDuY2zhWwSH5ISU5Pjm98x9nRo7+7JVBB3wl5nJz35Vo/z/esBQUVf2+QlkD9Aw42/Ts3Au7ushdAhQ5UzJoOjE+OrV9/1tDR7cNnIax7N2bDX9nm1bUQXdz9Rp/MLwRoqAtDOzcaO7rvDrAWW8vhcatWVNjF6cmJre9embkz1947h3YfXgIUgVzblQldxgFH0ZOr/qULwM15k4Zlci4Vd9ZU5ltY71oObHBnBFQBidmUk8kEsOP7Hntwqsb974NfS8PAh7LKoo23Hw+2R4FQcSzKlDPgFOEyf8kx3HW94kQ7xJgRRdAJG7CyIWxgiXNUN0+k5nJLN83k3n8D8eHN3+1ux5+8uBHIKiWt1G1Rn3IJkiUCcQzU3G0h9qWHMeJdoSrwtr9dl6I6DNjFwRRyxiKnStSqkPJPsGSmZ+mp1P9z2dzOy3Klj31yMdmX9S8V75APEsomMZwT9fz9i6vkW9AvEgQyqrBQM2Dq9rrD0gCgXfHA0jpjIRm2Zcw+3CR2tZl27SnMZFSZ1lWcRwZITeDckresAEXaoKwwBh7/WQubgTOQj5BVjdv7KiBJz7bztMNcHIk03JiONNyfiK/ntv2VMHAMx6BjpoA/Gj9Emdjul7W7e6TeQNDK9WJLRm361P5c1drEmAaymaYoXpfjZoiOk7FHWuh5dxEHmzLHiXM9oyTz9FawRZw65f5yyzXBMpd0JGhFKB5nSwRMVvumDv2cxm4m1f5X4AuWhRePDUOtqEPQJVVGfWcBz1ahmPlTlxzqaJLquYZU1HTvjcTMD6dOULM0n+g5nKposHzdWbo7FgEkDBviWlYx++53XtQ33kvDU8dHAJm6L8usdwEZn09S3qiPed5lcCSLUpI0eEA8620zLbDl6bh8T+egkI+/7Rl6kegcTSPst1QUKaM+brhrjnF2yUQJNxnrGMnR7KbTw5nYFVjyAl98w2+VdvVlA67Dw3BgROjAKa+yyrpz0BKTbJnez1NT6AKrrnA1bEi1av2v3xaiL90dnxL2Kc0rsXc4WpcQEc8AEtiGrRiejmK6WWeMDIxtVwwKExijB5KFuBYIg1cy8dx0dTQ/yQVc78yBXMIqJ5i/VvvkqHdSjXuM/THKy7w2LQJ6fpJms38QiHGvlzBt+RwJv2JQ2elbjyRtjIi1AIRMAsKPuQduHVzr2YW+kIBE5BTwOzzxLKOiMX8QVuWh00IpqD+S0WHtLlzefpLBOZo/IYvEqQPnTX5dxmy4xookqaCjRuT4mMi8g3bxs2KCkj3GFj4+QSzA0RkeskU8iCJeUiBDv09Jt8OPEV6k7DlP3gxxh/dAPymPh/Kf5d897dIOd9P7H8oEd4G1JV8wPGbRadx52sgLmrRAZ99EZ5+LZgV+v+4Llrg/wX6HRCxgvzAAwAAAABJRU5ErkJggg==)}}

stripe/trunk/assets/css/admin.scss

@@ -8 +8 @@
 #simpay-global-settings {
 
-    margin-right: 310px;
+    /* Should be 40px more than #simpay-settings-sidebar-right below. */
+    margin-right: 350px;
 
     // Remove right margin for sidebar promo on mobile.
@@ -34 +35 @@
 
         float: right;
-        width: 270px;
-        margin-right: -290px;
+
+        /* Move width down to 270px if extra space not needed. */
+        width: 310px;
+        /* margin-right should be negative of width and subtract another 20px. */
+        margin-right: -330px;
 
         // Move sidebar promo below other settings on mobile.
@@ -210 +214 @@
             width: 100%;
 
+            &:last-of-type {
+                margin-bottom: 20px;
+            }
+
             thead th {
                 border-bottom: 1px solid #eee;
@@ -283 +291 @@
         }
 
-        // WP core's "regular-text" class is 25em width.
+        // In lieu of .simpay-large-text, use
+        // WP core's "regular-text" class, which is 25em width.
 
     } // end .simpay-field
@@ -352 +361 @@
     .simpay-docs-link-wrap {
 
+        position: absolute;
+        right: 0;
+        bottom: 0;
         color: #666;
-        float: right;
         font-size: 13px;
         font-style: italic;
@@ -473 +484 @@
 
 }
+
+/*
+ * Stripe Connect
+ */
+
+ #wpsp-api-keys-row-hide {
+  display:none;
+ }
+ 
+.wpsp-stripe-connect {
+    display: inline-block;
+    margin-bottom: 1px;
+
+    background-image: -webkit-linear-gradient(#28A0E5, #015E94);
+    background-image: -moz-linear-gradient(#28A0E5, #015E94);
+    background-image: -ms-linear-gradient(#28A0E5, #015E94);
+    background-image: linear-gradient(#28A0E5, #015E94);
+
+    -webkit-font-smoothing: antialiased;
+    border: 0;
+    padding: 1px;
+    height: 30px;
+    text-decoration: none;
+
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+
+    -moz-box-shadow: 0 1px 0 rgba(0,0,0,0.2);
+    -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
+    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
+
+    cursor: pointer;
+
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+
+    span {
+        display: block;
+        position: relative;
+        padding: 0 12px 0 44px;
+        height: 30px;
+
+        background: #1275FF;
+        background-image: -webkit-linear-gradient(#7DC5EE, #008CDD 85%, #30A2E4);
+        background-image: -moz-linear-gradient(#7DC5EE, #008CDD 85%, #30A2E4);
+        background-image: -ms-linear-gradient(#7DC5EE, #008CDD 85%, #30A2E4);
+        background-image: linear-gradient(#7DC5EE, #008CDD 85%, #30A2E4);
+
+        font-size: 14px;
+        line-height: 30px;
+        color: white;
+        font-weight: bold;
+        font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+        text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+
+        -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.25);
+        -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+        box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+
+        -moz-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+
+        &:before {
+            content: '';
+            display: block;
+            position: absolute;
+            left: 11px;
+            top: 50%;
+            width: 23px;
+            height: 24px;
+            margin-top: -12px;
+            background-repeat: no-repeat;
+            background-size: 23px 24px;
+        }
+    }
+
+    &:active {
+        background: #005D93;
+
+        span {
+            color: #EEE;
+
+            background: #008CDD;
+            background-image: -webkit-linear-gradient(#008CDD, #008CDD 85%, #239ADF);
+            background-image: -moz-linear-gradient(#008CDD, #008CDD 85%, #239ADF);
+            background-image: -ms-linear-gradient(#008CDD, #008CDD 85%, #239ADF);
+            background-image: linear-gradient(#008CDD, #008CDD 85%, #239ADF);
+
+            -moz-box-shadow: inset 0 1px 0 rgba(0,0,0,0.1);
+            -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1);
+            box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1);
+        }
+    }
+
+    span:before,
+    &.blue span:before {
+        background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAYCAYAAAARfGZ1AAAKRGlDQ1BJQ0MgUHJvZmlsZQAASA2dlndUFNcXx9/MbC+0XZYiZem9twWkLr1IlSYKy+4CS1nWZRewN0QFIoqICFYkKGLAaCgSK6JYCAgW7AEJIkoMRhEVlczGHPX3Oyf5/U7eH3c+8333nnfn3vvOGQAoASECYQ6sAEC2UCKO9PdmxsUnMPG9AAZEgAM2AHC4uaLQKL9ogK5AXzYzF3WS8V8LAuD1LYBaAK5bBIQzmX/p/+9DkSsSSwCAwtEAOx4/l4tyIcpZ+RKRTJ9EmZ6SKWMYI2MxmiDKqjJO+8Tmf/p8Yk8Z87KFPNRHlrOIl82TcRfKG/OkfJSREJSL8gT8fJRvoKyfJc0WoPwGZXo2n5MLAIYi0yV8bjrK1ihTxNGRbJTnAkCgpH3FKV+xhF+A5gkAO0e0RCxIS5cwjbkmTBtnZxYzgJ+fxZdILMI53EyOmMdk52SLOMIlAHz6ZlkUUJLVlokW2dHG2dHRwtYSLf/n9Y+bn73+GWS9/eTxMuLPnkGMni/al9gvWk4tAKwptDZbvmgpOwFoWw+A6t0vmv4+AOQLAWjt++p7GLJ5SZdIRC5WVvn5+ZYCPtdSVtDP6386fPb8e/jqPEvZeZ9rx/Thp3KkWRKmrKjcnKwcqZiZK+Jw+UyL/x7ifx34VVpf5WEeyU/li/lC9KgYdMoEwjS03UKeQCLIETIFwr/r8L8M+yoHGX6aaxRodR8BPckSKPTRAfJrD8DQyABJ3IPuQJ/7FkKMAbKbF6s99mnuUUb3/7T/YeAy9BXOFaQxZTI7MprJlYrzZIzeCZnBAhKQB3SgBrSAHjAGFsAWOAFX4Al8QRAIA9EgHiwCXJAOsoEY5IPlYA0oAiVgC9gOqsFeUAcaQBM4BtrASXAOXARXwTVwE9wDQ2AUPAOT4DWYgSAID1EhGqQGaUMGkBlkC7Egd8gXCoEioXgoGUqDhJAUWg6tg0qgcqga2g81QN9DJ6Bz0GWoH7oDDUPj0O/QOxiBKTAd1oQNYSuYBXvBwXA0vBBOgxfDS+FCeDNcBdfCR+BW+Bx8Fb4JD8HP4CkEIGSEgeggFggLYSNhSAKSioiRlUgxUonUIk1IB9KNXEeGkAnkLQaHoWGYGAuMKyYAMx/DxSzGrMSUYqoxhzCtmC7MdcwwZhLzEUvFamDNsC7YQGwcNg2bjy3CVmLrsS3YC9ib2FHsaxwOx8AZ4ZxwAbh4XAZuGa4UtxvXjDuL68eN4KbweLwa3gzvhg/Dc/ASfBF+J/4I/gx+AD+Kf0MgE7QJtgQ/QgJBSFhLqCQcJpwmDBDGCDNEBaIB0YUYRuQRlxDLiHXEDmIfcZQ4Q1IkGZHcSNGkDNIaUhWpiXSBdJ/0kkwm65KdyRFkAXk1uYp8lHyJPEx+S1GimFLYlESKlLKZcpBylnKH8pJKpRpSPakJVAl1M7WBep76kPpGjiZnKRcox5NbJVcj1yo3IPdcnihvIO8lv0h+qXyl/HH5PvkJBaKCoQJbgaOwUqFG4YTCoMKUIk3RRjFMMVuxVPGw4mXFJ0p4JUMlXyWeUqHSAaXzSiM0hKZHY9O4tHW0OtoF2igdRzeiB9Iz6CX07+i99EllJWV75RjlAuUa5VPKQwyEYcgIZGQxyhjHGLcY71Q0VbxU+CqbVJpUBlSmVeeoeqryVYtVm1Vvqr5TY6r5qmWqbVVrU3ugjlE3VY9Qz1ffo35BfWIOfY7rHO6c4jnH5tzVgDVMNSI1lmkc0OjRmNLU0vTXFGnu1DyvOaHF0PLUytCq0DqtNa5N03bXFmhXaJ/RfspUZnoxs5hVzC7mpI6GToCOVGe/Tq/OjK6R7nzdtbrNug/0SHosvVS9Cr1OvUl9bf1Q/eX6jfp3DYgGLIN0gx0G3QbThkaGsYYbDNsMnxipGgUaLTVqNLpvTDX2MF5sXGt8wwRnwjLJNNltcs0UNnUwTTetMe0zg80czQRmu836zbHmzuZC81rzQQuKhZdFnkWjxbAlwzLEcq1lm+VzK32rBKutVt1WH60drLOs66zv2SjZBNmstemw+d3W1JZrW2N7w45q52e3yq7d7oW9mT3ffo/9bQeaQ6jDBodOhw+OTo5ixybHcSd9p2SnXU6DLDornFXKuuSMdfZ2XuV80vmti6OLxOWYy2+uFq6Zroddn8w1msufWzd3xE3XjeO2323Ineme7L7PfchDx4PjUevxyFPPk+dZ7znmZeKV4XXE67m3tbfYu8V7mu3CXsE+64P4+PsU+/T6KvnO9632fein65fm1+g36e/gv8z/bAA2IDhga8BgoGYgN7AhcDLIKWhFUFcwJTgquDr4UYhpiDikIxQODQrdFnp/nsE84by2MBAWGLYt7EG4Ufji8B8jcBHhETURjyNtIpdHdkfRopKiDke9jvaOLou+N994vnR+Z4x8TGJMQ8x0rE9seexQnFXcirir8erxgvj2BHxCTEJ9wtQC3wXbF4wmOiQWJd5aaLSwYOHlReqLshadSpJP4iQdT8YmxyYfTn7PCePUcqZSAlN2pUxy2dwd3Gc8T14Fb5zvxi/nj6W6pZanPklzS9uWNp7ukV6ZPiFgC6oFLzICMvZmTGeGZR7MnM2KzWrOJmQnZ58QKgkzhV05WjkFOf0iM1GRaGixy+LtiyfFweL6XCh3YW67hI7+TPVIjaXrpcN57nk1eW/yY/KPFygWCAt6lpgu2bRkbKnf0m+XYZZxl3Uu11m+ZvnwCq8V+1dCK1NWdq7SW1W4anS1/+pDa0hrMtf8tNZ6bfnaV+ti13UUahauLhxZ77++sUiuSFw0uMF1w96NmI2Cjb2b7Dbt3PSxmFd8pcS6pLLkfSm39Mo3Nt9UfTO7OXVzb5lj2Z4tuC3CLbe2emw9VK5YvrR8ZFvottYKZkVxxavtSdsvV9pX7t1B2iHdMVQVUtW+U3/nlp3vq9Orb9Z41zTv0ti1adf0bt7ugT2ee5r2au4t2ftun2Df7f3++1trDWsrD+AO5B14XBdT1/0t69uGevX6kvoPB4UHhw5FHupqcGpoOKxxuKwRbpQ2jh9JPHLtO5/v2pssmvY3M5pLjoKj0qNPv0/+/tax4GOdx1nHm34w+GFXC62luBVqXdI62ZbeNtQe395/IuhEZ4drR8uPlj8ePKlzsuaU8qmy06TThadnzyw9M3VWdHbiXNq5kc6kznvn487f6Iro6r0QfOHSRb+L57u9us9ccrt08rLL5RNXWFfarjpebe1x6Gn5yeGnll7H3tY+p772a87XOvrn9p8e8Bg4d93n+sUbgTeu3px3s//W/Fu3BxMHh27zbj+5k3Xnxd28uzP3Vt/H3i9+oPCg8qHGw9qfTX5uHnIcOjXsM9zzKOrRvRHuyLNfcn95P1r4mPq4ckx7rOGJ7ZOT437j154ueDr6TPRsZqLoV8Vfdz03fv7Db56/9UzGTY6+EL+Y/b30pdrLg6/sX3VOhU89fJ39ema6+I3am0NvWW+738W+G5vJf49/X/XB5EPHx+CP92ezZ2f/AAOY8/wRDtFgAAADQklEQVRIDbWVaUiUQRjHZ96dXY/d1fYQj1U03dJSw9YkFgy6DIkILRArQSSC7PjQjQQqVH7oQ0GHQUWgpQhKHzoNSqiUwpXcsrwIjzVtPVrzbPV9Z6bZhYV3N3WXYAeGmWeeZ37z8J95GEgpBf5oeXn1Es4fYAdzPDlM6je4RBYhR+LMU89UxiCBGiCgkUwsBYSA+SlPKLQBQAYEAZm+3j42K96z3NyOF7VOeMrp62opRcacjPW5+43rDTpNSKQ8QKZAEg7xmPCTs/O27uGJgXuNbW0pxyvLfTmAEBzthEsFZLxRvPdi5rpYo2cmUiQJDA4IVeo0obGdlvGfXUPj0Sym2zPuHxvzcWjDyVupJ/YYizKTGNjLw/HiduNTAqIRIUJ6Vpp+ky8bCSFgwQ2xgkGxFi1ioNWEBGuJB31gbLIv/2pd7SpFoGxtpCYkLSEq4ptlzIYFO7tc7w0TKkeEYg5ADnrWkkYhD8s26GPq3nW0WKxTptftPYBI4Mj3O2fHvKNZBMVSDmMwarXNjDkSF3d5kExZeiCr8M2VI+VFu9IvsPcYtzAvkfoEZkEEE45jMppq3ppbCNPFIY1nD1cpo07lbMmvOXeoDCF8BLKy9uUAAjDkBh+c6bz78mNtVVP7MwET7JBnqb4xXpdWVpC1OVzWn+ELHLCsneX/s7rkRWl1463cy1U3WroG21jhCGKJXPOtKQnpAuENvsAppgDB3TcDVIrpDHbK5Kd+y7W8iodNybHh22rOHyxUK+UaMYjZaoyp25rYL54TSihSKmwZ14v3lc3ZFxdbeywjn/tGJnkmzrydX1ApxOEACKymmXLYfXVpi1JMEOGxPi1ep18doY4r2J7uFumQQ9yGf01bMcZW8dpyc0oIjxxpuC5wuUDX+ovWrnYeg3aXvdLIqnmOvXPsfH6uA5YbTb1DX8ofvTLzTy6ZV4K6fAw+gXiATfdffmjeaUgc1UdpdWplsCooQBrEnqUw82dhdnjit/Vxc4f59tP3DRjzJvYteqrl4rmNlJIfrOwpgNklesDRNQBCHYtQAQqD2CgACNjHAJnG1EyfV/S67fZiJB5t2OGEe4n7L3fS4fpEv/2hUEATfoPbuam5v8N7nps70YTbAAAAAElFTkSuQmCC");
+    }
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
+only screen and (min--moz-device-pixel-ratio: 1.5),
+only screen and (min-device-pixel-ratio: 1.5) {
+    .wpsp-stripe-connect span:before, .wpsp-stripe-connect.blue span:before {
+        background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAwCAYAAABuZUjcAAAKRGlDQ1BJQ0MgUHJvZmlsZQAASA2dlndUFNcXx9/MbC+0XZYiZem9twWkLr1IlSYKy+4CS1nWZRewN0QFIoqICFYkKGLAaCgSK6JYCAgW7AEJIkoMRhEVlczGHPX3Oyf5/U7eH3c+8333nnfn3vvOGQAoASECYQ6sAEC2UCKO9PdmxsUnMPG9AAZEgAM2AHC4uaLQKL9ogK5AXzYzF3WS8V8LAuD1LYBaAK5bBIQzmX/p/+9DkSsSSwCAwtEAOx4/l4tyIcpZ+RKRTJ9EmZ6SKWMYI2MxmiDKqjJO+8Tmf/p8Yk8Z87KFPNRHlrOIl82TcRfKG/OkfJSREJSL8gT8fJRvoKyfJc0WoPwGZXo2n5MLAIYi0yV8bjrK1ihTxNGRbJTnAkCgpH3FKV+xhF+A5gkAO0e0RCxIS5cwjbkmTBtnZxYzgJ+fxZdILMI53EyOmMdk52SLOMIlAHz6ZlkUUJLVlokW2dHG2dHRwtYSLf/n9Y+bn73+GWS9/eTxMuLPnkGMni/al9gvWk4tAKwptDZbvmgpOwFoWw+A6t0vmv4+AOQLAWjt++p7GLJ5SZdIRC5WVvn5+ZYCPtdSVtDP6386fPb8e/jqPEvZeZ9rx/Thp3KkWRKmrKjcnKwcqZiZK+Jw+UyL/x7ifx34VVpf5WEeyU/li/lC9KgYdMoEwjS03UKeQCLIETIFwr/r8L8M+yoHGX6aaxRodR8BPckSKPTRAfJrD8DQyABJ3IPuQJ/7FkKMAbKbF6s99mnuUUb3/7T/YeAy9BXOFaQxZTI7MprJlYrzZIzeCZnBAhKQB3SgBrSAHjAGFsAWOAFX4Al8QRAIA9EgHiwCXJAOsoEY5IPlYA0oAiVgC9gOqsFeUAcaQBM4BtrASXAOXARXwTVwE9wDQ2AUPAOT4DWYgSAID1EhGqQGaUMGkBlkC7Egd8gXCoEioXgoGUqDhJAUWg6tg0qgcqga2g81QN9DJ6Bz0GWoH7oDDUPj0O/QOxiBKTAd1oQNYSuYBXvBwXA0vBBOgxfDS+FCeDNcBdfCR+BW+Bx8Fb4JD8HP4CkEIGSEgeggFggLYSNhSAKSioiRlUgxUonUIk1IB9KNXEeGkAnkLQaHoWGYGAuMKyYAMx/DxSzGrMSUYqoxhzCtmC7MdcwwZhLzEUvFamDNsC7YQGwcNg2bjy3CVmLrsS3YC9ib2FHsaxwOx8AZ4ZxwAbh4XAZuGa4UtxvXjDuL68eN4KbweLwa3gzvhg/Dc/ASfBF+J/4I/gx+AD+Kf0MgE7QJtgQ/QgJBSFhLqCQcJpwmDBDGCDNEBaIB0YUYRuQRlxDLiHXEDmIfcZQ4Q1IkGZHcSNGkDNIaUhWpiXSBdJ/0kkwm65KdyRFkAXk1uYp8lHyJPEx+S1GimFLYlESKlLKZcpBylnKH8pJKpRpSPakJVAl1M7WBep76kPpGjiZnKRcox5NbJVcj1yo3IPdcnihvIO8lv0h+qXyl/HH5PvkJBaKCoQJbgaOwUqFG4YTCoMKUIk3RRjFMMVuxVPGw4mXFJ0p4JUMlXyWeUqHSAaXzSiM0hKZHY9O4tHW0OtoF2igdRzeiB9Iz6CX07+i99EllJWV75RjlAuUa5VPKQwyEYcgIZGQxyhjHGLcY71Q0VbxU+CqbVJpUBlSmVeeoeqryVYtVm1Vvqr5TY6r5qmWqbVVrU3ugjlE3VY9Qz1ffo35BfWIOfY7rHO6c4jnH5tzVgDVMNSI1lmkc0OjRmNLU0vTXFGnu1DyvOaHF0PLUytCq0DqtNa5N03bXFmhXaJ/RfspUZnoxs5hVzC7mpI6GToCOVGe/Tq/OjK6R7nzdtbrNug/0SHosvVS9Cr1OvUl9bf1Q/eX6jfp3DYgGLIN0gx0G3QbThkaGsYYbDNsMnxipGgUaLTVqNLpvTDX2MF5sXGt8wwRnwjLJNNltcs0UNnUwTTetMe0zg80czQRmu836zbHmzuZC81rzQQuKhZdFnkWjxbAlwzLEcq1lm+VzK32rBKutVt1WH60drLOs66zv2SjZBNmstemw+d3W1JZrW2N7w45q52e3yq7d7oW9mT3ffo/9bQeaQ6jDBodOhw+OTo5ixybHcSd9p2SnXU6DLDornFXKuuSMdfZ2XuV80vmti6OLxOWYy2+uFq6Zroddn8w1msufWzd3xE3XjeO2323Ineme7L7PfchDx4PjUevxyFPPk+dZ7znmZeKV4XXE67m3tbfYu8V7mu3CXsE+64P4+PsU+/T6KvnO9632fein65fm1+g36e/gv8z/bAA2IDhga8BgoGYgN7AhcDLIKWhFUFcwJTgquDr4UYhpiDikIxQODQrdFnp/nsE84by2MBAWGLYt7EG4Ufji8B8jcBHhETURjyNtIpdHdkfRopKiDke9jvaOLou+N994vnR+Z4x8TGJMQ8x0rE9seexQnFXcirir8erxgvj2BHxCTEJ9wtQC3wXbF4wmOiQWJd5aaLSwYOHlReqLshadSpJP4iQdT8YmxyYfTn7PCePUcqZSAlN2pUxy2dwd3Gc8T14Fb5zvxi/nj6W6pZanPklzS9uWNp7ukV6ZPiFgC6oFLzICMvZmTGeGZR7MnM2KzWrOJmQnZ58QKgkzhV05WjkFOf0iM1GRaGixy+LtiyfFweL6XCh3YW67hI7+TPVIjaXrpcN57nk1eW/yY/KPFygWCAt6lpgu2bRkbKnf0m+XYZZxl3Uu11m+ZvnwCq8V+1dCK1NWdq7SW1W4anS1/+pDa0hrMtf8tNZ6bfnaV+ti13UUahauLhxZ77++sUiuSFw0uMF1w96NmI2Cjb2b7Dbt3PSxmFd8pcS6pLLkfSm39Mo3Nt9UfTO7OXVzb5lj2Z4tuC3CLbe2emw9VK5YvrR8ZFvottYKZkVxxavtSdsvV9pX7t1B2iHdMVQVUtW+U3/nlp3vq9Orb9Z41zTv0ti1adf0bt7ugT2ee5r2au4t2ftun2Df7f3++1trDWsrD+AO5B14XBdT1/0t69uGevX6kvoPB4UHhw5FHupqcGpoOKxxuKwRbpQ2jh9JPHLtO5/v2pssmvY3M5pLjoKj0qNPv0/+/tax4GOdx1nHm34w+GFXC62luBVqXdI62ZbeNtQe395/IuhEZ4drR8uPlj8ePKlzsuaU8qmy06TThadnzyw9M3VWdHbiXNq5kc6kznvn487f6Iro6r0QfOHSRb+L57u9us9ccrt08rLL5RNXWFfarjpebe1x6Gn5yeGnll7H3tY+p772a87XOvrn9p8e8Bg4d93n+sUbgTeu3px3s//W/Fu3BxMHh27zbj+5k3Xnxd28uzP3Vt/H3i9+oPCg8qHGw9qfTX5uHnIcOjXsM9zzKOrRvRHuyLNfcn95P1r4mPq4ckx7rOGJ7ZOT437j154ueDr6TPRsZqLoV8Vfdz03fv7Db56/9UzGTY6+EL+Y/b30pdrLg6/sX3VOhU89fJ39ema6+I3am0NvWW+738W+G5vJf49/X/XB5EPHx+CP92ezZ2f/AAOY8/wRDtFgAAAIbklEQVRoBdVZa5BURxU+fZ9z57mzs7PvF4i7srAQSCifMVDERC0jYlzUlJalKeGPlCnL/NEfywpWacoiVZRVJIYfGjGUu5bxj5qHFSAYyQOBEsJzYSHDvnd2dp535j66PX1vNgsULDPs1cr2Vs+9e7v79NfnnnP663MJYwwWYxEWI2iOedEClxabxgkBwjEvOuA9PQOOlSw64JMr4vK8GidYYMcOES4tVSEAAZ8FAUqon1GiAJEEEG0CjFB8cTaxZUMAo1gEqQA0UABprAjPbrUwXnkesgqKP8CBk5vDIenrE+BKmwI+MawA1MbCkdV10cBDflXuVmSxQRbFkCAQZ9U2ZTaONyxKcyXDHjMs83ImV3rz6njmDRPMUZB80zAJOuvvsflkXpTP7DrWyeXcYCqk75AEieawrEoty1vrvlcV0ja3VQdb1rVUQVd9EFqqNIj5ZfDJooPBsCnohq2ldDMynC42XZnW7z09lu25lMxDMl34y0gyvTsBwyewc84Z4MEPpWIzF/MBcLLtNzJISmxZU+PmWETbtqGzfvVja5uguyF02+kCIEJUk6Ex4oMV9XP9ZnQT/nZ24it7XrtoJ5LZ7SjAM+Bg2+0ckAOcbBkQIaZFVzY1bGurjezYfn87PNQZ5+13ZaQRXMzH26Lg8ymfUokQdAR59INOc53GQ6q/Jiiua6oJ7+h9uAPua47cHeLrwHEmQRmTGLHV6x4v+JYwWsOFCGRDn6RKem1rPPrkN9Y0uqAXLN4VwCgjYGEE8rBgMAjwKsF9S9WgLa9qjYcf+Po9jXdlGrfC5Wj8Vg0Lf+ZENAFmpGB9TWTLhmUxUD1UDg/gtudRnK+a4RtkgqQyO+RT5LVrmiLgJcN19gcGNojUWriS5yRQm7pcBTc/vyCKdW1RrWwzOTiYhGf+dRUmcgZosgDVfgWaMCS2V2tO+OzG0MiVjdUwiFiYm9a7O4kJAoZEooV9H4T0O0ofODkKr5+6+nY6V3heVZQpv6ZWaz55qSJJnXjtUBW5pT7k8xeK5u+B0PQdBVbQgTLq9HbQYthyNVSmTT6A/nB0aGpF0K99+trY1F7TNI9PZGXkKUVRtYjGZCIOV1dHR4Ynz8FSLV8BrjK6uiAlpLcmco1ipmgpAaU8rfesboCuumBg31uJbx6+qH0uX9D/em0i85xFhaslKZKA8/82RtYDhd/1MkCuBnjxrLgKB0EQSb5oWO+9O1bZrsy3+Kc3dcH+b99b07NuyXe6P9r8z/am+C9lkuqCjo4qGGkQES76qJcuz/2GOlUoFuVsQS+98frlaSeq8Gkqqctrg7Dz853wwrfugUfXtj3W3tJ8oCletRUEXy1SCSSYHhdu41gFqILcZCrzwkvnJmE0U3JtHefiL7eS2l7th11f7IQ9j65aVh+r+nlzbd2TELJrHPLmIXZX3wyBX8MTQMm8PJ0u9Pe9chGQYy9omvXouHu/thJqI+Ef1sZDm0AMBmfPiQsSPDuY2zhWwSH5ISU5Pjm98x9nRo7+7JVBB3wl5nJz35Vo/z/esBQUVf2+QlkD9Aw42/Ts3Au7ushdAhQ5UzJoOjE+OrV9/1tDR7cNnIax7N2bDX9nm1bUQXdz9Rp/MLwRoqAtDOzcaO7rvDrAWW8vhcatWVNjF6cmJre9embkz1947h3YfXgIUgVzblQldxgFH0ZOr/qULwM15k4Zlci4Vd9ZU5ltY71oObHBnBFQBidmUk8kEsOP7Hntwqsb974NfS8PAh7LKoo23Hw+2R4FQcSzKlDPgFOEyf8kx3HW94kQ7xJgRRdAJG7CyIWxgiXNUN0+k5nJLN83k3n8D8eHN3+1ux5+8uBHIKiWt1G1Rn3IJkiUCcQzU3G0h9qWHMeJdoSrwtr9dl6I6DNjFwRRyxiKnStSqkPJPsGSmZ+mp1P9z2dzOy3Klj31yMdmX9S8V75APEsomMZwT9fz9i6vkW9AvEgQyqrBQM2Dq9rrD0gCgXfHA0jpjIRm2Zcw+3CR2tZl27SnMZFSZ1lWcRwZITeDckresAEXaoKwwBh7/WQubgTOQj5BVjdv7KiBJz7bztMNcHIk03JiONNyfiK/ntv2VMHAMx6BjpoA/Gj9Emdjul7W7e6TeQNDK9WJLRm361P5c1drEmAaymaYoXpfjZoiOk7FHWuh5dxEHmzLHiXM9oyTz9FawRZw65f5yyzXBMpd0JGhFKB5nSwRMVvumDv2cxm4m1f5X4AuWhRePDUOtqEPQJVVGfWcBz1ahmPlTlxzqaJLquYZU1HTvjcTMD6dOULM0n+g5nKposHzdWbo7FgEkDBviWlYx++53XtQ33kvDU8dHAJm6L8usdwEZn09S3qiPed5lcCSLUpI0eEA8620zLbDl6bh8T+egkI+/7Rl6kegcTSPst1QUKaM+brhrjnF2yUQJNxnrGMnR7KbTw5nYFVjyAl98w2+VdvVlA67Dw3BgROjAKa+yyrpz0BKTbJnez1NT6AKrrnA1bEi1av2v3xaiL90dnxL2Kc0rsXc4WpcQEc8AEtiGrRiejmK6WWeMDIxtVwwKExijB5KFuBYIg1cy8dx0dTQ/yQVc78yBXMIqJ5i/VvvkqHdSjXuM/THKy7w2LQJ6fpJms38QiHGvlzBt+RwJv2JQ2elbjyRtjIi1AIRMAsKPuQduHVzr2YW+kIBE5BTwOzzxLKOiMX8QVuWh00IpqD+S0WHtLlzefpLBOZo/IYvEqQPnTX5dxmy4xookqaCjRuT4mMi8g3bxs2KCkj3GFj4+QSzA0RkeskU8iCJeUiBDv09Jt8OPEV6k7DlP3gxxh/dAPymPh/Kf5d897dIOd9P7H8oEd4G1JV8wPGbRadx52sgLmrRAZ99EZ5+LZgV+v+4Llrg/wX6HRCxgvzAAwAAAABJRU5ErkJggg==");
+    }
+}
+
+/* End of Stripe Connect */

stripe/trunk/assets/css/chosen.min.css

@@ -1 @@
-/*! WP Simple Pay Lite for Stripe - 2.0.12
+/*! WP Simple Pay Lite for Stripe - 2.1.0
  * https://wpsimplepay.com/
- * Copyright (c) Moonstone Media Group 2018
+ * Copyright (c) Moonstone Media Group 2019
  * Licensed GPLv2+ */
 

stripe/trunk/assets/css/public.css

@@ -8 +8 @@
 
 .simpay-form-control {
-  margin-bottom: 15px;
-  *zoom: 1; }
+  *zoom: 1;
+  margin-bottom: 15px; }
   .simpay-form-control::before, .simpay-form-control::after {
     content: " ";
@@ -19 +19 @@
     margin: 0; }
   .simpay-form-control ul {
-    margin-bottom: 0.5em; }
-  .simpay-form-control ul li {
-    list-style-type: none; }
+    margin: 0 0 0.5em 0; }
+    .simpay-form-control ul li {
+      list-style-type: none; }
+      .simpay-form-control ul li label {
+        display: block;
+        margin: 0 0 0.5em 0; }
+        .simpay-form-control ul li label input[type="radio"], .simpay-form-control ul li label input[type="checkbox"] {
+          margin-right: 0.5em; }
   .simpay-form-control label {
-    cursor: pointer; }
+    cursor: pointer;
+    display: block; }
   .simpay-form-control .simpay-field-wrap {
     *zoom: 1; }
@@ -32 +38 @@
       clear: both; }
 
-.simpay-test-mode-badge-container {
-  padding-top: 10px; }
-  .simpay-test-mode-badge-container .simpay-test-mode-badge {
-    background-color: #f7e633;
-    color: #363636;
-    border-radius: 5px;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-weight: 700;
-    font-size: 11px;
-    text-transform: uppercase;
-    padding: 5px 9px; }
+.simpay-errors {
+  color: #eb1c26;
+  margin-bottom: 15px; }
 
-.simpay-error {
-  *zoom: 1;
-  background-color: #f2dede;
-  border: 1px solid #ebcccc;
-  border-radius: .25rem;
-  color: #a94442;
-  margin: 1rem 0;
-  padding: .75rem 1.25rem; }
-  .simpay-error::before, .simpay-error::after {
-    content: " ";
-    display: table; }
-  .simpay-error::after {
-    clear: both; }
-  .simpay-error .simpay-error-item {
-    margin: 0; }
+.simpay-test-mode-badge-container .simpay-test-mode-badge {
+  background-color: #f7e633;
+  color: #333;
+  border-radius: 5px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 700;
+  font-size: 11px;
+  text-transform: uppercase;
+  padding: 5px 9px; }

stripe/trunk/assets/css/public.min.css

@@ -1 @@
-/*! WP Simple Pay Lite for Stripe - 2.0.12
+/*! WP Simple Pay Lite for Stripe - 2.1.0
  * https://wpsimplepay.com/
- * Copyright (c) Moonstone Media Group 2018
+ * Copyright (c) Moonstone Media Group 2019
  * Licensed GPLv2+ */
 
-.simpay-clearfix::after,.simpay-clearfix::before{content:" ";display:table}.simpay-clearfix::after{clear:both}.simpay-form-control{margin-bottom:15px}.simpay-form-control::after,.simpay-form-control::before{content:" ";display:table}.simpay-form-control::after{clear:both}.simpay-form-control p{padding:0;margin:0}.simpay-form-control ul{margin-bottom:.5em}.simpay-form-control ul li{list-style-type:none}.simpay-form-control label{cursor:pointer}.simpay-form-control .simpay-field-wrap::after,.simpay-form-control .simpay-field-wrap::before{content:" ";display:table}.simpay-form-control .simpay-field-wrap::after{clear:both}.simpay-test-mode-badge-container{padding-top:10px}.simpay-test-mode-badge-container .simpay-test-mode-badge{background-color:#f7e633;color:#363636;border-radius:5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:700;font-size:11px;text-transform:uppercase;padding:5px 9px}.simpay-error{background-color:#f2dede;border:1px solid #ebcccc;border-radius:.25rem;color:#a94442;margin:1rem 0;padding:.75rem 1.25rem}.simpay-error::after,.simpay-error::before{content:" ";display:table}.simpay-error::after{clear:both}.simpay-error .simpay-error-item{margin:0}
+.simpay-clearfix::after,.simpay-clearfix::before{content:" ";display:table}.simpay-clearfix::after{clear:both}.simpay-form-control{margin-bottom:15px}.simpay-form-control::after,.simpay-form-control::before{content:" ";display:table}.simpay-form-control::after{clear:both}.simpay-form-control p{padding:0;margin:0}.simpay-form-control ul{margin:0 0 .5em 0}.simpay-form-control ul li{list-style-type:none}.simpay-form-control ul li label{display:block;margin:0 0 .5em 0}.simpay-form-control ul li label input[type=checkbox],.simpay-form-control ul li label input[type=radio]{margin-right:.5em}.simpay-form-control label{cursor:pointer;display:block}.simpay-form-control .simpay-field-wrap::after,.simpay-form-control .simpay-field-wrap::before{content:" ";display:table}.simpay-form-control .simpay-field-wrap::after{clear:both}.simpay-errors{color:#eb1c26;margin-bottom:15px}.simpay-test-mode-badge-container .simpay-test-mode-badge{background-color:#f7e633;color:#333;border-radius:5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:700;font-size:11px;text-transform:uppercase;padding:5px 9px}

stripe/trunk/assets/css/public.scss

@@ -1 @@
-@import '_mixins';
+@import 'mixins';
+@import 'variables';
 
 .simpay-form-control {
-
+    @include clearfix();
     margin-bottom: 15px;
-    @include clearfix();
 
     p {
@@ -12 +12 @@
 
     ul {
-        margin-bottom: 0.5em;
-    }
+        margin: 0 0 0.5em 0;
 
-    ul li {
-        list-style-type: none;
+        li {
+            list-style-type: none;
+
+            label {
+                display: block;
+                margin: 0 0 0.5em 0;
+
+                input[type="radio"], input[type="checkbox"] {
+                    margin-right: 0.5em;
+                }
+            }
+        }
     }
 
     label {
         cursor: pointer;
+        display: block;
     }
 
@@ -29 +39 @@
 }
 
+// Error messages container
+
+.simpay-errors {
+    //@include clearfix();
+    color: $error-text-color;
+    margin-bottom: 15px;
+}
+
 // Test mode badge
 
 .simpay-test-mode-badge-container {
-    padding-top: 10px;
 
     .simpay-test-mode-badge {
         background-color: #f7e633;
-        color: #363636;
+        color: $base-text-color;
         border-radius: 5px;
         font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -45 +62 @@
     }
 }
-
-// Error messages
-// Styles taken from Bootstrap
-// http://getbootstrap.com/components/#alerts & https://v4-alpha.getbootstrap.com/components/alerts/
-
-.simpay-error {
-    @include clearfix();
-
-    background-color: #f2dede;
-    border: 1px solid #ebcccc;
-    border-radius: .25rem;
-    color: #a94442;
-    margin: 1rem 0;
-    padding: .75rem 1.25rem;
-
-    .simpay-error-item {
-        margin: 0;
-    }
-}

stripe/trunk/assets/js/admin.js

@@ -3 +3 @@
 var spAdmin = {};
 
-(function( $ ) {
+( function( $ ) {
     'use strict';
 
@@ -25 +25 @@
             // Init admin metabox tab clicks.
             this.handleMetaboxTabClick();
+
+            this.stripeConnect();
 
             // Init internal link to tab clicks.
@@ -37 +39 @@
             } );
 
-            // Section toggles
-            spFormSettings.find( '.simpay-panel-field' ).on( 'click.simpaySectionToggle', '.simpay-section-toggle', function( e ) {
+            // Checkbox section toggles
+            spFormSettings.find( '.simpay-panel-field' ).on( 'change.simpaySectionToggle', '.simpay-section-toggle', function( e ) {
                 spAdmin.initSectionToggle( $( this ) );
             } );
@@ -54 +56 @@
             // Handle the submit when they press enter
             body.find( '#post' ).on( 'keypress.simpaySubmitOnEnter', function( e ) {
-                spAdmin.handleSubmitOnEnter( $( this ) );
+                spAdmin.handleSubmitOnEnter( $( this ), e );
             } );
 
@@ -66 +68 @@
             } );
 
+            // Trigger focus out (blur) for all amount input fields on page load.
+            // Should only need for admin. Used to be in shared.js.
+            body.find( '.simpay-amount-input' ).trigger( 'blur.validateAndUpdateAmount' );
+
             body.trigger( 'simpayAdminInit' );
         },
 
-        handleSubmitOnEnter: function( elem ) {
+        // TODO This working or needed now?
+
+        handleSubmitOnEnter: function( el, e ) {
 
             var keyCode,
@@ -77 +85 @@
 
             // Get the keycode
-            keyCode = ( event.keyCode ? event.keyCode : event.which );
+            keyCode = ( e.keyCode ? e.keyCode : e.which );
 
             // Check if the enter button was pressed
             if ( 13 === keyCode ) {
 
-                form = elem.closest( 'form' );
+                form = el.closest( 'form' );
 
                 draftButton = form.find( '#save-post' );
@@ -96 +104 @@
         },
 
-        handlePreviewButton: function( elem, e ) {
+        handlePreviewButton: function( el, e ) {
 
             var prevFormAction,
@@ -104 +112 @@
 
             // Get the form this button belongs to
-            formElem = elem.closest( 'form' );
+            formElem = el.closest( 'form' );
 
             // Get the form action we need to fall back to
@@ -110 +118 @@
 
             // Temporarily change the action of our form to point to the preview page
-            formElem.attr( 'action', elem.data( 'action' ) );
+            formElem.attr( 'action', el.data( 'action' ) );
             formElem.attr( 'target', '_blank' );
 
@@ -120 +128 @@
         },
 
-        showSpinner: function( elem ) {
-            elem.parent().find( '.spinner' ).css( 'visibility', 'visible' );
+        showSpinner: function( el ) {
+            el.parent().find( '.spinner' ).css( 'visibility', 'visible' );
         },
 
@@ -242 +250 @@
         },
 
+        stripeConnect: function() {
+            $( '#simpay-settings-keys-mode-test-mode' ).closest( '.form-table' ).next().hide().next().hide();
+            $( '#wpsp-api-keys-row-reveal a' ).click( function() {
+                $( '#simpay-settings-keys-mode-test-mode' ).closest( '.form-table' ).next().show().next().show();
+                $( '#wpsp-api-keys-row-hide' ).show();
+                $( this ).parent().hide();
+            } );
+            $( '#wpsp-api-keys-row-hide a' ).click( function() {
+                $( '#simpay-settings-keys-mode-test-mode' ).closest( '.form-table' ).next().hide().next().hide();
+                $( '#wpsp-api-keys-row-reveal' ).show();
+                $( this ).parent().hide();
+            } );
+        },
+
         // Handle links within tab content to other tabs.
         // When one is clicked, trigger the corresponding tab link click.
-        handleInternalLinkToTabClicks: function( elem ) {
-
-            var tabToShowId = elem.data( 'show-tab' ),
+        handleInternalLinkToTabClicks: function( el ) {
+
+            var tabToShowId = el.data( 'show-tab' ),
                 tabToShowLinkEl = body.find( '.' + tabToShowId + '-tab a' );
 
@@ -252 +274 @@
         },
 
-        initSectionToggle: function( elem ) {
-
-            var showElem = elem.data( 'show' );
-
-            if ( elem.is( ':checked' ) ) {
-                elem.closest( '.simpay-panel-field' ).parent().find( showElem ).show();
+        initSectionToggle: function( el ) {
+
+            // TODO DRY
+            //var sectionElem = el.closest( '.simpay-panel-field' ).parent().find( showElem );
+
+            var showElem = el.data( 'show' );
+
+            if ( el.is( ':checked' ) ) {
+                el.closest( '.simpay-panel-field' ).parent().find( showElem ).show();
             } else {
-                elem.closest( '.simpay-panel-field' ).parent().find( showElem ).hide();
+                el.closest( '.simpay-panel-field' ).parent().find( showElem ).hide();
             }
         },
 
-        initMultiToggle: function( elem ) {
-
-            var selectedId = elem.attr( 'id' );
+        initMultiToggle: function( el ) {
+
+            var selectedId = el.attr( 'id' );
 
             // Hide all options first. This allows us to show multiple sections with the classes
-            elem.closest( '.simpay-field-radios-inline' ).find( 'input[type="radio"]' ).each( function( currIndex ) {
+            el.closest( '.simpay-field-radios-inline' ).find( 'input[type="radio"]' ).each( function( i ) {
 
                 // $( this ) in this context is the current iteration, not what is set to elem. so we need to keep it here
@@ -280 +305 @@
 
     $( document ).ready( function( $ ) {
-
         spAdmin.init();
     } );

stripe/trunk/assets/js/admin.min.js

@@ -1 @@
-/*! WP Simple Pay Lite for Stripe - 2.0.12
+/*! WP Simple Pay Lite for Stripe - 2.1.0
  * https://wpsimplepay.com/
- * Copyright (c) Moonstone Media Group 2018
+ * Copyright (c) Moonstone Media Group 2019
  * Licensed GPLv2+ */
 
-var spAdmin={};!function(s){"use strict";var n,t;spAdmin={init:function(){n=s(document.body),t=n.find("#simpay-form-settings"),this.setupChosen(),this.addMediaFields(),this.handleMetaboxTabClick(),t.on("click.simpayTabLink",".simpay-tab-link",function(i){i.preventDefault(),spAdmin.handleInternalLinkToTabClicks(s(this))}),t.on("click.simpayImagePreview",".simpay-remove-image-preview",function(i){spAdmin.handleRemoveImagePreviewClick(i)}),t.find(".simpay-panel-field").on("click.simpaySectionToggle",".simpay-section-toggle",function(i){spAdmin.initSectionToggle(s(this))}),n.find(".simpay-button").on("click.simpayShowSpinner",function(i){spAdmin.showSpinner(s(this))}),n.find("#simpay-preview-button").on("click.simpayPreviewButton",function(i){spAdmin.handlePreviewButton(s(this),i)}),n.find("#post").on("keypress.simpaySubmitOnEnter",function(i){spAdmin.handleSubmitOnEnter(s(this))}),t.find('.simpay-multi-toggle input[type="radio"]:checked').each(function(){spAdmin.initMultiToggle(s(this))}),t.on("change.simpayMultiToggle",'.simpay-multi-toggle input[type="radio"]',function(){spAdmin.initMultiToggle(s(this))}),n.trigger("simpayAdminInit")},handleSubmitOnEnter:function(i){var e,n,t;13===(event.keyCode?event.keyCode:event.which)&&(n=(e=i.closest("form")).find("#save-post"),t=e.find("#publish"),0<n.length?n.click():t.click())},handlePreviewButton:function(i,e){var n,t;e.preventDefault(),n=(t=i.closest("form")).attr("action"),t.attr("action",i.data("action")),t.attr("target","_blank"),t.submit(),t.attr("action",n),t.attr("target","")},showSpinner:function(i){i.parent().find(".spinner").css("visibility","visible")},handleRemoveImagePreviewClick:function(i){i.preventDefault(),t.find(".simpay-image-preview-wrap").hide(),t.find("#_image_url").val("")},addMediaFields:function(){var t;s(".simpay-media-uploader").on("click",function(i){i.preventDefault(),window.simpayMediaUploaderInputField=s(this),t||(t=wp.media.frames.file_frame=wp.media({title:spGeneral.i18n.mediaTitle,button:{text:spGeneral.i18n.mediaButtonText},multiple:!1})).on("select",function(){var i=t.state().get("selection").first().toJSON(),e=window.simpayMediaUploaderInputField.prev(),n="id"===e.data("fvalue")?i.id:i.url;s(".simpay-image-preview-wrap").show(),s(".simpay-image-preview").prop("src",n),e.val(n)}),t.open()})},setupChosen:function(){var i=s(".simpay-chosen-select, .simpay-chosen-search");i.chosen({disable_search_threshold:20}),i.chosen()},handleMetaboxTabClick:function(){var i=s("ul.simpay-tabs a"),t=s("div.simpay-panel"),a=i.parents("li"),e={};i.on("click",function(i){var e=s(this).parent(),n=s(s(this).attr("href"));location.hash=s(this).attr("href"),i.preventDefault(),a.removeClass("active"),e.addClass("active"),t.addClass("simpay-panel-hidden"),n.removeClass("simpay-panel-hidden"),i.stopPropagation()}),location.hash.length&&(setTimeout(function(){window.scrollTo(0,0)},1),(e=s('ul.simpay-tabs a[href="'+location.hash+'"]')).length&&e.click())},handleInternalLinkToTabClicks:function(i){var e=i.data("show-tab");n.find("."+e+"-tab a").click()},initSectionToggle:function(i){var e=i.data("show");i.is(":checked")?i.closest(".simpay-panel-field").parent().find(e).show():i.closest(".simpay-panel-field").parent().find(e).hide()},initMultiToggle:function(i){var e=i.attr("id");i.closest(".simpay-field-radios-inline").find('input[type="radio"]').each(function(i){t.find(".toggle-"+s(this).attr("id")).hide()}),t.find(".toggle-"+e).show()}},s(document).ready(function(i){spAdmin.init()})}(jQuery);
+var spAdmin={};!function(s){"use strict";var t,n;spAdmin={init:function(){t=s(document.body),n=t.find("#simpay-form-settings"),this.setupChosen(),this.addMediaFields(),this.handleMetaboxTabClick(),this.stripeConnect(),n.on("click.simpayTabLink",".simpay-tab-link",function(i){i.preventDefault(),spAdmin.handleInternalLinkToTabClicks(s(this))}),n.on("click.simpayImagePreview",".simpay-remove-image-preview",function(i){spAdmin.handleRemoveImagePreviewClick(i)}),n.find(".simpay-panel-field").on("change.simpaySectionToggle",".simpay-section-toggle",function(i){spAdmin.initSectionToggle(s(this))}),t.find(".simpay-button").on("click.simpayShowSpinner",function(i){spAdmin.showSpinner(s(this))}),t.find("#simpay-preview-button").on("click.simpayPreviewButton",function(i){spAdmin.handlePreviewButton(s(this),i)}),t.find("#post").on("keypress.simpaySubmitOnEnter",function(i){spAdmin.handleSubmitOnEnter(s(this),i)}),n.find('.simpay-multi-toggle input[type="radio"]:checked').each(function(){spAdmin.initMultiToggle(s(this))}),n.on("change.simpayMultiToggle",'.simpay-multi-toggle input[type="radio"]',function(){spAdmin.initMultiToggle(s(this))}),t.find(".simpay-amount-input").trigger("blur.validateAndUpdateAmount"),t.trigger("simpayAdminInit")},handleSubmitOnEnter:function(i,e){var t,n,a;13===(e.keyCode?e.keyCode:e.which)&&(n=(t=i.closest("form")).find("#save-post"),a=t.find("#publish"),0<n.length?n.click():a.click())},handlePreviewButton:function(i,e){var t,n;e.preventDefault(),t=(n=i.closest("form")).attr("action"),n.attr("action",i.data("action")),n.attr("target","_blank"),n.submit(),n.attr("action",t),n.attr("target","")},showSpinner:function(i){i.parent().find(".spinner").css("visibility","visible")},handleRemoveImagePreviewClick:function(i){i.preventDefault(),n.find(".simpay-image-preview-wrap").hide(),n.find("#_image_url").val("")},addMediaFields:function(){var n;s(".simpay-media-uploader").on("click",function(i){i.preventDefault(),window.simpayMediaUploaderInputField=s(this),n||(n=wp.media.frames.file_frame=wp.media({title:spGeneral.i18n.mediaTitle,button:{text:spGeneral.i18n.mediaButtonText},multiple:!1})).on("select",function(){var i=n.state().get("selection").first().toJSON(),e=window.simpayMediaUploaderInputField.prev(),t="id"===e.data("fvalue")?i.id:i.url;s(".simpay-image-preview-wrap").show(),s(".simpay-image-preview").prop("src",t),e.val(t)}),n.open()})},setupChosen:function(){var i=s(".simpay-chosen-select, .simpay-chosen-search");i.chosen({disable_search_threshold:20}),i.chosen()},handleMetaboxTabClick:function(){var i=s("ul.simpay-tabs a"),n=s("div.simpay-panel"),a=i.parents("li"),e={};i.on("click",function(i){var e=s(this).parent(),t=s(s(this).attr("href"));location.hash=s(this).attr("href"),i.preventDefault(),a.removeClass("active"),e.addClass("active"),n.addClass("simpay-panel-hidden"),t.removeClass("simpay-panel-hidden"),i.stopPropagation()}),location.hash.length&&(setTimeout(function(){window.scrollTo(0,0)},1),(e=s('ul.simpay-tabs a[href="'+location.hash+'"]')).length&&e.click())},stripeConnect:function(){s("#simpay-settings-keys-mode-test-mode").closest(".form-table").next().hide().next().hide(),s("#wpsp-api-keys-row-reveal a").click(function(){s("#simpay-settings-keys-mode-test-mode").closest(".form-table").next().show().next().show(),s("#wpsp-api-keys-row-hide").show(),s(this).parent().hide()}),s("#wpsp-api-keys-row-hide a").click(function(){s("#simpay-settings-keys-mode-test-mode").closest(".form-table").next().hide().next().hide(),s("#wpsp-api-keys-row-reveal").show(),s(this).parent().hide()})},handleInternalLinkToTabClicks:function(i){var e=i.data("show-tab");t.find("."+e+"-tab a").click()},initSectionToggle:function(i){var e=i.data("show");i.is(":checked")?i.closest(".simpay-panel-field").parent().find(e).show():i.closest(".simpay-panel-field").parent().find(e).hide()},initMultiToggle:function(i){var e=i.attr("id");i.closest(".simpay-field-radios-inline").find('input[type="radio"]').each(function(i){n.find(".toggle-"+s(this).attr("id")).hide()}),n.find(".toggle-"+e).show()}},s(document).ready(function(i){spAdmin.init()})}(jQuery);

stripe/trunk/assets/js/public.js

@@ -3 +3 @@
 var simpayApp = {};
 
-(function( $ ) {
+( function( $ ) {
     'use strict';
 
@@ -16 +16 @@
         spFormData: {},
 
-        // Stripe Data?
-        spStripeData: {},
-
         init: function() {
 
@@ -24 +21 @@
             body = $( document.body );
 
-            this.spFormElList = body.find( '.simpay-checkout-form' );
-
-            this.spFormElList.each( function() {
+            simpayApp.spFormElList = body.find( '.simpay-checkout-form' );
+
+            simpayApp.spFormElList.each( function() {
 
                 var spFormElem = $( this );
-                simpayApp.processForm( spFormElem );
-
-                body.trigger( 'simpayProcessFormElements', [ spFormElem ] );
+                simpayApp.setupCoreForm( spFormElem );
+
+                body.trigger( 'simpaySetupCoreForm', [ spFormElem ] );
             } );
-
-            body.trigger( 'simpayLoaded' );
-        },
-
-        processForm: function( spFormElem ) {
-
-            // Set the form ID
+        },
+
+        // Does this payment form use the Stripe Checkout overlay?
+        isStripeCheckoutForm: function( formData ) {
+
+            return ( undefined === formData.formDisplayType ) || ( 'stripe_checkout' === formData.formDisplayType );
+        },
+
+        setupCoreForm: function( spFormElem ) {
+
             var formId = spFormElem.data( 'simpay-form-id' );
 
-            // Grab the localized data for this form ID
+            // Grab the localized data for this form ID.
             var localizedFormData = simplePayForms[ formId ];
 
-            // Set a local variable to hold all of the form information.
-            var formData = this.spFormData[ formId ];
-
-            // Variable to hold the Stripe configuration
-            var stripeHandler = null;
-
             // Set formData array index of the current form ID to match the localized data passed over for form settings.
-            formData = $.extend( {},  localizedFormData.form.integers, localizedFormData.form.bools, localizedFormData.form.strings );
-
+            var formData = $.extend( {}, localizedFormData.form.bools, localizedFormData.form.integers, localizedFormData.form.i18n, localizedFormData.form.strings );
+
+            // Set form ID from data attribute.
             formData.formId = formId;
 
-            // Set a finalAmount setting so that we can perform all the actions on this. That way if we need to reverse anything we leave the base amount untouched and can revert to it.
+            // Set a finalAmount setting so that we can perform all the actions on this.
+            // That way if we need to reverse anything we leave the base amount untouched and can revert to it.
+            // .amount & .finalAmount prop values = 1 for $1.00 USD, 100 if a zero decimal currency.
             formData.finalAmount = formData.amount;
 
-            // Set the default quantity to 1
+            // Set the default quantity to 1.
             formData.quantity = 1;
 
@@ -66 +63 @@
             formData.stripeParams = $.extend( {}, localizedFormData.stripe.strings, localizedFormData.stripe.bools );
 
-            // Set a fallback button label
-            formData.oldPanelLabel = undefined !== formData.stripeParams.panelLabel ? formData.stripeParams.panelLabel : '';
-
-            body.trigger( 'simpayFormVarsInitialized', [ spFormElem, formData ] );
-
-            // Stripe Checkout handler configuration.
-            // Only token callback function set here. All other params set in stripeParams.
-            // Chrome on iOS needs handler set before click event or else checkout won't open in a new tab.
-            // See "How do I prevent the Checkout popup from being blocked?"
-            // Full docs: https://stripe.com/docs/checkout#integration-custom
-            stripeHandler = StripeCheckout.configure( {
-
-                // Key param MUST be sent here instead of stripeHandler.open(). Discovered 8/11/16.
-                key: formData.stripeParams.key,
-
-                token: handleStripeToken,
-
-                opened: function() {
-                },
-                closed: function() {
+            // Set a fallback button label.
+            formData.oldPanelLabel = ( undefined !== formData.stripeParams.panelLabel ) ? formData.stripeParams.panelLabel : '';
+
+            // Set button element class that will trigger payment form submit.
+            // Different for Pro custom forms implementation.
+            formData.submitBtnClass = 'simpay-payment-btn';
+
+            body.trigger( 'simpayCoreFormVarsInitialized', [ spFormElem, formData ] );
+
+            if ( simpayApp.isStripeCheckoutForm( formData ) ) {
+                simpayApp.setupStripeCheckout( spFormElem, formData );
+            }
+
+            simpayApp.spFormData[ formId ] = formData;
+
+            body.trigger( 'simpayBindCoreFormEventsAndTriggers', [ spFormElem, formData ] );
+        },
+
+        setupStripeCheckout: function( spFormElem, formData ) {
+
+            var submitBtn = spFormElem.find( '.' + formData.submitBtnClass );
+
+            // Variable to hold the Stripe configuration.
+            var stripeHandler = null;
+
+            if ( submitBtn.length ) {
+
+                // Stripe Checkout handler configuration.
+                // Only token callback function set here. All other params set in stripeParams.
+                // Chrome on iOS needs handler set before click event or else checkout won't open in a new tab.
+                // See "How do I prevent the Checkout popup from being blocked?"
+                // Full docs: https://stripe.com/docs/checkout#integration-custom
+                stripeHandler = StripeCheckout.configure( {
+
+                    // Key param MUST be sent here instead of stripeHandler.open().
+                    key: formData.stripeParams.key,
+                    token: function( token, args ) {
+                        handleStripeCheckoutToken( token, args );
+                    },
+                    opened: function() {
+                    },
+                    closed: function() {
+                    }
+                } );
+            }
+
+            /** Form submitted through checkout button click or Enter key. */
+
+            function submitCoreForm() {
+
+                // Init flag for form validation state.
+                formData.isValid = true;
+
+                // Trigger custom event right before executing payment.
+                // For Pro version client-side validation and other client-side changes.
+                spFormElem.trigger( 'simpayBeforeStripePayment', [ spFormElem, formData ] );
+
+                // Now check validation state flag before continuing.
+                // There are no validation checks in the Lite version natively.
+                // But this is needed for Pro and/or custom code.
+                if ( !formData.isValid ) {
+                    return;
                 }
-            } );
-
-            // Internal Strike token callback function for StripeCheckout.configure
-            function handleStripeToken( token, args ) {
-
-                // At this point the Stripe Checkout overlay is validated and submitted.
-                // Set values to hidden elements to pass via POST when submitting the form for payment.
-                spFormElem.find( '.simpay-stripe-token' ).val( token.id );
-                spFormElem.find( '.simpay-stripe-email' ).val( token.email );
-
-                // Handle args
-                simpayApp.handleStripeArgs( spFormElem, args );
-
-                // Disable original payment button and change text for UI feedback while POST-ing to Stripe.
-                spFormElem.find( '.simpay-payment-btn' )
+
+                simpayApp.setCoreFinalAmount( spFormElem, formData );
+
+                // Send the final amount to Stripe params.
+                // Stripe expects amounts in cents (100 for $1.00 USD / no decimals), so convert here.
+                formData.stripeParams.amount = spShared.convertToCents( formData.finalAmount );
+
+                // Set the same cents value to the hidden input for submitting form for processing.
+                spFormElem.find( '.simpay-amount' ).val( formData.stripeParams.amount );
+
+                stripeHandler.open( formData.stripeParams );
+            }
+
+            /**
+             * Stripe Checkout token handler
+             *
+             * https://stripe.com/docs/checkout#integration-custom
+             *
+             * @param token Stripe Token object - https://stripe.com/docs/api#tokens
+             * @param args Object containing the billing and shipping addresses, if enabled.
+             */
+
+            function handleStripeCheckoutToken( token, args ) {
+
+                var submitBtn = spFormElem.find( '.' + formData.submitBtnClass );
+
+                // Append hidden inputs to hold Stripe Checkout token values to sumbit with form POST.
+
+                $( '<input>' ).attr( {
+                    type: 'hidden',
+                    name: 'simpay_stripe_token',
+                    value: token.id
+                } ).appendTo( spFormElem );
+
+                $( '<input>' ).attr( {
+                    type: 'hidden',
+                    name: 'simpay_stripe_email',
+                    value: token.email
+                } ).appendTo( spFormElem );
+
+                // Handle extra (shipping) args.
+                if ( args ) {
+                    simpayApp.handleStripeShippingArgs( spFormElem, args );
+                }
+
+                // Disable original form submit button and change text for UI feedback while POST-ing to Stripe.
+                submitBtn
                     .prop( 'disabled', true )
                     .find( 'span' )
                     .text( formData.loadingText );
 
-                // Unbind original form submit trigger before calling again to "reset" it and submit normally.
-                spFormElem.unbind( 'submit', [ spFormElem, formData ] );
-
+                // Reset form submit handler to prevent an infinite loop.
+                // Then finally submit the form.
+                spFormElem.off( 'submit' );
                 spFormElem.submit();
             }
 
-            // Page-level initial payment button clicked. Use over form submit for more control/validation.
-            spFormElem.find( '.simpay-payment-btn' ).on( 'click.simpayPaymentBtn', function( e ) {
+            /** Original form submit handler */
+
+            spFormElem.on( 'submit', function( e ) {
                 e.preventDefault();
-
-                // Trigger custom event right before executing payment
-                spFormElem.trigger( 'simpayBeforeStripePayment', [ spFormElem, formData ] );
-
-                simpayApp.submitPayment( spFormElem, formData, stripeHandler );
+                submitCoreForm();
             } );
-
-            this.spFormData[ formId ] = formData;
-
-            /** Event handlers for form elements **/
-
-            body.trigger( 'simpayBindEventsAndTriggers', [ spFormElem, formData ] );
-        },
-
-        handleStripeArgs: function( spFormElem, args ) {
-
-            // Check and add only the ones that are found
+        },
+
+        // Check & add extra shipping values if found.
+        handleStripeShippingArgs: function( spFormElem, args ) {
 
             if ( args.shipping_name ) {
@@ -158 +219 @@
         },
 
-        submitPayment: function( spFormElem, formData, stripeHandler ) {
-
-            simpayApp.setFinalAmount( spFormElem, formData );
-
-            // Add in the final amount to Stripe params
-            formData.stripeParams.amount = parseInt( formData.finalAmount );
-
-            // If everything checks out then let's open the form
-            if ( spFormElem.valid() ) {
-
-                body.trigger( 'simpaySubmitPayment', [ spFormElem, formData ] );
-
-                spShared.debugLog( 'stripeParams', formData.stripeParams );
-
-                stripeHandler.open( formData.stripeParams );
-            }
-        },
-
-        // Run this to process and get the final amount when the payment button is clicked
-        setFinalAmount: function( spFormElem, formData ) {
-
-            var finalAmount = formData.amount;
-
-            formData.finalAmount = finalAmount.toFixed( 0 );
-
-            body.trigger( 'simpayFinalizeAmount', [ spFormElem, formData ] );
-
-            // Update hidden amount field for processing
-            spFormElem.find( '.simpay-amount' ).val( formData.finalAmount );
-
-        },
-
-        formatMoney: function( amount ) {
-
-            // Default format is to the left with no space
-            var format = '%s%v';
-            var options;
-
-            // Convert our amount from cents to a formatted amount
-            amount = simpayApp.convertFromCents( amount );
-
-            // Set currency position based on settings
-            if ( 'left_space' === spGeneral.strings.currencyPosition ) {
-
-                //1 Left with a space
-                format = '%s %v';
-            } else if ( 'right' === spGeneral.strings.currencyPosition ) {
-
-                // Right side no space
-                format = '%v%s';
-            } else if ( 'right_space' === spGeneral.strings.currencyPosition ) {
-
-                // Right side with space
-                format = '%v %s';
-            }
-
-            options = {
-                symbol: spGeneral.strings.currencySymbol,
-                decimal: spGeneral.strings.decimalSeparator,
-                thousand: spGeneral.strings.thousandSeparator,
-                precision: spGeneral.integers.decimalPlaces,
-                format: format
-            };
-
-            return accounting.formatMoney( amount, options );
-        },
-
-        convertFromCents: function( amount ) {
-
-            if ( spGeneral.booleans.isZeroDecimal ) {
-                return amount;
-            } else {
-                return ( amount / 100 ).toFixed( 2 );
-            }
-        },
-
-        convertToCents: function( amount ) {
-
-            if ( spGeneral.booleans.isZeroDecimal ) {
-                return amount;
-            } else {
-                return ( amount * 100 ).toFixed( 2 );
-            }
+        // Set the internal final amount property value as well as the hidden form field.
+        // .amount & .finalAmount prop values = 1 for $1.00 USD, 100 if a zero decimal currency.
+        setCoreFinalAmount: function( spFormElem, formData ) {
+
+            formData.finalAmount = formData.amount;
+
+            // Fire trigger to do additional calculations in Pro.
+            body.trigger( 'simpayFinalizeCoreAmount', [ spFormElem, formData ] );
         }
     };
 
     $( document ).ready( function( $ ) {
-
         simpayApp.init();
     } );

stripe/trunk/assets/js/public.min.js

@@ -1 @@
-/*! WP Simple Pay Lite for Stripe - 2.0.12
+/*! WP Simple Pay Lite for Stripe - 2.1.0
  * https://wpsimplepay.com/
- * Copyright (c) Moonstone Media Group 2018
+ * Copyright (c) Moonstone Media Group 2019
  * Licensed GPLv2+ */
 
-var simpayApp={};!function(t){"use strict";var r;simpayApp={spFormElList:{},spFormData:{},spStripeData:{},init:function(){r=t(document.body),this.spFormElList=r.find(".simpay-checkout-form"),this.spFormElList.each(function(){var i=t(this);simpayApp.processForm(i),r.trigger("simpayProcessFormElements",[i])}),r.trigger("simpayLoaded")},processForm:function(n){var s,i=n.data("simpay-form-id"),e=simplePayForms[i],a=this.spFormData[i];(a=t.extend({},e.form.integers,e.form.bools,e.form.strings)).formId=i,a.finalAmount=a.amount,a.quantity=1,a.stripeParams=t.extend({},e.stripe.strings,e.stripe.bools),a.oldPanelLabel=void 0!==a.stripeParams.panelLabel?a.stripeParams.panelLabel:"",r.trigger("simpayFormVarsInitialized",[n,a]),s=StripeCheckout.configure({key:a.stripeParams.key,token:function(i,s){n.find(".simpay-stripe-token").val(i.id),n.find(".simpay-stripe-email").val(i.email),simpayApp.handleStripeArgs(n,s),n.find(".simpay-payment-btn").prop("disabled",!0).find("span").text(a.loadingText),n.unbind("submit",[n,a]),n.submit()},opened:function(){},closed:function(){}}),n.find(".simpay-payment-btn").on("click.simpayPaymentBtn",function(i){i.preventDefault(),n.trigger("simpayBeforeStripePayment",[n,a]),simpayApp.submitPayment(n,a,s)}),this.spFormData[i]=a,r.trigger("simpayBindEventsAndTriggers",[n,a])},handleStripeArgs:function(i,s){s.shipping_name&&i.find(".simpay-shipping-name").val(s.shipping_name),s.shipping_address_country&&i.find(".simpay-shipping-country").val(s.shipping_address_country),s.shipping_address_zip&&i.find(".simpay-shipping-zip").val(s.shipping_address_zip),s.shipping_address_state&&i.find(".simpay-shipping-state").val(s.shipping_address_state),s.shipping_address_line1&&i.find(".simpay-shipping-address-line1").val(s.shipping_address_line1),s.shipping_address_city&&i.find(".simpay-shipping-city").val(s.shipping_address_city)},submitPayment:function(i,s,n){simpayApp.setFinalAmount(i,s),s.stripeParams.amount=parseInt(s.finalAmount),i.valid()&&(r.trigger("simpaySubmitPayment",[i,s]),spShared.debugLog("stripeParams",s.stripeParams),n.open(s.stripeParams))},setFinalAmount:function(i,s){var n=s.amount;s.finalAmount=n.toFixed(0),r.trigger("simpayFinalizeAmount",[i,s]),i.find(".simpay-amount").val(s.finalAmount)},formatMoney:function(i){var s,n="%s%v";return i=simpayApp.convertFromCents(i),"left_space"===spGeneral.strings.currencyPosition?n="%s %v":"right"===spGeneral.strings.currencyPosition?n="%v%s":"right_space"===spGeneral.strings.currencyPosition&&(n="%v %s"),s={symbol:spGeneral.strings.currencySymbol,decimal:spGeneral.strings.decimalSeparator,thousand:spGeneral.strings.thousandSeparator,precision:spGeneral.integers.decimalPlaces,format:n},accounting.formatMoney(i,s)},convertFromCents:function(i){return spGeneral.booleans.isZeroDecimal?i:(i/100).toFixed(2)},convertToCents:function(i){return spGeneral.booleans.isZeroDecimal?i:(100*i).toFixed(2)}},t(document).ready(function(i){simpayApp.init()})}(jQuery);
+var simpayApp={};!function(t){"use strict";var e;simpayApp={spFormElList:{},spFormData:{},init:function(){e=t(document.body),simpayApp.spFormElList=e.find(".simpay-checkout-form"),simpayApp.spFormElList.each(function(){var i=t(this);simpayApp.setupCoreForm(i),e.trigger("simpaySetupCoreForm",[i])})},isStripeCheckoutForm:function(i){return void 0===i.formDisplayType||"stripe_checkout"===i.formDisplayType},setupCoreForm:function(i){var p=i.data("simpay-form-id"),s=simplePayForms[p],n=t.extend({},s.form.bools,s.form.integers,s.form.i18n,s.form.strings);n.formId=p,n.finalAmount=n.amount,n.quantity=1,n.stripeParams=t.extend({},s.stripe.strings,s.stripe.bools),n.oldPanelLabel=void 0!==n.stripeParams.panelLabel?n.stripeParams.panelLabel:"",n.submitBtnClass="simpay-payment-btn",e.trigger("simpayCoreFormVarsInitialized",[i,n]),simpayApp.isStripeCheckoutForm(n)&&simpayApp.setupStripeCheckout(i,n),simpayApp.spFormData[p]=n,e.trigger("simpayBindCoreFormEventsAndTriggers",[i,n])},setupStripeCheckout:function(n,e){var i=n.find("."+e.submitBtnClass),p=null;i.length&&(p=StripeCheckout.configure({key:e.stripeParams.key,token:function(i,p){!function(i,p){var s=n.find("."+e.submitBtnClass);t("<input>").attr({type:"hidden",name:"simpay_stripe_token",value:i.id}).appendTo(n),t("<input>").attr({type:"hidden",name:"simpay_stripe_email",value:i.email}).appendTo(n),p&&simpayApp.handleStripeShippingArgs(n,p);s.prop("disabled",!0).find("span").text(e.loadingText),n.off("submit"),n.submit()}(i,p)},opened:function(){},closed:function(){}})),n.on("submit",function(i){i.preventDefault(),e.isValid=!0,n.trigger("simpayBeforeStripePayment",[n,e]),e.isValid&&(simpayApp.setCoreFinalAmount(n,e),e.stripeParams.amount=spShared.convertToCents(e.finalAmount),n.find(".simpay-amount").val(e.stripeParams.amount),p.open(e.stripeParams))})},handleStripeShippingArgs:function(i,p){p.shipping_name&&i.find(".simpay-shipping-name").val(p.shipping_name),p.shipping_address_country&&i.find(".simpay-shipping-country").val(p.shipping_address_country),p.shipping_address_zip&&i.find(".simpay-shipping-zip").val(p.shipping_address_zip),p.shipping_address_state&&i.find(".simpay-shipping-state").val(p.shipping_address_state),p.shipping_address_line1&&i.find(".simpay-shipping-address-line1").val(p.shipping_address_line1),p.shipping_address_city&&i.find(".simpay-shipping-city").val(p.shipping_address_city)},setCoreFinalAmount:function(i,p){p.finalAmount=p.amount,e.trigger("simpayFinalizeCoreAmount",[i,p])}},t(document).ready(function(i){simpayApp.init()})}(jQuery);

stripe/trunk/assets/js/shared.js

@@ -1 @@
-/* global spGeneral, jQuery  */
+/* global spGeneral, jQuery */
 
 var spShared = {};
 
-(function( $ ) {
+( function( $ ) {
     'use strict';
 
@@ -15 +15 @@
             body = $( document.body );
 
-            // Format currency inputs after they lose focus
-            body.find( '.simpay-currency-format' ).on( 'blur.simpayCurrencyFormat', function( e ) {
-                spShared.formatCurrencyField( $( this ) );
+            // Validate & update amount input fields on focus out (blur).
+            body.find( '.simpay-amount-input' ).on( 'blur.validateAndUpdateAmount', function( e ) {
+                spShared.validateAndUpdateAmountInput( $( this ) );
             } );
-
-            // Validate amount fields
-            body.find( '.simpay-amount-input' ).on( 'blur.simpayValidateAmount', function( e ) {
-                spShared.validateAmount( $( this ) );
-            } );
-
-            // Triggers
-            // Trigger the currency format for page load
-            body.find( '.simpay-currency-format' ).trigger( 'blur.simpayCurrencyFormat' );
-
-            // Trigger the amount inputs for page load
-            body.find( '.simpay-amount-input' ).trigger( 'blur.simpayValidateAmount' );
         },
 
-        // Log to console if SCRIPT_DEBUG PHP constant set to true.
+        /**
+         * Return amount as number value.
+         * Uses global decimal separator setting ("." or ",").
+         * accounting.unformat removes formatting/cruft first.
+         * Respects decimal separator, but ignores zero decimal currency setting.
+         * Also prevent negative values.
+         * @returns number
+         */
+        unformatCurrency: function( amount ) {
+            return Math.abs( accounting.unformat( amount, spGeneral.strings.decimalSeparator ) );
+        },
+
+        /**
+         * Return amount as formatted string.
+         * With or without currency symbol.
+         * Used for labels & amount inputs in admin & front-end.
+         * Uses global currency settings.
+         * @returns string
+         */
+        formatCurrency: function( amount, includeSymbol ) {
+
+            // Default format is to the left with no space.
+            var format = '%s%v',
+                args;
+
+            // Include symbol param = false if omitted.
+            includeSymbol = includeSymbol || false;
+
+            if ( includeSymbol ) {
+
+                // Account for other symbol placement formats (besides default left without space).
+                switch ( spGeneral.strings.currencyPosition ) {
+
+                    case 'left_space':
+                        format = '%s %v'; // Left side with space
+                        break;
+
+                    case 'right':
+                        format = '%v%s'; // Right side without space
+                        break;
+
+                    case 'right_space':
+                        format = '%v %s'; // Right side with space
+                        break;
+                }
+            }
+
+            args = {
+                symbol: includeSymbol ? spGeneral.strings.currencySymbol : '',
+                decimal: spGeneral.strings.decimalSeparator,
+                thousand: spGeneral.strings.thousandSeparator,
+                precision: spGeneral.integers.decimalPlaces,
+                format: format
+            };
+
+            return accounting.formatMoney( amount, args );
+        },
+
+        /**
+         * Convert from cents to dollars (in USD).
+         * Uses global zero decimal currency setting.
+         * Leaves zero decimal currencies alone.
+         * @returns number
+         */
+        convertToDollars: function( amount ) {
+
+            if ( !spGeneral.booleans.isZeroDecimal ) {
+                amount = accounting.toFixed( amount / 100, 2 );
+            }
+
+            return spShared.unformatCurrency( amount );
+        },
+
+        /**
+         * Convert from dollars to cents (in USD).
+         * Uses global zero decimal currency setting.
+         * Leaves zero decimal currencies alone.
+         * @returns number
+         */
+        convertToCents: function( amount ) {
+
+            if ( !spGeneral.booleans.isZeroDecimal ) {
+                amount = Number( accounting.toFixed( amount * 100, 0 ) );
+            }
+
+            return amount;
+        },
+
+        /**
+         * Validate amount field client-side and update according to rules set by CSS classes.
+         * Some fields display blank instead of "0.00" or "0".
+         * Some fields require a minimum of "1.00" or "100" (100 currency units).
+         * Invalid characters and the negative symbol will be removed.
+         */
+        validateAndUpdateAmountInput: function( el ) {
+
+            // Amount is intially a string.
+            var amount = el.val();
+
+            var globalMinAmount = Math.abs( spGeneral.integers.minAmount );
+
+            // Convert amount to number value.
+            amount = spShared.unformatCurrency( amount );
+
+            // Update amount field to blank if specific class is present.
+            // If zero, convert to blank and exit function.
+            // Ex: Default Custom Amount, Setup Fee
+            if ( el.hasClass( 'simpay-allow-blank-amount' ) ) {
+                if ( 0 === amount ) {
+                    el.val( '' );
+                    return;
+                }
+            }
+
+            // Validate & update fields to the global minimum amount (usually $1.00) if specific class is present.
+            // Namely this is just on admin pages, separate from the custom amount minimum amount set per form.
+            // Ex: One-Time Amount, Minimum Custom Amount
+            if ( el.hasClass( 'simpay-minimum-amount-required' ) ) {
+                if ( amount < globalMinAmount ) {
+                    amount = globalMinAmount;
+                }
+            }
+
+            // Convert amount back to string with proper thousands & decimal separators, but without symbol.
+            amount = spShared.formatCurrency( amount, false );
+
+            // Update format price string in input field.
+            // Exception: If they changed to 'number' type via filters don't reformat (default type is 'tel').
+            if ( 'number' !== el[0].type ) {
+                el.val( amount );
+            }
+        },
+
+        /**
+         * Log debug messages to console.
+         * Alternative to console.log so doesn't show up in production environments.
+         * Instead, only if SCRIPT_DEBUG PHP constant set to true.
+         */
         debugLog: function( key, value ) {
 
@@ -39 +164 @@
                 console.log( key, value );
             }
-        },
-
-        formatCurrencyField: function( elem ) {
-
-            elem.val( function( index, value ) {
-
-                // Some fields we want to allow nothing to be entered but still be formatted as an amount field
-                if ( elem.hasClass( 'simpay-allow-empty' ) && !elem.val() ) {
-                    return '';
-                }
-
-                return accounting.formatMoney( accounting.unformat( value, spGeneral.strings.decimalSeparator ), '', 2, spGeneral.strings.thousandSeparator, spGeneral.strings.decimalSeparator );
-            } );
-        },
-
-        validateAmount: function( elem ) {
-
-            var amount = spShared.unformatCurrency( elem.val() );
-
-            // If the amount doesn't exist or is  less than 1
-            if ( !amount || spGeneral.integers.minAmount > parseFloat( amount ) ) {
-                elem.val( '' );
-
-                return false;
-            }
-
-            // Set the correct decimal separator according to settings
-            amount = amount.replace( '.', spGeneral.strings.decimalSeparator );
-
-            // Check if current number is negative or not.
-            if ( -1 !== amount.indexOf( '-' ) ) {
-                amount = amount.replace( '-', '' );
-            }
-
-            // Update format price string in input field.
-            elem.val( amount );
-        },
-
-        unformatCurrency: function( amount ) {
-
-            amount = accounting.unformat( amount, spGeneral.strings.decimalSeparator ).toString();
-
-            if ( !spGeneral.booleans.isZeroDecimal ) {
-
-                // Set default value for number of decimals.
-                amount = parseFloat( amount ).toFixed( 2 );
-            }
-
-            return amount;
-
         }
     };
 
     $( document ).ready( function( $ ) {
-
         spShared.init();
     } );

stripe/trunk/assets/js/shared.min.js

@@ -1 @@
-/*! WP Simple Pay Lite for Stripe - 2.0.12
+/*! WP Simple Pay Lite for Stripe - 2.1.0
  * https://wpsimplepay.com/
- * Copyright (c) Moonstone Media Group 2018
+ * Copyright (c) Moonstone Media Group 2019
  * Licensed GPLv2+ */
 
-var spShared={};!function(r){"use strict";var n;spShared={init:function(){(n=r(document.body)).find(".simpay-currency-format").on("blur.simpayCurrencyFormat",function(n){spShared.formatCurrencyField(r(this))}),n.find(".simpay-amount-input").on("blur.simpayValidateAmount",function(n){spShared.validateAmount(r(this))}),n.find(".simpay-currency-format").trigger("blur.simpayCurrencyFormat"),n.find(".simpay-amount-input").trigger("blur.simpayValidateAmount")},debugLog:function(n,r){"undefined"!=typeof spGeneral&&!0===spGeneral.booleans.scriptDebug&&console.log(n,r)},formatCurrencyField:function(a){a.val(function(n,r){return a.hasClass("simpay-allow-empty")&&!a.val()?"":accounting.formatMoney(accounting.unformat(r,spGeneral.strings.decimalSeparator),"",2,spGeneral.strings.thousandSeparator,spGeneral.strings.decimalSeparator)})},validateAmount:function(n){var r=spShared.unformatCurrency(n.val());if(!r||spGeneral.integers.minAmount>parseFloat(r))return n.val(""),!1;-1!==(r=r.replace(".",spGeneral.strings.decimalSeparator)).indexOf("-")&&(r=r.replace("-","")),n.val(r)},unformatCurrency:function(n){return n=accounting.unformat(n,spGeneral.strings.decimalSeparator).toString(),spGeneral.booleans.isZeroDecimal||(n=parseFloat(n).toFixed(2)),n}},r(document).ready(function(n){spShared.init()})}(jQuery);
+var spShared={};!function(e){"use strict";spShared={init:function(){e(document.body).find(".simpay-amount-input").on("blur.validateAndUpdateAmount",function(n){spShared.validateAndUpdateAmountInput(e(this))})},unformatCurrency:function(n){return Math.abs(accounting.unformat(n,spGeneral.strings.decimalSeparator))},formatCurrency:function(n,e){var a,r="%s%v";if(e=e||!1)switch(spGeneral.strings.currencyPosition){case"left_space":r="%s %v";break;case"right":r="%v%s";break;case"right_space":r="%v %s"}return a={symbol:e?spGeneral.strings.currencySymbol:"",decimal:spGeneral.strings.decimalSeparator,thousand:spGeneral.strings.thousandSeparator,precision:spGeneral.integers.decimalPlaces,format:r},accounting.formatMoney(n,a)},convertToDollars:function(n){return spGeneral.booleans.isZeroDecimal||(n=accounting.toFixed(n/100,2)),spShared.unformatCurrency(n)},convertToCents:function(n){return spGeneral.booleans.isZeroDecimal||(n=Number(accounting.toFixed(100*n,0))),n},validateAndUpdateAmountInput:function(n){var e=n.val(),a=Math.abs(spGeneral.integers.minAmount);e=spShared.unformatCurrency(e),n.hasClass("simpay-allow-blank-amount")&&0===e?n.val(""):(n.hasClass("simpay-minimum-amount-required")&&e<a&&(e=a),e=spShared.formatCurrency(e,!1),"number"!==n[0].type&&n.val(e))},debugLog:function(n,e){"undefined"!=typeof spGeneral&&!0===spGeneral.booleans.scriptDebug&&console.log(n,e)}},e(document).ready(function(n){spShared.init()})}(jQuery);

stripe/trunk/assets/js/upgrade-link.min.js

@@ -1 @@
-/*! WP Simple Pay Lite for Stripe - 2.0.12
+/*! WP Simple Pay Lite for Stripe - 2.1.0
  * https://wpsimplepay.com/
- * Copyright (c) Moonstone Media Group 2018
+ * Copyright (c) Moonstone Media Group 2019
  * Licensed GPLv2+ */
 

stripe/trunk/includes/core/abstracts/field.php

@@ -280 +280 @@
         $classes    = '';
         $type_class = '';
-        $error      = '';
 
         if ( ! empty( $class ) && is_array( $class ) ) {
@@ -288 +287 @@
             $type_class = esc_attr( $this->type_class );
         }
-        if ( true !== $this->validation && ! empty( $this->validation ) ) {
-            $error = 'simpay-field-error ';
-        }
-
-        $this->class = trim( $error . 'simpay-field ' . $type_class . ' ' . $classes );
+
+        $this->class = trim( 'simpay-field ' . $type_class . ' ' . $classes );
     }
 

stripe/trunk/includes/core/abstracts/form.php

@@ -31 +31 @@
 
     /* Ambiguous Keys */
+    public $account_id = '';
     public $secret_key = '';
     public $publishable_key = '';
@@ -40 +41 @@
     public $payment_failure_page = '';
     public $locale = '';
+    public $country = '';
 
     /* Currency Options */
@@ -68 +70 @@
     public $statement_descriptor = '';
 
-    /** CHECKOUT OVERLAY DISPLAY **/
+    /** STRIPE CHECKOUT DISPLAY **/
 
     public $company_name = '';
@@ -118 +120 @@
         $simpay_form = $this;
 
+        $this->maybe_register_hooks();
+
         do_action( 'simpay_form_loaded' );
     }
+
+    /**
+     * Determine if hooks should be registered.
+     *
+     * Hooks get run once per form instance. See https://github.com/wpsimplepay/WP-Simple-Pay-Pro-3/issues/617
+     *
+     */
+    public function maybe_register_hooks() {
+
+        global $simpay_displayed_form_ids;
+
+        if( ! is_array( $simpay_displayed_form_ids ) ) {
+            $simpay_displayed_form_ids = array();
+        }
+
+        // Collect any form IDs we've displayed already so we can avoid duplicate IDs
+        if ( ! isset( $simpay_displayed_form_ids[ $this->id ] ) ) {
+            $this->register_hooks();
+
+            $simpay_displayed_form_ids[ $this->id ] = true;
+        }
+
+    }
+
+    /**
+     * Add hooks and filters for this form instance.
+     *
+     * Hooks get run once per form instance. See https://github.com/wpsimplepay/WP-Simple-Pay-Pro-3/issues/617
+     *
+     */
+    public function register_hooks() {}
 
     /**
@@ -171 +206 @@
         $this->secret_key      = simpay_get_filtered( 'secret_key', simpay_is_test_mode() ? $this->test_secret_key : $this->live_secret_key, $this->id );
         $this->publishable_key = simpay_get_filtered( 'publishable_key', simpay_is_test_mode() ? $this->test_publishable_key : $this->live_publishable_key, $this->id );
+        $this->account_id      = simpay_get_filtered( 'account_id', $this->account_id, $this->id );
 
         /** GENERAL **/
@@ -185 +221 @@
 
         $this->locale      = simpay_get_filtered( 'locale', simpay_get_global_setting( 'locale' ), $this->id );
+        $this->country     = simpay_get_filtered( 'country', simpay_get_global_setting( 'country' ), $this->id );
 
         /* Currency Options */
@@ -222 +259 @@
         /* one-time payment options */
 
-        $this->amount = simpay_convert_amount_to_cents( simpay_get_filtered( 'amount', simpay_get_saved_meta( $this->id, '_amount', '100' ), $this->id ) );
+        $this->amount = simpay_get_filtered( 'amount', simpay_get_saved_meta( $this->id, '_amount', simpay_global_minimum_amount() ), $this->id );
 
         // Statement descriptor
-        $this->statement_descriptor = simpay_get_filtered( 'statement_descriptor', simpay_get_saved_meta( $this->id, '_statement_descriptor', '' ), $this->id );
-
-        /** CHECKOUT OVERLAY DISPLAY **/
+        $this->statement_descriptor = simpay_get_filtered( 'statement_descriptor', null, $this->id );
+
+        /** STRIPE CHECKOUT DISPLAY **/
 
         $this->company_name = simpay_get_filtered( 'company_name', simpay_get_saved_meta( $this->id, '_company_name' ), $this->id );
@@ -370 +407 @@
         }
 
+        // Country
+        if ( ! empty( $this->country ) ) {
+            $strings['strings']['country'] = $this->country;
+        }
+
         // Currency
         if ( ! empty( $this->currency ) ) {

stripe/trunk/includes/core/admin/assets.php

@@ -73 +73 @@
                 'footer' => false,
             ),
-            'simpay-jquery-validate' => array(
-                'src'    => $js_path . 'vendor/jquery.validate' . $this->min . '.js',
-                'deps'   => array( 'jquery' ),
-                'ver'    => SIMPLE_PAY_VERSION,
-                'footer' => false,
-            ),
             'simpay-accounting'      => array(
                 'src'    => $js_path . 'vendor/accounting' . $this->min . '.js',
@@ -96 +90 @@
                     'jquery',
                     'simpay-chosen',
-                    'simpay-jquery-validate',
                     'simpay-accounting',
                     'simpay-shared',

stripe/trunk/includes/core/admin/metaboxes/settings.php

@@ -20 +20 @@
     public static function html( $post ) {
 
+        // @todo Don't use a static method and allow this class to properly register hooks.
+        add_action( 'simpay_admin_before_stripe_checkout_rows', array( __CLASS__, 'add_company_info_settings' ) );
+
         // @see Meta_Boxes::save_meta_boxes()
         wp_nonce_field( 'simpay_save_data', 'simpay_meta_nonce' );
@@ -39 +42 @@
                     <?php
 
-                    $payment_options_template = apply_filters( 'simpay_payment_options_template', 'views/tabs/tab-payment-options.php' );
-
-                    include_once( $payment_options_template );
+                    $payment_options_template = apply_filters( 'simpay_payment_options_template', SIMPLE_PAY_INC . 'core/admin/metaboxes/views/tabs/tab-payment-options.php' );
+
+                    if ( file_exists( $payment_options_template ) ) {
+                        include_once( $payment_options_template );
+                    }
 
                     do_action( 'simpay_form_settings_meta_payment_options_panel', $post->ID );
-                    ?>
-                </div>
-
-                <!-- On-Page Form Display Options Tab -->
-                <div id="form-display-settings-panel" class="simpay-panel simpay-panel-hidden">
-                    <?php
-
-                    $form_display_template = apply_filters( 'simpay_form_display_template', 'views/tabs/tab-form-display.php' );
-
-                    include_once( $form_display_template );
+
+                    ?>
+                </div>
+
+                <!-- Form Display Options Tab -->
+                <div id="form-display-options-settings-panel" class="simpay-panel simpay-panel-hidden">
+                    <?php
+
+                    $form_display_options_template = apply_filters( 'simpay_form_options_template', '' );
+
+                    if ( file_exists( $form_display_options_template ) ) {
+                        include( $form_display_options_template );
+                    }
+
+                    ?>
+                </div>
+
+                <!-- Custom Form Fields Options Tab -->
+                <div id="custom-form-fields-settings-panel" class="simpay-panel simpay-panel-hidden">
+                    <?php
+
+                    $form_display_template = apply_filters( 'simpay_form_display_template', SIMPLE_PAY_INC . 'core/admin/metaboxes/views/tabs/tab-custom-form-fields.php' );
+
+                    if ( file_exists( $form_display_template ) ) {
+                        include_once( $form_display_template );
+                    }
 
                     do_action( 'simpay_form_settings_meta_form_display_panel', $post->ID );
-                    ?>
-                </div>
-
-                <!-- Checkout Overlay Display Options Tab -->
-                <div id="overlay-display-settings-panel" class="simpay-panel simpay-panel-hidden">
-                    <?php
-
-                    $overlay_display_template = apply_filters( 'simpay_overlay_display_template', 'views/tabs/tab-overlay-display.php' );
-
-                    include_once( $overlay_display_template );
-
-                    do_action( 'simpay_form_settings_meta_overlay_display_panel', $post->ID );
+
+                    ?>
+                </div>
+
+                <!-- Stripe Checkout Display Options Tab -->
+                <div id="stripe-checkout-settings-panel" class="simpay-panel simpay-panel-hidden">
+                    <?php
+
+                    $stripe_checkout_template = apply_filters( 'simpay_stripe_checkout_template', SIMPLE_PAY_INC . 'core/admin/metaboxes/views/tabs/tab-stripe-checkout.php' );
+
+                    if ( file_exists( $stripe_checkout_template ) ) {
+                        include_once( $stripe_checkout_template );
+                    }
+
+                    do_action( 'simpay_form_settings_meta_stripe_checkout_panel', $post->ID );
+
                     ?>
                 </div>
@@ -77 +102 @@
                     $subscription_options_template = apply_filters( 'simpay_subscription_options_template', SIMPLE_PAY_INC . 'core/admin/metaboxes/views/tabs/tab-subscription-options.php' );
 
-                    include_once( $subscription_options_template );
+                    if ( file_exists( $subscription_options_template ) ) {
+                        include_once( $subscription_options_template );
+                    }
 
                     do_action( 'simpay_form_settings_meta_subscription_display_panel', $post->ID );
@@ -109 +136 @@
             ),
             'form_display'         => array(
-                'label'  => esc_html__( 'On-Page Form Display', 'stripe' ),
-                'target' => 'form-display-settings-panel',
+                'label'  => esc_html__( 'Custom Form Fields', 'stripe' ),
+                'target' => 'custom-form-fields-settings-panel',
                 'class'  => array(),
                 'icon'   => '',
             ),
-            'overlay_display'      => array(
-                'label'  => esc_html__( 'Checkout Overlay Display', 'stripe' ),
-                'target' => 'overlay-display-settings-panel',
-                'class'  => array(),
+            'stripe_checkout'      => array(
+                'label'  => esc_html__( 'Stripe Checkout Display', 'stripe' ),
+                'target' => 'stripe-checkout-settings-panel',
+                'class'  => array( 'toggle-_form_display_type-stripe_checkout' ),
                 'icon'   => '',
             ),
@@ -179 +206 @@
         }
 
-        // See what type of currency we are dealing with so we know how to save the values
-        $is_zero_decimal = simpay_is_zero_decimal();
-
-
         /** Payment Options */
 
@@ -189 +212 @@
         update_post_meta( $post_id, '_amount_type', $amount_type );
 
+        // TODO Rewrite. Hard to read.
+
         // Amount
-        if ( $is_zero_decimal ) {
-            $amount = isset( $_POST['_amount'] ) ? sanitize_text_field( $_POST['_amount'] ) : ( false !== get_post_meta( $post_id, '_amount', true ) ? get_post_meta( $post_id, '_amount', true ) : '100' );
-        } else {
-            $amount = isset( $_POST['_amount'] ) ? sanitize_text_field( $_POST['_amount'] ) : ( false !== get_post_meta( $post_id, '_amount', true ) ? get_post_meta( $post_id, '_amount', true ) : '1' );
-        }
+        $amount = isset( $_POST['_amount'] ) ? sanitize_text_field( $_POST['_amount'] ) : ( false !== get_post_meta( $post_id, '_amount', true ) ? get_post_meta( $post_id, '_amount', true ) : simpay_global_minimum_amount() );
+
         update_post_meta( $post_id, '_amount', $amount );
 
@@ -211 +233 @@
         update_post_meta( $post_id, '_success_redirect_url', $success_redirect_url );
 
+        /** Form Display Options **/
+
+
+        // Form Display Type
+        $form_display_type = isset( $_POST['_form_display_type'] ) ? sanitize_text_field( $_POST['_form_display_type'] ) : '';
+        update_post_meta( $post_id, '_form_display_type', $form_display_type );
+
+        /** Stripe Checkout Display */
+
+        // Company name
+        $company_name = isset( $_POST['_company_name'] ) ? sanitize_text_field( $_POST['_company_name'] ) : '';
+        update_post_meta( $post_id, '_company_name', $company_name );
+
+        // Item Description
+        $item_description = isset( $_POST['_item_description'] ) ? sanitize_text_field( $_POST['_item_description'] ) : '';
+        update_post_meta( $post_id, '_item_description', $item_description );
+
+        // Image URL
+        $image_url = isset( $_POST['_image_url'] ) ? sanitize_text_field( $_POST['_image_url'] ) : '';
+        update_post_meta( $post_id, '_image_url', $image_url );
+
+        // Enable Remember Me
+        $enable_remember_me = isset( $_POST['_enable_remember_me'] ) ? 'yes' : 'no';
+        update_post_meta( $post_id, '_enable_remember_me', $enable_remember_me );
+
+        // Checkout Button Text
+        $checkout_button_text = isset( $_POST['_checkout_button_text'] ) ? sanitize_text_field( $_POST['_checkout_button_text'] ) : '';
+        update_post_meta( $post_id, '_checkout_button_text', $checkout_button_text );
+
         // Verify Zip/Postal Code
         $verify_zip = isset( $_POST['_verify_zip'] ) ? 'yes' : 'no';
         update_post_meta( $post_id, '_verify_zip', $verify_zip );
 
-        /** Checkout Overlay Display */
-
-        // Company name
-        $company_name = isset( $_POST['_company_name'] ) ? sanitize_text_field( $_POST['_company_name'] ) : '';
-        update_post_meta( $post_id, '_company_name', $company_name );
-
-        // Image URL
-        $image_url = isset( $_POST['_image_url'] ) ? sanitize_text_field( $_POST['_image_url'] ) : '';
-        update_post_meta( $post_id, '_image_url', $image_url );
-
-        // Item Description
-        $item_description = isset( $_POST['_item_description'] ) ? sanitize_text_field( $_POST['_item_description'] ) : '';
-        update_post_meta( $post_id, '_item_description', $item_description );
-
-        // Enable Remember Me
-        $enable_remember_me = isset( $_POST['_enable_remember_me'] ) ? 'yes' : 'no';
-        update_post_meta( $post_id, '_enable_remember_me', $enable_remember_me );
-
         // Enable Billing Address
         $enable_billing_address = isset( $_POST['_enable_billing_address'] ) ? 'yes' : 'no';
@@ -240 +273 @@
         $enable_shipping_address = isset( $_POST['_enable_shipping_address'] ) ? 'yes' : 'no';
         update_post_meta( $post_id, '_enable_shipping_address', $enable_shipping_address );
-
-        // Checkout Button Text
-        $checkout_button_text = isset( $_POST['_checkout_button_text'] ) ? sanitize_text_field( $_POST['_checkout_button_text'] ) : '';
-        update_post_meta( $post_id, '_checkout_button_text', $checkout_button_text );
 
         // Save custom fields
@@ -295 +324 @@
         return $arr;
     }
+
+    /**
+     * Output Company Info settings in the Stripe Checkout tab.
+     *
+     * @since 3.4.0
+     */
+    public static function add_company_info_settings() {
+        include_once SIMPLE_PAY_INC . 'core/admin/metaboxes/views/partials/company-info-settings.php';
+    }
 }

stripe/trunk/includes/core/admin/metaboxes/views/tabs/tab-payment-options.php

@@ -33 +33 @@
                     'simpay-field-tiny',
                     'simpay-amount-input',
+                    'simpay-minimum-amount-required',
                 );
 
-                // Attributes
-                $attr = array(
-                    'min' => simpay_get_stripe_minimum_amount(),
-                );
-
-                // Check saved currency and set default to 100 or 1 accordingly and set steps and class
-                if ( simpay_is_zero_decimal() ) {
-                    $amount = simpay_get_saved_meta( $post->ID, '_amount', '100' );
-                } else {
-                    $amount = simpay_get_saved_meta( $post->ID, '_amount', '1' );
-                }
+                // Check saved currency and set default to 100 or 1 accordingly and set steps and class.
+                $amount = simpay_get_saved_meta( $post->ID, '_amount', simpay_global_minimum_amount() );
 
                 simpay_print_field( array(
@@ -53 +45 @@
                     'id'          => '_amount',
                     'value'       => $amount,
-                    'attributes'  => $attr,
                     'class'       => $classes,
-                    'placeholder' => simpay_formatted_amount( '100', '', false ),
+                    'placeholder' => simpay_format_currency( simpay_global_minimum_amount(), simpay_get_setting( 'currency' ), false ),
                 ) );
+
                 ?>
 

stripe/trunk/includes/core/admin/notices.php

@@ -15 +15 @@
      */
     public function __construct() {
-        
+
         add_action( 'admin_notices', array( $this, 'show_notices' ) );
+        add_action( 'admin_notices', array( $this, 'show_upgrade_php_version_notice' ) );
 
         add_action( 'in_plugin_update_message-' . plugin_basename( SIMPLE_PAY_MAIN_FILE ), array(
@@ -39 +40 @@
             }
 
-            $this->api_keys_error();
+            $this->stripe_connect_notice();
             $this->ssl_error();
-
-            // TODO Maybe reuse this for upcoming PHP 5.6 requirement.
-            /*
-            // Show non-dismissable notice for dropping PHP 5.3 next update.
-            if ( version_compare( PHP_VERSION, '5.4', '<' ) ) {
-
-                $notice_message = __( 'WP Simple Pay and Stripe are ending compatibility with PHP 5.3 in the next update. Please update PHP before updating WP Simple Pay.', 'simple-pay' ) . '<br/>' .
-                                  __( 'We strongly recommend PHP 7.0 or higher.', 'simple-pay' ) .
-                                  ' <a href="https://wordpress.org/about/requirements/" target="_blank">' . __( 'Click here for more details and a letter you can send to your host.', 'simple-pay' ) . '</a> ';
-
-                self::print_notice( $notice_message );
-            }
-            */
 
             do_action( 'simpay_admin_notices', $this->is_admin_screen );
@@ -74 +62 @@
 
     /**
-     * Function to display error messages for missing API Keys.
-     */
-    public function api_keys_error() {
-
-        if ( ! simpay_check_keys_exist() && ( ( false !== $this->is_admin_screen && ( 'simpay_settings' === $this->is_admin_screen && isset( $_GET['tab'] ) && 'keys' !== $_GET['tab'] && 'license' !== $_GET['tab'] ) || 'simpay' === $this->is_admin_screen ) ) ) {
-
-            /* Translators: 1. "test Stripe API keys" OR "live Stripe API keys" 2. Plugin name */
-            $notice_message = sprintf( __( 'Your %1$s Stripe API Keys for %2$s have not been entered.', 'stripe' ), ( simpay_is_test_mode() ? _x( 'test', 'Your test Stripe API keys...', 'stripe' ) : _x( 'live', 'Your live Stripe API keys...', 'stripe' ) ), SIMPLE_PAY_PLUGIN_NAME );
-            $notice_message .= ' <a href="' . admin_url( 'admin.php?page=simpay_settings&tab=keys' ) . '">' . esc_html__( 'Enter them here.', 'stripe' ) . '</a>';
-
-            self::print_notice( $notice_message, 'error' );
-        }
+     * Function to display an alert to installs that have not authorized through Stripe Connect
+     */
+    public function stripe_connect_notice() {
+        // If they are forced to use Stripe Connect they do not need to be notified about the functionality.
+        if ( ! simpay_can_site_manage_stripe_keys() ) {
+            return;
+        }
+
+        if ( 'simpay_settings' === $this->is_admin_screen && isset( $_GET['tab'] ) && 'keys' === $_GET['tab'] ) {
+            return;
+        }
+
+        if ( $this->check_if_dismissed( 'stripe-connect' ) ) {
+            return;
+        }
+
+        if ( ! simpay_get_account_id() ) {
+            $notice_message = sprintf(
+                __( 'WP Simple Pay now supports Stripe Connect for easier setup and improved security. <a href="%s">Click here</a> to connect your Stripe account.', 'stripe' ),
+                admin_url( 'admin.php?page=simpay_settings&tab=keys' )
+            );
+
+            self::print_notice( $notice_message, 'info', 'stripe-connect' );
+        }
+    }
+
+    /**
+     * Output the PHP requirement notice.
+     *
+     * This warns users that the plugin will not be able to function in their
+     * environment after a future update.
+     *
+     * @since 3.4.0
+     */
+    public function show_upgrade_php_version_notice() {
+        $future_required_version = 5.6;
+
+        if ( ! version_compare( PHP_VERSION, $future_required_version, '<' ) ) {
+            return;
+        }
+
+        $notice_message = '<p><strong>' . __( 'WP Simple Pay is increasing its PHP version requirement.', 'stripe' ) . '</strong></p>';
+        $notice_message .= '<p>' . sprintf( __( 'WP Simple Pay will be increasing its PHP requirement to version <code>%1$s</code> or higher in an upcoming release. It looks like you\'re using version <code>%2$s</code>, which means you will need to upgrade your version of PHP to allow the plugin to continue to function. Newer versions of PHP are both faster and more secure. The version you\'re using <a href="%3$s" target="_blank">no longer receives security updates</a>, which is another great reason to update.', 'stripe' ), $future_required_version, PHP_VERSION, 'http://php.net/eol.php' ) . '</p>';
+
+        $notice_message .= '<p><strong>' . __( 'Which version should I upgrade to?', 'stripe' ) . '</strong></p>';
+        $notice_message .= '<p>' . sprintf( __( 'In order to be compatible with future versions of WP Simple Pay, you should update your PHP version to <code>%1$s</code>, <code>7.0</code>, <code>7.1</code>, or <code>7.2</code>. On a normal WordPress site, switching to PHP <code>%1$s</code> should never cause issues. We would however actually recommend you switch to PHP <code>7.1</code> or higher to receive the full speed and security benefits provided to more modern and fully supported versions of PHP. However, some plugins may not be fully compatible with PHP <code>7.x</code>, so more testing may be required.', 'stripe' ), $future_required_version ) . '</p>';
+
+        $notice_message .= '<p><strong>' . __( 'Need help upgrading? Ask your web host!', 'stripe' ) . '</strong></p>';
+        $notice_message .= '<p>' . sprintf( __( 'Many web hosts can give you instructions on how/where to upgrade your version of PHP through their control panel, or may even be able to do it for you. If you need to change hosts, please see <a href="%s" target="_blank">our hosting recommendations</a>.', 'stripe' ), 'https://wpsimplepay.com/recommended-wordpress-hosting/' ) . '</p>';
+
+        self::print_notice( $notice_message );
     }
 

stripe/trunk/includes/core/admin/pages.php

@@ -74 +74 @@
         $this->tab = isset( $tabs[0] ) ? $tabs[0] : '';
 
-        // Remove the Save Changes button from the license page
-        add_filter( 'simpay_admin_page_settings_license_submit', function () {
-            return false;
-        } );
-
         add_filter( 'admin_footer_text', array( $this, 'add_footer_text' ) );
 

stripe/trunk/includes/core/admin/pages/general.php

@@ -132 +132 @@
                     $saved_currency_symbol = simpay_get_currency_symbol( $this->get_option_value( $section, 'currency' ) );
 
-                    $formatted_amount = simpay_formatted_amount( 499, '', false );
+                    $formatted_amount = simpay_format_currency( ( simpay_is_zero_decimal() ? 499 : 4.99 ), '', false );
 
                     $fields[ $section ] = array(

stripe/trunk/includes/core/admin/pages/keys.php

@@ -27 +27 @@
         $this->id           = 'keys';
         $this->option_group = 'settings';
-        $this->label        = esc_html__( 'Stripe Keys', 'stripe' );
+        $this->label        = esc_html__( 'Stripe Setup', 'stripe' );
         $this->link_text    = esc_html__( 'Help docs for Stripe Keys Settings', 'stripe' );
         $this->link_slug    = ''; // TODO: Fill in slug, not in use currently (issue #301)
@@ -46 +46 @@
 
         return apply_filters( 'simpay_add_' . $this->option_group . '_' . $this->id . '_sections', array(
+            'connect'      => array(
+                'title' => '',
+            ),
             'mode'      => array(
                 'title' => '',
@@ -53 +56 @@
             ),
             'live_keys' => array(
+                'title' => '',
+            ),
+            'country' => array(
                 'title' => '',
             ),
@@ -75 +81 @@
                 $section = sanitize_key( $section );
 
-                if ( 'mode' == $section ) {
+                if ( 'connect' == $section ) {
+
+                    $stripe_connect_url = add_query_arg( array(
+                        'live_mode' => (int) ! simpay_is_test_mode(),
+                        'state' => str_pad( wp_rand( wp_rand(), PHP_INT_MAX ), 100, wp_rand(), STR_PAD_BOTH ),
+                        'customer_site_url' => admin_url( 'admin.php?page=simpay_settings&tab=keys' ),
+                    ), 'https://wpsimplepay.com/?wpsp_gateway_connect_init=stripe_connect' );
+
+                    $show_connect_button = false;
+
+                    $mode = simpay_is_test_mode() ? __( 'test', 'stripe' ) : __( 'live', 'stripe' );
+
+                    if( simpay_is_test_mode() && ! simpay_check_keys_exist() ) {
+
+                        $show_connect_button = true;
+
+                    } elseif( ! simpay_check_keys_exist() ) {
+
+                        $show_connect_button = true;
+
+                    }
+
+                    if( $show_connect_button ) {
+
+                        $html = '<a href="'. esc_url( $stripe_connect_url ) .'" class="wpsp-stripe-connect"><span>' . __( 'Connect with Stripe', 'stripe' ) . '</span></a>';
+                        $html .= '<p>' . sprintf( __( 'Have questions about connecting with Stripe? See the <a href="%s" target="_blank" rel="noopener noreferrer">documentation</a>.', 'stripe' ), simpay_get_url( 'docs' ) . 'articles/stripe-setup/' ) . '</p>';
+                        
+                    } else {
+
+                        $html = sprintf( __( 'Your Stripe account is connected in %s mode. If you need to reconnect in %s mode, <a href="%s">click here</a>.', 'stripe' ), '<strong>' . $mode . '</strong>', $mode, esc_url( $stripe_connect_url ) );
+                    
+                    }
+
+                    if ( simpay_can_site_manage_stripe_keys() ) {
+                        $html .= '<p id="wpsp-api-keys-row-reveal">' . __( '<a href="#">Click here</a> to manage your API keys manually.', 'stripe' ) . '</p>';
+                        $html .= '<p id="wpsp-api-keys-row-hide">' . __( '<a href="#">Click here</a> to hide your API keys.', 'stripe' ) . '</p>';
+                    }
+
+                    $fields[ $section ] = array(
+                        'test_mode' => array(
+                            'title'       => esc_html__( 'Connection Status', 'stripe' ),
+                            'type'        => 'custom-html',
+                            'html'        => $html,
+                            'name'        => 'simpay_' . $this->option_group . '_' . $this->id . '[' . $section . '][test_mode]',
+                            'id'          => 'simpay-' . $this->option_group . '-' . $this->id . '-' . $section . '-test-mode',
+                        ),
+                    );
+                } elseif  ( 'mode' == $section ) {
                     $fields[ $section ] = array(
                         'test_mode' => array(
@@ -85 +138 @@
                                 'disabled' => esc_html__( 'Disabled', 'stripe' ),
                             ),
+                            'value'       => $this->get_option_value( $section, 'test_mode' ),                      
                             'name'        => 'simpay_' . $this->option_group . '_' . $this->id . '[' . $section . '][test_mode]',
                             'id'          => 'simpay-' . $this->option_group . '-' . $this->id . '-' . $section . '-test-mode',
-                            'value'       => $this->get_option_value( $section, 'test_mode' ),
                             'inline'      => 'inline',
                             'description' => sprintf( wp_kses( __( 'While in test mode no live payments are processed. Make sure Test mode is enabled in your <a href="%1$s" target="_blank">Stripe dashboard</a> to view your test transactions.', 'stripe' ), array(
                                     'a' => array( 'href' => array(), 'target' => array() ),
-                                ) ), esc_url( 'https://dashboard.stripe.com/' ) ) . '<br/><br/>' . sprintf( wp_kses( __( '<a href="%1$s" target="_blank">Retrieve your Stripe API test and live keys.</a>', 'stripe' ), array(
-                                    'a' => array( 'href' => array(), 'target' => array() ),
-                                ) ), esc_url( 'https://dashboard.stripe.com/account/apikeys' ) ),
+                                ) ), esc_url( 'https://dashboard.stripe.com/' ) )
                         ),
                     );
@@ -152 +203 @@
                         ),
                     );
+                } elseif ( 'country' == $section ) {
+
+                    $fields[ $section ] = array(
+                        'country'       => array(
+                            'title'       => esc_html__( 'Account Country', 'stripe' ),
+                            'type'        => 'select',
+                            'options'     => simpay_get_country_list(),
+                            'name'        => 'simpay_' . $this->option_group . '_' . $this->id . '[' . $section . '][country]',
+                            'id'          => 'simpay-' . $this->option_group . '-' . $this->id . '-' . $section . '-country',
+                            'value'       => $this->get_option_value( $section, 'country' ),
+                            'description' => esc_html__( 'The country associated with the connected Stripe account.', 'stripe' ) . '<br />' . '<a href="https://dashboard.stripe.com/account">' . esc_html__( 'View your account settings', 'stripe' ),
+                        ),
+                    );
+
                 }
 

stripe/trunk/includes/core/admin/pages/main.php

@@ -176 +176 @@
     public static function get_form_settings( $action ) {
 
+        global $post;
+
         switch ( $action ) {
             case 'edit':
@@ -188 +190 @@
                     break;
                 }
+
             case 'create':
                 {
+                    // Add New is actually creating the payment form CPT record here.
 
                     // Create post object
@@ -198 +202 @@
                         'post_type'    => 'simple-pay',
                     );
-
+                    
                     // Insert the post into the database
-                    $form = wp_insert_post( $form_args );
-
-                    $form = get_post( $form );
+                    $form_id = wp_insert_post( $form_args );
+
+                    $form = get_post( $form_id );
+
+                    do_action( 'simpay_form_created', $form->ID );
 
                     $form_action = esc_url( add_query_arg( array(
@@ -213 +219 @@
                     break;
                 }
+
             default:
                 {
@@ -221 +228 @@
         }
 
-        global $post;
-
         $post = $form;
 
         setup_postdata( $post );
-
         ?>
+
         <form id="post" method="post" action="<?php echo esc_attr( $form_action ); ?>">
             <div id="poststuff">

stripe/trunk/includes/core/assets.php

@@ -61 +61 @@
 
     /**
-     * Setup arrays for both styles and scripts
+     * Setup arrays for both scripts & styles.
      */
     public function setup() {
@@ -73 +73 @@
                 'deps'   => array(),
                 'ver'    => null,
-                'footer' => true,
-            ),
-            'simpay-jquery-validate' => array(
-                'src'    => $js_path . 'vendor/jquery.validate' . $this->min . '.js',
-                'deps'   => array( 'jquery' ),
-                'ver'    => SIMPLE_PAY_VERSION,
                 'footer' => true,
             ),
@@ -97 +91 @@
                 'deps'   => array(
                     'jquery',
-                    'simpay-jquery-validate',
                     'simpay-accounting',
                     'simpay-shared',
@@ -110 +103 @@
 
             $this->styles = array(
-                'stripe-checkout-button'     => array(
+                'google-font-roboto'     => array(
+                    'src'   => 'https://fonts.googleapis.com/css?family=Roboto',
+                    'deps'  => array(),
+                    'ver'   => null,
+                    'media' => 'all',
+                ),
+                'stripe-checkout-button' => array(
                     'src'   => 'https://checkout.stripe.com/v3/checkout/button.css',
                     'deps'  => array(),
@@ -116 +115 @@
                     'media' => 'all',
                 ),
-                'simpay-public'              => array(
+                'simpay-public'          => array(
                     'src'   => $css_path . 'public' . $this->min . '.css',
-                    'deps'  => array( 'stripe-checkout-button' ),
+                    'deps'  => array( 'google-font-roboto', 'stripe-checkout-button' ),
                     'ver'   => SIMPLE_PAY_VERSION,
                     'media' => 'all',
@@ -127 +126 @@
 
     /**
-     * Register the scripts and styles
+     * Register scripts & styles
      */
     public function register() {
@@ -154 +153 @@
 
     /**
-     * Enqueue the scripts and styles
+     * Enqueue registered scripts & styles
      */
     public function enqueue() {

stripe/trunk/includes/core/errors.php

@@ -107 +107 @@
      * @return string
      */
+
+    // TODO Used? Remove?
     public static function get_error_html() {
 

stripe/trunk/includes/core/forms/default-form.php

@@ -32 +32 @@
         parent::__construct( $id );
 
+    }
+
+    /**
+     * Add hooks and filters for this form instance.
+     *
+     * Hooks get run once per form instance. See https://github.com/wpsimplepay/WP-Simple-Pay-Pro-3/issues/617
+     *
+     */
+    public function register_hooks() {
         add_action( 'wp_footer', array( $this, 'set_script_variables' ), 0 );
+        add_filter( 'simpay_form_' . $this->id . '_custom_fields', array( $this, 'get_custom_fields_html' ), 10, 2 );
     }
 
@@ -43 +53 @@
             'form'   => $this->get_form_script_variables(),
             'stripe' => array_merge( array(
-                'amount' => $this->total_amount,
+                'amount'  => $this->total_amount,
+                'country' => $this->country,
             ), $this->get_stripe_script_variables() ),
         );
@@ -58 +69 @@
     public function html() {
 
+        $id                = 'simpay-form-' . $this->id;
+        $form_display_type = simpay_get_saved_meta( $this->id, '_form_display_type' );
+
+        do_action( 'simpay_before_form_display', $this );
+
+        echo '<div id="simpay-' . $form_display_type . '-form-wrap-' . $this->id . '" class="simpay-' . $form_display_type . '-form-wrap simpay-form-wrap">';
+
+            do_action( 'simpay_form_' . absint( $this->id ) . '_before_payment_form', $this );
+
+            // Can add additional form tag attributes here using a filter.
+            $more_form_atts = apply_filters( 'simpay_more_form_attributes', '' );
+
+            echo '<form action="" method="post" class="' . $this->get_form_classes( $this->id ) . '" id="' . esc_attr( $id ) . '" data-simpay-form-id="' . esc_attr( $this->id ) . '" ' . esc_attr( $more_form_atts ) . '>';
+
+                do_action( 'simpay_form_' . absint( $this->id ) . '_before_form_top', $this );
+
+                if ( ! empty( $this->custom_fields ) && is_array( $this->custom_fields ) ) {
+                    echo $this->print_custom_fields();
+                }
+
+                // Hidden inputs to hold the Stripe token properties (id & email) appended to the form in public.js.
+
+                // TODO Append these hidden inputs to form in public.js?
+                echo '<input type="hidden" name="simpay_form_id" value="' . esc_attr( $this->id ) . '" />';
+                echo '<input type="hidden" name="simpay_amount" value="" class="simpay-amount" />';
+
+                if ( $this->enable_shipping_address ) {
+                    echo $this->shipping_fields();
+                }
+
+                // Form validation error message container
+                echo '<div class="simpay-errors" id="' . esc_attr( $id ) . '-error"></div>';
+
+                echo simpay_get_test_mode_badge();
+
+                do_action( 'simpay_form_' . absint( $this->id ) . '_before_form_bottom', $this );
+
+            // We echo the </form> instead of appending it so that the action hook can work correctly if they try to output something before the form close.
+            echo '</form>';
+
+            do_action( 'simpay_form_' . absint( $this->id ) . '_after_form_display', $this );
+
+        echo '</div>'; // .simpay-{$form_display_type}-form-wrap
+    }
+
+    private function get_form_classes( $id ) {
+
+        $classes = apply_filters( 'simpay_form_' . absint( $this->id ) . '_classes', array(
+            'simpay-checkout-form',
+            'simpay-form-' . absint( $this->id ),
+        ) );
+
+        return trim( implode( ' ', array_map( 'trim', array_map( 'sanitize_html_class', array_unique( $classes ) ) ) ) );
+
+    }
+
+    /**
+     * Print out the custom fields.
+     *
+     * @return string
+     */
+    public function print_custom_fields() {
+
         $html = '';
-        $id   = 'simpay-form-' . $this->id;
-
-        // Can add additional form tag attributes here using a filter.
-        $more_form_atts = apply_filters( 'simpay_more_form_attributes', '' );
-
-        $html .= '<form action="" method="post" class="simpay-checkout-form ' . esc_attr( $id ) . '" id="' . esc_attr( $id ) . '" data-simpay-form-id="' . esc_attr( $this->id ) . '" ' . esc_attr( $more_form_atts ) . '>';
 
         if ( ! empty( $this->custom_fields ) && is_array( $this->custom_fields ) ) {
-            $html .= $this->print_custom_fields();
-        }
-
-        $html .= '<input type="hidden" name="simpay_stripe_token" value="" class="simpay-stripe-token" />';
-        $html .= '<input type="hidden" name="simpay_stripe_email" value="" class="simpay-stripe-email" />';
-        $html .= '<input type="hidden" class="simpay_form_id" name="simpay_form_id" value="' . esc_attr( $this->id ) . '" />';
-
-        $html .= '<input type="hidden" name="simpay_amount" value="" class="simpay-amount" />';
-
-        if ( $this->enable_shipping_address ) {
-            $html .= $this->shipping_fields();
-        }
-
-        do_action( 'simpay_before_form_display' );
-
-        echo $html;
-
-        do_action( 'simpay_before_form_close' );
-
-        // We echo the </form> instead of appending it so that the action hook can work correctly if they try to output something before the form close.
-        echo  '</form>';
-
-        do_action( 'simpay_after_form_display' );
-    }
-
-    /**
-     * Print out the custom fields.
-     *
-     * @return string
-     */
-    public function print_custom_fields() {
-
-        $html = '';
-
-        if ( ! empty( $this->custom_fields ) && is_array( $this->custom_fields ) ) {
+
             foreach ( $this->custom_fields as $k => $v ) {
-
-                switch ( $v['type'] ) {
-                    case 'payment_button':
-                        $html .= Fields\Payment_Button::html( $v );
-                        break;
-                    case has_filter( 'simpay_custom_fields' ):
-                        $html .= apply_filters( 'simpay_custom_fields', $html, $v );
-                        break;
-                }
+    
+                /*
+                 * These filters are deprecated but still here for backwards compatibility
+                 */
+                $html = apply_filters( 'simpay_custom_field_html', $html, $v );
+                $html = apply_filters( 'simpay_custom_fields', $html, $v );
             }
         }
+
+        $html = apply_filters( 'simpay_form_' . absint( $this->id ) . '_custom_fields', $html, $this );
+        $html = apply_filters( 'simpay_form_custom_fields', $html, $this );
 
         return $html;
@@ -164 +198 @@
 
         $integers['integers'] = array(
-            'amount'            => round( $this->amount ),
+            'amount' => floatval( $this->amount ),
         );
 
         $strings['strings'] = array(
-            'loadingText' => $loading_text,
+            'loadingText' => $loading_text,
         );
 
@@ -175 +209 @@
         return $form_variables;
     }
+
+    /**
+     * Default custom fields handler.
+     *
+     * @since 3.4.0
+     *
+     * @param string $html Form HTML.
+     * @param object $form The current form.
+     * @return string $html Form HTML.
+     */
+    public function get_custom_fields_html( $html, $form ) {
+        foreach ( $this->custom_fields as $key => $value ) {
+            switch ( $value['type'] ) {
+                case 'payment_button':
+                    $html .= Fields\Payment_Button::html( $value );
+                    break;
+            }
+        }
+
+        return $html;
+    }
 }

stripe/trunk/includes/core/forms/fields/payment-button.php

@@ -42 +42 @@
         $html .= '<button id="' . esc_attr( $id ) . '" class="' . self::get_payment_button_classes( $button_style ) . '"><span>' . esc_html( $text ) . '</span></button>';
 
-        // Test mode badge placement
-        if ( simpay_is_test_mode() ) {
-            $html .= '<div class="simpay-test-mode-badge-container">';
-            $html .= '<span class="simpay-test-mode-badge">' . esc_html__( 'Test Mode', 'stripe' ) . '</span>';
-            $html .= '</div>';
-        }
-
         $html .= '</div>';
 

stripe/trunk/includes/core/functions/shared.php

@@ -12 +12 @@
 
 use SimplePay\Core\Abstracts\Form;
-
-// TODO Need function simpay_clean?
-
-/**
- * Clean variables using sanitize_text_field. Arrays are cleaned recursively.
- * Non-scalar values are ignored.
- *
- * @since  3.0
- * @param  string|array $var
- *
- * @return string|array
- */
-function simpay_clean( $var ) {
-    if ( is_array( $var ) ) {
-        return array_map( 'simpay_clean', $var );
-    } else {
-        return is_scalar( $var ) ? sanitize_text_field( $var ) : $var;
-    }
-}
 
 /**
@@ -171 +152 @@
         return apply_filters( $form_filter, $value );
     } else {
-        return apply_filters( 'simpay_' . $filter, $value );
+        return apply_filters( 'simpay_' . $filter, $value, $form_id );
     }
 }
@@ -185 +166 @@
 
     if ( $formatted ) {
-        return simpay_formatted_amount( simpay_get_setting( 'amount' ) );
+        return simpay_format_currency( simpay_get_setting( 'amount' ) );
     }
 
@@ -237 +218 @@
  */
 function simpay_get_form( $object ) {
+
+    if( is_numeric( $object ) ) {
+        $object = get_post( $object );
+    }
+
     $objects = \SimplePay\Core\SimplePay()->objects;
 
@@ -296 +282 @@
 
     return ( isset( $settings['mode']['test_mode'] ) && 'enabled' === $settings['mode']['test_mode'] );
+}
+
+/**
+ * Return test mode badge html if in test mode.
+ *
+ * @return string
+ */
+function simpay_get_test_mode_badge() {
+    $html = '';
+
+    if ( simpay_is_test_mode() ) {
+        $html .= '<div class="simpay-test-mode-badge-container">';
+        $html .= '<span class="simpay-test-mode-badge">' . esc_html__( 'Test Mode', 'stripe' ) . '</span>';
+        $html .= '</div>';
+    }
+
+    return $html;
 }
 
@@ -445 +448 @@
 
     $i18n['i18n'] = array(
-        'mediaTitle'                      => esc_html__( 'Insert Media', 'stripe' ),
-        'mediaButtonText'                 => esc_html__( 'Use Image', 'stripe' ),
+        'mediaTitle'      => esc_html__( 'Insert Media', 'stripe' ),
+        'mediaButtonText' => esc_html__( 'Use Image', 'stripe' ),
     );
 
     $integers['integers'] = array(
         'decimalPlaces' => simpay_get_decimal_places(),
-        'minAmount'     => simpay_get_stripe_minimum_amount(),
+        'minAmount'     => simpay_global_minimum_amount(),
     );
 
@@ -505 +508 @@
 
 /**
- * Convert an amount to cents.
- *
- * @param        $amount
- * @param string $decimal_separator
- * @param string $thousand_separator
- *
- * @return float|int
- */
-function simpay_convert_amount_to_cents( $amount, $decimal_separator = '', $thousand_separator = '' ) {
-
-    $decimal_separator  = ( ! empty( $decimal_separator ) ? $decimal_separator : simpay_get_decimal_separator() );
-    $thousand_separator = ( ! empty( $thousand_separator ) ? $thousand_separator : simpay_get_thousand_separator() );
-
-    // Remove thousand separator
-    $amount = str_replace( $thousand_separator, '', $amount );
-
-    // Now replace decimal separator with an actual decimal point for processing purposes
-    $amount = str_replace( $decimal_separator, '.', $amount );
-
-    if ( simpay_is_zero_decimal() ) {
-        return intval( $amount );
-    } else {
-        return floatval( $amount ) * 100;
-    }
-
-}
-
-/**
  * Get the thousands separator.
  *
@@ -596 +571 @@
 
 /**
- * Get the Stripe minimum amount
- *
- * @param bool $cents
+ * Return amount as number value.
+ * Uses global (or filtered) decimal separator setting ("." or ",") & thousand separator setting.
+ * Like accounting.unformat removes formatting/cruft first.
+ * Respects decimal separator, but ignores zero decimal currency setting.
+ * Also prevent negative values.
+ * Similar to JS function unformatCurrency.
+ *
+ * @param string|float $amount
  *
  * @return float
  */
-function simpay_get_stripe_minimum_amount( $cents = false ) {
-
-    // Check if we want the number in cents or a formatted amount based on the zero decimal amount
-    if ( $cents ) {
-        $minimum = '50';
+function simpay_unformat_currency( $amount ) {
+
+    // Remove thousand separator.
+    $amount = str_replace( simpay_get_thousand_separator(), '', $amount );
+
+    // Replace decimal separator with an actual decimal point to allow converting to float.
+    $amount = str_replace( simpay_get_decimal_separator(), '.', $amount );
+
+    return abs( floatval( $amount ) );
+}
+
+/**
+ * Convert from dollars to cents (in USD).
+ * Leaves zero decimal currencies alone.
+ * Similar to JS function convertToCents.
+ *
+ * @param string|float $amount
+ *
+ * @return int
+ */
+function simpay_convert_amount_to_cents( $amount ) {
+
+    $amount = simpay_unformat_currency( $amount );
+
+    if ( simpay_is_zero_decimal() ) {
+        return intval( $amount );
     } else {
-        $minimum = simpay_is_zero_decimal() ? '50' : '.50';
-    }
-
-    return floatval( apply_filters( 'simpay_stripe_minimum_amount', $minimum ) );
-}
-
-/**
- * Return the formatted amount.
+        return intval( $amount * 100 );
+    }
+}
+
+/**
+ * Convert from cents to dollars (in USD).
+ * Uses global zero decimal currency setting.
+ * Leaves zero decimal currencies alone.
+ * Similar to JS function convertToDollars.
+ *
+ * @param string|int $amount
+ *
+ * @return int|float
+ */
+function simpay_convert_amount_to_dollars( $amount ) {
+
+    $amount = simpay_unformat_currency( $amount );
+
+    if ( ! simpay_is_zero_decimal() ) {
+        $amount = round( intval( $amount ) / 100, simpay_get_decimal_places() );
+    }
+
+    return $amount;
+}
+
+/**
+ * Get the global system-wide minimum amount. Stripe dictates minimum USD is 50 cents, but set to 100 cents/currency
+ * units as it can vary from currency to currency.
+ *
+ * @return int
+ */
+function simpay_global_minimum_amount() {
+
+    // Initially set to 1.00 for non-zero decimal currencies (i.e. $1.00 USD).
+    $amount = 1;
+
+    if ( simpay_is_zero_decimal() ) {
+        $amount = 100;
+    }
+
+    return floatval( apply_filters( 'simpay_global_minimum_amount', $amount ) );
+}
+
+/**
+ * Validate a statement subscription for a charge or plan.
+ *
+ * @since 3.4.0
+ *
+ * @param string $statement_description Statement description to validate.
+ * @return mixed Description or null.
+ */
+function simpay_validate_statement_descriptor( $statement_descripor ) {
+    $illegal = array( '<', '>', '"', "'", '*', '\\' );
+
+    // Remove slashes
+    $descriptor = stripslashes( $statement_descripor );
+
+    // Remove illegal characters
+    $descriptor = str_replace( $illegal, '', $descriptor );
+
+    // Trim to 22 characters max
+    $descriptor = substr( $descriptor, 0, 22 );
+
+    return $descriptor;
+}
+
+/**
+ * Return amount as formatted string.
+ * With or without currency symbol.
+ * Used for labels & amount inputs in admin & front-end.
+ * Uses global (or filtered) decimal separator setting ("." or ",") & thousand separator setting.
+ * Similar to JS function formatCurrency.
  *
  * @param        $amount
  * @param string $currency
  * @param bool   $show_symbol
- * @param string $separator
  *
  * @return string
  */
-function simpay_formatted_amount( $amount, $currency = '', $show_symbol = true, $separator = '' ) {
+function simpay_format_currency( $amount, $currency = '', $show_symbol = true ) {
 
     if ( empty( $currency ) ) {
-        $symbol = simpay_get_currency_symbol( simpay_get_setting( 'currency' ) );
-    } else {
-        $symbol = simpay_get_currency_symbol( $currency );
-    }
+        $currency = simpay_get_setting( 'currency' );
+    }
+
+    $symbol = simpay_get_currency_symbol( $currency );
 
     $position = simpay_get_setting( 'currency_position' );
 
-    // Non-zero
-    if ( simpay_is_zero_decimal( $currency ) ) {
-        $amount = number_format( intval( $amount ), 0, simpay_get_decimal_separator(), simpay_get_thousand_separator() );
-    } else {
-        $amount = number_format( floatval( $amount ) / 100, simpay_get_decimal_places(), simpay_get_decimal_separator(), simpay_get_thousand_separator() );
-    }
-
-    $amount = apply_filters( 'simpay_formatted_amount', $amount, $amount );
+    $amount = number_format( floatval( $amount ), simpay_get_decimal_places(), simpay_get_decimal_separator(), simpay_get_thousand_separator() );
+
+    $amount = apply_filters( 'simpay_formatted_amount', $amount );
 
     if ( $show_symbol ) {
@@ -680 +739 @@
             $template .= '<strong>' . esc_html__( 'Payment Date:', 'stripe' ) . '</strong>' . ' {charge-date}' . "\n";
             $template .= '<strong>' . esc_html__( 'Payment Amount: ', 'stripe' ) . '</strong>' . '{total-amount}' . "\n";
+
             return $template;
         case has_filter( 'simpay_editor_template' ):
@@ -872 +932 @@
     return apply_filters( 'simpay_currency_symbol', $currency_symbol, $currency );
 }
+
+/**
+ * Insert an array key/value pair after a certain point in an existing associative array.
+ *
+ * @since 3.4.0
+ *
+ * @param $new_key  string The new key to use for $fields[ $section ][ $new_key ]
+ * @param $value    array The array that holds the information for this settings array
+ * @param $needle   string The key to find in the current array of fields
+ * @param $haystack array The current array to search
+ * @return array
+ */
+function simpay_add_to_array_after( $new_key, $value, $needle, $haystack ) {
+    $split = array(); // The split off portion of the array after the key we want to insert after
+    $new   = array(); // The new array will consist of the opposite of the split + the new element we want to add
+
+    if ( array_key_exists( $needle, $haystack ) ) {
+        $offset = array_search( $needle, array_keys( $haystack ) );
+
+        $split = array_slice( $haystack, $offset + 1 );
+        $new   = array_slice( $haystack, 0, $offset + 1 );
+
+        // Add the new element to the bottom
+        $new[ $new_key ] = $value;
+    }
+
+    return $new + $split;
+}

stripe/trunk/includes/core/main.php

@@ -94 +94 @@
         // Load core shared back-end & front-end functions.
         require_once( SIMPLE_PAY_INC . 'core/functions/shared.php' );
+        require_once( SIMPLE_PAY_INC . 'core/functions/countries.php' );
+
+        // Stripe Connect functionality.
+        require_once( SIMPLE_PAY_INC . 'core/stripe-connect/functions.php' );
+        require_once( SIMPLE_PAY_INC . 'core/stripe-connect/admin.php' );
 
         // TODO Don't load sessions in admin after Pro multi-plan setup fee set/get is refactored.

stripe/trunk/includes/core/objects.php

@@ -33 +33 @@
      * Get a specific form
      *
-     * @param $object
+     * @param $object Post ID or post object
      *
      * @return false|null|Object
@@ -40 +40 @@
 
         if ( is_int( $object ) ) {
-            $post = get_post( $object );
-            if ( $post ) {
-                return $this->get_object( apply_filters( 'simpay_form_object_type', 'default-form' ), 'form', $post );
-            }
+            $object = get_post( $object );
+        }
+    
+        if ( $object ) {
+            return $this->get_object( apply_filters( 'simpay_form_object_type', 'default-form' ), 'form', $object );
         }
 

stripe/trunk/includes/core/payments/charge.php

@@ -56 +56 @@
         );
 
-        if ( ! empty( $simpay_form->statement_descriptor ) ) {
+        if ( $simpay_form->statement_descriptor ) {
+            $charge_args['statement_descriptor'] = simpay_validate_statement_descriptor( $simpay_form->statement_descriptor );
+        }
 
-            $illegal = array( '<', '>', '"', "'" );
+        $stripe_account_id = simpay_get_account_id();
 
-            // Remove slashes
-            $descriptor = stripslashes( $simpay_form->statement_descriptor );
-
-            // Remove illegal characters
-            $descriptor = str_replace( $illegal, '', $descriptor );
-
-            // Trim to 22 characters max
-            $descriptor = substr( $descriptor, 0, 22 );
-
-            $charge_args['statement_descriptor'] = $descriptor;
+        if ( $stripe_account_id ) {
+            $charge_args['stripe_account'] = $stripe_account_id;
         }
 

stripe/trunk/includes/core/payments/customer.php

@@ -48 +48 @@
 
             // Create and save a new customer with the appropriate data
-            $this->customer = Stripe_API::request( 'Customer', 'create', apply_filters( 'simpay_stripe_customer_args', array(
-                'email' => $this->payment->get_email(),
-                'card'  => $this->payment->get_token(),
-            ) ) );
+            $this->customer = Stripe_API::request( 'Customer', 'create', array(
+                'source' => $this->payment->get_token(),
+                'email'  => $this->payment->get_email(),
+            ) );
         } else {
+
             // Retrieve a customer if one already exists
             $this->customer = Stripe_API::request( 'Customer', 'retrieve', $customer_id );
@@ -75 +76 @@
      * Get a specific customer by their ID
      *
-     * @param $id The unique customer ID
+     * @param $id string The unique customer ID
      *
      * @return mixed Stripe Customer object

stripe/trunk/includes/core/payments/details.php

@@ -31 +31 @@
 
     /**
-     * Setup all the tags available in the Payment Confirmation editor
+     * Setup all the tags available in the Payment Confirmation editor.
+     * Convert all amounts from cents to dollars (100 = $1.00 USD) before displaying.
+     * Values will be coming from Stripe in cents (non-decimal) format.
      */
     public function set_tags() {
@@ -70 +72 @@
             'total-amount' => array(
                 'type'  => array( 'all' ),
-                'value' => isset( $this->payment->charge->amount ) ? simpay_formatted_amount( $this->payment->charge->amount, $this->payment->get_currency() ) : '',
+                'value' => isset( $this->payment->charge->amount ) ? simpay_format_currency( simpay_convert_amount_to_dollars( $this->payment->charge->amount ), $this->payment->get_currency() ) : '',
             ),
         ), $this->payment );

stripe/trunk/includes/core/payments/payment.php

@@ -96 +96 @@
         } else {
             // Fallback to our set total amount
-            $this->amount = $simpay_form->total_amount;
+            $this->amount = $simpay_form->amount;
         }
 
@@ -103 +103 @@
 
         // Set token and email needed for charges
-        $this->token = $_POST['simpay_stripe_token'];
-        $this->email = $_POST['simpay_stripe_email'];
+        $this->token = sanitize_text_field( $_POST['simpay_stripe_token'] );
+        $this->email = sanitize_text_field( $_POST['simpay_stripe_email'] );
 
         if ( $simpay_form->enable_shipping_address ) {
@@ -167 +167 @@
         global $simpay_form;
 
-        // TODO Convert form object to array and clean recursively before saving to session?
-        // TODO Cast using `(array)` or use get_object_vars() ?
         \SimplePay\Core\SimplePay()->session->set( 'simpay_form', $simpay_form );
-        //\SimplePay\Core\SimplePay()->session->set( 'simpay_form', (array) simpay_clean( $simpay_form ) );
     }
 

stripe/trunk/includes/core/payments/stripe-api.php

@@ -29 +29 @@
 
         // Send our plugin info over with the API request
-        Stripe::setAppInfo( SIMPLE_PAY_PLUGIN_NAME, SIMPLE_PAY_VERSION, SIMPLE_PAY_STORE_URL );
+        Stripe::setAppInfo(
+            sprintf( 'WordPress %s', SIMPLE_PAY_PLUGIN_NAME ),
+            SIMPLE_PAY_VERSION,
+            SIMPLE_PAY_STORE_URL,
+            SIMPLE_PAY_STRIPE_PARTNER_ID
+        );
 
         // Send the API info over
@@ -130 +135 @@
         if ( ! is_admin() && ! $simpay_doing_ajax ) {
             Errors::set( $error_id, $error_message );
-            wp_redirect( $simpay_form->payment_failure_page );
-            exit;
+
+            if ( ! headers_sent() ) {
+                wp_redirect( $simpay_form->payment_failure_page );
+                exit;
+            } else {
+                return $error_message;
+            }
         } else {
             return false;

stripe/trunk/includes/core/shortcodes.php

@@ -47 +47 @@
      * @return string
      */
+
+    // TODO Used? Remove?
     public function print_errors( $attributes ) {
 

stripe/trunk/includes/old/stripe-checkout.php

@@ -92 +92 @@
 global $base_class;
 
+/**
+ * Determine if legacy settings need to be exposed.
+ *
+ * @since 2.1.0
+ *
+ * @return bool
+ */
+function simpay_lite_needs_legacy() {
+    $settings_1 = get_option( 'sc_settings' );
+    $settings_2 = get_option( 'simpay_settings_keys' );
+
+    $key_1 = isset( $settings_1['live_publish_key'] ) ? $settings_1['live_publish_key'] : false;
+    $key_2 = isset( $settings_2['live_keys']['secret_key'] ) ? $settings_2['live_keys']['secret_key'] : false;
+
+    // Try Stripe Connect.
+    if ( ! $key_2 ) {
+        $key_2 = simpay_get_account_id();
+    }
+
+    return $key_1 && ! $key_2;
+}
+
+/**
+ * Show a deprecation notice about 1.x shortcode/settings.
+ */
+function simpay_lite_deprecation_notice() {
+    $notice_message = '<p><strong>' . __( 'An update to your settings is required!', 'stripe' ) . '</strong></p>';
+    $notice_message .= '<p>' . __( 'It looks like you may still be relying on the legacy settings of this plugin. These settings will no longer work in the next update of Stripe Payments for WordPress.', 'stripe' ) . '</p>';
+    $notice_message .= '<p>' . sprintf( __( 'Please %2$supdate your settings%1$s then %3$screate a new form%1$s to generate an updated shortcode to use on your pages.', 'stripe' ), '</a>', '<a href="' . admin_url( 'admin.php?page=simpay_settings' ) . '">', '<a href="' . admin_url( 'admin.php?page=simpay&action=create' ) . '">' ) . '</p>';
+
+    SimplePay\Core\Admin\Notices::print_notice( $notice_message );
+}
+
+if ( ! simpay_lite_needs_legacy() ) {
+    return;
+}
+
+// Notice about code removal.
+add_action( 'admin_notices', 'simpay_lite_deprecation_notice' );
+
 // Let's get going finally!
 $base_class = Stripe_Checkout::get_instance();

stripe/trunk/includes/promos/promo-loader.php

@@ -21 +21 @@
 
             // Checkout Overlay tab
-            add_action( 'simpay_form_settings_meta_overlay_display_panel', array( $this, 'checkout_overlay_tab' ) );
+            add_action( 'simpay_admin_after_stripe_checkout', array( $this, 'checkout_overlay_tab' ) );
         }
 

stripe/trunk/includes/promos/views/generic-tab-promo.php

@@ -1 +1 @@
 <h2><?php _e( 'Want to customize your payment forms even more?', 'stripe' ); ?></h2>
 <p>
-    <?php _e( 'By upgrading to WP Simple Pay Pro, you get access to powerful features such as custom fields, user-entered amounts, coupon codes, tax rate support, Stripe Subscriptions, and so much more!', 'stripe' ); ?>
+    <?php _e( 'By upgrading to WP Simple Pay Pro, you get access to powerful features such as:', 'stripe' ); ?>
 </p>
+
+<!-- Repeat this bulleted list in sidebar.php & generic-tab-promo.php -->
+<ul>
+    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Unlimited Custom Fields', 'stripe' ); ?></li>
+    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'User-Entered Amounts', 'stripe' ); ?></li>
+    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Coupon Codes', 'stripe' ); ?></li>
+    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Embedded & Overlay Custom Forms', 'stripe' ); ?></li>
+    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Apple & Google Pay (coming March 2019)', 'stripe' ); ?></li>
+    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Stripe Subscription Support (Business license required)', 'stripe' ); ?></li>
+</ul>

stripe/trunk/includes/promos/views/sidebar.php

@@ -5 +5 @@
             <div class="main">
                 <p class="sidebar-heading centered">
-                    <?php _e( "Additional features included in WP Simple Pay Pro", 'stripe' ); ?>
+                    <?php _e( "Additional features included in<br />WP Simple Pay Pro", 'stripe' ); ?>
                 </p>
 
+                <!-- Repeat this bulleted list in sidebar.php & generic-tab-promo.php -->
                 <ul>
-                    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Custom Fields', 'stripe' ); ?></li>
+                    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Unlimited Custom Fields', 'stripe' ); ?></li>
                     <li><div class="dashicons dashicons-yes"></div> <?php _e( 'User-Entered Amounts', 'stripe' ); ?></li>
                     <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Coupon Codes', 'stripe' ); ?></li>
-                    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Tax Rate Support', 'stripe' ); ?></li>
-                    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Stripe Subscriptions', 'stripe' ); ?>*</li>
-                    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Subscription Installment Plans', 'stripe' ); ?>*</li>
-                    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Subscription Setup Fees', 'stripe' ); ?>*</li>
-                    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Subscription Trial Periods', 'stripe' ); ?>*</li>
+                    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Embedded & Overlay Custom Forms', 'stripe' ); ?></li>
+                    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Apple & Google Pay (coming March 2019)', 'stripe' ); ?></li>
+                    <li><div class="dashicons dashicons-yes"></div> <?php _e( 'Stripe Subscription Support', 'stripe' ); ?>*</li>
                 </ul>
 

stripe/trunk/readme.txt

@@ -1 +1 @@
 === Stripe Payments for WordPress - WP Simple Pay ===
-Contributors: pderksen, mordauk, cklosows, sdavis2702, dgoldak, nickyoung87, nekojira
+Contributors: pderksen, spencerfinnell, adamjlea, mordauk, cklosows, sdavis2702, dgoldak, nickyoung87, nekojira
 Tags: stripe, payments, credit card, stripe payments, stripe checkout
-Requires at least: 4.7
-Tested up to: 4.9
-Stable tag: 2.0.12
+Requires at least: 4.9
+Tested up to: 5.1
+Stable tag: 2.1.0
 Requires PHP: 5.4
 License: GPLv2 or later
@@ -36 +36 @@
 * Optionally verify zip/postal code without address
 * Support for 12 languages, 25 countries and 135+ currencies
+* Stripe Connect support for easier setup and improved security
 * Translation ready
 * [AffiliateWP](https://affiliatewp.com/) integration
@@ -46 +47 @@
 * *Everything in Lite plus...*
 * Drag & drop form design controls
-* Custom fields to capture additional data
+* Unlimited custom fields to capture additional data
 * Custom amounts - let customers enter an amount to pay
 * Coupon code support
-* Tax rate support
+* Embedded & Overlay custom forms
+* Apple & Google Pay (coming March 2019)
 * Stripe Subscription support
 * Subscription installment plans
@@ -55 +57 @@
 * Subscription trial periods
 * [Easy Pricing Tables](https://fatcatapps.com/easypricingtables/) integration
-* [MemberPress](https://memberpress.com/) integration
 * Priority email support with a 24-hour response time during business days
 
@@ -109 +110 @@
 
 == Changelog ==
+
+= 2.1.0 - March 15, 2018 =
+
+* New: You can now easily connect your Stripe account with Stripe Connect. See your settings page for more details.
+* New: Enable ZIP/Postal Code verification by default on new forms.
+* New: Allow "Company Name" value to be blank.
+* New: Add "Country" setting in Stripe Setup settings to send with Stripe API requests.
+* Fix: Delete extraneous options on uninstall routine.
+* Fix: Prefix Stripe API request from library with "WordPress".
+* Dev: Updated to Stripe PHP library v6.30.4.
+* Dev: Updated to use Stripe API version 2019-02-19.
+* Dev: Remove unused files.
 
 = 2.0.12 - November 1, 2018 =

stripe/trunk/stripe-checkout.php

@@ -1 +1 @@
 <?php
 /**
- * Plugin Name: WP Simple Pay (Lite Version)
+ * Plugin Name: WP Simple Pay Lite
  * Plugin URI:  https://wpsimplepay.com
  * Description: Add high conversion Stripe payment forms to your WordPress site in minutes.
  * Author: WP Simple Pay
  * Author URI:  https://wpsimplepay.com
- * Version: 2.0.12
+ * Version: 2.1.0
  * Text Domain: stripe
  */
@@ -25 +25 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright 2014-2018 Moonstone Media Group. All rights reserved.
+ * Copyright 2014-2019 Moonstone Media Group. All rights reserved.
  */
 
@@ -34 +34 @@
 if ( ! defined( 'SIMPLE_PAY_VERSION' ) ) {
 
-    define( 'SIMPLE_PAY_VERSION', '2.0.12' );
+    define( 'SIMPLE_PAY_VERSION', '2.1.0' );
 
     if ( ! defined( 'SIMPLE_PAY_PLUGIN_NAME' ) ) {
-        define( 'SIMPLE_PAY_PLUGIN_NAME', 'WP Simple Pay' );
+        define( 'SIMPLE_PAY_PLUGIN_NAME', 'WP Simple Pay Lite' );
     }
 
     // Stripe API version should be in 'YYYY-MM-DD' format.
     if ( ! defined( 'SIMPLE_PAY_STRIPE_API_VERSION' ) ) {
-        define( 'SIMPLE_PAY_STRIPE_API_VERSION', '2018-10-31' );
+        define( 'SIMPLE_PAY_STRIPE_API_VERSION', '2019-02-19' );
     }
 
@@ -67 +67 @@
     if ( ! defined( 'SIMPLE_PAY_STORE_URL' ) ) {
         define( 'SIMPLE_PAY_STORE_URL', 'https://wpsimplepay.com/' );
+    }
+
+    if ( ! defined( 'SIMPLE_PAY_STRIPE_PARTNER_ID' ) ) {
+        define( 'SIMPLE_PAY_STRIPE_PARTNER_ID', 'pp_partner_DKkf27LbiCjOYt' );
     }
 

stripe/trunk/uninstall.php

@@ -25 +25 @@
 
     // Remove misc options
+    delete_option( 'simpay_use_php_sessions' );
     delete_option( 'simpay_dismiss_ssl' );
-    delete_option( 'simpay_preview_form_id' );
+    delete_option( 'simpay_dismiss_dropping_php53_bitcoin' );
 
     // Remove settings options
@@ -33 +34 @@
     delete_option( 'simpay_settings_display' );
     delete_option( 'simpay_settings_shipping_billing' );
+
+    // Remove legacy options
+    delete_option( 'simpay_preview_form_id' );
 
     // Delete form posts.

stripe/trunk/vendor/composer/autoload_psr4.php

@@ -8 +8 @@
 return array(
     'Stripe\\' => array($vendorDir . '/stripe/stripe-php/lib'),
-    'Composer\\Installers\\' => array($vendorDir . '/composer/installers/src/Composer/Installers'),
 );

stripe/trunk/vendor/composer/autoload_static.php

@@ -12 +12 @@
             'Stripe\\' => 7,
         ),
-        'C' => 
-        array (
-            'Composer\\Installers\\' => 20,
-        ),
     );
 
@@ -22 +18 @@
         array (
             0 => __DIR__ . '/..' . '/stripe/stripe-php/lib',
-        ),
-        'Composer\\Installers\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers',
         ),
     );

stripe/trunk/vendor/composer/installed.json

@@ -1 +1 @@
 [
     {
-        "name": "composer/installers",
-        "version": "v1.6.0",
-        "version_normalized": "1.6.0.0",
+        "name": "stripe/stripe-php",
+        "version": "v6.30.4",
+        "version_normalized": "6.30.4.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/composer/installers.git",
-            "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b"
+            "url": "https://github.com/stripe/stripe-php.git",
+            "reference": "0d9e2773b1df27d4f0c590b15bed3a1433e0414c"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/composer/installers/zipball/cfcca6b1b60bc4974324efb5783c13dca6932b5b",
-            "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b",
-            "shasum": ""
-        },
-        "require": {
-            "composer-plugin-api": "^1.0"
-        },
-        "replace": {
-            "roundcube/plugin-installer": "*",
-            "shama/baton": "*"
-        },
-        "require-dev": {
-            "composer/composer": "1.0.*@dev",
-            "phpunit/phpunit": "^4.8.36"
-        },
-        "time": "2018-08-27T06:10:37+00:00",
-        "type": "composer-plugin",
-        "extra": {
-            "class": "Composer\\Installers\\Plugin",
-            "branch-alias": {
-                "dev-master": "1.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Composer\\Installers\\": "src/Composer/Installers"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Kyle Robinson Young",
-                "email": "kyle@dontkry.com",
-                "homepage": "https://github.com/shama"
-            }
-        ],
-        "description": "A multi-framework Composer library installer",
-        "homepage": "https://composer.github.io/installers/",
-        "keywords": [
-            "Craft",
-            "Dolibarr",
-            "Eliasis",
-            "Hurad",
-            "ImageCMS",
-            "Kanboard",
-            "Lan Management System",
-            "MODX Evo",
-            "Mautic",
-            "Maya",
-            "OXID",
-            "Plentymarkets",
-            "Porto",
-            "RadPHP",
-            "SMF",
-            "Thelia",
-            "WolfCMS",
-            "agl",
-            "aimeos",
-            "annotatecms",
-            "attogram",
-            "bitrix",
-            "cakephp",
-            "chef",
-            "cockpit",
-            "codeigniter",
-            "concrete5",
-            "croogo",
-            "dokuwiki",
-            "drupal",
-            "eZ Platform",
-            "elgg",
-            "expressionengine",
-            "fuelphp",
-            "grav",
-            "installer",
-            "itop",
-            "joomla",
-            "kohana",
-            "laravel",
-            "lavalite",
-            "lithium",
-            "magento",
-            "majima",
-            "mako",
-            "mediawiki",
-            "modulework",
-            "modx",
-            "moodle",
-            "osclass",
-            "phpbb",
-            "piwik",
-            "ppi",
-            "puppet",
-            "pxcms",
-            "reindex",
-            "roundcube",
-            "shopware",
-            "silverstripe",
-            "sydes",
-            "symfony",
-            "typo3",
-            "wordpress",
-            "yawik",
-            "zend",
-            "zikula"
-        ]
-    },
-    {
-        "name": "stripe/stripe-php",
-        "version": "v6.20.0",
-        "version_normalized": "6.20.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/stripe/stripe-php.git",
-            "reference": "eef8383c1b54417c470f3f60f14ffdd6f04773d4"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/stripe/stripe-php/zipball/eef8383c1b54417c470f3f60f14ffdd6f04773d4",
-            "reference": "eef8383c1b54417c470f3f60f14ffdd6f04773d4",
+            "url": "https://api.github.com/repos/stripe/stripe-php/zipball/0d9e2773b1df27d4f0c590b15bed3a1433e0414c",
+            "reference": "0d9e2773b1df27d4f0c590b15bed3a1433e0414c",
             "shasum": ""
         },
@@ -146 +24 @@
             "php-coveralls/php-coveralls": "1.*",
             "phpunit/phpunit": "~4.0",
-            "squizlabs/php_codesniffer": "~2.0"
+            "squizlabs/php_codesniffer": "~2.0",
+            "symfony/process": "~2.8"
         },
-        "time": "2018-10-30T17:02:13+00:00",
+        "time": "2019-02-27T18:07:30+00:00",
         "type": "library",
         "extra": {

stripe/trunk/vendor/stripe/stripe-php/CHANGELOG.md

@@ -1 +1 @@
 # Changelog
+
+## 6.30.4 - 2019-02-27
+* [#602](https://github.com/stripe/stripe-php/pull/602) Add `subscription_schedule` to `Subscription` for PHPDoc.
+
+## 6.30.3 - 2019-02-26
+* [#603](https://github.com/stripe/stripe-php/pull/603) Improve PHPDoc on the `Source` object to cover all types of Sources currently supported.
+
+## 6.30.2 - 2019-02-25
+* [#601](https://github.com/stripe/stripe-php/pull/601) Fix PHPDoc across multiple resources and add support for new events.
+
+## 6.30.1 - 2019-02-16
+* [#599](https://github.com/stripe/stripe-php/pull/599) Fix PHPDoc for `SubscriptionSchedule` and `SubscriptionScheduleRevision`
+
+## 6.30.0 - 2019-02-12
+* [#590](https://github.com/stripe/stripe-php/pull/590) Add support for `SubscriptionSchedule` and `SubscriptionScheduleRevision`
+
+## 6.29.3 - 2019-01-31
+* [#592](https://github.com/stripe/stripe-php/pull/592) Some more PHPDoc fixes
+
+## 6.29.2 - 2019-01-31
+* [#591](https://github.com/stripe/stripe-php/pull/591) Fix PHPDoc for nested resources
+
+## 6.29.1 - 2019-01-25
+* [#566](https://github.com/stripe/stripe-php/pull/566) Fix dangling message contents
+* [#586](https://github.com/stripe/stripe-php/pull/586) Don't overwrite `CURLOPT_HTTP_VERSION` option
+
+## 6.29.0 - 2019-01-23
+* [#579](https://github.com/stripe/stripe-php/pull/579) Rename `CheckoutSession` to `Session` and move it under the `Checkout` namespace. This is a breaking change, but we've reached out to affected merchants and all new merchants would use the new approach.
+
+## 6.28.1 - 2019-01-21
+* [#580](https://github.com/stripe/stripe-php/pull/580) Properly serialize `individual` on `Account` objects
+
+## 6.28.0 - 2019-01-03
+* [#576](https://github.com/stripe/stripe-php/pull/576) Add support for iterating directly over `Collection` instances
+
+## 6.27.0 - 2018-12-21
+* [#571](https://github.com/stripe/stripe-php/pull/571) Add support for the `CheckoutSession` resource
+
+## 6.26.0 - 2018-12-11
+* [#568](https://github.com/stripe/stripe-php/pull/568) Enable persistent connections
+
+## 6.25.0 - 2018-12-10
+* [#567](https://github.com/stripe/stripe-php/pull/567) Add support for account links
+
+## 6.24.0 - 2018-11-28
+* [#562](https://github.com/stripe/stripe-php/pull/562) Add support for the Review resource
+* [#564](https://github.com/stripe/stripe-php/pull/564) Add event name constants for subscription schedule aborted/expiring
+
+## 6.23.0 - 2018-11-27
+* [#542](https://github.com/stripe/stripe-php/pull/542) Add support for `ValueList` and `ValueListItem` for Radar 
+
+## 6.22.1 - 2018-11-20
+* [#561](https://github.com/stripe/stripe-php/pull/561) Add cast and some docs to telemetry introduced in 6.22.0/#549
+
+## 6.22.0 - 2018-11-15
+* [#549](https://github.com/stripe/stripe-php/pull/549) Add support for client telemetry
+
+## 6.21.1 - 2018-11-12
+* [#548](https://github.com/stripe/stripe-php/pull/548) Don't mutate `Exception` class properties from `OAuthBase` error
+
+## 6.21.0 - 2018-11-08
+* [#537](https://github.com/stripe/stripe-php/pull/537) Add new API endpoints for the `Invoice` resource.
+
+## 6.20.1 - 2018-11-07
+* [#546](https://github.com/stripe/stripe-php/pull/546) Drop files from the Composer package that aren't needed in the release
 
 ## 6.20.0 - 2018-10-30

stripe/trunk/vendor/stripe/stripe-php/LICENSE

@@ -1 +1 @@
 The MIT License
 
-Copyright (c) 2010-2015 Stripe
+Copyright (c) 2010-2019 Stripe, Inc. (https://stripe.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

stripe/trunk/vendor/stripe/stripe-php/VERSION

@@ -1 @@
-6.20.0
+6.30.4

stripe/trunk/vendor/stripe/stripe-php/composer.json

@@ -24 +24 @@
     "phpunit/phpunit": "~4.0",
     "php-coveralls/php-coveralls": "1.*",
-    "squizlabs/php_codesniffer": "~2.0"
+    "squizlabs/php_codesniffer": "~2.0",
+    "symfony/process": "~2.8"
   },
   "autoload": {

stripe/trunk/vendor/stripe/stripe-php/init.php

@@ -50 +50 @@
 // Plumbing
 require(dirname(__FILE__) . '/lib/ApiResponse.php');
+require(dirname(__FILE__) . '/lib/RequestTelemetry.php');
 require(dirname(__FILE__) . '/lib/StripeObject.php');
 require(dirname(__FILE__) . '/lib/ApiRequestor.php');
@@ -57 +58 @@
 // Stripe API Resources
 require(dirname(__FILE__) . '/lib/Account.php');
+require(dirname(__FILE__) . '/lib/AccountLink.php');
 require(dirname(__FILE__) . '/lib/AlipayAccount.php');
 require(dirname(__FILE__) . '/lib/ApplePayDomain.php');
@@ -68 +70 @@
 require(dirname(__FILE__) . '/lib/Card.php');
 require(dirname(__FILE__) . '/lib/Charge.php');
+require(dirname(__FILE__) . '/lib/Checkout/Session.php');
 require(dirname(__FILE__) . '/lib/Collection.php');
 require(dirname(__FILE__) . '/lib/CountrySpec.php');
@@ -99 +102 @@
 require(dirname(__FILE__) . '/lib/Plan.php');
 require(dirname(__FILE__) . '/lib/Product.php');
+require(dirname(__FILE__) . '/lib/Radar/ValueList.php');
+require(dirname(__FILE__) . '/lib/Radar/ValueListItem.php');
 require(dirname(__FILE__) . '/lib/Recipient.php');
 require(dirname(__FILE__) . '/lib/RecipientTransfer.php');
@@ -104 +109 @@
 require(dirname(__FILE__) . '/lib/Reporting/ReportRun.php');
 require(dirname(__FILE__) . '/lib/Reporting/ReportType.php');
+require(dirname(__FILE__) . '/lib/Review.php');
 require(dirname(__FILE__) . '/lib/SKU.php');
 require(dirname(__FILE__) . '/lib/Sigma/ScheduledQueryRun.php');
@@ -110 +116 @@
 require(dirname(__FILE__) . '/lib/Subscription.php');
 require(dirname(__FILE__) . '/lib/SubscriptionItem.php');
+require(dirname(__FILE__) . '/lib/SubscriptionSchedule.php');
+require(dirname(__FILE__) . '/lib/SubscriptionScheduleRevision.php');
 require(dirname(__FILE__) . '/lib/Terminal/ConnectionToken.php');
 require(dirname(__FILE__) . '/lib/Terminal/Location.php');

stripe/trunk/vendor/stripe/stripe-php/lib/Account.php

@@ -8 +8 @@
  * @property string $id
  * @property string $object
- * @property string $business_logo
- * @property string $business_name
- * @property string $business_primary_color
- * @property string $business_url
+ * @property mixed $business_profile
+ * @property string $business_type
+ * @property mixed $capabilities
  * @property bool $charges_enabled
+ * @property mixed $company
  * @property string $country
  * @property int $created
- * @property bool $debit_negative_balances
- * @property mixed $decline_charge_on
  * @property string $default_currency
  * @property bool $details_submitted
- * @property string $display_name
  * @property string $email
  * @property Collection $external_accounts
- * @property mixed $legal_entity
+ * @property mixed $individual
  * @property StripeObject $metadata
- * @property mixed $payout_schedule
- * @property string $payout_statement_descriptor
  * @property bool $payouts_enabled
- * @property string $product_description
- * @property string $statement_descriptor
- * @property mixed $support_address
- * @property string $support_email
- * @property string $support_phone
- * @property string $support_url
- * @property string $timezone
+ * @property mixed $requirements
+ * @property mixed $settings
  * @property mixed $tos_acceptance
  * @property string $type
- * @property mixed $verification
  *
  * @package Stripe
@@ -140 +129 @@
 
     /**
-     * @param array|null $id The ID of the account on which to create the external account.
+     * @param string|null $id The ID of the account on which to create the external account.
      * @param array|null $params
      * @param array|string|null $opts
@@ -152 +141 @@
 
     /**
-     * @param array|null $id The ID of the account to which the external account belongs.
+     * @param string|null $id The ID of the account to which the external account belongs.
      * @param array|null $externalAccountId The ID of the external account to retrieve.
      * @param array|null $params
@@ -165 +154 @@
 
     /**
-     * @param array|null $id The ID of the account to which the external account belongs.
+     * @param string|null $id The ID of the account to which the external account belongs.
      * @param array|null $externalAccountId The ID of the external account to update.
      * @param array|null $params
@@ -178 +167 @@
 
     /**
-     * @param array|null $id The ID of the account to which the external account belongs.
+     * @param string|null $id The ID of the account to which the external account belongs.
      * @param array|null $externalAccountId The ID of the external account to delete.
      * @param array|null $params
@@ -191 +180 @@
 
     /**
-     * @param array|null $id The ID of the account on which to retrieve the external accounts.
+     * @param string|null $id The ID of the account on which to retrieve the external accounts.
      * @param array|null $params
      * @param array|string|null $opts
@@ -203 +192 @@
 
     /**
-     * @param array|null $id The ID of the account on which to create the login link.
+     * @param string|null $id The ID of the account on which to create the login link.
      * @param array|null $params
      * @param array|string|null $opts
@@ -215 +204 @@
 
     /**
-     * @param array|null $id The ID of the account on which to create the person.
+     * @param string|null $id The ID of the account on which to create the person.
      * @param array|null $params
      * @param array|string|null $opts
@@ -227 +216 @@
 
     /**
-     * @param array|null $id The ID of the account to which the person belongs.
+     * @param string|null $id The ID of the account to which the person belongs.
      * @param array|null $personId The ID of the person to retrieve.
      * @param array|null $params
@@ -240 +229 @@
 
     /**
-     * @param array|null $id The ID of the account to which the person belongs.
+     * @param string|null $id The ID of the account to which the person belongs.
      * @param array|null $personId The ID of the person to update.
      * @param array|null $params
@@ -253 +242 @@
 
     /**
-     * @param array|null $id The ID of the account to which the person belongs.
+     * @param string|null $id The ID of the account to which the person belongs.
      * @param array|null $personId The ID of the person to delete.
      * @param array|null $params
@@ -266 +255 @@
 
     /**
-     * @param array|null $id The ID of the account on which to retrieve the persons.
+     * @param string|null $id The ID of the account on which to retrieve the persons.
      * @param array|null $params
      * @param array|string|null $opts
@@ -289 +278 @@
             }
         }
+        if (isset($this->_values['individual'])) {
+            $individual = $this['individual'];
+            if (($individual instanceof Person) && !isset($update['individual'])) {
+                $update['individual'] = $individual->serializeParameters($force);
+            }
+        }
         return $update;
     }

stripe/trunk/vendor/stripe/stripe-php/lib/ApiOperations/NestedResource.php

@@ -61 +61 @@
      * @param string $id
      * @param string $nestedPath
+     * @param string|null $nestedId
      * @param array|null $params
      * @param array|string|null $options
@@ -75 +76 @@
      * @param string $id
      * @param string $nestedPath
+     * @param string|null $nestedId
      * @param array|null $params
      * @param array|string|null $options
@@ -89 +91 @@
      * @param string $id
      * @param string $nestedPath
+     * @param string|null $nestedId
      * @param array|null $params
      * @param array|string|null $options

stripe/trunk/vendor/stripe/stripe-php/lib/ApiRequestor.php

@@ -26 +26 @@
 
     /**
+     * @var RequestTelemetry
+     */
+    private static $requestTelemetry;
+
+    /**
      * ApiRequestor constructor.
      *
@@ -38 +43 @@
         }
         $this->_apiBase = $apiBase;
+    }
+
+    /**
+     * Creates a telemetry json blob for use in 'X-Stripe-Client-Telemetry' headers
+     * @static
+     *
+     * @param RequestTelemetry $requestTelemetry
+     * @return string
+     */
+    private static function _telemetryJson($requestTelemetry)
+    {
+        $payload = array(
+            'last_request_metrics' => array(
+                'request_id' => $requestTelemetry->requestId,
+                'request_duration_ms' => $requestTelemetry->requestDuration,
+        ));
+
+        $result = json_encode($payload);
+        if ($result != false) {
+            return $result;
+        } else {
+            Stripe::getLogger()->error("Serializing telemetry payload failed!");
+            return "{}";
+        }
     }
 
@@ -333 +362 @@
         }
 
+        if (Stripe::$enableTelemetry && self::$requestTelemetry != null) {
+            $defaultHeaders["X-Stripe-Client-Telemetry"] = self::_telemetryJson(self::$requestTelemetry);
+        }
+
         $hasFile = false;
         $hasCurlFile = class_exists('\CURLFile', false);
@@ -357 +390 @@
         }
 
+        $requestStartMs = Util\Util::currentTimeMillis();
+
         list($rbody, $rcode, $rheaders) = $this->httpClient()->request(
             $method,
@@ -364 +399 @@
             $hasFile
         );
+
+        if (array_key_exists('request-id', $rheaders)) {
+            self::$requestTelemetry = new RequestTelemetry(
+                $rheaders['request-id'],
+                Util\Util::currentTimeMillis() - $requestStartMs
+            );
+        }
+
         return [$rbody, $rcode, $rheaders, $myApiKey];
     }
@@ -444 +487 @@
 
     /**
+     * @static
+     *
+     * Resets any stateful telemetry data
+     */
+    public static function resetTelemetry()
+    {
+        self::$requestTelemetry = null;
+    }
+
+    /**
      * @return HttpClient\ClientInterface
      */

stripe/trunk/vendor/stripe/stripe-php/lib/ApplicationFee.php

@@ -48 +48 @@
 
     /**
-     * @param array|null $id The ID of the application fee on which to create the refund.
+     * @param string|null $id The ID of the application fee on which to create the refund.
      * @param array|null $params
      * @param array|string|null $opts
@@ -60 +60 @@
 
     /**
-     * @param array|null $id The ID of the application fee to which the refund belongs.
+     * @param string|null $id The ID of the application fee to which the refund belongs.
      * @param array|null $refundId The ID of the refund to retrieve.
      * @param array|null $params
@@ -73 +73 @@
 
     /**
-     * @param array|null $id The ID of the application fee to which the refund belongs.
+     * @param string|null $id The ID of the application fee to which the refund belongs.
      * @param array|null $refundId The ID of the refund to update.
      * @param array|null $params
@@ -86 +86 @@
 
     /**
-     * @param array|null $id The ID of the application fee on which to retrieve the refunds.
+     * @param string|null $id The ID of the application fee on which to retrieve the refunds.
      * @param array|null $params
      * @param array|string|null $opts

stripe/trunk/vendor/stripe/stripe-php/lib/Card.php

@@ -17 +17 @@
  * @property string $address_zip
  * @property string $address_zip_check
- * @property array $available_payout_methods
+ * @property string[] $available_payout_methods
  * @property string $brand
  * @property string $country
@@ -83 +83 @@
         $msg = "Cards cannot be accessed without a customer, recipient or account ID. " .
                "Retrieve a card using \$customer->sources->retrieve('card_id'), " .
-               "\$recipient->cards->retrieve('card_id'), or";
+               "\$recipient->cards->retrieve('card_id'), or " .
                "\$account->external_accounts->retrieve('card_id') instead.";
         throw new Error\InvalidRequest($msg, null);
@@ -99 +99 @@
         $msg = "Cards cannot be accessed without a customer, recipient or account ID. " .
                "Call save() on \$customer->sources->retrieve('card_id'), " .
-               "\$recipient->cards->retrieve('card_id'), or";
+               "\$recipient->cards->retrieve('card_id'), or " .
                "\$account->external_accounts->retrieve('card_id') instead.";
         throw new Error\InvalidRequest($msg, null);

stripe/trunk/vendor/stripe/stripe-php/lib/Charge.php

@@ -33 +33 @@
  * @property string $receipt_email
  * @property string $receipt_number
+ * @property string $receipt_url
  * @property bool $refunded
  * @property Collection $refunds
@@ -42 +43 @@
  * @property string $status
  * @property string $transfer
+ * @property mixed $transfer_data
  * @property string $transfer_group
  *

stripe/trunk/vendor/stripe/stripe-php/lib/Collection.php

@@ -13 +13 @@
  * @package Stripe
  */
-class Collection extends StripeObject
+class Collection extends StripeObject implements \IteratorAggregate
 {
 
@@ -70 +70 @@
 
     /**
+     * @return \ArrayIterator An iterator that can be used to iterate
+     *    across objects in the current page.
+     */
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->data);
+    }
+
+    /**
      * @return Util\AutoPagingIterator An iterator that can be used to iterate
      *    across all objects across all pages. As page boundaries are

stripe/trunk/vendor/stripe/stripe-php/lib/Customer.php

@@ -9 +9 @@
  * @property string $object
  * @property int $account_balance
- * @property string $business_vat_id
  * @property string $created
  * @property string $currency
@@ -18 +17 @@
  * @property string $email
  * @property string $invoice_prefix
+ * @property mixed $invoice_settings
  * @property bool $livemode
  * @property StripeObject $metadata
@@ -142 +142 @@
 
     /**
-     * @param array|null $id The ID of the customer on which to create the source.
+     * @param string|null $id The ID of the customer on which to create the source.
      * @param array|null $params
      * @param array|string|null $opts
@@ -154 +154 @@
 
     /**
-     * @param array|null $id The ID of the customer to which the source belongs.
-     * @param array|null $sourceId The ID of the source to retrieve.
+     * @param string|null $id The ID of the customer to which the source belongs.
+     * @param string|null $sourceId The ID of the source to retrieve.
      * @param array|null $params
      * @param array|string|null $opts
@@ -167 +167 @@
 
     /**
-     * @param array|null $id The ID of the customer to which the source belongs.
-     * @param array|null $sourceId The ID of the source to update.
+     * @param string|null $id The ID of the customer to which the source belongs.
+     * @param string|null $sourceId The ID of the source to update.
      * @param array|null $params
      * @param array|string|null $opts
@@ -180 +180 @@
 
     /**
-     * @param array|null $id The ID of the customer to which the source belongs.
-     * @param array|null $sourceId The ID of the source to delete.
+     * @param string|null $id The ID of the customer to which the source belongs.
+     * @param string|null $sourceId The ID of the source to delete.
      * @param array|null $params
      * @param array|string|null $opts
@@ -193 +193 @@
 
     /**
-     * @param array|null $id The ID of the customer on which to retrieve the sources.
+     * @param string|null $id The ID of the customer on which to retrieve the sources.
      * @param array|null $params
      * @param array|string|null $opts

stripe/trunk/vendor/stripe/stripe-php/lib/Error/OAuth/OAuthBase.php

@@ -14 +14 @@
     ) {
         parent::__construct($description, $httpStatus, $httpBody, $jsonBody, $httpHeaders);
-        $this->code = $code;
+        $this->errorCode = $code;
     }
 
     public function getErrorCode()
     {
-        return $this->code;
+        return $this->errorCode;
     }
 }

stripe/trunk/vendor/stripe/stripe-php/lib/Event.php

@@ -10 +10 @@
  * @property string $account
  * @property string $api_version
- * @property int $created
- * @property mixed $data
- * @property bool $livemode
- * @property int $pending_webhooks
- * @property mixed $request
+ * @property int    $created
+ * @property mixed  $data
+ * @property bool   $livemode
+ * @property int    $pending_webhooks
+ * @property mixed  $request
  * @property string $type
  *
@@ -24 +24 @@
     const OBJECT_NAME = "event";
 
-     /**
+    /**
      * Possible string representations of event types.
      * @link https://stripe.com/docs/api#event_types
      */
-    const ACCOUNT_UPDATED                      = 'account.updated';
-    const ACCOUNT_APPLICATION_DEAUTHORIZED     = 'account.application.deauthorized';
-    const ACCOUNT_EXTERNAL_ACCOUNT_CREATED     = 'account.external_account.created';
-    const ACCOUNT_EXTERNAL_ACCOUNT_DELETED     = 'account.external_account.deleted';
-    const ACCOUNT_EXTERNAL_ACCOUNT_UPDATED     = 'account.external_account.updated';
-    const APPLICATION_FEE_CREATED              = 'application_fee.created';
-    const APPLICATION_FEE_REFUNDED             = 'application_fee.refunded';
-    const APPLICATION_FEE_REFUND_UPDATED       = 'application_fee.refund.updated';
-    const BALANCE_AVAILABLE                    = 'balance.available';
-    const CHARGE_CAPTURED                      = 'charge.captured';
-    const CHARGE_EXPIRED                       = 'charge.expired';
-    const CHARGE_FAILED                        = 'charge.failed';
-    const CHARGE_PENDING                       = 'charge.pending';
-    const CHARGE_REFUNDED                      = 'charge.refunded';
-    const CHARGE_SUCCEEDED                     = 'charge.succeeded';
-    const CHARGE_UPDATED                       = 'charge.updated';
-    const CHARGE_DISPUTE_CLOSED                = 'charge.dispute.closed';
-    const CHARGE_DISPUTE_CREATED               = 'charge.dispute.created';
-    const CHARGE_DISPUTE_FUNDS_REINSTATED      = 'charge.dispute.funds_reinstated';
-    const CHARGE_DISPUTE_FUNDS_WITHDRAWN       = 'charge.dispute.funds_withdrawn';
-    const CHARGE_DISPUTE_UPDATED               = 'charge.dispute.updated';
-    const CHARGE_REFUND_UPDATED                = 'charge.refund.updated';
-    const COUPON_CREATED                       = 'coupon.created';
-    const COUPON_DELETED                       = 'coupon.deleted';
-    const COUPON_UPDATED                       = 'coupon.updated';
-    const CUSTOMER_CREATED                     = 'customer.created';
-    const CUSTOMER_DELETED                     = 'customer.deleted';
-    const CUSTOMER_UPDATED                     = 'customer.updated';
-    const CUSTOMER_DISCOUNT_CREATED            = 'customer.discount.created';
-    const CUSTOMER_DISCOUNT_DELETED            = 'customer.discount.deleted';
-    const CUSTOMER_DISCOUNT_UPDATED            = 'customer.discount.updated';
-    const CUSTOMER_SOURCE_CREATED              = 'customer.source.created';
-    const CUSTOMER_SOURCE_DELETED              = 'customer.source.deleted';
-    const CUSTOMER_SOURCE_EXPIRING             = 'customer.source.expiring';
-    const CUSTOMER_SOURCE_UPDATED              = 'customer.source.updated';
-    const CUSTOMER_SUBSCRIPTION_CREATED        = 'customer.subscription.created';
-    const CUSTOMER_SUBSCRIPTION_DELETED        = 'customer.subscription.deleted';
-    const CUSTOMER_SUBSCRIPTION_TRIAL_WILL_END = 'customer.subscription.trial_will_end';
-    const CUSTOMER_SUBSCRIPTION_UPDATED        = 'customer.subscription.updated';
-    const FILE_CREATED                         = 'file.created';
-    const INVOICE_CREATED                      = 'invoice.created';
-    const INVOICE_PAYMENT_FAILED               = 'invoice.payment_failed';
-    const INVOICE_PAYMENT_SUCCEEDED            = 'invoice.payment_succeeded';
-    const INVOICE_SENT                         = 'invoice.sent';
-    const INVOICE_UPCOMING                     = 'invoice.upcoming';
-    const INVOICE_UPDATED                      = 'invoice.updated';
-    const INVOICEITEM_CREATED                  = 'invoiceitem.created';
-    const INVOICEITEM_DELETED                  = 'invoiceitem.deleted';
-    const INVOICEITEM_UPDATED                  = 'invoiceitem.updated';
-    const ORDER_CREATED                        = 'order.created';
-    const ORDER_PAYMENT_FAILED                 = 'order.payment_failed';
-    const ORDER_PAYMENT_SUCCEEDED              = 'order.payment_succeeded';
-    const ORDER_UPDATED                        = 'order.updated';
-    const ORDER_RETURN_CREATED                 = 'order_return.created';
-    const PAYOUT_CANCELED                      = 'payout.canceled';
-    const PAYOUT_CREATED                       = 'payout.created';
-    const PAYOUT_FAILED                        = 'payout.failed';
-    const PAYOUT_PAID                          = 'payout.paid';
-    const PAYOUT_UPDATED                       = 'payout.updated';
-    const PING                                 = 'ping';
-    const PLAN_CREATED                         = 'plan.created';
-    const PLAN_DELETED                         = 'plan.deleted';
-    const PLAN_UPDATED                         = 'plan.updated';
-    const PRODUCT_CREATED                      = 'product.created';
-    const PRODUCT_DELETED                      = 'product.deleted';
-    const PRODUCT_UPDATED                      = 'product.updated';
-    const RECIPIENT_CREATED                    = 'recipient.created';
-    const RECIPIENT_DELETED                    = 'recipient.deleted';
-    const RECIPIENT_UPDATED                    = 'recipient.updated';
-    const REVIEW_CLOSED                        = 'review.closed';
-    const REVIEW_OPENED                        = 'review.opened';
-    const SIGMA_SCHEDULED_QUERY_RUN_CREATED    = 'sigma.scheduled_query_run.created';
-    const SKU_CREATED                          = 'sku.created';
-    const SKU_DELETED                          = 'sku.deleted';
-    const SKU_UPDATED                          = 'sku.updated';
-    const SOURCE_CANCELED                      = 'source.canceled';
-    const SOURCE_CHARGEABLE                    = 'source.chargeable';
-    const SOURCE_FAILED                        = 'source.failed';
-    const SOURCE_MANDATE_NOTIFICATION          = 'source.mandate_notification';
-    const SOURCE_TRANSACTION_CREATED           = 'source.transaction.created';
-    const TOPUP_CREATED                        = 'topup.created';
-    const TOPUP_FAILED                         = 'topup.failed';
-    const TOPUP_SUCCEEDED                      = 'topup.succeeded';
-    const TRANSFER_CREATED                     = 'transfer.created';
-    const TRANSFER_REVERSED                    = 'transfer.reversed';
-    const TRANSFER_UPDATED                     = 'transfer.updated';
+    const ACCOUNT_UPDATED                          = 'account.updated';
+    const ACCOUNT_APPLICATION_AUTHORIZED           = 'account.application.authorized';
+    const ACCOUNT_APPLICATION_DEAUTHORIZED         = 'account.application.deauthorized';
+    const ACCOUNT_EXTERNAL_ACCOUNT_CREATED         = 'account.external_account.created';
+    const ACCOUNT_EXTERNAL_ACCOUNT_DELETED         = 'account.external_account.deleted';
+    const ACCOUNT_EXTERNAL_ACCOUNT_UPDATED         = 'account.external_account.updated';
+    const APPLICATION_FEE_CREATED                  = 'application_fee.created';
+    const APPLICATION_FEE_REFUNDED                 = 'application_fee.refunded';
+    const APPLICATION_FEE_REFUND_UPDATED           = 'application_fee.refund.updated';
+    const BALANCE_AVAILABLE                        = 'balance.available';
+    const CHARGE_CAPTURED                          = 'charge.captured';
+    const CHARGE_EXPIRED                           = 'charge.expired';
+    const CHARGE_FAILED                            = 'charge.failed';
+    const CHARGE_PENDING                           = 'charge.pending';
+    const CHARGE_REFUNDED                          = 'charge.refunded';
+    const CHARGE_SUCCEEDED                         = 'charge.succeeded';
+    const CHARGE_UPDATED                           = 'charge.updated';
+    const CHARGE_DISPUTE_CLOSED                    = 'charge.dispute.closed';
+    const CHARGE_DISPUTE_CREATED                   = 'charge.dispute.created';
+    const CHARGE_DISPUTE_FUNDS_REINSTATED          = 'charge.dispute.funds_reinstated';
+    const CHARGE_DISPUTE_FUNDS_WITHDRAWN           = 'charge.dispute.funds_withdrawn';
+    const CHARGE_DISPUTE_UPDATED                   = 'charge.dispute.updated';
+    const CHARGE_REFUND_UPDATED                    = 'charge.refund.updated';
+    const COUPON_CREATED                           = 'coupon.created';
+    const COUPON_DELETED                           = 'coupon.deleted';
+    const COUPON_UPDATED                           = 'coupon.updated';
+    const CUSTOMER_CREATED                         = 'customer.created';
+    const CUSTOMER_DELETED                         = 'customer.deleted';
+    const CUSTOMER_UPDATED                         = 'customer.updated';
+    const CUSTOMER_DISCOUNT_CREATED                = 'customer.discount.created';
+    const CUSTOMER_DISCOUNT_DELETED                = 'customer.discount.deleted';
+    const CUSTOMER_DISCOUNT_UPDATED                = 'customer.discount.updated';
+    const CUSTOMER_SOURCE_CREATED                  = 'customer.source.created';
+    const CUSTOMER_SOURCE_DELETED                  = 'customer.source.deleted';
+    const CUSTOMER_SOURCE_EXPIRING                 = 'customer.source.expiring';
+    const CUSTOMER_SOURCE_UPDATED                  = 'customer.source.updated';
+    const CUSTOMER_SUBSCRIPTION_CREATED            = 'customer.subscription.created';
+    const CUSTOMER_SUBSCRIPTION_DELETED            = 'customer.subscription.deleted';
+    const CUSTOMER_SUBSCRIPTION_TRIAL_WILL_END     = 'customer.subscription.trial_will_end';
+    const CUSTOMER_SUBSCRIPTION_UPDATED            = 'customer.subscription.updated';
+    const FILE_CREATED                             = 'file.created';
+    const INVOICE_CREATED                          = 'invoice.created';
+    const INVOICE_DELETED                          = 'invoice.deleted';
+    const INVOICE_FINALIZED                        = 'invoice.finalized';
+    const INVOICE_MARKED_UNCOLLECTIBLE             = 'invoice.marked_uncollectible';
+    const INVOICE_PAYMENT_FAILED                   = 'invoice.payment_failed';
+    const INVOICE_PAYMENT_SUCCEEDED                = 'invoice.payment_succeeded';
+    const INVOICE_SENT                             = 'invoice.sent';
+    const INVOICE_UPCOMING                         = 'invoice.upcoming';
+    const INVOICE_UPDATED                          = 'invoice.updated';
+    const INVOICE_VOIDED                           = 'invoice.voided';
+    const INVOICEITEM_CREATED                      = 'invoiceitem.created';
+    const INVOICEITEM_DELETED                      = 'invoiceitem.deleted';
+    const INVOICEITEM_UPDATED                      = 'invoiceitem.updated';
+    const ISSUER_FRAUD_RECORD_CREATED              = 'issuer_fraud_record.created';
+    const ISSUING_AUTHORIZATION_CREATED            = 'issuing_authorization.created';
+    const ISSUING_AUTHORIZATION_UPDATED            = 'issuing_authorization.updated';
+    const ISSUING_CARD_CREATED                     = 'issuing_card.created';
+    const ISSUING_CARD_UPDATED                     = 'issuing_card.updated';
+    const ISSUING_CARDHOLDER_CREATED               = 'issuing_cardholder.created';
+    const ISSUING_CARDHOLDER_UPDATED               = 'issuing_cardholder.updated';
+    const ISSUING_TRANSACTION_CREATED              = 'issuing_transaction.created';
+    const ISSUING_TRANSACTION_UPDATED              = 'issuing_transaction.updated';
+    const ORDER_CREATED                            = 'order.created';
+    const ORDER_PAYMENT_FAILED                     = 'order.payment_failed';
+    const ORDER_PAYMENT_SUCCEEDED                  = 'order.payment_succeeded';
+    const ORDER_UPDATED                            = 'order.updated';
+    const ORDER_RETURN_CREATED                     = 'order_return.created';
+    const PAYMENT_INTENT_AMOUNT_CAPTURABLE_UPDATED = 'payment_intent.amount_capturable_updated';
+    const PAYMENT_INTENT_CREATED                   = 'payment_intent.created';
+    const PAYMENT_INTENT_FAILED                    = 'payment_intent.failed';
+    const PAYMENT_INTENT_SUCCEEDED                 = 'payment_intent.succeeded';
+    const PAYOUT_CANCELED                          = 'payout.canceled';
+    const PAYOUT_CREATED                           = 'payout.created';
+    const PAYOUT_FAILED                            = 'payout.failed';
+    const PAYOUT_PAID                              = 'payout.paid';
+    const PAYOUT_UPDATED                           = 'payout.updated';
+    const PING                                     = 'ping';
+    const PLAN_CREATED                             = 'plan.created';
+    const PLAN_DELETED                             = 'plan.deleted';
+    const PLAN_UPDATED                             = 'plan.updated';
+    const PRODUCT_CREATED                          = 'product.created';
+    const PRODUCT_DELETED                          = 'product.deleted';
+    const PRODUCT_UPDATED                          = 'product.updated';
+    const RECIPIENT_CREATED                        = 'recipient.created';
+    const RECIPIENT_DELETED                        = 'recipient.deleted';
+    const RECIPIENT_UPDATED                        = 'recipient.updated';
+    const REPORTING_REPORT_RUN_FAILED              = 'reporting.report_run.failed';
+    const REPORTING_REPORT_RUN_SUCCEEDED           = 'reporting.report_run.succeeded';
+    const REPORTING_REPORT_TYPE_UPDATED            = 'reporting.report_type.updated';
+    const REVIEW_CLOSED                            = 'review.closed';
+    const REVIEW_OPENED                            = 'review.opened';
+    const SIGMA_SCHEDULED_QUERY_RUN_CREATED        = 'sigma.scheduled_query_run.created';
+    const SKU_CREATED                              = 'sku.created';
+    const SKU_DELETED                              = 'sku.deleted';
+    const SKU_UPDATED                              = 'sku.updated';
+    const SOURCE_CANCELED                          = 'source.canceled';
+    const SOURCE_CHARGEABLE                        = 'source.chargeable';
+    const SOURCE_FAILED                            = 'source.failed';
+    const SOURCE_MANDATE_NOTIFICATION              = 'source.mandate_notification';
+    const SOURCE_REFUND_ATTRIBUTES_REQUIRED        = 'source.refund_attributes_required';
+    const SOURCE_TRANSACTION_CREATED               = 'source.transaction.created';
+    const SOURCE_TRANSACTION_UPDATED               = 'source.transaction.updated';
+    const SUBSCRIPTION_SCHEDULE_ABORTED            = 'subscription_schedule.aborted';
+    const SUBSCRIPTION_SCHEDULE_CANCELED           = 'subscription_schedule.canceled';
+    const SUBSCRIPTION_SCHEDULE_COMPLETED          = 'subscription_schedule.completed';
+    const SUBSCRIPTION_SCHEDULE_CREATED            = 'subscription_schedule.created';
+    const SUBSCRIPTION_SCHEDULE_EXPIRING           = 'subscription_schedule.expiring';
+    const SUBSCRIPTION_SCHEDULE_RELEASED           = 'subscription_schedule.released';
+    const SUBSCRIPTION_SCHEDULE_UPDATED            = 'subscription_schedule.updated';
+    const TOPUP_CANCELED                           = 'topup.canceled';
+    const TOPUP_CREATED                            = 'topup.created';
+    const TOPUP_FAILED                             = 'topup.failed';
+    const TOPUP_REVERSED                           = 'topup.reversed';
+    const TOPUP_SUCCEEDED                          = 'topup.succeeded';
+    const TRANSFER_CREATED                         = 'transfer.created';
+    const TRANSFER_REVERSED                        = 'transfer.reversed';
+    const TRANSFER_UPDATED                         = 'transfer.updated';
 
     use ApiOperations\All;

stripe/trunk/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php

@@ -42 +42 @@
 
     protected $userAgentInfo;
+
+    protected $enablePersistentConnections = null;
+
+    protected $curlHandle = null;
 
     /**
@@ -61 +65 @@
         $this->randomGenerator = $randomGenerator ?: new Util\RandomGenerator();
         $this->initUserAgentInfo();
+
+        // TODO: curl_reset requires PHP >= 5.5.0. Once we drop support for PHP 5.4, we can simply
+        // initialize this to true.
+        $this->enablePersistentConnections = function_exists('curl_reset');
+    }
+
+    public function __destruct()
+    {
+        $this->closeCurlHandle();
     }
 
@@ -80 +93 @@
     {
         return $this->userAgentInfo;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function getEnablePersistentConnections()
+    {
+        return $this->enablePersistentConnections;
+    }
+
+    /**
+     * @param boolean $enable
+     */
+    public function setEnablePersistentConnections($enable)
+    {
+        $this->enablePersistentConnections = $enable;
     }
 
@@ -200 +229 @@
         }
 
-        // For HTTPS requests, enable HTTP/2, if supported
-        $opts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_2TLS;
+        if (!isset($opts[CURLOPT_HTTP_VERSION])) {
+            // For HTTPS requests, enable HTTP/2, if supported
+            $opts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_2TLS;
+        }
 
         list($rbody, $rcode) = $this->executeRequestWithRetries($opts, $absUrl);
@@ -219 +250 @@
             $errno = 0;
 
-            $curl = curl_init();
-            curl_setopt_array($curl, $opts);
-            $rbody = curl_exec($curl);
+            $this->resetCurlHandle();
+            curl_setopt_array($this->curlHandle, $opts);
+            $rbody = curl_exec($this->curlHandle);
 
             if ($rbody === false) {
-                $errno = curl_errno($curl);
-                $message = curl_error($curl);
+                $errno = curl_errno($this->curlHandle);
+                $message = curl_error($this->curlHandle);
             } else {
-                $rcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-            }
-            curl_close($curl);
+                $rcode = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
+            }
+            if (!$this->getEnablePersistentConnections()) {
+                $this->closeCurlHandle();
+            }
 
             if ($this->shouldRetry($errno, $rcode, $numRetries)) {
@@ -341 +374 @@
         return $sleepSeconds;
     }
+
+    /**
+     * Initializes the curl handle. If already initialized, the handle is closed first.
+     */
+    private function initCurlHandle()
+    {
+        $this->closeCurlHandle();
+        $this->curlHandle = curl_init();
+    }
+
+    /**
+     * Closes the curl handle if initialized. Do nothing if already closed.
+     */
+    private function closeCurlHandle()
+    {
+        if (!is_null($this->curlHandle)) {
+            curl_close($this->curlHandle);
+            $this->curlHandle = null;
+        }
+    }
+
+    /**
+     * Resets the curl handle. If the handle is not already initialized, or if persistent
+     * connections are disabled, the handle is reinitialized instead.
+     */
+    private function resetCurlHandle()
+    {
+        if (!is_null($this->curlHandle) && $this->getEnablePersistentConnections()) {
+            curl_reset($this->curlHandle);
+        } else {
+            $this->initCurlHandle();
+        }
+    }
 }

stripe/trunk/vendor/stripe/stripe-php/lib/Invoice.php

@@ -18 +18 @@
  * @property string $billing_reason
  * @property string $charge
- * @property bool $closed
+ * @property int $created
  * @property string $currency
+ * @property mixed $custom_fields
  * @property string $customer
- * @property int $date
+ * @property string $default_source
  * @property string $description
  * @property Discount $discount
  * @property int $due_date
  * @property int $ending_balance
- * @property bool $forgiven
+ * @property string $footer
  * @property string $hosted_invoice_url
  * @property string $invoice_pdf
@@ -40 +41 @@
  * @property int $starting_balance
  * @property string $statement_descriptor
+ * @property string $status
+ * @property mixed $status_transitions
  * @property string $subscription
  * @property int $subscription_proration_date
@@ -45 +48 @@
  * @property int $tax
  * @property float $tax_percent
+ * @property mixed $threshold_reason
  * @property int $total
  * @property int $webhooks_delivered_at
@@ -57 +61 @@
     use ApiOperations\All;
     use ApiOperations\Create;
+    use ApiOperations\Delete;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Invoice The finalized invoice.
+     */
+    public function finalizeInvoice($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/finalize';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Invoice The uncollectible invoice.
+     */
+    public function markUncollectible($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/mark_uncollectible';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Invoice The paid invoice.
+     */
+    public function pay($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/pay';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Invoice The sent invoice.
+     */
+    public function sendInvoice($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/send';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
 
     /**
@@ -76 +137 @@
 
     /**
-     * @return Invoice The paid invoice.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Invoice The voided invoice.
      */
-    public function pay($params = null, $opts = null)
+    public function voidInvoice($params = null, $opts = null)
     {
-        $url = $this->instanceUrl() . '/pay';
+        $url = $this->instanceUrl() . '/void';
         list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);

stripe/trunk/vendor/stripe/stripe-php/lib/Issuing/Authorization.php

@@ -26 +26 @@
  * @property mixed $request_history
  * @property string $status
- * @property mixed $request_history
  * @property \Stripe\Collection $transactions
  * @property mixed $verification_data

stripe/trunk/vendor/stripe/stripe-php/lib/PaymentIntent.php

@@ -8 +8 @@
  * @property string $id
  * @property string $object
- * @property string[] $allowed_source_types
  * @property int $amount
  * @property int $amount_capturable
  * @property int $amount_received
  * @property string $application
- * @property int $application_fee
+ * @property int $application_fee_amount
  * @property int $canceled_at
+ * @property string $cancellation_reason
  * @property string $capture_method
  * @property Collection $charges
@@ -23 +23 @@
  * @property string $customer
  * @property string $description
+ * @property mixed $last_payment_error
  * @property bool $livemode
  * @property StripeObject $metadata
- * @property mixed $next_source_action
+ * @property mixed $next_action
  * @property string $on_behalf_of
+ * @property string[] $payment_method_types
  * @property string $receipt_email
- * @property string $return_url
  * @property string $review
  * @property mixed $shipping

stripe/trunk/vendor/stripe/stripe-php/lib/Person.php

@@ -36 +36 @@
 class Person extends ApiResource
 {
+
     const OBJECT_NAME = "person";
 

stripe/trunk/vendor/stripe/stripe-php/lib/Product.php

@@ -14 +14 @@
  * @property string[] $deactivate_on
  * @property string $description
- * @property array $images
+ * @property string[] $images
  * @property bool $livemode
  * @property StripeObject $metadata

stripe/trunk/vendor/stripe/stripe-php/lib/Refund.php

@@ -13 +13 @@
  * @property int $created
  * @property string $currency
+ * @property string $description
  * @property string $failure_balance_transaction
  * @property string $failure_reason
  * @property StripeObject $metadata
- * @property mixed $reason
- * @property mixed $receipt_number
+ * @property string $reason
+ * @property string $receipt_number
+ * @property string $source_transfer_reversal
  * @property string $status
+ * @property string $transfer_reversal
  *
  * @package Stripe

stripe/trunk/vendor/stripe/stripe-php/lib/Source.php

@@ -8 +8 @@
  * @property string $id
  * @property string $object
+ * @property mixed $ach_credit_transfer
+ * @property mixed $ach_debit
+ * @property mixed $alipay
  * @property int $amount
+ * @property mixed $bancontact
+ * @property mixed $card
+ * @property mixed $card_present
  * @property string $client_secret
  * @property mixed $code_verification
  * @property int $created
  * @property string $currency
+ * @property mixed $eps
  * @property string $flow
+ * @property mixed $giropay
+ * @property mixed $ideal
  * @property bool $livemode
  * @property StripeObject $metadata
+ * @property mixed $multibanco
  * @property mixed $owner
+ * @property mixed $p24
  * @property mixed $receiver
  * @property mixed $redirect
+ * @property mixed $sepa_debit
+ * @property mixed $sofort
  * @property string $statement_descriptor
  * @property string $status
+ * @property mixed $three_d_secure
  * @property string $type
  * @property string $usage
- *
+ * @property mixed $wechat
+
  * @package Stripe
  */

stripe/trunk/vendor/stripe/stripe-php/lib/Stripe.php

@@ -47 +47 @@
     public static $maxNetworkRetries = 0;
 
+    // @var boolean Whether client telemetry is enabled. Defaults to false.
+    public static $enableTelemetry = false;
+
     // @var float Maximum delay between retries, in seconds
     private static $maxNetworkRetryDelay = 2.0;
@@ -53 +56 @@
     private static $initialNetworkRetryDelay = 0.5;
 
-    const VERSION = '6.20.0';
+    const VERSION = '6.30.4';
 
     /**
@@ -240 +243 @@
         return self::$initialNetworkRetryDelay;
     }
+
+    /**
+     * @return bool Whether client telemetry is enabled
+     */
+    public static function getEnableTelemetry()
+    {
+        return self::$enableTelemetry;
+    }
+
+    /**
+     * @param bool $enableTelemetry Enables client telemetry.
+     *
+     * Client telemetry enables timing and request metrics to be sent back to Stripe as an HTTP Header
+     * with the current request. This enables Stripe to do latency and metrics analysis without adding extra
+     * overhead (such as extra network calls) on the client.
+     */
+    public static function setEnableTelemetry($enableTelemetry)
+    {
+        self::$enableTelemetry = $enableTelemetry;
+    }
 }

stripe/trunk/vendor/stripe/stripe-php/lib/Subscription.php

@@ -11 +11 @@
  * @property string $billing
  * @property int $billing_cycle_anchor
+ * @property mixed $billing_thresholds
  * @property bool $cancel_at_period_end
  * @property int $canceled_at
@@ -18 +19 @@
  * @property string $customer
  * @property int $days_until_due
+ * @property string $default_source
  * @property Discount $discount
  * @property int $ended_at
  * @property Collection $items
+ * @property string $latest_invoice
  * @property boolean $livemode
  * @property StripeObject $metadata
  * @property Plan $plan
  * @property int $quantity
+ * @property SubscriptionSchedule $schedule
  * @property int $start
  * @property string $status

stripe/trunk/vendor/stripe/stripe-php/lib/SubscriptionItem.php

@@ -8 +8 @@
  * @property string $id
  * @property string $object
+ * @property mixed $billing_thresholds
  * @property int $created
  * @property StripeObject $metadata

stripe/trunk/vendor/stripe/stripe-php/lib/Transfer.php

@@ -62 +62 @@
 
     /**
-     * @param array|null $id The ID of the transfer on which to create the reversal.
+     * @param string|null $id The ID of the transfer on which to create the reversal.
      * @param array|null $params
      * @param array|string|null $opts
@@ -74 +74 @@
 
     /**
-     * @param array|null $id The ID of the transfer to which the reversal belongs.
+     * @param string|null $id The ID of the transfer to which the reversal belongs.
      * @param array|null $reversalId The ID of the reversal to retrieve.
      * @param array|null $params
@@ -87 +87 @@
 
     /**
-     * @param array|null $id The ID of the transfer to which the reversal belongs.
+     * @param string|null $id The ID of the transfer to which the reversal belongs.
      * @param array|null $reversalId The ID of the reversal to update.
      * @param array|null $params
@@ -100 +100 @@
 
     /**
-     * @param array|null $id The ID of the transfer on which to retrieve the reversals.
+     * @param string|null $id The ID of the transfer on which to retrieve the reversals.
      * @param array|null $params
      * @param array|string|null $opts

stripe/trunk/vendor/stripe/stripe-php/lib/TransferReversal.php

@@ -12 +12 @@
  * @property int $created
  * @property string $currency
+ * @property string $destination_payment_refund
  * @property StripeObject $metadata
+ * @property string $source_refund
  * @property string $transfer
  *

stripe/trunk/vendor/stripe/stripe-php/lib/Util/Util.php

@@ -72 +72 @@
             // business objects
             \Stripe\Account::OBJECT_NAME => 'Stripe\\Account',
+            \Stripe\AccountLink::OBJECT_NAME => 'Stripe\\AccountLink',
             \Stripe\AlipayAccount::OBJECT_NAME => 'Stripe\\AlipayAccount',
             \Stripe\ApplePayDomain::OBJECT_NAME => 'Stripe\\ApplePayDomain',
@@ -82 +83 @@
             \Stripe\Card::OBJECT_NAME => 'Stripe\\Card',
             \Stripe\Charge::OBJECT_NAME => 'Stripe\\Charge',
+            \Stripe\Checkout\Session::OBJECT_NAME => 'Stripe\\Checkout\\Session',
             \Stripe\CountrySpec::OBJECT_NAME => 'Stripe\\CountrySpec',
             \Stripe\Coupon::OBJECT_NAME => 'Stripe\\Coupon',
@@ -113 +115 @@
             \Stripe\Plan::OBJECT_NAME => 'Stripe\\Plan',
             \Stripe\Product::OBJECT_NAME => 'Stripe\\Product',
+            \Stripe\Radar\ValueList::OBJECT_NAME => 'Stripe\\Radar\\ValueList',
+            \Stripe\Radar\ValueListItem::OBJECT_NAME => 'Stripe\\Radar\\ValueListItem',
             \Stripe\Recipient::OBJECT_NAME => 'Stripe\\Recipient',
             \Stripe\RecipientTransfer::OBJECT_NAME => 'Stripe\\RecipientTransfer',
@@ -118 +122 @@
             \Stripe\Reporting\ReportRun::OBJECT_NAME => 'Stripe\\Reporting\\ReportRun',
             \Stripe\Reporting\ReportType::OBJECT_NAME => 'Stripe\\Reporting\\ReportType',
+            \Stripe\Review::OBJECT_NAME => 'Stripe\\Review',
             \Stripe\SKU::OBJECT_NAME => 'Stripe\\SKU',
             \Stripe\Sigma\ScheduledQueryRun::OBJECT_NAME => 'Stripe\\Sigma\\ScheduledQueryRun',
@@ -124 +129 @@
             \Stripe\Subscription::OBJECT_NAME => 'Stripe\\Subscription',
             \Stripe\SubscriptionItem::OBJECT_NAME => 'Stripe\\SubscriptionItem',
+            \Stripe\SubscriptionSchedule::OBJECT_NAME => 'Stripe\\SubscriptionSchedule',
+            \Stripe\SubscriptionScheduleRevision::OBJECT_NAME => 'Stripe\\SubscriptionScheduleRevision',
             \Stripe\ThreeDSecure::OBJECT_NAME => 'Stripe\\ThreeDSecure',
             \Stripe\Terminal\ConnectionToken::OBJECT_NAME => 'Stripe\\Terminal\\ConnectionToken',
@@ -334 +341 @@
         return [$id, $params];
     }
+
+    /**
+     * Returns UNIX timestamp in milliseconds
+     *
+     * @return integer current time in millis
+     */
+    public static function currentTimeMillis()
+    {
+        return (int) round(microtime(true) * 1000);
+    }
 }