'+_+"
"),O.find("span.status-label").removeClass("status-active status-installed status-missing").addClass(a).removeClass("button button-primary button-secondary disabled").text(c),w.removeClass("status-active status-installed status-missing").removeClass("button button-primary button-secondary disabled").addClass(a).html(u)):("object"===r()(e.data)?"addon"===k?O.find(".simpay-addon__actions").append(''+v+"
"):O.find(".simpay-addon__actions").append(''+g+"
"):O.find(".simpay-addon__actions").append(''+e.data+"
"),"install"===n&&"plugin"===k&&w.addClass("status-go-to-url").removeClass("status-missing"),w.html(b)),w.prop("disabled",!1).removeClass("loading"),setTimeout((function(){O.find(".msg").remove()}),3e3)}))}}Object(a.a)((function(){document.querySelector(".simpay-addons")&&document.querySelectorAll(".simpay-addon").forEach((function(e){e.querySelector("button").addEventListener("click",b)}))}))}).call(this,n(14))},341:function(e,t,n){"use strict";var r=n(7);Object(r.a)((function(){var e=new ClipboardJS(".simpay-copy-button");e.on("success",(function(t){var n=t.trigger,r=n.dataset.copied,a=n.innerHTML;clearTimeout(o),n.innerHTML=r,n.classList.contains("button-secondary")&&(n.style.color="green",n.style.borderColor="green"),t.clearSelection();var o=setTimeout((function(){n.innerHTML=a,n.classList.contains("button-secondary")&&(n.style.color="",n.style.borderColor=""),e.clipboardAction.fakeElem&&e.clipboardAction.removeFake&&e.clipboardAction.removeFake()}),3e3);wp.a11y.speak(r)}))}))},354:function(e,t,n){"use strict";n(338),n(339);var r=n(37),a=n.n(r),o=n(7),i=n(15);function c(e){var t=e.target,n=t.options[t.selectedIndex].value,r=document.querySelectorAll(".simpay-panel-field-payment-method[data-payment-method]");a()(r).forEach((function(e){var t="popular"===JSON.parse(e.dataset.paymentMethod).scope?"block":"none";e.style.display="all"===n?"block":t}))}Object(o.a)((function(){var e=document.querySelectorAll(".simpay-panel-field-payment-method-filter");0!==e.length&&a()(e).forEach((function(e){e.addEventListener("change",c)}));var t=document.querySelectorAll(".simpay-payment-method-lite");t&&t.forEach((function(e){return e.addEventListener("change",i.maybeBlockCheckboxWithUpgradeModal)}))})),Object(o.a)((function(){var e;document.querySelector(".post-type-simple-pay #post")&&(e=document.getElementById("simpay-add-field-lite"))&&e.addEventListener("click",i.maybeBlockButtonWithUpgradeModal)})),Object(o.a)((function(){var e,t;(e=document.getElementById("_enable_tax_id"))&&e.addEventListener("change",i.maybeBlockCheckboxWithUpgradeModal),(t=document.getElementById("_enable_promotion_codes"))&&t.addEventListener("change",i.maybeBlockCheckboxWithUpgradeModal)}))},36:function(e,t){function n(e,t,n,r,a,o,i){try{var c=e[o](i),s=c.value}catch(e){return void n(e)}c.done?t(s):Promise.resolve(s).then(r,a)}e.exports=function(e){return function(){var t=this,r=arguments;return new Promise((function(a,o){var i=e.apply(t,r);function c(e){n(i,a,o,c,s,"next",e)}function s(e){n(i,a,o,c,s,"throw",e)}c(void 0)}))}},e.exports.__esModule=!0,e.exports.default=e.exports},37:function(e,t,n){var r=n(108),a=n(109),o=n(110),i=n(111);e.exports=function(e){return r(e)||a(e)||o(e)||i()},e.exports.__esModule=!0,e.exports.default=e.exports},5:function(e,t){e.exports=function(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e},e.exports.__esModule=!0,e.exports.default=e.exports},6:function(e,t,n){"use strict";(function(e){n.d(t,"a",(function(){return c}));var r=n(36),a=n.n(r),o=n(20),i=n.n(o);function c(_x,e){return s.apply(this,arguments)}function s(){return(s=a()(i.a.mark((function t(n,r){return i.a.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.prev=0,t.next=3,e.ajax({data:r,method:"POST",url:"".concat(wpApiSettings.root,"wpsp/").concat(n),beforeSend:function(e){e.setRequestHeader("X-WP-Nonce",wpApiSettings.nonce)}});case 3:return t.abrupt("return",t.sent);case 6:throw t.prev=6,t.t0=t.catch(0),t.t0.responseJSON;case 10:case"end":return t.stop()}}),t,null,[[0,6]])})))).apply(this,arguments)}}).call(this,n(14))},64:function(e,t,n){var r=function(e){"use strict";var t=Object.prototype,n=t.hasOwnProperty,r="function"==typeof Symbol?Symbol:{},a=r.iterator||"@@iterator",o=r.asyncIterator||"@@asyncIterator",i=r.toStringTag||"@@toStringTag";function c(e,t,n){return Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}),e[t]}try{c({},"")}catch(e){c=function(e,t,n){return e[t]=n}}function s(e,t,n,r){var a=t&&t.prototype instanceof d?t:d,o=Object.create(a.prototype),i=new O(r||[]);return o._invoke=function(e,t,n){var r="suspendedStart";return function(a,o){if("executing"===r)throw new Error("Generator is already running");if("completed"===r){if("throw"===a)throw o;return{value:void 0,done:!0}}for(n.method=a,n.arg=o;;){var i=n.delegate;if(i){var c=_(i,n);if(c){if(c===u)continue;return c}}if("next"===n.method)n.sent=n._sent=n.arg;else if("throw"===n.method){if("suspendedStart"===r)throw r="completed",n.arg;n.dispatchException(n.arg)}else"return"===n.method&&n.abrupt("return",n.arg);r="executing";var s=l(e,t,n);if("normal"===s.type){if(r=n.done?"completed":"suspendedYield",s.arg===u)continue;return{value:s.arg,done:n.done}}"throw"===s.type&&(r="completed",n.method="throw",n.arg=s.arg)}}}(e,n,i),o}function l(e,t,n){try{return{type:"normal",arg:e.call(t,n)}}catch(e){return{type:"throw",arg:e}}}e.wrap=s;var u={};function d(){}function p(){}function f(){}var y={};c(y,a,(function(){return this}));var m=Object.getPrototypeOf,h=m&&m(m(S([])));h&&h!==t&&n.call(h,a)&&(y=h);var v=f.prototype=d.prototype=Object.create(y);function g(e){["next","throw","return"].forEach((function(t){c(e,t,(function(e){return this._invoke(t,e)}))}))}function b(e,t){var r;this._invoke=function(a,o){function i(){return new t((function(r,i){!function r(a,o,i,c){var s=l(e[a],e,o);if("throw"!==s.type){var u=s.arg,d=u.value;return d&&"object"==typeof d&&n.call(d,"__await")?t.resolve(d.__await).then((function(e){r("next",e,i,c)}),(function(e){r("throw",e,i,c)})):t.resolve(d).then((function(e){u.value=e,i(u)}),(function(e){return r("throw",e,i,c)}))}c(s.arg)}(a,o,r,i)}))}return r=r?r.then(i,i):i()}}function _(e,t){var n=e.iterator[t.method];if(void 0===n){if(t.delegate=null,"throw"===t.method){if(e.iterator.return&&(t.method="return",t.arg=void 0,_(e,t),"throw"===t.method))return u;t.method="throw",t.arg=new TypeError("The iterator does not provide a 'throw' method")}return u}var r=l(n,e.iterator,t.arg);if("throw"===r.type)return t.method="throw",t.arg=r.arg,t.delegate=null,u;var a=r.arg;return a?a.done?(t[e.resultName]=a.value,t.next=e.nextLoc,"return"!==t.method&&(t.method="next",t.arg=void 0),t.delegate=null,u):a:(t.method="throw",t.arg=new TypeError("iterator result is not an object"),t.delegate=null,u)}function w(e){var t={tryLoc:e[0]};1 in e&&(t.catchLoc=e[1]),2 in e&&(t.finallyLoc=e[2],t.afterLoc=e[3]),this.tryEntries.push(t)}function k(e){var t=e.completion||{};t.type="normal",delete t.arg,e.completion=t}function O(e){this.tryEntries=[{tryLoc:"root"}],e.forEach(w,this),this.reset(!0)}function S(e){if(e){var t=e[a];if(t)return t.call(e);if("function"==typeof e.next)return e;if(!isNaN(e.length)){var r=-1,o=function t(){for(;++r'+_+"
"),O.find("span.status-label").removeClass("status-active status-installed status-missing").addClass(a).removeClass("button button-primary button-secondary disabled").text(c),w.removeClass("status-active status-installed status-missing").removeClass("button button-primary button-secondary disabled").addClass(a).html(u)):("object"===r()(e.data)?"addon"===k?O.find(".simpay-addon__actions").append(''+v+"
"):O.find(".simpay-addon__actions").append(''+g+"
"):O.find(".simpay-addon__actions").append(''+e.data+"
"),"install"===n&&"plugin"===k&&w.addClass("status-go-to-url").removeClass("status-missing"),w.html(b)),w.prop("disabled",!1).removeClass("loading"),setTimeout((function(){O.find(".msg").remove()}),3e3)}))}}Object(a.a)((function(){document.querySelector(".simpay-addons")&&document.querySelectorAll(".simpay-addon").forEach((function(e){e.querySelector("button").addEventListener("click",b)}))}))}).call(this,n(14))},342:function(e,t,n){"use strict";var r=n(7);Object(r.a)((function(){var e=new ClipboardJS(".simpay-copy-button");e.on("success",(function(t){var n=t.trigger,r=n.dataset.copied,a=n.innerHTML;clearTimeout(o),n.innerHTML=r,n.classList.contains("button-secondary")&&(n.style.color="green",n.style.borderColor="green"),t.clearSelection();var o=setTimeout((function(){n.innerHTML=a,n.classList.contains("button-secondary")&&(n.style.color="",n.style.borderColor=""),e.clipboardAction.fakeElem&&e.clipboardAction.removeFake&&e.clipboardAction.removeFake()}),3e3);wp.a11y.speak(r)}))}))},355:function(e,t,n){"use strict";n(338),n(339);var r=n(37),a=n.n(r),o=n(7),i=n(15);function c(e){var t=e.target,n=t.options[t.selectedIndex].value,r=document.querySelectorAll(".simpay-panel-field-payment-method[data-payment-method]");a()(r).forEach((function(e){var t="popular"===JSON.parse(e.dataset.paymentMethod).scope?"block":"none";e.style.display="all"===n?"block":t}))}Object(o.a)((function(){var e=document.querySelectorAll(".simpay-panel-field-payment-method-filter");0!==e.length&&a()(e).forEach((function(e){e.addEventListener("change",c)}));var t=document.querySelectorAll(".simpay-payment-method-lite");t&&t.forEach((function(e){return e.addEventListener("change",i.maybeBlockCheckboxWithUpgradeModal)}))})),Object(o.a)((function(){var e;document.querySelector(".post-type-simple-pay #post")&&(e=document.getElementById("simpay-add-field-lite"))&&e.addEventListener("click",i.maybeBlockButtonWithUpgradeModal)})),Object(o.a)((function(){var e,t;(e=document.getElementById("_enable_tax_id"))&&e.addEventListener("change",i.maybeBlockCheckboxWithUpgradeModal),(t=document.getElementById("_enable_promotion_codes"))&&t.addEventListener("change",i.maybeBlockCheckboxWithUpgradeModal)})),n(340)},36:function(e,t){function n(e,t,n,r,a,o,i){try{var c=e[o](i),s=c.value}catch(e){return void n(e)}c.done?t(s):Promise.resolve(s).then(r,a)}e.exports=function(e){return function(){var t=this,r=arguments;return new Promise((function(a,o){var i=e.apply(t,r);function c(e){n(i,a,o,c,s,"next",e)}function s(e){n(i,a,o,c,s,"throw",e)}c(void 0)}))}},e.exports.__esModule=!0,e.exports.default=e.exports},37:function(e,t,n){var r=n(108),a=n(109),o=n(110),i=n(111);e.exports=function(e){return r(e)||a(e)||o(e)||i()},e.exports.__esModule=!0,e.exports.default=e.exports},5:function(e,t){e.exports=function(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e},e.exports.__esModule=!0,e.exports.default=e.exports},6:function(e,t,n){"use strict";(function(e){n.d(t,"a",(function(){return c}));var r=n(36),a=n.n(r),o=n(20),i=n.n(o);function c(_x,e){return s.apply(this,arguments)}function s(){return(s=a()(i.a.mark((function t(n,r){return i.a.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.prev=0,t.next=3,e.ajax({data:r,method:"POST",url:"".concat(wpApiSettings.root,"wpsp/").concat(n),beforeSend:function(e){e.setRequestHeader("X-WP-Nonce",wpApiSettings.nonce)}});case 3:return t.abrupt("return",t.sent);case 6:throw t.prev=6,t.t0=t.catch(0),t.t0.responseJSON;case 10:case"end":return t.stop()}}),t,null,[[0,6]])})))).apply(this,arguments)}}).call(this,n(14))},64:function(e,t,n){var r=function(e){"use strict";var t=Object.prototype,n=t.hasOwnProperty,r="function"==typeof Symbol?Symbol:{},a=r.iterator||"@@iterator",o=r.asyncIterator||"@@asyncIterator",i=r.toStringTag||"@@toStringTag";function c(e,t,n){return Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}),e[t]}try{c({},"")}catch(e){c=function(e,t,n){return e[t]=n}}function s(e,t,n,r){var a=t&&t.prototype instanceof d?t:d,o=Object.create(a.prototype),i=new O(r||[]);return o._invoke=function(e,t,n){var r="suspendedStart";return function(a,o){if("executing"===r)throw new Error("Generator is already running");if("completed"===r){if("throw"===a)throw o;return{value:void 0,done:!0}}for(n.method=a,n.arg=o;;){var i=n.delegate;if(i){var c=_(i,n);if(c){if(c===u)continue;return c}}if("next"===n.method)n.sent=n._sent=n.arg;else if("throw"===n.method){if("suspendedStart"===r)throw r="completed",n.arg;n.dispatchException(n.arg)}else"return"===n.method&&n.abrupt("return",n.arg);r="executing";var s=l(e,t,n);if("normal"===s.type){if(r=n.done?"completed":"suspendedYield",s.arg===u)continue;return{value:s.arg,done:n.done}}"throw"===s.type&&(r="completed",n.method="throw",n.arg=s.arg)}}}(e,n,i),o}function l(e,t,n){try{return{type:"normal",arg:e.call(t,n)}}catch(e){return{type:"throw",arg:e}}}e.wrap=s;var u={};function d(){}function p(){}function f(){}var y={};c(y,a,(function(){return this}));var m=Object.getPrototypeOf,h=m&&m(m(S([])));h&&h!==t&&n.call(h,a)&&(y=h);var v=f.prototype=d.prototype=Object.create(y);function g(e){["next","throw","return"].forEach((function(t){c(e,t,(function(e){return this._invoke(t,e)}))}))}function b(e,t){var r;this._invoke=function(a,o){function i(){return new t((function(r,i){!function r(a,o,i,c){var s=l(e[a],e,o);if("throw"!==s.type){var u=s.arg,d=u.value;return d&&"object"==typeof d&&n.call(d,"__await")?t.resolve(d.__await).then((function(e){r("next",e,i,c)}),(function(e){r("throw",e,i,c)})):t.resolve(d).then((function(e){u.value=e,i(u)}),(function(e){return r("throw",e,i,c)}))}c(s.arg)}(a,o,r,i)}))}return r=r?r.then(i,i):i()}}function _(e,t){var n=e.iterator[t.method];if(void 0===n){if(t.delegate=null,"throw"===t.method){if(e.iterator.return&&(t.method="return",t.arg=void 0,_(e,t),"throw"===t.method))return u;t.method="throw",t.arg=new TypeError("The iterator does not provide a 'throw' method")}return u}var r=l(n,e.iterator,t.arg);if("throw"===r.type)return t.method="throw",t.arg=r.arg,t.delegate=null,u;var a=r.arg;return a?a.done?(t[e.resultName]=a.value,t.next=e.nextLoc,"return"!==t.method&&(t.method="next",t.arg=void 0),t.delegate=null,u):a:(t.method="throw",t.arg=new TypeError("iterator result is not an object"),t.delegate=null,u)}function w(e){var t={tryLoc:e[0]};1 in e&&(t.catchLoc=e[1]),2 in e&&(t.finallyLoc=e[2],t.afterLoc=e[3]),this.tryEntries.push(t)}function k(e){var t=e.completion||{};t.type="normal",delete t.arg,e.completion=t}function O(e){this.tryEntries=[{tryLoc:"root"}],e.forEach(w,this),this.reset(!0)}function S(e){if(e){var t=e[a];if(t)return t.call(e);if("function"==typeof e.next)return e;if(!isNaN(e.length)){var r=-1,o=function t(){for(;++r%s
', - esc_html__( 'Available template tags:', 'stripe' ) + esc_html__( 'Available smart tags:', 'stripe' ) ); foreach ( $tags as $tag_id => $description ) { diff --git a/includes/core/payments/payment-confirmation.php b/includes/core/payments/payment-confirmation.php index a4a33387..790c54ac 100644 --- a/includes/core/payments/payment-confirmation.php +++ b/includes/core/payments/payment-confirmation.php @@ -59,7 +59,7 @@ function get_confirmation_data( $customer_id = false, $session_id = false, $form * @since 3.6.2 * * @param int $form_id ID of the form the payment was created from. - * @param array $payment_confirmation_data Array of data to send to the Payment Confirmation template tags. + * @param array $payment_confirmation_data Array of data to send to the Payment Confirmation smart tags. */ $form_id = apply_filters( 'simpay_payment_confirmation_form_id', @@ -147,7 +147,7 @@ function get_confirmation_data( $customer_id = false, $session_id = false, $form * * @since 3.6.0 * - * @param array $payment_confirmation_data Array of data to send to the Payment Confirmation template tags. + * @param array $payment_confirmation_data Array of data to send to the Payment Confirmation smart tags. */ $payment_confirmation_data = apply_filters( 'simpay_payment_confirmation_data', $payment_confirmation_data ); diff --git a/includes/core/post-types/simple-pay/edit-form-payment-page.php b/includes/core/post-types/simple-pay/edit-form-payment-page.php new file mode 100644 index 00000000..6441b76d --- /dev/null +++ b/includes/core/post-types/simple-pay/edit-form-payment-page.php @@ -0,0 +1,173 @@ + 'simpay-form-settings-payment-page-education', + ) + ); + + if ( true === $dismissed_notice ) { + return; + } + + $features_url = simpay_docs_link( + 'Payment Pages', + 'how-to-use-payment-pages', + 'form-payment-page-settings', + true + ); + + include_once SIMPLE_PAY_DIR . '/views/admin-education-payment-form-payment-page-settings.php'; // @phpstan-ignore-line +} +add_action( + 'simpay_form_settings_payment_page_panel', + __NAMESPACE__ . '\\payment_page_education' +); + +/** + * Adds the "Payment Page Mode" setting. + * + * @since 4.5.0 + * + * @param int $post_id Payment Form ID. + * @return void + */ +function payment_page_enable( $post_id ) { + $structure = get_option( 'permalink_structure' ); + + ?> + +| + + + + | +
+ is_pro( 'professional', '>=' ) &&
+ 'yes' === $enable_payment_page ? 'yes' : 'no'
+ );
+
+ $upgrade_title = __(
+ 'Unlock Payment Pages',
+ 'stripe'
+ );
+
+ $upgrade_description = __(
+ 'We\'re sorry, creating dedicated payment pages is not available on your plan. Please upgrade to the Professional plan or higher to unlock this and other awesome features.',
+ 'stripe'
+ );
+
+ $upgrade_url = simpay_pro_upgrade_url(
+ 'form-payment-page-settings',
+ 'Payment Page Mode'
+ );
+
+ $upgrade_purchased_url = simpay_docs_link(
+ 'Payment Page Mode (already purchased)',
+ 'upgrading-wp-simple-pay-lite-to-pro',
+ $license->is_lite()
+ ? 'upgrading-wp-simple-pay-lite-to-pro'
+ : 'activate-wp-simple-pay-pro-license',
+ true
+ );
+ ?>
+
+
+
+
+ + tag, do not translate. %2$s Closing tag, do not translate. */ + __( + 'Heads up! To use Payment Pages, please configure your site\'s permalinks on the WordPress %1$sPermalink Settings%2$s page.', + 'stripe' + ), + '', + Utils\get_external_link_markup() . '' + ), + array( + 'a' => array( + 'href' => true, + 'rel' => true, + 'target' => true, + 'class' => true, + ), + 'span' => array( + 'class' => true, + ), + ) + ); + ?> + |
+
|---|
'',
);
+ $tabs['payment_page'] = array(
+ 'label' => esc_html__( 'Payment Page', 'stripe' ),
+ 'target' => 'payment-page-settings-panel',
+ 'icon' => '',
+ );
+
/**
* Filters the tabs for the Payment Form settings.
*
diff --git a/includes/core/post-types/simple-pay/list-table.php b/includes/core/post-types/simple-pay/list-table.php
index 3d8e7a74..bd44d194 100644
--- a/includes/core/post-types/simple-pay/list-table.php
+++ b/includes/core/post-types/simple-pay/list-table.php
@@ -14,6 +14,24 @@
exit;
}
+/**
+ * Removes the Edit option from the bulk options dropdown.
+ *
+ * @since 4.5.0
+ *
+ * @param array $actions payment form actions.
+ * @return array
+ */
+function remove_edit_from_bulk_actions( $actions ) {
+
+ if ( isset( $actions['edit'] ) ) {
+ unset( $actions['edit'] );
+ }
+
+ return $actions;
+}
+add_filter( 'bulk_actions-edit-simple-pay', __NAMESPACE__ . '\\remove_edit_from_bulk_actions', 10, 1 );
+
/**
* Appends a previously set `post_title` to the "Company Name" field.
*
@@ -68,6 +86,26 @@ function row_actions( $actions, $post ) {
// Remove "Quick Edit".
unset( $actions['inline hide-if-no-js'] );
+ // Update "View" to "View Payment Page", or remove if not enabled.
+ if ( isset( $actions['view'] ) ) {
+ /** @var string $payment_page_enabled */
+ $payment_page_enabled = get_post_meta(
+ $post->ID,
+ '_enable_payment_page',
+ true
+ );
+
+ if ( 'yes' !== $payment_page_enabled ) {
+ unset( $actions['view'] );
+ } else {
+ $actions['view'] = sprintf(
+ '%s',
+ get_permalink( $post->ID ),
+ esc_html__( 'View Payment Page', 'stripe' )
+ );
+ }
+ }
+
// Preview.
$actions = simpay_add_to_array_after(
'simpay-preview',
diff --git a/includes/core/post-types/simple-pay/register.php b/includes/core/post-types/simple-pay/register.php
index 84a0ef5b..cb199ae8 100644
--- a/includes/core/post-types/simple-pay/register.php
+++ b/includes/core/post-types/simple-pay/register.php
@@ -90,7 +90,7 @@ function register() {
'labels' => $labels,
'menu_icon' => \simpay_get_svg_icon_url(),
'public' => false,
- 'publicly_queryable' => false,
+ 'publicly_queryable' => true,
'exclude_from_search' => true,
'show_ui' => true,
'show_in_menu' => true,
@@ -98,12 +98,12 @@ function register() {
'show_in_rest' => true,
'show_in_admin_bar' => true,
'archive_in_nav_menus' => false,
- 'query_var' => 'simpay-preview',
'rewrite' => false,
'capability_type' => 'post',
'map_meta_cap' => true,
'has_archive' => false,
'hierarchical' => false,
+ 'exclude_from_search' => true,
'supports' => array(
'title',
),
@@ -150,32 +150,36 @@ function add_rest_fields() {
add_action( 'rest_api_init', __NAMESPACE__ . '\\add_rest_fields' );
/**
- * Filters the Post's (Payment Form) preview link.
+ * Filters the Post's (Payment Form) link.
*
* @since 3.8.0
+ * @since 4.5.0 Adds compatibility with Payment Pages.
*
* @param string $link Permalink.
* @param \WP_Post $post Current Payment Form (post) object.
* @return string
*/
-function previewlink( $link, $post ) {
- if ( 'simple-pay' !== $post->post_type ) {
+function permalink( $link, $post ) {
+ if ( 'simple-pay' !== get_post_type( $post ) ) {
return $link;
}
- $link = add_query_arg(
- array(
- 'simpay-preview' => $post->ID,
- ),
- home_url()
+ $payment_page_enabled = get_post_meta(
+ $post->ID,
+ '_enable_payment_page',
+ true
);
- return $link;
+ if ( 'yes' !== $payment_page_enabled ) {
+ return $link;
+ }
+
+ return home_url( $post->post_name );
}
-add_filter( 'preview_post_link', __NAMESPACE__ . '\\previewlink', 10, 2 );
+add_filter( 'post_type_link', __NAMESPACE__ . '\\permalink', 10, 2 );
/**
- * Filters the Post's (Payment Form) link.
+ * Filters the Post's (Payment Form) preview link.
*
* @since 3.8.0
*
@@ -183,10 +187,21 @@ function previewlink( $link, $post ) {
* @param \WP_Post $post Current Payment Form (post) object.
* @return string
*/
-function permalink( $link, $post ) {
- return previewlink( $link, $post );
+function previewlink( $link, $post ) {
+ if ( 'simple-pay' !== $post->post_type ) {
+ return $link;
+ }
+
+ $link = add_query_arg(
+ array(
+ 'simpay-preview' => $post->ID,
+ ),
+ home_url()
+ );
+
+ return $link;
}
-add_filter( 'post_type_link', __NAMESPACE__ . '\\permalink', 10, 2 );
+add_filter( 'preview_post_link', __NAMESPACE__ . '\\previewlink', 10, 2 );
/**
* Adds messages for general actions.
@@ -199,7 +214,7 @@ function permalink( $link, $post ) {
function updated_messages( $messages ) {
global $post;
- $open = '';
+ $open = '';
$close = '';
$messages['simple-pay'] = array(
diff --git a/includes/core/rest-api/class-controller.php b/includes/core/rest-api/class-controller.php
index 9484337d..2fed1f46 100644
--- a/includes/core/rest-api/class-controller.php
+++ b/includes/core/rest-api/class-controller.php
@@ -45,7 +45,7 @@ abstract class Controller extends WP_REST_Controller {
*
* @since 4.2.0
*
- * @param array $checks List of permission checks to call.
+ * @param array $checks List of permission checks to call.
* @param \WP_REST_Request $request Incoming REST API request data.
* @return \WP_Error|true Error if a permission check fails.
*/
@@ -150,6 +150,100 @@ protected function check_form_nonce( $request ) {
return true;
}
+ /**
+ * Determines if the REST API request contains all required fields.
+ *
+ * @since 4.5.0
+ *
+ * @param \WP_REST_Request $request Incoming REST API request data.
+ * @return \WP_Error|true Error if the required fields are missing.
+ */
+ protected function check_required_fields( $request ) {
+ $invalid_request = new \WP_Error(
+ 'rest_forbidden',
+ __( 'Invalid request. Please try again.', 'stripe' ),
+ array(
+ 'status' => rest_authorization_required_code(),
+ )
+ );
+
+ if ( ! isset( $request['form_id'] ) ) {
+ return $invalid_request;
+ }
+
+ $form_id = intval( $request['form_id'] );
+ $form = simpay_get_form( $form_id );
+
+ if ( false === $form ) {
+ return $invalid_request;
+ }
+
+ $form_values = $request['form_values'];
+ $custom_fields = simpay_get_saved_meta( $form->id, '_custom_fields' );
+
+ foreach ( $custom_fields as $custom_field_type => $custom_field_types ) {
+ foreach ( $custom_field_types as $field ) {
+ if ( ! isset( $field['required'] ) ) {
+ continue;
+ }
+
+ // Check custom fields.
+ if ( isset( $field['metadata'] ) ) {
+ if ( empty( $field['metadata'] ) ) {
+ $id = isset( $field['uid'] )
+ ? $field['uid']
+ : '';
+
+ $meta_key = 'simpay-form-' . $form->id . '-field-' . $id;
+ } else {
+ $meta_key = $field['metadata'];
+ }
+
+ if ( empty( $form_values['simpay_field'][ $meta_key ] ) ) {
+ return $invalid_request;
+ }
+ }
+
+ // Check Customer fields.
+ switch ( $custom_field_type ) {
+ case 'address':
+ $address_parts = array(
+ 'line1',
+ 'city',
+ 'state',
+ 'postal_code',
+ 'country',
+ );
+
+ foreach ( $address_parts as $address_part ) {
+ if ( empty( $form_values[ 'simpay_billing_address_' . $address_part ] ) ) {
+ return $invalid_request;
+ }
+ }
+
+ break;
+ case 'tax_id':
+ if (
+ empty( $form_values['simpay_tax_id'] ) ||
+ empty( $form_values['simpay_tax_id_type'] )
+ ) {
+ return $invalid_request;
+ }
+
+ break;
+ case 'customer_name':
+ case 'telephone':
+ case 'email':
+ if ( empty( $form_values[ 'simpay_' . $custom_field_type ] ) ) {
+ return $invalid_request;
+ }
+ }
+ }
+ }
+
+ return true;
+ }
+
/**
* Determines if the REST API request contains a valid Customer nonce.
*
@@ -220,4 +314,5 @@ protected function check_customer_nonce( $request ) {
return true;
}
+
}
diff --git a/includes/core/rest-api/v2/class-checkout-session-controller.php b/includes/core/rest-api/v2/class-checkout-session-controller.php
index a723eafb..5cae23ef 100644
--- a/includes/core/rest-api/v2/class-checkout-session-controller.php
+++ b/includes/core/rest-api/v2/class-checkout-session-controller.php
@@ -73,6 +73,7 @@ public function create_item_permissions_check( $request ) {
$checks = array(
'rate_limit',
'form_nonce',
+ 'required_fields',
);
return $this->permission_checks( $checks, $request );
@@ -167,10 +168,15 @@ public function create_item( $request ) {
$customer_id
);
+ $license = simpay_get_license();
+
return new \WP_REST_Response(
array(
- 'sessionId' => $session->id,
- 'session' => $session,
+ 'sessionId' => $session->id,
+ 'session' => $session,
+ 'redirect_type' => $license->is_pro( 'professional' )
+ ? 'manual'
+ : 'stripe',
)
);
} catch ( \Exception $e ) {
@@ -191,6 +197,7 @@ public function create_item( $request ) {
* @param array $form_values Values of named fields in the payment form.
* @param int $customer_id Stripe Customer ID.
* @return array
+ * @throws \Exception If payment form data is invalid.
*/
function get_args_from_payment_form_request(
$form,
diff --git a/includes/core/rest-api/v2/class-customer-controller.php b/includes/core/rest-api/v2/class-customer-controller.php
index c153deff..38a65294 100644
--- a/includes/core/rest-api/v2/class-customer-controller.php
+++ b/includes/core/rest-api/v2/class-customer-controller.php
@@ -78,6 +78,7 @@ public function create_item_permissions_check( $request ) {
$checks = array(
'rate_limit',
'form_nonce',
+ 'required_fields',
);
return $this->permission_checks( $checks, $request );
@@ -101,7 +102,7 @@ public function create_item_permissions_check( $request ) {
public function create_item( $request ) {
try {
// Do not proceed if attempting to set the PaymentMethod or Source (legacy flow).
- if ( isset( $request['payment_method_id'], $request['source_id' ] ) ) {
+ if ( isset( $request['payment_method_id'], $request['source_id'] ) ) {
throw new \Exception(
__( 'Unable to complete payment.', 'stripe' )
);
diff --git a/includes/core/rest-api/v2/class-paymentintent-controller.php b/includes/core/rest-api/v2/class-paymentintent-controller.php
index 592e2b39..8cc5d771 100644
--- a/includes/core/rest-api/v2/class-paymentintent-controller.php
+++ b/includes/core/rest-api/v2/class-paymentintent-controller.php
@@ -72,6 +72,7 @@ public function create_item_permissions_check( $request ) {
$checks = array(
'rate_limit',
'form_nonce',
+ 'required_fields',
'customer_nonce',
);
@@ -128,6 +129,12 @@ public function create_item( $request ) {
);
}
+ if ( 'stripe_checkout' === $form->get_display_type() ) {
+ throw new \Exception(
+ esc_html__( 'Invalid request. Please try again.', 'stripe' )
+ );
+ }
+
// Handle legacy form processing.
Legacy\Hooks\simpay_process_form( $form, $form_data, $form_values, $customer_id );
diff --git a/package.json b/package.json
index bf5b48f1..3ca60f9b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "wp-simple-pay-lite",
"title": "WP Simple Pay Lite for Stripe",
"description": "Add high conversion Stripe Checkout forms to your WordPress site and start accepting payments in minutes. **Lite Version**",
- "version": "4.4.71",
+ "version": "4.5.0",
"license": "GPL-2.0-or-later",
"homepage": "https://wpsimplepay.com/",
"repository": {
diff --git a/readme.txt b/readme.txt
index 66bd893b..7f17d43d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -69,7 +69,7 @@ By upgrading to WP Simple Pay Pro, you also get access to one-on-one help from o
> Brian Casel, Founder of Audience Ops
-There is a small 2% credit card fee per-transaction plus Stripe fees while using WP Simple Pay Lite. [Upgrade to Pro](https://wpsimplepay.com/?utm_source=wporg&utm_campaign=lite-plugin&utm_medium=link) for no added credit card form fees and priority support.
+There is a small 3% credit card fee per-transaction plus Stripe fees while using WP Simple Pay Lite. [Upgrade to Pro](https://wpsimplepay.com/?utm_source=wporg&utm_campaign=lite-plugin&utm_medium=link) for no added credit card form fees and priority support.
= Who is WP Simple Pay For? =
@@ -270,9 +270,9 @@ Payment forms are embedded via shortcodes and can be placed anywhere a shortcode
Stripe has a per-transaction charge which varies by country. [See Stripe’s pricing](https://stripe.com/pricing) for details.
-Besides Stripe's pricing, WP Simple Pay charges an additional 2% fee for transactions processed through WP Simple Pay Lite (the free version of the plugin).
+Besides Stripe's pricing, WP Simple Pay charges an additional 3% fee for transactions processed through WP Simple Pay Lite (the free version of the plugin).
-The 2% additional fee is removed by [upgrading to WP Simple Pay Pro](https://wpsimplepay.com/?utm_source=wporg&utm_campaign=lite-plugin&utm_medium=link).
+The 3% additional fee is removed by [upgrading to WP Simple Pay Pro](https://wpsimplepay.com/?utm_source=wporg&utm_campaign=lite-plugin&utm_medium=link).
= Can I offer coupon codes to my site visitors? =
@@ -297,6 +297,14 @@ The 2% additional fee is removed by [upgrading to WP Simple Pay Pro](https://wps
== Changelog ==
+= Stripe Payment Forms v4.5.0 - August 16, 2022 =
+
+* New: Use `{customer-name}` smart tag to display the customer's name in payment confirmations.
+* Fix: Hide output of payment forms that are not fully published.
+* Fix: Remove "Edit" from bulk options.
+* Fix: Update composer autoload to avoid namespace conflicts.
+* Fix: Update non-licensed additional fee to 3%.
+
= Stripe Payment Forms v4.4.7.1 - July 12, 2022 =
* Fix: Only enqueue button block scripts in the block editor.
diff --git a/src/FormPreview/FormPreviewOutput.php b/src/FormPreview/FormPreviewOutput.php
index f470ed11..b8a62956 100644
--- a/src/FormPreview/FormPreviewOutput.php
+++ b/src/FormPreview/FormPreviewOutput.php
@@ -50,7 +50,20 @@ public function maybe_output_preview() {
);
}
- $id = absint( $_GET['simpay-preview'] );
+ $id = absint( $_GET['simpay-preview'] );
+ $form = simpay_get_form( $id );
+
+ if ( false === $form ) {
+ wp_safe_redirect(
+ add_query_arg(
+ array(
+ 'post_type' => 'simple-pay',
+ ),
+ admin_url( 'edit.php' )
+ )
+ );
+ exit;
+ }
$edit_form_url = add_query_arg(
array(
@@ -60,6 +73,11 @@ public function maybe_output_preview() {
admin_url( 'post.php' )
);
+ $payment_page_enabled = get_post_meta( $id, '_enable_payment_page', true );
+ $payment_page_url = 'yes' === $payment_page_enabled
+ ? get_permalink( $id )
+ : '';
+
wp_enqueue_script( 'clipboard' );
wp_enqueue_script( 'wp-a11y' );
wp_enqueue_style( 'dashicons' );
diff --git a/src/PaymentPage/PaymentPageOutput.php b/src/PaymentPage/PaymentPageOutput.php
new file mode 100644
index 00000000..91318630
--- /dev/null
+++ b/src/PaymentPage/PaymentPageOutput.php
@@ -0,0 +1,498 @@
+events = $events;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_subscribed_events() {
+ if ( true === $this->license->is_lite() ) {
+ return array();
+ }
+
+ return array(
+ 'parse_request' => 'parse_pretty_request',
+ );
+ }
+
+ /**
+ * Parses "pretty" permalink requests and shows a payment form if needed.
+ *
+ * @since 4.5.0
+ *
+ * @param \WP $wp WordPress request.
+ * @return void
+ */
+ public function parse_pretty_request( $wp ) {
+ if ( ! empty( $wp->query_vars['name'] ) ) {
+ $request = $wp->query_vars['name'];
+ }
+
+ if ( empty( $request ) && ! empty( $wp->query_vars['pagename'] ) ) {
+ $request = $wp->query_vars['pagename'];
+ }
+
+ if ( empty( $request ) ) {
+ $request = ! empty( $_SERVER['REQUEST_URI'] )
+ ? esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) )
+ : '';
+
+ $path = (string) wp_parse_url( $request, PHP_URL_PATH );
+ $request = ! empty( $request ) ? sanitize_key( $path ) : '';
+ }
+
+ $payment_form_obj = get_page_by_path( $request, OBJECT, 'simple-pay' );
+
+ if ( null === $payment_form_obj ) {
+ return;
+ }
+
+ // Set the "Success Page" redirect _before_ we call the form, but when
+ // we are pretty sure we are on a Payment Page.
+ $this->events->add_callback(
+ 'simpay_payment_success_page',
+ array( $this, 'set_self_redirect' ),
+ 10,
+ 2
+ );
+
+ $this->form = simpay_get_form( $payment_form_obj->ID );
+
+ if (
+ false === $this->form ||
+ false === $this->is_payment_page_enabled( $payment_form_obj->ID )
+ ) {
+ return;
+ }
+
+ // Override page URLs with the same slug.
+ if ( ! empty( $wp->query_vars['pagename'] ) ) {
+ $wp->query_vars['name'] = $wp->query_vars['pagename'];
+ unset( $wp->query_vars['pagename'] );
+ }
+
+ if ( empty( $wp->query_vars['name'] ) ) {
+ $wp->query_vars['name'] = $request;
+ }
+
+ $wp->query_vars['post_type'] = 'simple-pay';
+
+ // Unset 'error' query var that may appear if custom permalink structures used.
+ unset( $wp->query_vars['error'] );
+
+ $this->compat_hooks();
+ $this->output( $payment_form_obj->ID );
+ }
+
+ /**
+ * Additional compatibility.
+ *
+ * @since 4.5.0
+ *
+ * @return void
+ */
+ private function compat_hooks() {
+ // Remove data.
+ $this->events->remove_callback(
+ 'wp_head',
+ 'adjacent_posts_rel_link_wp_head'
+ );
+ $this->events->remove_callback(
+ 'wp_head',
+ 'wp_oembed_add_discovery_links'
+ );
+ $this->events->remove_callback(
+ 'wp_head',
+ 'wp_oembed_add_host_js'
+ );
+
+ // Update tag.
+ // Remove conditional title tag rendering...
+ $this->events->remove_callback(
+ 'wp_head',
+ '_wp_render_title_tag',
+ 1
+ );
+
+ // ...and make it unconditional.
+ $this->events->add_callback(
+ 'wp_head',
+ '_block_template_render_title_tag',
+ 1
+ );
+
+ // Override parts.
+ $this->events->add_callback(
+ 'document_title_parts',
+ array( $this, 'change_payment_page_title' )
+ );
+
+ // Asset Compatibility.
+ $this->events->add_callback(
+ 'wp_print_styles',
+ array( $this, 'css_compatibility_mode' ),
+ 99
+ );
+
+ $this->events->add_callback(
+ 'wp_print_scripts',
+ array( $this, 'js_compatibility_mode' ),
+ 99
+ );
+
+ /**
+ * Allows Payment Page compatibility to be added/modified.
+ *
+ * @since 4.5.0
+ *
+ * @param \SimplePay\Core\EventManagement\EventManager $events
+ */
+ do_action( 'simpay_before_payment_page_output', $this->events );
+ }
+
+ /**
+ * Update the payment confirmation URL if receipt should show on the same page.
+ *
+ * @since 4.5.0
+ *
+ * @param string $url Success page URL.
+ * @param int $form_id Payment form ID.
+ * @return string
+ */
+ public function set_self_redirect( $url, $form_id ) {
+ // Return standard success URL if Payment Page is not enabled.
+ if ( false === $this->is_payment_page_enabled( $form_id ) ) {
+ return $url;
+ }
+
+ $self_confirmation = get_post_meta(
+ $form_id,
+ '_payment_page_self_confirmation',
+ true
+ );
+
+ // Return standard success URL if self confirmation is not enabled.
+ if ( 'no' === $self_confirmation ) {
+ return $url;
+ }
+
+ $redirect_url = get_permalink( $form_id );
+
+ if ( ! is_string( $redirect_url ) ) {
+ return $url;
+ }
+
+ return $redirect_url;
+ }
+
+ /**
+ * Use the payment form's title as the page title.
+ *
+ * @since 4.5.0
+ *
+ * @param array<string, string> $title Title parts.
+ * @return array<string, string>
+ */
+ public function change_payment_page_title( $title ) {
+ if ( false === $this->form ) {
+ return $title;
+ }
+
+ /** @var string $form_title */
+ $form_title = get_post_meta(
+ $this->form->id,
+ '_company_name',
+ true
+ );
+
+ $title['title'] = $form_title;
+
+ return $title;
+ }
+
+ /**
+ * Outputs the payment page.
+ *
+ * @since 4.5.0
+ *
+ * @param int $form_id Payment forM ID.
+ * @return void
+ */
+ private function output( $form_id ) {
+ /** @var string $background_color */
+ $background_color = get_post_meta(
+ $form_id,
+ '_payment_page_background_color',
+ true
+ );
+
+ $darker_background_color = $this->adjust_color_brightness(
+ $background_color,
+ -20
+ );
+
+ $title_desc = get_post_meta(
+ $form_id,
+ '_payment_page_title_description',
+ true
+ );
+
+ $footer_text = get_post_meta(
+ $form_id,
+ '_payment_page_footer_text',
+ true
+ );
+
+ $powered_by = get_post_meta(
+ $form_id,
+ '_payment_page_powered_by',
+ true
+ );
+
+ $image = get_post_meta(
+ $form_id,
+ '_payment_page_image_url',
+ true
+ );
+
+ $title = get_post_meta(
+ $form_id,
+ '_company_name',
+ true
+ );
+
+ $desc = get_post_meta(
+ $form_id,
+ '_item_description',
+ true
+ );
+
+ $is_confirmation = ! empty(
+ Payment_Confirmation\get_confirmation_data()
+ );
+
+ include_once SIMPLE_PAY_DIR . '/views/payment-page-output.php'; // @phpstan-ignore-line
+ exit;
+ }
+
+ /**
+ * Unload CSS potentially interfering with Payment Pages.
+ *
+ * @since 4.5.0
+ *
+ * @return void
+ */
+ public function css_compatibility_mode() {
+ $enable_css_compatibility_mode = true;
+
+ /**
+ * Filters if "CSS Compatibility" mode should be active for Payment Pages.
+ *
+ * This removes all non-WP Simple Pay styles from the page.
+ *
+ * @since 4.5.0
+ *
+ * @param bool $enable_css_compatibility_mode Enable "CSS Compatibility" mode for payment pages.
+ */
+ $enable_css_compatibility_mode = apply_filters(
+ 'simpay_payment_page_css_compatibility_mode',
+ $enable_css_compatibility_mode
+ );
+
+ if ( false === $enable_css_compatibility_mode ) {
+ return;
+ }
+
+ $this->asset_compatibility_mode( 'css' );
+ }
+
+ /**
+ * Unload JS potentially interfering with Payment Pages.
+ *
+ * @since 4.5.0
+ *
+ * @return void
+ */
+ public function js_compatibility_mode() {
+ $enable_js_compatibility_mode = true;
+
+ /**
+ * Filters if "JS Compatibility" mode should be active for Payment Pages.
+ *
+ * This removes all non-WP Simple Pay styles from the page.
+ *
+ * @since 4.5.0
+ *
+ * @param bool $enable_js_compatibility_mode Enable "JS Compatibility" mode for payment pages.
+ */
+ $enable_js_compatibility_mode = apply_filters(
+ 'simpay_payment_page_js_compatibility_mode',
+ $enable_js_compatibility_mode
+ );
+
+ if ( false === $enable_js_compatibility_mode ) {
+ return;
+ }
+
+ $this->asset_compatibility_mode( 'js' );
+ }
+
+ /**
+ * Dequeues assets (CSS or JS) that are not a part of the plugin.
+ *
+ * @since 4.5.0
+ *
+ * @param string $asset_type Asset type. `css` or `js`.
+ * @return void
+ */
+ private function asset_compatibility_mode( $asset_type ) {
+ $assets = 'css' === $asset_type ? wp_styles() : wp_scripts();
+
+ if ( empty( $assets->queue ) ) {
+ return;
+ }
+
+ $simpay_payment_page_asset_handle_allowlist = array(
+ 'wp-',
+ 'simpay-',
+ 'sandhills',
+ );
+
+ /**
+ * Filters the list of asset handles that should be allowed on Payment Pages.
+ *
+ * @since 4.5.0
+ *
+ * @param array<string> $simpay_payment_page_asset_handle_allowlist List of asset handles that should be allowed.
+ */
+ $simpay_payment_page_asset_handle_allowlist = apply_filters(
+ 'simpay_payment_page_asset_handle_allowlist',
+ $simpay_payment_page_asset_handle_allowlist
+ );
+
+ $non_simpay_assets = array_filter(
+ $assets->queue,
+ function( $handle ) use ( $simpay_payment_page_asset_handle_allowlist ) {
+ $allowed = true;
+
+ foreach ( $simpay_payment_page_asset_handle_allowlist as $allowed_handle ) {
+ if ( false !== strpos( $handle, $allowed_handle ) ) {
+ $allowed = false;
+ }
+ }
+
+ return $allowed;
+ }
+ );
+
+ foreach ( $non_simpay_assets as $handle ) {
+ if ( 'css' === $asset_type ) {
+ wp_dequeue_style( $handle );
+ } else {
+ wp_dequeue_script( $handle );
+ }
+ }
+ }
+
+ /**
+ * Determines if Payment Page mode is enabled for a payment form ID.
+ *
+ * @since 4.5.0
+ *
+ * @param int $form_id Payment form ID.
+ * @return bool
+ */
+ private function is_payment_page_enabled( $form_id ) {
+ $enabled = get_post_meta(
+ $form_id,
+ '_enable_payment_page',
+ true
+ );
+
+ return 'yes' === $enabled;
+ }
+
+ /**
+ * Returns a darkened version of a hexidecimal code.
+ *
+ * @since 4.5.0
+ *
+ * @param string $color Hexidecimal code to darken.
+ * @param int $steps Number of steps to adjust.
+ * @return string
+ */
+ private function adjust_color_brightness( $color, $steps ) {
+ $steps = max( -255, min( 255, $steps ) );
+ $hex = str_replace( '#', '', $color );
+
+ if ( strlen( $hex ) === 3 ) {
+ $hex =
+ str_repeat( substr( $hex, 0, 1 ), 2 ) .
+ str_repeat( substr( $hex, 1, 1 ), 2 ) .
+ str_repeat( substr( $hex, 2, 1 ), 2 );
+ }
+
+ // Split into three parts: R, G and B.
+ $color_parts = str_split( $hex, 2 );
+ $return = '#';
+
+ foreach ( $color_parts as $color ) {
+ $color = hexdec( $color );
+ $color = (int) max( 0, min( 255, $color + $steps ) );
+ $return .= str_pad( dechex( $color ), 2, '0', STR_PAD_LEFT );
+ }
+
+ return $return;
+ }
+
+}
diff --git a/src/PaymentPage/PaymentPageServiceProvider.php b/src/PaymentPage/PaymentPageServiceProvider.php
new file mode 100644
index 00000000..78d2d625
--- /dev/null
+++ b/src/PaymentPage/PaymentPageServiceProvider.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Payment Page: Service provider
+ *
+ * @package SimplePay
+ * @subpackage Core
+ * @copyright Copyright (c) 2022, Sandhills Development, LLC
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @since 4.5.0
+ */
+
+namespace SimplePay\Core\PaymentPage;
+
+use SimplePay\Core\AbstractPluginServiceProvider;
+
+/**
+ * PaymentPageServiceProvider class.
+ *
+ * @since 4.5.0
+ */
+class PaymentPageServiceProvider extends AbstractPluginServiceProvider {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_services() {
+ return array();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_subscribers() {
+ return array(
+ 'payment-page-output',
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function register() {
+ $container = $this->getContainer();
+
+ $container->share(
+ 'payment-page-output',
+ PaymentPageOutput::class
+ )
+ ->withArgument( $container->get( 'event-manager' ) );
+ }
+
+}
diff --git a/src/Plugin.php b/src/Plugin.php
index 7ac01cf3..72abf23a 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -205,6 +205,7 @@ private function get_service_providers() {
new FormPreview\FormPreviewServiceProvider,
new Integration\IntegrationServiceProvider,
new License\LicenseServiceProvider,
+ new PaymentPage\PaymentPageServiceProvider,
new RestApi\RestApiServiceProvider,
new StripeConnect\StripeConnectServiceProvider,
new Transaction\TransactionServiceProvider,
diff --git a/src/StripeConnect/ApplicationFee.php b/src/StripeConnect/ApplicationFee.php
index 92bdb90d..17d1d9bc 100644
--- a/src/StripeConnect/ApplicationFee.php
+++ b/src/StripeConnect/ApplicationFee.php
@@ -109,7 +109,7 @@ public function maybe_show_application_fee( $message ) {
$message .= sprintf(
/* translators: %1$s Opening strong tag, do not translate. %2$s Closing strong tag, do not translate. %3$s Opening anchor tag, do not translate. %4$s Closing anchor tag, do not translate. */
__(
- '%1$sPay as you go pricing%2$s: 2%% fee per-transaction + Stripe fees. %3$sUpgrade to Pro%4$s for no added fees and priority support.',
+ '%1$sPay as you go pricing%2$s: 3%% fee per-transaction + Stripe fees. %3$sUpgrade to Pro%4$s for no added fees and priority support.',
'stripe'
),
'<strong>',
@@ -130,7 +130,7 @@ public function maybe_show_application_fee( $message ) {
$message .= sprintf(
/* translators: %1$s Opening strong tag, do not translate. %2$s Closing strong tag, do not translate. %3$s Opening anchor tag, do not translate. %4$s Closing anchor tag, do not translate. */
__(
- '%1$sPay as you go pricing%2$s: 2%% fee per-transaction + Stripe fees. %3$sActivate your license%4$s to remove additional fees and unlock powerful features.',
+ '%1$sPay as you go pricing%2$s: 3%% fee per-transaction + Stripe fees. %3$sActivate your license%4$s to remove additional fees and unlock powerful features.',
'stripe'
),
'<strong>',
@@ -148,7 +148,7 @@ public function maybe_show_application_fee( $message ) {
$message .= sprintf(
/* translators: %1$s Opening strong tag, do not translate. %2$s Closing strong tag, do not translate. %3$s Opening anchor tag, do not translate. %4$s Closing anchor tag, do not translate. */
__(
- '%1$sPay as you go pricing%2$s: 2%% fee per-transaction + Stripe fees. %3$sRenew your license%4$s to remove additional fees and unlock powerful features.',
+ '%1$sPay as you go pricing%2$s: 3%% fee per-transaction + Stripe fees. %3$sRenew your license%4$s to remove additional fees and unlock powerful features.',
'stripe'
),
'<strong>',
@@ -177,7 +177,7 @@ public function maybe_add_one_time_application_fee( $payment_intent_args ) {
}
$payment_intent_args['application_fee_amount'] = round(
- $payment_intent_args['amount'] * 0.02,
+ $payment_intent_args['amount'] * 0.03,
0
);
@@ -197,7 +197,7 @@ public function maybe_add_subscription_application_fee( $subscription_args ) {
return $subscription_args;
}
- $subscription_args['application_fee_percent'] = 2;
+ $subscription_args['application_fee_percent'] = 3;
return $subscription_args;
}
diff --git a/stripe-checkout.php b/stripe-checkout.php
index 00bb8dbc..125967cb 100644
--- a/stripe-checkout.php
+++ b/stripe-checkout.php
@@ -5,7 +5,7 @@
* Description: Add high conversion Stripe payment forms to your WordPress site in minutes.
* Author: WP Simple Pay
* Author URI: https://wpsimplepay.com
- * Version: 4.4.7.1
+ * Version: 4.5.0
* Text Domain: stripe
* Domain Path: /languages
*/
@@ -50,7 +50,7 @@
//
// Lite/Pro-specific.
//
- define( 'SIMPLE_PAY_VERSION', '4.4.7.1' );
+ define( 'SIMPLE_PAY_VERSION', '4.5.0' );
if ( ! defined( 'SIMPLE_PAY_PLUGIN_NAME' ) ) {
define( 'SIMPLE_PAY_PLUGIN_NAME', 'WP Simple Pay Lite' );
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 0e2717ac..888b754c 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit08c6010c3476ae9184e966bd98da33cc::getLoader();
+return ComposerAutoloaderInit274b67ee9371824c320bb5f21b2feecb::getLoader();
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 673094b6..9d82e6d7 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -6,12 +6,7 @@
$baseDir = dirname($vendorDir);
return array(
- 'Stripe\\' => array($vendorDir . '/stripe/stripe-php/lib'),
'SimplePay\\Vendor\\Stripe\\' => array($baseDir . '/lib/Stripe/lib'),
'SimplePay\\Vendor\\' => array($baseDir . '/lib'),
'SimplePay\\Core\\' => array($baseDir . '/src'),
- 'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
- 'League\\Container\\' => array($vendorDir . '/league/container/src'),
- 'Interop\\Container\\' => array($vendorDir . '/container-interop/container-interop/src/Interop/Container'),
- 'BerlinDB\\' => array($vendorDir . '/berlindb/core/src'),
);
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 47614912..e6c0542e 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit08c6010c3476ae9184e966bd98da33cc
+class ComposerAutoloaderInit274b67ee9371824c320bb5f21b2feecb
{
private static $loader;
@@ -22,15 +22,15 @@ public static function getLoader()
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit08c6010c3476ae9184e966bd98da33cc', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit274b67ee9371824c320bb5f21b2feecb', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInit08c6010c3476ae9184e966bd98da33cc', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit274b67ee9371824c320bb5f21b2feecb', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit08c6010c3476ae9184e966bd98da33cc::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit274b67ee9371824c320bb5f21b2feecb::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index a866d393..4f117add 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,39 +4,18 @@
namespace Composer\Autoload;
-class ComposerStaticInit08c6010c3476ae9184e966bd98da33cc
+class ComposerStaticInit274b67ee9371824c320bb5f21b2feecb
{
public static $prefixLengthsPsr4 = array (
'S' =>
array (
- 'Stripe\\' => 7,
'SimplePay\\Vendor\\Stripe\\' => 24,
'SimplePay\\Vendor\\' => 17,
'SimplePay\\Core\\' => 15,
),
- 'P' =>
- array (
- 'Psr\\Container\\' => 14,
- ),
- 'L' =>
- array (
- 'League\\Container\\' => 17,
- ),
- 'I' =>
- array (
- 'Interop\\Container\\' => 18,
- ),
- 'B' =>
- array (
- 'BerlinDB\\' => 9,
- ),
);
public static $prefixDirsPsr4 = array (
- 'Stripe\\' =>
- array (
- 0 => __DIR__ . '/..' . '/stripe/stripe-php/lib',
- ),
'SimplePay\\Vendor\\Stripe\\' =>
array (
0 => __DIR__ . '/../..' . '/lib/Stripe/lib',
@@ -49,22 +28,6 @@ class ComposerStaticInit08c6010c3476ae9184e966bd98da33cc
array (
0 => __DIR__ . '/../..' . '/src',
),
- 'Psr\\Container\\' =>
- array (
- 0 => __DIR__ . '/..' . '/psr/container/src',
- ),
- 'League\\Container\\' =>
- array (
- 0 => __DIR__ . '/..' . '/league/container/src',
- ),
- 'Interop\\Container\\' =>
- array (
- 0 => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container',
- ),
- 'BerlinDB\\' =>
- array (
- 0 => __DIR__ . '/..' . '/berlindb/core/src',
- ),
);
public static $classMap = array (
@@ -74,9 +37,9 @@ class ComposerStaticInit08c6010c3476ae9184e966bd98da33cc
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit08c6010c3476ae9184e966bd98da33cc::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit08c6010c3476ae9184e966bd98da33cc::$prefixDirsPsr4;
- $loader->classMap = ComposerStaticInit08c6010c3476ae9184e966bd98da33cc::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit274b67ee9371824c320bb5f21b2feecb::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit274b67ee9371824c320bb5f21b2feecb::$prefixDirsPsr4;
+ $loader->classMap = ComposerStaticInit274b67ee9371824c320bb5f21b2feecb::$classMap;
}, null, ClassLoader::class);
}
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index e838ef27..d8859d29 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -5,7 +5,7 @@
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '15ac55518e1e37aac2ff055debfa2851d3f58246',
+ 'reference' => 'f2de5005e75221eda2f7417c0ad7e67cc8722e16',
'name' => 'wpsimplepay/wp-simple-pay-pro-3',
'dev' => false,
),
@@ -88,7 +88,7 @@
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '15ac55518e1e37aac2ff055debfa2851d3f58246',
+ 'reference' => 'f2de5005e75221eda2f7417c0ad7e67cc8722e16',
'dev_requirement' => false,
),
),
diff --git a/views/admin-education-payment-form-instant-payouts-settings.php b/views/admin-education-payment-form-instant-payouts-settings.php
index 0c2ee479..55a60b36 100644
--- a/views/admin-education-payment-form-instant-payouts-settings.php
+++ b/views/admin-education-payment-form-instant-payouts-settings.php
@@ -16,7 +16,7 @@
?>
<div
- class="simpay-notice simpay-instant-payouts-notice"
+ class="simpay-notice simpay-form-settings-notice"
data-nonce="<?php echo esc_attr( wp_create_nonce( 'simpay-dismiss-notice-simpay-form-settings-instant-payouts-education' ) ); ?>"
data-id="simpay-form-settings-instant-payouts-education"
data-lifespan="<?php echo esc_attr( DAY_IN_SECONDS * 180 ); // @phpstan-ignore-line ?>"
diff --git a/views/admin-education-payment-form-payment-page-settings.php b/views/admin-education-payment-form-payment-page-settings.php
new file mode 100644
index 00000000..00320713
--- /dev/null
+++ b/views/admin-education-payment-form-payment-page-settings.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Admin: Payment form payment page education
+ *
+ * @package SimplePay
+ * @subpackage Core
+ * @copyright Copyright (c) 2022, Sandhills Development, LLC
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @since 4.5.0
+ *
+ * @var string $features_url URL to features page on website.
+ */
+
+use SimplePay\Core\Utils;
+?>
+
+<div
+ class="simpay-notice simpay-form-settings-notice"
+ data-nonce="<?php echo esc_attr( wp_create_nonce( 'simpay-dismiss-notice-simpay-form-settings-payment-page-education' ) ); ?>"
+ data-id="simpay-form-settings-payment-page-education"
+ data-lifespan="<?php echo esc_attr( YEAR_IN_SECONDS ); // @phpstan-ignore-line ?>"
+>
+ <strong style="display: flex; align-items: center;">
+ <svg style="width: 18px; height: 18px; margin-right: 5px;" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+ <path stroke-linecap="round" stroke-linejoin="round" stroke="#635aff" d="M13 7h8m0 0v8m0-8l-8 8-4-4-6 6" />
+ </svg>
+ <span><?php esc_html_e( 'Want to improve your form conversions?', 'stripe' ); ?></span>
+ </strong>
+
+ <p>
+ <?php
+ echo wp_kses(
+ sprintf(
+ /* translators: %1$s Opening <a> tag, do not translate. %2$s Closing </a> tag, do not translate. */
+ __(
+ '%1$sPayment Pages%2$s allow you to create completely custom “distraction-free” payment form landing pages to boost conversions (without writing any code).',
+ 'stripe'
+ ),
+ '<a href="' . esc_url( $features_url ) . '" target="_blank" rel="noopener noreferrer" class="simpay-external-link">',
+ Utils\get_external_link_markup() . '</a>'
+ ),
+ array(
+ 'a' => array(
+ 'href' => true,
+ 'rel' => true,
+ 'target' => true,
+ 'class' => true,
+ ),
+ 'span' => array(
+ 'class' => true,
+ ),
+ )
+ );
+ ?>
+ </p>
+
+ <button type="button" class="button button-link simpay-notice-dismiss">
+ ×
+ <span class="screen-reader-text">
+ <?php esc_html_e( 'Dismiss', 'stripe' ); ?>
+ </span>
+ </button>
+</div>
diff --git a/views/admin-form-preview-output.php b/views/admin-form-preview-output.php
index 2f374033..ff35e04c 100644
--- a/views/admin-form-preview-output.php
+++ b/views/admin-form-preview-output.php
@@ -25,6 +25,13 @@
);
?>
+
@@ -52,6 +59,7 @@
; // @phpstan-ignore-line ?>core/assets/images/wp-simple-pay-logo-white.svg){kind=logo}
+