'+e.message+"
'+e.message+"
'+e.data.message+"
'+s+"
'+s+"
'+e.data.message+"
'+s+"
'+s+"
'+edd_vars.test_email_save_changes+"
'+e.message+"
"+e.data+"
").addClass("notice notice-error")}))})),function e(){var n=document.getElementById("edd-paypal-commerce-connect-wrap");n&&t.post(ajaxurl,{action:"edd_paypal_commerce_get_account_info",_ajax_nonce:n.getAttribute("data-nonce")},(function(a){var d=""+eddPayPalConnectVars.defaultError+"
";a.success?(d=a.data.account_status,a.data.actions&&a.data.actions.length&&(d+=''+a.data.actions.join(" ")+"
"),a.data.disconnect_links&&a.data.disconnect_links.length&&(document.getElementById("edd-paypal-disconnect").innerHTML=a.data.disconnect_links.join(" "))):a.data&&a.data.message&&(d=a.data.message),n.innerHTML=d,n.classList.remove("notice-success","notice-warning","notice-error","loading");var o=a.success&&a.data.status?"notice-"+a.data.status:"notice-error";n.classList.add(o);var s,c=document.getElementById("edd-paypal-commerce-get-help");"success"===a.data.status?(c.classList.add("edd-hidden"),c.classList.remove("button","button-secondary")):(c.classList.remove("edd-hidden"),c.classList.add("button","button-secondary")),(s=document.querySelectorAll(".edd-paypal-connect-action"))&&s.length&&s.forEach((function(n){n.addEventListener("click",(function(n){n.preventDefault();var a=n.target;a.disabled=!0,a.classList.add("updating-message");var d=document.getElementById("edd-paypal-commerce-connect-wrap");d&&d.length&&d.remove(),t.post(ajaxurl,{action:a.dataset.action,_ajax_nonce:a.dataset.nonce}).done((function(){e()})).fail((function(e){console.log("Failure",e.data),a.disabled=!1,a.classList.remove("updating-message"),d.html(""+e.data+"
").addClass("edd-paypal-actions-error-wrap")}))}))}))}))}()}else{if(document.getElementById("edd-paypal-commerce-link")){var d=document.createElement("script");d.id="edd-paypal-commerce-onboarding",d.src="https://www.paypal.com/webapps/merchantboarding/js/lib/lightbox/partner.js",document.body.appendChild(d),setTimeout((function(){"undefined"!==window.PAYPAL.apps.Signup&&window.PAYPAL.apps.Signup.render()}),1e3)}window.eddPayPalOnboardingCallback=function(t,n){var a=document.getElementById("edd-paypal-commerce-link"),d=document.getElementById("edd-paypal-commerce-errors");e.post(ajaxurl,{action:"edd_paypal_commerce_get_access_token",auth_code:t,share_id:n,_ajax_nonce:a.dataset.nonce}).done((function(){a.classList.add("disabled","updating-message"),a.disabled=!0})).fail((function(e){d.innerHTML=""+e.data+"
",d.classList.add("notice","notice-error");var t=document.getElementById("edd-paypal-commerce-get-help");t.classList.remove("edd-hidden"),t.classList.add("button","button-secondary")}))}}}}))}).call(this,n(1))}}); \ No newline at end of file +!function(e){var t={};function n(a){if(t[a])return t[a].exports;var d=t[a]={i:a,l:!1,exports:{}};return e[a].call(d.exports,d,d.exports,n),d.l=!0,d.exports}n.m=e,n.c=t,n.d=function(e,t,a){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:a})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var a=Object.create(null);if(n.r(a),Object.defineProperty(a,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var d in e)n.d(a,d,function(t){return e[t]}.bind(null,d));return a},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=318)}({0:function(e,t){e.exports=jQuery},291:function(e,t,n){"use strict";(function(e){n.d(t,"a",(function(){return a}));var a=function(){var t={action:"edd_recapture_remote_install",nonce:document.getElementById("edd-recapture-connect-nonce").value};e.post(ajaxurl,t,(function(e){!e.success&&e.data&&confirm(e.data.error)?location.reload():window.location.href="https://recapture.io/register"}))}}).call(this,n(0))},318:function(e,t,n){"use strict";n.r(t),function(e,t){var a=n(291),d=(n(319),{init:function(){this.general(),this.misc(),this.gateways(),this.emails()},general:function(){var t,n=e(".edd-color-picker");n.length&&n.wpColorPicker(),window.formfield="",e(document.body).on("click",".edd_settings_upload_button",(function(n){n.preventDefault();var a=e(this);window.formfield=e(a.data("input")),t||((t=wp.media.frames.file_frame=wp.media({title:a.data("uploader_title"),library:{type:"image"},button:{text:a.data("uploader_button_text")},multiple:!1})).on("menu:render:default",(function(e){e.unset("library-separator"),e.unset("gallery"),e.unset("featured-image"),e.unset("embed"),e.unset("playlist"),e.unset("video-playlist"),e.set({})})),t.on("select",(function(){t.state().get("selection").each((function(e,t){e=e.toJSON(),window.formfield.val(e.url)}))}))),t.open()})),window.formfield=""},misc:function(){var t=e('select[name="edd_settings[download_method]"]'),n=t.parent().parent().next(),a=e('input[name="edd_settings[allow_tracking]"]');"direct"===t.val()&&(n.css("opacity","0.4"),n.find("input").prop("checked",!1).prop("disabled",!0)),t.on("change",(function(){"direct"===e(this).val()?(n.css("opacity","0.4"),n.find("input").prop("checked",!1).prop("disabled",!0)):(n.find("input").prop("disabled",!1),n.css("opacity","1"))})),a.on("change",(function(){e(".allow_tracking.edd-heart").toggleClass("edd-hidden")}))},gateways:function(){e('#edd-payment-gateways input[type="checkbox"]').on("change",(function(){var t=e(this).data("gateway-key"),n=e("#edd_settings\\[default_gateway\\]"),a=n.find('option[value="'+t+'"]');a.prop("disabled",(function(e,t){return!t})),a.prop("selected")&&a.prop("selected",!1),n.trigger("chosen:updated")}))},emails:function(){e("#edd-recapture-connect").on("click",(function(t){t.preventDefault(),e(this).html(edd_vars.wait+' '),document.body.style.cursor="wait",Object(a.a)()}));var t=e('select[name="edd_settings[email_summary_recipient]"]'),n=t.val(),d=e('textarea[name="edd_settings[email_summary_custom_recipients]"]').parents("tr"),o=e("#edd-send-test-summary-save-changes-notice"),s=e("#edd-send-test-summary"),c=e("#edd-send-test-summary-notice");t.on("change",(function(){d.toggleClass("hidden"),s.removeClass("hidden updated-message"),c.empty(),o.empty(),n!==t.val()&&(s.addClass("hidden"),o.html(''+edd_vars.test_email_save_changes+"
'+e.message+"
"+e.data+"
").addClass("notice notice-error")}))})),function e(){var n=document.getElementById("edd-paypal-commerce-connect-wrap");n&&t.post(ajaxurl,{action:"edd_paypal_commerce_get_account_info",_ajax_nonce:n.getAttribute("data-nonce")},(function(a){var d=""+eddPayPalConnectVars.defaultError+"
";a.success?(d=a.data.account_status,a.data.actions&&a.data.actions.length&&(d+=''+a.data.actions.join(" ")+"
"),a.data.disconnect_links&&a.data.disconnect_links.length&&(document.getElementById("edd-paypal-disconnect").innerHTML=a.data.disconnect_links.join(" "))):a.data&&a.data.message&&(d=a.data.message),n.innerHTML=d,n.classList.remove("notice-success","notice-warning","notice-error","loading");var o=a.success&&a.data.status?"notice-"+a.data.status:"notice-error";n.classList.add(o);var s,c=document.getElementById("edd-paypal-commerce-get-help");"success"===a.data.status?(c.classList.add("edd-hidden"),c.classList.remove("button","button-secondary")):(c.classList.remove("edd-hidden"),c.classList.add("button","button-secondary")),(s=document.querySelectorAll(".edd-paypal-connect-action"))&&s.length&&s.forEach((function(n){n.addEventListener("click",(function(n){n.preventDefault();var a=n.target;a.disabled=!0,a.classList.add("updating-message");var d=document.getElementById("edd-paypal-commerce-connect-wrap");d&&d.length&&d.remove(),t.post(ajaxurl,{action:a.dataset.action,_ajax_nonce:a.dataset.nonce}).done((function(){e()})).fail((function(e){console.log("Failure",e.data),a.disabled=!1,a.classList.remove("updating-message"),d.html(""+e.data+"
").addClass("edd-paypal-actions-error-wrap")}))}))}))}))}()}else{if(document.getElementById("edd-paypal-commerce-link")){var d=document.createElement("script");d.id="edd-paypal-commerce-onboarding",d.src="https://www.paypal.com/webapps/merchantboarding/js/lib/lightbox/partner.js",document.body.appendChild(d),setTimeout((function(){"undefined"!==window.PAYPAL.apps.Signup&&window.PAYPAL.apps.Signup.render()}),1e3)}window.eddPayPalOnboardingCallback=function(t,n){var a=document.getElementById("edd-paypal-commerce-link"),d=document.getElementById("edd-paypal-commerce-errors");e.post(ajaxurl,{action:"edd_paypal_commerce_get_access_token",auth_code:t,share_id:n,_ajax_nonce:a.dataset.nonce}).done((function(){a.classList.add("disabled","updating-message"),a.disabled=!0})).fail((function(e){d.innerHTML=""+e.data+"
",d.classList.add("notice","notice-error");var t=document.getElementById("edd-paypal-commerce-get-help");t.classList.remove("edd-hidden"),t.classList.add("button","button-secondary")}))}}}}))}).call(this,n(0))}}); \ No newline at end of file diff --git a/assets/js/edd-admin-tax-rates.js b/assets/js/edd-admin-tax-rates.js index 61bb29c276b..be71d9ba165 100644 --- a/assets/js/edd-admin-tax-rates.js +++ b/assets/js/edd-admin-tax-rates.js @@ -1 +1 @@ -!function(e){var t={};function n(o){if(t[o])return t[o].exports;var i=t[o]={i:o,l:!1,exports:{}};return e[o].call(i.exports,i,i.exports,n),i.l=!0,i.exports}n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var i in e)n.d(o,i,function(t){return e[t]}.bind(null,i));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=368)}({1:function(e,t){e.exports=jQuery},100:function(e,t,n){"use strict";var o=Backbone.Model.extend({defaults:{id:"",country:"",region:"",global:!0,amount:0,status:"active",unsaved:!1,selected:!1},formattedAmount:function(){var e=0;return this.get("amount")&&(e=parseFloat(this.get("amount")).toFixed(2)),"".concat(e,"%")}});t.a=o},12:function(e,t,n){"use strict";(function(e){n.d(t,"a",(function(){return o}));var o=function(t){e(t)}}).call(this,n(1))},13:function(e,t,n){var o=n(4).default;e.exports=function(e,t){if("object"!=o(e)||!e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var i=n.call(e,t||"default");if("object"!=o(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)},e.exports.__esModule=!0,e.exports.default=e.exports},20:function(e,t,n){"use strict";(function(e){n.d(t,"a",(function(){return s}));var o=n(3),i=n.n(o);function a(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}return n}function r(e){for(var t=1;t'+i+"
'+a+"
'+i+"
'+a+"
'+edd_vars.unsupported_browser+"
'+n.data.error+"
'+t.data.error+"
'+t.data.message+"
'+edd_vars.unsupported_browser+"
'+n.data.error+"
'+t.data.error+"
'+t.data.message+"
'+edd_vars.batch_export_no_class+"
'+edd_vars.batch_export_no_reqs+"
'+edd_vars.batch_export_no_class+"
'+edd_vars.batch_export_no_reqs+"
"+t+"
").removeClass("edd-hidden"),d.inProgress=!1,r.find("input").prop("disabled",!1),r.find("button").prop("disabled",!1).addClass("button-primary").removeClass("button-secondary disabled updating-message")},markUpgradeInProgress:function(a){var d=e("#edd-v3-migration-"+a);if(d.length){var t=d.find(".dashicons");t.length&&t.removeClass("dashicons-minus").addClass("dashicons-update"),d.find(".edd-migration-percentage").removeClass("edd-hidden")}},updateUpgradePercentage:function(a,d){var t=e("#edd-v3-migration-"+a);t.length&&t.find(".edd-migration-percentage-value").text(d)},markUpgradeComplete:function(a){var d=e("#edd-v3-migration-"+a);if(d.length){d.addClass("edd-upgrade-complete");var t=d.find(".dashicons");t.length&&t.removeClass("dashicons-minus dashicons-update").addClass("dashicons-yes");var r=d.find(".edd-migration-status .screen-reader-text");r.length&&r.text(edd_admin_upgrade_vars.migration_complete),d.find(".edd-migration-percentage-value").text(100)}},showLegacyDataRemoval:function(){e("#edd-v3-migration-button").removeClass("updating-message"),e("#edd-v3-migration-complete").removeClass("edd-hidden");var a=e("#edd-v3-remove-legacy-data");a.length&&a.removeClass("edd-hidden")},legacyDataRemovalComplete:function(){var a=e("#edd-v3-remove-legacy-data");a.length&&(a.find("form").addClass("edd-hidden"),a.find("#edd-v3-legacy-data-removal-complete").removeClass("edd-hidden"))},stopAllSpinners:function(){}};a(document).ready((function(e){d.init()}))}).call(this,d(1),d(1))}}); \ No newline at end of file +!function(e){var a={};function d(t){if(a[t])return a[t].exports;var r=a[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,d),r.l=!0,r.exports}d.m=e,d.c=a,d.d=function(e,a,t){d.o(e,a)||Object.defineProperty(e,a,{enumerable:!0,get:t})},d.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},d.t=function(e,a){if(1&a&&(e=d(e)),8&a)return e;if(4&a&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(d.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&a&&"string"!=typeof e)for(var r in e)d.d(t,r,function(a){return e[a]}.bind(null,r));return t},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="",d(d.s=321)}({0:function(e,a){e.exports=jQuery},321:function(e,a,d){"use strict";d.r(a),d(322)},322:function(e,a,d){(function(e,a){var d={inProgress:!1,init:function(){e(".edd-v3-migration-confirmation").on("change",(function(a){var d=e(this).closest(".edd-v3-migration").find("button");a.target.checked?d.removeClass("disabled").prop("disabled",!1):d.addClass("disabled").prop("disabled",!0)})),e(".edd-v3-migration").on("submit",(function(a){if(a.preventDefault(),!d.inProgress){d.inProgress=!0;var t=e(this),r=t.find('input[name="upgrade_key"]'),n=!1;if(r.length&&r.val()&&(n=r.val()),t.find("button").removeClass("button-primary").addClass("button-secondary disabled updating-message").prop("disabled",!0),t.find("input").prop("disabled",!0),"edd-v3-migration"===t.attr("id")){e("#edd-migration-progress").removeClass("edd-hidden");var o=e("#edd-migration-progress li:not(.edd-upgrade-complete)");o.length&&!n&&(n=o.data("upgrade"))}d.processStep(n,1,t.find('input[name="_wpnonce"]').val())}}))},processStep:function(a,t,r){var n={action:"edd_process_v3_upgrade",_ajax_nonce:r,upgrade_key:a,step:t};d.clearErrors(),a&&d.markUpgradeInProgress(a),e.ajax({type:"POST",data:n,url:ajaxurl,success:function(e){if(e.success){if(e.data.upgrade_completed){if(d.markUpgradeComplete(e.data.upgrade_processed),"v30_legacy_data_removed"===e.data.upgrade_processed)return void d.legacyDataRemovalComplete()}else e.data.percentage&&d.updateUpgradePercentage(e.data.upgrade_processed,e.data.percentage);e.data.next_upgrade&&"v30_legacy_data_removed"===e.data.next_upgrade&&"v30_legacy_data_removed"!==e.data.upgrade_processed?(d.inProgress=!1,d.showLegacyDataRemoval()):e.data.next_upgrade?d.processStep(e.data.next_upgrade,e.data.next_step,e.data.nonce):(d.inProgress=!1,d.stopAllSpinners())}else d.showError(a,e.data)}}).fail((function(e){}))},clearErrors:function(){e(".edd-v3-migration-error").addClass("edd-hidden").html("")},showError:function(a,t){var r=e("#edd-v3-migration");"v30_legacy_data_removed"===a&&(r=e("#edd-v3-remove-legacy-data")),r.find(".edd-v3-migration-error").html(""+t+"
").removeClass("edd-hidden"),d.inProgress=!1,r.find("input").prop("disabled",!1),r.find("button").prop("disabled",!1).addClass("button-primary").removeClass("button-secondary disabled updating-message")},markUpgradeInProgress:function(a){var d=e("#edd-v3-migration-"+a);if(d.length){var t=d.find(".dashicons");t.length&&t.removeClass("dashicons-minus").addClass("dashicons-update"),d.find(".edd-migration-percentage").removeClass("edd-hidden")}},updateUpgradePercentage:function(a,d){var t=e("#edd-v3-migration-"+a);t.length&&t.find(".edd-migration-percentage-value").text(d)},markUpgradeComplete:function(a){var d=e("#edd-v3-migration-"+a);if(d.length){d.addClass("edd-upgrade-complete");var t=d.find(".dashicons");t.length&&t.removeClass("dashicons-minus dashicons-update").addClass("dashicons-yes");var r=d.find(".edd-migration-status .screen-reader-text");r.length&&r.text(edd_admin_upgrade_vars.migration_complete),d.find(".edd-migration-percentage-value").text(100)}},showLegacyDataRemoval:function(){e("#edd-v3-migration-button").removeClass("updating-message"),e("#edd-v3-migration-complete").removeClass("edd-hidden");var a=e("#edd-v3-remove-legacy-data");a.length&&a.removeClass("edd-hidden")},legacyDataRemovalComplete:function(){var a=e("#edd-v3-remove-legacy-data");a.length&&(a.find("form").addClass("edd-hidden"),a.find("#edd-v3-legacy-data-removal-complete").removeClass("edd-hidden"))},stopAllSpinners:function(){}};a(document).ready((function(e){d.init()}))}).call(this,d(0),d(0))}}); \ No newline at end of file diff --git a/assets/js/edd-admin.js b/assets/js/edd-admin.js index 7f5638e6f56..93068f008f1 100644 --- a/assets/js/edd-admin.js +++ b/assets/js/edd-admin.js @@ -1 +1 @@ -!function(e){var t={};function n(o){if(t[o])return t[o].exports;var a=t[o]={i:o,l:!1,exports:{}};return e[o].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var a in e)n.d(o,a,function(t){return e[t]}.bind(null,a));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=325)}({1:function(e,t){e.exports=jQuery},12:function(e,t,n){"use strict";(function(e){n.d(t,"a",(function(){return o}));var o=function(t){e(t)}}).call(this,n(1))},13:function(e,t,n){var o=n(4).default;e.exports=function(e,t){if("object"!=o(e)||!e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var a=n.call(e,t||"default");if("object"!=o(a))return a;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)},e.exports.__esModule=!0,e.exports.default=e.exports},20:function(e,t,n){"use strict";(function(e){n.d(t,"a",(function(){return c}));var o=n(3),a=n.n(o);function i(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}return n}function r(e){for(var t=1;t' . $this->esc_notice( $r['message'] ) . '
'; + $message = '' . $this->esc_notice( $r['message'] ) . '
'; } elseif ( is_array( $r['message'] ) ) { - $message = '' . implode( '
', array_map( array( $this, 'esc_notice' ), $r['message'] ) ) . '
'; + $message = '' . implode( '
', array_map( array( $this, 'esc_notice' ), $r['message'] ) ) . '
'; - // Messages as objects + // Messages as objects. } elseif ( is_wp_error( $r['message'] ) ) { $default_class = 'is-error'; $errors = $r['message']->get_error_messages(); @@ -97,27 +103,27 @@ public function add_notice( $args = array() ) { break; } - // Message is an unknown format, so bail + // Message is an unknown format, so bail. } else { return false; } - // CSS Classes + // CSS Classes. $classes = array( $default_class ); if ( ! empty( $r['class'] ) ) { $classes = explode( ' ', $r['class'] ); } - // Add dismissible class + // Add dismissible class. if ( ! empty( $r['is_dismissible'] ) ) { array_push( $classes, 'is-dismissible' ); } - // Assemble the message + // Assemble the message. $message = '' . $upload_directory . '' ),
- __( 'To protect them, you must add this NGINX redirect rule.', 'easy-digital-downloads' ),
- /* translators: %s: Dismiss notice URL */
- sprintf( __( 'If you have already done this, or it does not apply to your site, you may permenently %s.', 'easy-digital-downloads' ), '' . __( 'dismiss this notice', 'easy-digital-downloads' ) . '' )
- )
- ) );
+ $this->add_notice(
+ array(
+ 'id' => 'edd-nginx',
+ 'class' => 'error',
+ 'is_dismissible' => false,
+ 'message' => array(
+ /* translators: %s: Uploads directory */
+ sprintf( __( 'The files in %s are not currently protected.', 'easy-digital-downloads' ), '' . $upload_directory . '' ),
+ __( 'To protect them, you must add this NGINX redirect rule.', 'easy-digital-downloads' ),
+ sprintf(
+ wp_kses(
+ /* translators: %s: Dismiss notice URL */
+ __( 'If you have already done this, or it does not apply to your site, you may permanently dismiss this notice.', 'easy-digital-downloads' ),
+ array(
+ 'a' => array(
+ 'href' => array(),
+ ),
+ )
+ ),
+ $dismiss_notice_url
+ ),
+ ),
+ ),
+ );
}
- // Running Apache
+ // Running Apache.
if ( ! empty( $GLOBALS['is_apache'] ) && ! edd_htaccess_exists() && ! get_user_meta( get_current_user_id(), '_edd_htaccess_missing_dismissed', true ) ) {
- $dismiss_notice_url = wp_nonce_url( add_query_arg( array(
- 'edd_action' => 'dismiss_notices',
- 'edd_notice' => 'htaccess_missing'
- ) ), 'edd_notice_nonce' );
+ $dismiss_notice_url = wp_nonce_url(
+ add_query_arg(
+ array(
+ 'edd_action' => 'dismiss_notices',
+ 'edd_notice' => 'htaccess_missing',
+ )
+ ),
+ 'edd_notice_nonce'
+ );
- $this->add_notice( array(
- 'id' => 'edd-apache',
- 'class' => 'error',
- 'is_dismissible' => false,
- 'message' => array(
- sprintf( __( 'The .htaccess file is missing from: %s', 'easy-digital-downloads' ), '' . $upload_directory . '' ),
- sprintf( __( 'First, please resave the Misc settings tab a few times. If this warning continues to appear, create a file called ".htaccess" in the %s directory, and copy the following into it:', 'easy-digital-downloads' ), '' . $upload_directory . '' ),
- sprintf( __( 'If you have already done this, or it does not apply to your site, you may permenently %s.', 'easy-digital-downloads' ), '' . __( 'dismiss this notice', 'easy-digital-downloads' ) . '' ),
- '' . edd_get_htaccess_rules() . '' + $this->add_notice( + array( + 'id' => 'edd-apache', + 'class' => 'error', + 'is_dismissible' => false, + 'message' => array( + /* translators: %s: Uploads directory */ + sprintf( __( 'The .htaccess file is missing from: %s', 'easy-digital-downloads' ), '' . $upload_directory . '' ), + /* translators: %s: Uploads directory */ + sprintf( __( 'First, please re-save the Misc settings tab a few times. If this warning continues to appear, create a file called ".htaccess" in the %s directory, and copy the following into it:', 'easy-digital-downloads' ), '' . $upload_directory . '' ), + /* translators: %s: Notice Dismissal URL */ + sprintf( __( 'If you have already done this, or it does not apply to your site, you may permanently %s.', 'easy-digital-downloads' ), '' . __( 'dismiss this notice', 'easy-digital-downloads' ) . '' ), + '
' . edd_get_htaccess_rules() . '', + ), ) - ) ); + ); } } @@ -364,19 +409,28 @@ private function add_system_notices() { */ private function add_data_notices() { - // Recount earnings + // Recount earnings. if ( class_exists( 'EDD_Recount_Earnings' ) ) { - $this->add_notice( array( - 'id' => 'edd-recount-earnings', - 'class' => 'error', - 'is_dismissible' => false, - 'message' => sprintf( - /* translators: 1. link to the recount tool; 2. link to the plugins screen. */ - __( 'Easy Digital Downloads 2.5 contains a built in recount tool. Please deactivate the Easy Digital Downloads - Recount Earnings plugin', 'easy-digital-downloads' ), - esc_url( edd_get_admin_url( array( 'page' => 'edd-tools', 'tab' => 'general' ) ) ), - esc_url( admin_url( 'plugins.php' ) ) + $this->add_notice( + array( + 'id' => 'edd-recount-earnings', + 'class' => 'error', + 'is_dismissible' => false, + 'message' => sprintf( + /* translators: 1: link to the recount tool, 2: link to the plugins screen. */ + __( 'Easy Digital Downloads 2.5 contains a built in recount tool. Please deactivate the Easy Digital Downloads - Recount Earnings plugin', 'easy-digital-downloads' ), + esc_url( + edd_get_admin_url( + array( + 'page' => 'edd-tools', + 'tab' => 'general', + ) + ) + ), + esc_url( admin_url( 'plugins.php' ) ) + ), ) - ) ); + ); } } @@ -398,24 +452,27 @@ private function add_tax_rate_notice() { return; } - // URL to fix this - $url = edd_get_admin_url( array( - 'page' => 'edd-settings', - 'tab' => 'taxes', - 'section' => 'rates' - ) ); + // URL to fix this. + $url = edd_get_admin_url( + array( + 'page' => 'edd-settings', + 'tab' => 'taxes', + 'section' => 'rates', + ) + ); - // Link + // Link. $link = '' . __( 'Review Tax Rates', 'easy-digital-downloads' ) . ''; - // Add the notice - $this->add_notice( array( - 'id' => 'edd-default-tax-rate', - 'class' => 'error', - /* translators: Link to review existing tax rates. */ - 'message' => '' . __( 'A default tax rate was detected.', 'easy-digital-downloads' ) . '
' . __( 'This setting is no longer used in this version of Easy Digital Downloads. Please confirm your regional tax rates are properly configured and update tax settings to remove this notice.', 'easy-digital-downloads' ) . '
' . $link, - 'is_dismissible' => false - ) ); + // Add the notice. + $this->add_notice( + array( + 'id' => 'edd-default-tax-rate', + 'class' => 'error', + 'message' => '' . __( 'A default tax rate was detected.', 'easy-digital-downloads' ) . '
' . __( 'This setting is no longer used in this version of Easy Digital Downloads. Please confirm your regional tax rates are properly configured and update tax settings to remove this notice.', 'easy-digital-downloads' ) . '
' . $link,
+ 'is_dismissible' => false,
+ )
+ );
}
/**
@@ -425,17 +482,18 @@ private function add_tax_rate_notice() {
*/
private function add_settings_notices() {
- // Settings area
- if ( empty( $_GET['page'] ) || ( 'edd-settings' !== $_GET['page'] ) ) {
+ // Settings area.
+ $page = filter_input( INPUT_GET, 'page', FILTER_SANITIZE_SPECIAL_CHARS );
+ if ( ! in_array( $page, array( 'edd-settings', 'edd-emails' ), true ) ) {
return;
}
- // Settings updated
+ // Settings updated.
if ( ! empty( $_GET['settings-updated'] ) ) {
$this->add_notice(
array(
'id' => 'edd-notices',
- 'message' => __( 'Settings updated.', 'easy-digital-downloads' )
+ 'message' => __( 'Settings updated.', 'easy-digital-downloads' ),
)
);
}
@@ -502,7 +560,7 @@ private function add_stripe_notice() {
'id' => 'edd-stripe-outdated',
'class' => 'notice-warning',
'message' => sprintf(
- // translators: 1. opening link tag; 2. opening link tag; 3. closing link tag.
+ /* translators: 1: opening link tag, 2: opening link tag, 3: closing link tag. */
__( 'You are running an outdated version of the Easy Digital Downloads — Stripe Pro Payment Gateway. You may need to log into %1$syour account%3$s to download the latest version and %2$smanually upgrade%3$s it.', 'easy-digital-downloads' ),
'',
'',
@@ -536,7 +594,7 @@ private function add_paypal_sync_notice() {
'id' => 'edd-paypal-webhook-sync',
'class' => 'updated',
'message' => sprintf(
- /* translators: %1$s: Opening anchor tag; %2$s: Closing anchor tag. */
+ /* translators: 1: Opening anchor tag; %2$s: Closing anchor tag. */
__( 'New webhooks have been registered for PayPal Commerce, but we were unable to update them automatically. Please %1$ssync your webhooks manually%2$s.', 'easy-digital-downloads' ),
'',
''
@@ -551,196 +609,225 @@ private function add_paypal_sync_notice() {
*
* @since 3.0
*
- * @param string $notice
+ * @param string $notice The notice key.
*/
private function add_user_action_notices( $notice = '' ) {
- // Sanitize notice key
+ // Sanitize notice key.
$notice = sanitize_key( $notice );
- // Bail if notice is empty
+ // Bail if notice is empty.
if ( empty( $notice ) ) {
return;
}
- // Shop discounts errors
+ // Shop discounts errors.
if ( current_user_can( 'manage_shop_discounts' ) ) {
switch ( $notice ) {
- case 'discount_added' :
- $this->add_notice( array(
- 'id' => 'edd-discount-added',
- 'message' => __( 'Discount code added.', 'easy-digital-downloads' )
- ) );
- break;
- case 'discount_add_failed' :
- $this->add_notice( array(
- 'id' => 'edd-discount-add-fail',
- 'message' => __( 'There was a problem adding that discount code, please try again.', 'easy-digital-downloads' ),
- 'class' => 'error'
- ) );
- break;
- case 'discount_exists' :
- $this->add_notice( array(
- 'id' => 'edd-discount-exists',
- 'message' => __( 'A discount with that code already exists, please use a different code.', 'easy-digital-downloads' ),
- 'class' => 'error'
- ) );
- break;
- case 'discount_updated' :
- $this->add_notice( array(
- 'id' => 'edd-discount-updated',
- 'message' => __( 'Discount code updated.', 'easy-digital-downloads' )
- ) );
- break;
- case 'discount_not_changed' :
- $this->add_notice( array(
- 'id' => 'edd-discount-not-changed',
- 'message' => __( 'No changes were made to that discount code.', 'easy-digital-downloads' )
- ) );
- break;
- case 'discount_update_failed' :
- $this->add_notice( array(
- 'id' => 'edd-discount-updated-fail',
- 'message' => __( 'There was a problem updating that discount code, please try again.', 'easy-digital-downloads' ),
- 'class' => 'error'
- ) );
- break;
- case 'discount_validation_failed' :
- $this->add_notice( array(
- 'id' => 'edd-discount-validation-fail',
- 'message' => __( 'The discount code could not be added because one or more of the required fields was empty, please try again.', 'easy-digital-downloads' ),
- 'class' => 'error'
- ) );
+ case 'discount_added':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-added',
+ 'message' => __( 'Discount code added.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'discount_add_failed':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-add-fail',
+ 'message' => __( 'There was a problem adding that discount code, please try again.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
+ break;
+ case 'discount_exists':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-exists',
+ 'message' => __( 'A discount with that code already exists, please use a different code.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
+ break;
+ case 'discount_updated':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-updated',
+ 'message' => __( 'Discount code updated.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'discount_not_changed':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-not-changed',
+ 'message' => __( 'No changes were made to that discount code.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'discount_update_failed':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-updated-fail',
+ 'message' => __( 'There was a problem updating that discount code, please try again.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
+ break;
+ case 'discount_validation_failed':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-validation-fail',
+ 'message' => __( 'The discount code could not be added because one or more of the required fields was empty, please try again.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
break;
case 'discount_invalid_code':
- $this->add_notice( array(
- 'id' => 'edd-discount-invalid-code',
- 'message' => __( 'The discount code entered is invalid; only alphanumeric characters are allowed, please try again.', 'easy-digital-downloads' ),
- 'class' => 'error'
- ) );
- break;
- case 'discount_invalid_amount' :
- $this->add_notice( array(
- 'id' => 'edd-discount-invalid-amount',
- 'message' => __( 'The discount amount must be a valid percentage or numeric flat amount. Please try again.', 'easy-digital-downloads' ),
- 'class' => 'error'
- ) );
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-invalid-code',
+ 'message' => __( 'The discount code entered is invalid; only alphanumeric characters are allowed, please try again.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
+ break;
+ case 'discount_invalid_amount':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-invalid-amount',
+ 'message' => __( 'The discount amount must be a valid percentage or numeric flat amount. Please try again.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
break;
case 'discount_deleted':
- $this->add_notice( array(
- 'id' => 'edd-discount-deleted',
- 'message' => __( 'Discount code deleted.', 'easy-digital-downloads' )
- ) );
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-deleted',
+ 'message' => __( 'Discount code deleted.', 'easy-digital-downloads' ),
+ )
+ );
break;
case 'discount_delete_failed':
- $this->add_notice( array(
- 'id' => 'edd-discount-delete-fail',
- 'message' => __( 'There was a problem deleting that discount code, please try again.', 'easy-digital-downloads' ),
- 'class' => 'error'
- ) );
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-delete-fail',
+ 'message' => __( 'There was a problem deleting that discount code, please try again.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
break;
case 'discount_activated':
- $this->add_notice( array(
- 'id' => 'edd-discount-activated',
- 'message' => __( 'Discount code activated.', 'easy-digital-downloads' )
- ) );
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-activated',
+ 'message' => __( 'Discount code activated.', 'easy-digital-downloads' ),
+ )
+ );
break;
case 'discount_activation_failed':
- $this->add_notice( array(
- 'id' => 'edd-discount-activation-fail',
- 'message' => __( 'There was a problem activating that discount code, please try again.', 'easy-digital-downloads' ),
- 'class' => 'error'
- ) );
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-activation-fail',
+ 'message' => __( 'There was a problem activating that discount code, please try again.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
break;
case 'discount_deactivated':
- $this->add_notice( array(
- 'id' => 'edd-discount-deactivated',
- 'message' => __( 'Discount code deactivated.', 'easy-digital-downloads' )
- ) );
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-deactivated',
+ 'message' => __( 'Discount code deactivated.', 'easy-digital-downloads' ),
+ )
+ );
break;
case 'discount_deactivation_failed':
- $this->add_notice( array(
- 'id' => 'edd-discount-deactivation-fail',
- 'message' => __( 'There was a problem deactivating that discount code, please try again.', 'easy-digital-downloads' ),
- 'class' => 'error'
- ) );
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-deactivation-fail',
+ 'message' => __( 'There was a problem deactivating that discount code, please try again.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
break;
case 'discount_archived':
- $this->add_notice( array(
- 'id' => 'edd-discount-archived',
- 'message' => __( 'Discount code archived.', 'easy-digital-downloads' )
- ) );
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-archived',
+ 'message' => __( 'Discount code archived.', 'easy-digital-downloads' ),
+ )
+ );
break;
case 'discount_archived_failed':
- $this->add_notice( array(
- 'id' => 'edd-discount-archived-fail',
- 'message' => __( 'There was a problem archiving that discount code, please try again.', 'easy-digital-downloads' ),
- 'class' => 'error'
- ) );
+ $this->add_notice(
+ array(
+ 'id' => 'edd-discount-archived-fail',
+ 'message' => __( 'There was a problem archiving that discount code, please try again.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
break;
}
}
- // Shop reports errors
+ // Shop reports errors.
if ( current_user_can( 'view_shop_reports' ) ) {
- switch( $notice ) {
- case 'refreshed-reports' :
- $this->add_notice( array(
- 'id' => 'edd-refreshed-reports',
- 'message' => __( 'The reports have been refreshed.', 'easy-digital-downloads' )
- ) );
+ switch ( $notice ) {
+ case 'refreshed-reports':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-refreshed-reports',
+ 'message' => __( 'The reports have been refreshed.', 'easy-digital-downloads' ),
+ )
+ );
break;
}
}
- // Shop settings errors
+ // Shop settings errors.
if ( current_user_can( 'manage_shop_settings' ) ) {
- switch( $notice ) {
- case 'settings-imported' :
- $this->add_notice( array(
- 'id' => 'edd-settings-imported',
- 'message' => __( 'The settings have been imported.', 'easy-digital-downloads' )
- ) );
- break;
- case 'api-key-generated' :
- $this->add_notice( array(
- 'id' => 'edd-api-key-generated',
- 'message' => __( 'API keys successfully generated.', 'easy-digital-downloads' )
- ) );
- break;
- case 'api-key-exists' :
- $this->add_notice( array(
- 'id' => 'edd-api-key-exists',
- 'message' => __( 'The specified user already has API keys.', 'easy-digital-downloads' ),
- 'class' => 'error'
- ) );
+ switch ( $notice ) {
+ case 'settings-imported':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-settings-imported',
+ 'message' => __( 'The settings have been imported.', 'easy-digital-downloads' ),
+ )
+ );
break;
- case 'api-key-regenerated' :
- $this->add_notice( array(
- 'id' => 'edd-api-key-regenerated',
- 'message' => __( 'API keys successfully regenerated.', 'easy-digital-downloads' )
- ) );
+ case 'api-key-generated':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-api-key-generated',
+ 'message' => __( 'API keys successfully generated.', 'easy-digital-downloads' ),
+ )
+ );
break;
- case 'api-key-revoked' :
- $this->add_notice( array(
- 'id' => 'edd-api-key-revoked',
- 'message' => __( 'API keys successfully revoked.', 'easy-digital-downloads' )
- ) );
+ case 'api-key-exists':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-api-key-exists',
+ 'message' => __( 'The specified user already has API keys.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
break;
- case 'test-purchase-email-sent':
+ case 'api-key-regenerated':
$this->add_notice(
array(
- 'id' => 'edd-test-purchase-receipt-sent',
- 'message' => __( 'The test email was sent successfully.', 'easy-digital-downloads' )
+ 'id' => 'edd-api-key-regenerated',
+ 'message' => __( 'API keys successfully regenerated.', 'easy-digital-downloads' ),
)
);
break;
- case 'test-purchase-email-failed':
+ case 'api-key-revoked':
$this->add_notice(
array(
- 'id' => 'edd-test-purchase-receipt-failed',
- 'message' => __( 'The test email could not be sent. Please check your email settings and try again.', 'easy-digital-downloads' ),
- 'class' => 'error',
+ 'id' => 'edd-api-key-revoked',
+ 'message' => __( 'API keys successfully revoked.', 'easy-digital-downloads' ),
)
);
break;
@@ -748,7 +835,7 @@ private function add_user_action_notices( $notice = '' ) {
$this->add_notice(
array(
'id' => 'edd-test-summary-email-sent',
- 'message' => __( 'The test email summary was sent successfully.', 'easy-digital-downloads' )
+ 'message' => __( 'The test email summary was sent successfully.', 'easy-digital-downloads' ),
)
);
break;
@@ -765,133 +852,171 @@ private function add_user_action_notices( $notice = '' ) {
}
}
- // Shop payments errors
+ // Shop payments errors.
if ( current_user_can( 'edit_shop_payments' ) ) {
- switch( $notice ) {
- case 'note-added' :
- $this->add_notice( array(
- 'id' => 'edd-note-added',
- 'message' => __( 'The note has been added successfully.', 'easy-digital-downloads' )
- ) );
- break;
- case 'payment-updated' :
- $this->add_notice( array(
- 'id' => 'edd-payment-updated',
- 'message' => __( 'The order has been updated successfully.', 'easy-digital-downloads' )
- ) );
- break;
- case 'order_added' :
- $this->add_notice( array(
- 'id' => 'edd-order-added',
- 'message' => __( 'Order successfully created.', 'easy-digital-downloads' )
- ) );
- break;
- case 'order_trashed' :
- $this->add_notice( array(
- 'id' => 'edd-order-trashed',
- 'message' => __( 'The order has been moved to the trash.', 'easy-digital-downloads' )
- ) );
- break;
- case 'order_restored' :
- $this->add_notice( array(
- 'id' => 'edd-order-restored',
- 'message' => __( 'The order has been restored.', 'easy-digital-downloads' )
- ) );
- break;
- case 'payment_deleted' :
- $this->add_notice( array(
- 'id' => 'edd-payment-deleted',
- 'message' => __( 'The order has been deleted.', 'easy-digital-downloads' )
- ) );
- break;
- case 'email_sent' :
- $this->add_notice( array(
- 'id' => 'edd-payment-sent',
- 'message' => __( 'The purchase receipt has been resent.', 'easy-digital-downloads' )
- ) );
+ switch ( $notice ) {
+ case 'note-added':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-note-added',
+ 'message' => __( 'The note has been added successfully.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'payment-updated':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-payment-updated',
+ 'message' => __( 'The order has been updated successfully.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'order_added':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-order-added',
+ 'message' => __( 'Order successfully created.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'order_trashed':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-order-trashed',
+ 'message' => __( 'The order has been moved to the trash.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'order_restored':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-order-restored',
+ 'message' => __( 'The order has been restored.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'payment_deleted':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-payment-deleted',
+ 'message' => __( 'The order has been deleted.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'email_sent':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-payment-sent',
+ 'message' => __( 'The purchase receipt has been resent.', 'easy-digital-downloads' ),
+ )
+ );
break;
case 'email_send_failed':
- $this->add_notice( array(
- 'id' => 'edd-payment-not-sent',
- 'message' => __( 'The purchase receipt could not be resent.', 'easy-digital-downloads' ),
- 'class' => 'error'
- ) );
+ $this->add_notice(
+ array(
+ 'id' => 'edd-payment-not-sent',
+ 'message' => __( 'The purchase receipt could not be resent.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
break;
case 'email_possibly_not_sent':
- $this->add_notice( array(
- 'id' => 'edd-order-receipt-maybe-not-sent',
- 'message' => __( 'The purchase receipt may not have been sent.', 'easy-digital-downloads' ),
- 'class' => 'notice-warning'
- ) );
- break;
- case 'payment-note-deleted' :
- $this->add_notice( array(
- 'id' => 'edd-note-deleted',
- 'message' => __( 'The order note has been deleted.', 'easy-digital-downloads' )
- ) );
+ $this->add_notice(
+ array(
+ 'id' => 'edd-order-receipt-maybe-not-sent',
+ 'message' => __( 'The purchase receipt may not have been sent.', 'easy-digital-downloads' ),
+ 'class' => 'notice-warning',
+ )
+ );
+ break;
+ case 'payment-note-deleted':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-note-deleted',
+ 'message' => __( 'The order note has been deleted.', 'easy-digital-downloads' ),
+ )
+ );
break;
}
}
- // Customer Notices
+ // Customer Notices.
if ( current_user_can( 'edit_shop_payments' ) ) {
- switch( $notice ) {
- case 'customer-deleted' :
- $this->add_notice( array(
- 'id' => 'edd-customer-deleted',
- 'message' => __( 'Customer successfully deleted.', 'easy-digital-downloads' ),
- ) );
- break;
- case 'user-verified' :
- $this->add_notice( array(
- 'id' => 'edd-user-verified',
- 'message' => __( 'User successfully verified.', 'easy-digital-downloads' ),
- ) );
- break;
- case 'email-added' :
- $this->add_notice( array(
- 'id' => 'edd-customer-email-added',
- 'message' => __( 'Customer email added.', 'easy-digital-downloads' ),
- ) );
- break;
- case 'email-removed' :
- $this->add_notice( array(
- 'id' => 'edd-customer-email-removed',
- 'message' => __( 'Customer email deleted.', 'easy-digital-downloads' ),
- ) );
- break;
- case 'email-remove-failed' :
- $this->add_notice( array(
- 'id' => 'edd-customer-email-remove-failed',
- 'message' => __( 'Failed to delete customer email.', 'easy-digital-downloads' ),
- 'class' => 'error',
- ) );
- break;
- case 'primary-email-updated' :
- $this->add_notice( array(
- 'id' => 'eddedd-customer-primary-email-updated',
- 'message' => __( 'Primary email updated for customer.', 'easy-digital-downloads' )
- ) );
- break;
- case 'primary-email-failed' :
- $this->add_notice( array(
- 'id' => 'edd-customer-primary-email-failed',
- 'message' => __( 'Failed to set primary email.', 'easy-digital-downloads' ),
- 'class' => 'error',
- ) );
- break;
- case 'address-removed' :
- $this->add_notice( array(
- 'id' => 'edd-customer-address-removed',
- 'message' => __( 'Customer address deleted.', 'easy-digital-downloads' )
- ) );
- break;
- case 'address-remove-failed' :
- $this->add_notice( array(
- 'id' => 'edd-customer-address-remove-failed',
- 'message' => __( 'Failed to delete customer address.', 'easy-digital-downloads' ),
- 'class' => 'error',
- ) );
+ switch ( $notice ) {
+ case 'customer-deleted':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-customer-deleted',
+ 'message' => __( 'Customer successfully deleted.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'user-verified':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-user-verified',
+ 'message' => __( 'User successfully verified.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'email-added':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-customer-email-added',
+ 'message' => __( 'Customer email added.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'email-removed':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-customer-email-removed',
+ 'message' => __( 'Customer email deleted.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'email-remove-failed':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-customer-email-remove-failed',
+ 'message' => __( 'Failed to delete customer email.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
+ break;
+ case 'primary-email-updated':
+ $this->add_notice(
+ array(
+ 'id' => 'eddedd-customer-primary-email-updated',
+ 'message' => __( 'Primary email updated for customer.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'primary-email-failed':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-customer-primary-email-failed',
+ 'message' => __( 'Failed to set primary email.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
+ break;
+ case 'address-removed':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-customer-address-removed',
+ 'message' => __( 'Customer address deleted.', 'easy-digital-downloads' ),
+ )
+ );
+ break;
+ case 'address-remove-failed':
+ $this->add_notice(
+ array(
+ 'id' => 'edd-customer-address-remove-failed',
+ 'message' => __( 'Failed to delete customer address.', 'easy-digital-downloads' ),
+ 'class' => 'error',
+ )
+ );
break;
}
}
@@ -901,7 +1026,7 @@ private function add_user_action_notices( $notice = '' ) {
array(
'id' => 'edd-upgraded',
'message' => sprintf(
- /* Translators: 1. opening strong tag, do not translate; 2. closing strong tag, do not translate */
+ /* translators: 1: opening strong tag, do not translate, 2: closing strong tag, do not translate */
__( 'Congratulations! You are now running %1$sEasy Digital Downloads (Pro)%2$s.', 'easy-digital-downloads' ),
'',
''
@@ -980,7 +1105,7 @@ public function edd_disable_debugging() {
*
* @since 2.6.0 bbPress (r6775)
*
- * @param string $message
+ * @param string $message Message to escape.
*
* @return string
*/
diff --git a/includes/admin/customers/class-customer-addresses-table.php b/includes/admin/customers/class-customer-addresses-table.php
index 823bc0ef1ac..d94ae08be4d 100644
--- a/includes/admin/customers/class-customer-addresses-table.php
+++ b/includes/admin/customers/class-customer-addresses-table.php
@@ -9,7 +9,7 @@
* @since 3.0
*/
-// Exit if accessed directly
+// Exit if accessed directly.
defined( 'ABSPATH' ) || exit;
use EDD\Admin\List_Table;
@@ -30,11 +30,13 @@ class EDD_Customer_Addresses_Table extends List_Table {
* @see WP_List_Table::__construct()
*/
public function __construct() {
- parent::__construct( array(
- 'singular' => 'address',
- 'plural' => 'addresses',
- 'ajax' => false
- ) );
+ parent::__construct(
+ array(
+ 'singular' => 'address',
+ 'plural' => 'addresses',
+ 'ajax' => false,
+ )
+ );
$this->process_bulk_action();
$this->get_counts();
@@ -57,22 +59,22 @@ protected function get_primary_column_name() {
*
* @since 3.0
*
- * @param array $item Contains all the data of the customers
- * @param string $column_name The name of the column
+ * @param array $item Contains all the data of the customers.
+ * @param string $column_name The name of the column.
*
* @return string Column Name
*/
public function column_default( $item, $column_name ) {
switch ( $column_name ) {
- case 'type' :
+ case 'type':
$value = edd_get_address_type_label( $item['type'] );
if ( ! empty( $item['is_primary'] ) ) {
$value .= ' ' . esc_html__( 'Primary', 'easy-digital-downloads' ) . '';
}
break;
- case 'date_created' :
+ case 'date_created':
$value = '';
break;
@@ -83,7 +85,7 @@ public function column_default( $item, $column_name ) {
break;
}
- // Filter & return
+ // Filter & return.
return apply_filters( 'edd_customers_column_' . $column_name, $value, $item['id'] );
}
@@ -92,53 +94,56 @@ public function column_default( $item, $column_name ) {
*
* @since 3.0
*
- * @param array $item
+ * @param array $item The current item.
* @return string
*/
public function column_address( $item ) {
- $state = $extra = '';
+ $state = '';
+ $extra = '';
$status = $this->get_status();
- $address = ! empty( $item['address'] ) ? $item['address'] : '—';
- $address2 = ! empty( $item['address2'] ) ? $item['address2'] : '';
- $city = ! empty( $item['city'] ) ? $item['city'] : '';
+ $address = ! empty( $item['address'] ) ? $item['address'] : '—';
+ $address2 = ! empty( $item['address2'] ) ? $item['address2'] : '';
+ $city = ! empty( $item['city'] ) ? $item['city'] : '';
$code = ! empty( $item['postal_code'] ) ? $item['postal_code'] : '';
- // Address2
+ // Address2.
if ( ! empty( $address2 ) ) {
$extra .= '
' . $address2;
}
- // City & Zip
+ // City & Zip.
if ( ! empty( $city ) || ! empty( $code ) ) {
$extra .= '
' . implode( ' ', array( $city, $code ) );
}
- // Get the item status
+ // Get the item status.
$item_status = ! empty( $item['status'] )
? $item['status']
: 'verified';
- // Get the customer ID
+ // Get the customer ID.
$customer_id = ! empty( $item['customer_id'] )
? absint( $item['customer_id'] )
: 0;
- // Link to customer
- $customer_url = edd_get_admin_url( array(
- 'page' => 'edd-customers',
- 'view' => 'overview',
- 'id' => absint( $customer_id ),
- ) );
+ // Link to customer.
+ $customer_url = edd_get_admin_url(
+ array(
+ 'page' => 'edd-customers',
+ 'view' => 'overview',
+ 'id' => absint( $customer_id ),
+ )
+ );
- // State
- if ( ( ! empty( $status ) && ( $status !== $item_status ) ) || ( $item_status !== 'active' ) ) {
+ // State.
+ if ( ( ! empty( $status ) && ( $status !== $item_status ) ) || ( 'active' !== $item_status ) ) {
switch ( $status ) {
- case 'pending' :
+ case 'pending':
$value = __( 'Pending', 'easy-digital-downloads' );
break;
- case 'verified' :
- case '' :
- default :
+ case 'verified':
+ case '':
+ default:
$value = __( 'Active', 'easy-digital-downloads' );
break;
}
@@ -146,7 +151,7 @@ public function column_address( $item ) {
$state = ' — ' . $value;
}
- // Concatenate and return
+ // Concatenate and return.
return '' . esc_html( $address ) . '' . esc_html( $state ) . '' . $extra . $this->row_actions( $this->get_row_actions( $item ) );
}
@@ -154,11 +159,11 @@ public function column_address( $item ) {
* Gets the row actions for the customer address.
*
* @since 3.0
- * @param array $item
+ * @param array $item The current item.
* @return array
*/
private function get_row_actions( $item ) {
- // Link to customer
+ // Link to customer.
$customer_url = edd_get_admin_url(
array(
'page' => 'edd-customers',
@@ -167,18 +172,23 @@ private function get_row_actions( $item ) {
)
);
- // Actions
+ // Actions.
$actions = array(
- 'view' => '' . esc_html__( 'View', 'easy-digital-downloads' ) . ''
+ 'view' => '' . esc_html__( 'View', 'easy-digital-downloads' ) . '',
);
if ( empty( $item['is_primary'] ) ) {
- $delete_url = wp_nonce_url( edd_get_admin_url( array(
- 'page' => 'edd-customers',
- 'view' => 'overview',
- 'id' => urlencode( $item['id'] ),
- 'edd_action' => 'customer-remove-address'
- ) ), 'edd-remove-customer-address' );
+ $delete_url = wp_nonce_url(
+ edd_get_admin_url(
+ array(
+ 'page' => 'edd-customers',
+ 'view' => 'overview',
+ 'id' => urlencode( $item['id'] ),
+ 'edd_action' => 'customer-remove-address',
+ )
+ ),
+ 'edd-remove-customer-address'
+ );
$actions['delete'] = '' . esc_html__( 'Delete', 'easy-digital-downloads' ) . '';
}
@@ -197,37 +207,39 @@ private function get_row_actions( $item ) {
*
* @since 3.0
*
- * @param array $item
+ * @param array $item The current item.
* @return string
*/
public function column_customer( $item ) {
- // Get the customer ID
+ // Get the customer ID.
$customer_id = ! empty( $item['customer_id'] )
? absint( $item['customer_id'] )
: 0;
- // Bail if no customer ID
+ // Bail if no customer ID.
if ( empty( $customer_id ) ) {
return '—';
}
- // Try to get the customer
+ // Try to get the customer.
$customer = edd_get_customer( $customer_id );
- // Bail if customer no longer exists
+ // Bail if customer no longer exists.
if ( empty( $customer ) ) {
return '—';
}
- // Link to customer
- $customer_url = edd_get_admin_url( array(
- 'page' => 'edd-customers',
- 'page_type' => 'physical',
- 's' => 'c:' . absint( $customer_id )
- ) );
+ // Link to customer.
+ $customer_url = edd_get_admin_url(
+ array(
+ 'page' => 'edd-customers',
+ 'page_type' => 'physical',
+ 's' => 'c:' . absint( $customer_id ),
+ )
+ );
- // Concatenate and return
+ // Concatenate and return.
return '' . esc_html( $customer->name ) . '';
}
@@ -253,10 +265,10 @@ public function column_cb( $item ) {
}
return sprintf(
'',
- /*$1%s*/ 'customer',
- /*$2%s*/ esc_attr( $item['id'] ),
- /* translators: customer name or address id */
- esc_html( sprintf( __( 'Select %s', 'easy-digital-downloads' ), $name ) )
+ esc_attr( 'customer' ),
+ esc_attr( $item['id'] ),
+ /* translators: %s: the customer name */
+ esc_html( sprintf( _x( 'Select %s', 'Noun: The customer name', 'easy-digital-downloads' ), $name ) )
);
}
@@ -278,15 +290,18 @@ public function get_counts() {
* @return array $columns Array of all the list table columns
*/
public function get_columns() {
- return apply_filters( 'edd_report_customer_columns', array(
- 'cb' => '',
- 'address' => __( 'Address', 'easy-digital-downloads' ),
- 'region' => __( 'Region', 'easy-digital-downloads' ),
- 'country' => __( 'Country', 'easy-digital-downloads' ),
- 'customer' => __( 'Customer', 'easy-digital-downloads' ),
- 'type' => __( 'Type', 'easy-digital-downloads' ),
- 'date_created' => __( 'Date', 'easy-digital-downloads' )
- ) );
+ return apply_filters(
+ 'edd_report_customer_columns',
+ array(
+ 'cb' => '',
+ 'address' => __( 'Address', 'easy-digital-downloads' ),
+ 'region' => __( 'Region', 'easy-digital-downloads' ),
+ 'country' => __( 'Country', 'easy-digital-downloads' ),
+ 'customer' => __( 'Customer', 'easy-digital-downloads' ),
+ 'type' => __( 'Type', 'easy-digital-downloads' ),
+ 'date_created' => __( 'Date', 'easy-digital-downloads' ),
+ )
+ );
}
/**
@@ -297,12 +312,12 @@ public function get_columns() {
*/
public function get_sortable_columns() {
return array(
- 'date_created' => array( 'date_created', true ),
- 'address' => array( 'address', false ),
- 'region' => array( 'region', true ),
- 'country' => array( 'country', true ),
- 'customer' => array( 'customer_id', false ),
- 'type' => array( 'type', false )
+ 'date_created' => array( 'date_created', true ),
+ 'address' => array( 'address', false ),
+ 'region' => array( 'region', true ),
+ 'country' => array( 'country', true ),
+ 'customer' => array( 'customer_id', false ),
+ 'type' => array( 'type', false ),
);
}
@@ -315,7 +330,7 @@ public function get_sortable_columns() {
*/
public function get_bulk_actions() {
return array(
- 'delete' => __( 'Delete', 'easy-digital-downloads' )
+ 'delete' => __( 'Delete', 'easy-digital-downloads' ),
);
}
@@ -344,7 +359,7 @@ public function process_bulk_action() {
foreach ( $ids as $id ) {
switch ( $this->current_action() ) {
- case 'delete' :
+ case 'delete':
edd_delete_customer_address( $id );
break;
}
@@ -363,44 +378,44 @@ public function get_data() {
$search = $this->get_search();
$args = array( 'status' => $this->get_status() );
- // Customer ID
+ // Customer ID.
if ( strpos( $search, 'c:' ) !== false ) {
$args['customer_id'] = trim( str_replace( 'c:', '', $search ) );
- // Country
+ // Country.
} elseif ( strpos( $search, 'country:' ) !== false ) {
$search = substr( $search, strlen( 'country:' ) );
$args['search'] = $search;
$args['search_columns'] = array( 'country' );
- // Zip
+ // Zip.
} elseif ( strpos( $search, 'zip:' ) !== false ) {
$search = substr( $search, strlen( 'zip:' ) );
$args['search'] = $search;
$args['search_columns'] = array( 'zip' );
- // Region
+ // Region.
} elseif ( strpos( $search, 'region:' ) !== false ) {
$search = substr( $search, strlen( 'region:' ) );
$args['search'] = $search;
$args['search_columns'] = array( 'region' );
- // City
+ // City.
} elseif ( strpos( $search, 'city:' ) !== false ) {
$search = substr( $search, strlen( 'city:' ) );
$args['search'] = $search;
$args['search_columns'] = array( 'city' );
- // Any...
+ // Any...
} else {
$args['search'] = $search;
$args['search_columns'] = array( 'address', 'address2', 'city', 'region', 'country', 'postal_code' );
}
- // Parse pagination
+ // Parse pagination.
$this->args = $this->parse_pagination_args( $args );
- // Get the data
+ // Get the data.
$addresses = edd_get_customer_addresses( $this->args );
if ( ! empty( $addresses ) ) {
@@ -436,26 +451,28 @@ public function prepare_items() {
$this->_column_headers = array(
$this->get_columns(),
array(),
- $this->get_sortable_columns()
+ $this->get_sortable_columns(),
);
$this->items = $this->get_data();
$status = $this->get_status( 'total' );
- // Setup pagination
- $this->set_pagination_args( array(
- 'total_pages' => ceil( $this->counts[ $status ] / $this->per_page ),
- 'total_items' => $this->counts[ $status ],
- 'per_page' => $this->per_page
- ) );
+ // Setup pagination.
+ $this->set_pagination_args(
+ array(
+ 'total_pages' => ceil( $this->counts[ $status ] / $this->per_page ),
+ 'total_items' => $this->counts[ $status ],
+ 'per_page' => $this->per_page,
+ )
+ );
}
/**
* Generate the table navigation above or below the table.
* We're overriding this to turn off the referer param in `wp_nonce_field()`.
*
- * @param string $which
+ * @param string $which If we're rendering the top or bottom nav.
* @since 3.1.0.4
*/
protected function display_tablenav( $which ) {
diff --git a/includes/admin/customers/class-customer-email-addresses-table.php b/includes/admin/customers/class-customer-email-addresses-table.php
index b2b7b72e36d..83acda8c634 100644
--- a/includes/admin/customers/class-customer-email-addresses-table.php
+++ b/includes/admin/customers/class-customer-email-addresses-table.php
@@ -9,7 +9,7 @@
* @since 3.0
*/
-// Exit if accessed directly
+// Exit if accessed directly.
defined( 'ABSPATH' ) || exit;
use EDD\Admin\List_Table;
@@ -30,11 +30,13 @@ class EDD_Customer_Email_Addresses_Table extends List_Table {
* @see WP_List_Table::__construct()
*/
public function __construct() {
- parent::__construct( array(
- 'singular' => 'email',
- 'plural' => 'emails',
- 'ajax' => false
- ) );
+ parent::__construct(
+ array(
+ 'singular' => 'email',
+ 'plural' => 'emails',
+ 'ajax' => false,
+ )
+ );
$this->process_bulk_action();
$this->get_counts();
@@ -57,29 +59,29 @@ protected function get_primary_column_name() {
*
* @since 3.0
*
- * @param array $item Contains all the data of the customers
- * @param string $column_name The name of the column
+ * @param array $item Contains all the data of the customers.
+ * @param string $column_name The name of the column.
*
* @return string Column Name
*/
public function column_default( $item, $column_name ) {
switch ( $column_name ) {
- case 'id' :
+ case 'id':
$value = $item['id'];
break;
- case 'email' :
+ case 'email':
$value = '' . esc_html( $item['email'] ) . '';
break;
- case 'type' :
+ case 'type':
$value = ( 'primary' === $item['type'] )
- ? esc_html__( 'Primary', 'easy-digital-downloads' )
+ ? esc_html__( 'Primary', 'easy-digital-downloads' )
: esc_html__( 'Secondary', 'easy-digital-downloads' );
break;
- case 'date_created' :
+ case 'date_created':
$value = '';
break;
@@ -90,7 +92,7 @@ public function column_default( $item, $column_name ) {
break;
}
- // Filter & return
+ // Filter & return.
return apply_filters( 'edd_customers_column_' . $column_name, $value, $item['id'] );
}
@@ -99,40 +101,42 @@ public function column_default( $item, $column_name ) {
*
* @since 3.0
*
- * @param array $item
+ * @param array $item The current item.
* @return string
*/
public function column_email( $item ) {
- $state = '';
- $status = $this->get_status();
- $email = ! empty( $item['email'] ) ? $item['email'] : '—';
+ $state = '';
+ $status = $this->get_status();
+ $email = ! empty( $item['email'] ) ? $item['email'] : '—';
- // Get the item status
+ // Get the item status.
$item_status = ! empty( $item['status'] )
? $item['status']
: 'verified';
- // Get the customer ID
+ // Get the customer ID.
$customer_id = ! empty( $item['customer_id'] )
? absint( $item['customer_id'] )
: 0;
- // Link to customer
- $customer_url = edd_get_admin_url( array(
- 'page' => 'edd-customers',
- 'view' => 'overview',
- 'id' => absint( $customer_id ),
- ) );
+ // Link to customer.
+ $customer_url = edd_get_admin_url(
+ array(
+ 'page' => 'edd-customers',
+ 'view' => 'overview',
+ 'id' => absint( $customer_id ),
+ )
+ );
- // State
- if ( ( ! empty( $status ) && ( $status !== $item_status ) ) || ( $item_status !== 'active' ) ) {
+ // State.
+ if ( ( ! empty( $status ) && ( $status !== $item_status ) ) || ( 'active' !== $item_status ) ) {
switch ( $status ) {
- case 'pending' :
+ case 'pending':
$value = __( 'Pending', 'easy-digital-downloads' );
break;
- case 'verified' :
- case '' :
- default :
+ case 'verified':
+ case '':
+ default:
$value = __( 'Active', 'easy-digital-downloads' );
break;
}
@@ -140,7 +144,7 @@ public function column_email( $item ) {
$state = ' — ' . $value;
}
- // Concatenate and return
+ // Concatenate and return.
return '' . esc_html( $email ) . '' . esc_html( $state ) . '' . $this->row_actions( $this->get_row_actions( $item ) );
}
@@ -148,11 +152,11 @@ public function column_email( $item ) {
* Gets the row actions for the customer email address.
*
* @since 3.0
- * @param array $item
+ * @param array $item The current item.
* @return array
*/
private function get_row_actions( $item ) {
- // Link to customer
+ // Link to customer.
$customer_url = edd_get_admin_url(
array(
'page' => 'edd-customers',
@@ -161,20 +165,25 @@ private function get_row_actions( $item ) {
)
);
- // Actions
+ // Actions.
$actions = array(
'view' => '' . __( 'View', 'easy-digital-downloads' ) . '',
);
- // Non-primary email actions
+ // Non-primary email actions.
if ( ! empty( $item['email'] ) && ( empty( $item['type'] ) || 'primary' !== $item['type'] ) ) {
- $delete_url = wp_nonce_url( edd_get_admin_url( array(
- 'page' => 'edd-customers',
- 'view' => 'overview',
- 'id' => urlencode( $item['customer_id'] ),
- 'email' => rawurlencode( $item['email'] ),
- 'edd_action' => 'customer-remove-email',
- ) ), 'edd-remove-customer-email' );
+ $delete_url = wp_nonce_url(
+ edd_get_admin_url(
+ array(
+ 'page' => 'edd-customers',
+ 'view' => 'overview',
+ 'id' => urlencode( $item['customer_id'] ),
+ 'email' => rawurlencode( $item['email'] ),
+ 'edd_action' => 'customer-remove-email',
+ )
+ ),
+ 'edd-remove-customer-email'
+ );
$actions['delete'] = '' . esc_html__( 'Delete', 'easy-digital-downloads' ) . '';
}
@@ -193,37 +202,39 @@ private function get_row_actions( $item ) {
*
* @since 3.0
*
- * @param array $item
+ * @param array $item The current item.
* @return string
*/
public function column_customer( $item ) {
- // Get the customer ID
+ // Get the customer ID.
$customer_id = ! empty( $item['customer_id'] )
? absint( $item['customer_id'] )
: 0;
- // Bail if no customer ID
+ // Bail if no customer ID.
if ( empty( $customer_id ) ) {
return '—';
}
- // Try to get the customer
+ // Try to get the customer.
$customer = edd_get_customer( $customer_id );
- // Bail if customer no longer exists
+ // Bail if customer no longer exists.
if ( empty( $customer ) ) {
return '—';
}
- // Link to customer
- $customer_url = edd_get_admin_url( array(
- 'page' => 'edd-customers',
- 'page_type' => 'emails',
- 's' => 'c:' . absint( $customer_id )
- ) );
+ // Link to customer.
+ $customer_url = edd_get_admin_url(
+ array(
+ 'page' => 'edd-customers',
+ 'page_type' => 'emails',
+ 's' => 'c:' . absint( $customer_id ),
+ )
+ );
- // Concatenate and return
+ // Concatenate and return.
return '' . esc_html( $customer->name ) . '';
}
@@ -233,7 +244,7 @@ public function column_customer( $item ) {
* @access public
* @since 3.0
*
- * @param array $item
+ * @param array $item The current item.
*
* @return string Displays a checkbox
*/
@@ -244,12 +255,12 @@ public function column_cb( $item ) {
return sprintf(
'',
- /*$1%s*/ esc_attr( 'customer' ),
- /*$2%s*/ esc_attr( $item['id'] ),
- /* translators: customer email */
- esc_html( sprintf( __( 'Select %s', 'easy-digital-downloads' ), $item['email'] ) ),
- /*$4%s*/ esc_attr( $title ),
- /*$5%s*/ $primary_attributes
+ esc_attr( 'customer' ),
+ esc_attr( $item['id'] ),
+ /* translators: %s: the customer email address */
+ esc_html( sprintf( _x( 'Select %s', 'Noun: The customer email address', 'easy-digital-downloads' ), $item['email'] ) ),
+ esc_attr( $title ),
+ $primary_attributes
);
}
@@ -271,13 +282,16 @@ public function get_counts() {
* @return array $columns Array of all the list table columns
*/
public function get_columns() {
- return apply_filters( 'edd_report_customer_columns', array(
- 'cb' => '',
- 'email' => __( 'Email', 'easy-digital-downloads' ),
- 'customer' => __( 'Customer', 'easy-digital-downloads' ),
- 'type' => __( 'Type', 'easy-digital-downloads' ),
- 'date_created' => __( 'Date', 'easy-digital-downloads' )
- ) );
+ return apply_filters(
+ 'edd_report_customer_columns',
+ array(
+ 'cb' => '',
+ 'email' => __( 'Email', 'easy-digital-downloads' ),
+ 'customer' => __( 'Customer', 'easy-digital-downloads' ),
+ 'type' => __( 'Type', 'easy-digital-downloads' ),
+ 'date_created' => __( 'Date', 'easy-digital-downloads' ),
+ )
+ );
}
/**
@@ -288,10 +302,10 @@ public function get_columns() {
*/
public function get_sortable_columns() {
return array(
- 'date_created' => array( 'date_created', true ),
- 'email' => array( 'email', true ),
- 'customer' => array( 'customer_id', false ),
- 'type' => array( 'type', false )
+ 'date_created' => array( 'date_created', true ),
+ 'email' => array( 'email', true ),
+ 'customer' => array( 'customer_id', false ),
+ 'type' => array( 'type', false ),
);
}
@@ -304,7 +318,7 @@ public function get_sortable_columns() {
*/
public function get_bulk_actions() {
return array(
- 'delete' => __( 'Delete', 'easy-digital-downloads' )
+ 'delete' => __( 'Delete', 'easy-digital-downloads' ),
);
}
@@ -335,16 +349,18 @@ public function process_bulk_action() {
* Only non-primary email addresses can be deleted, so we're building up a safelist using the provided
* IDs. Each ID will be matched against this prior to deletion.
*/
- $non_primary_address_ids = edd_get_customer_email_addresses( array(
- 'id__in' => $ids,
- 'type__not_in' => array( 'primary' ),
- 'fields' => 'id'
- ) );
+ $non_primary_address_ids = edd_get_customer_email_addresses(
+ array(
+ 'id__in' => $ids,
+ 'type__not_in' => array( 'primary' ),
+ 'fields' => 'id',
+ )
+ );
foreach ( $ids as $id ) {
switch ( $this->current_action() ) {
- case 'delete' :
- if ( in_array( $id, $non_primary_address_ids ) ) {
+ case 'delete':
+ if ( in_array( $id, $non_primary_address_ids, true ) ) {
edd_delete_customer_email_address( $id );
}
break;
@@ -362,7 +378,7 @@ public function process_bulk_action() {
public function get_data() {
$data = array();
$search = $this->get_search();
- $args = array( 'status' => $this->get_status() );
+ $args = array( 'status' => $this->get_status() );
// Account for search stripping the "+" from emails.
if ( strpos( $search, ' ' ) ) {
@@ -377,15 +393,15 @@ public function get_data() {
if ( is_email( $search ) ) {
$args['email'] = $search;
- // Address ID.
+ // Address ID.
} elseif ( is_numeric( $search ) ) {
$args['id'] = $search;
- // Customer ID.
+ // Customer ID.
} elseif ( strpos( $search, 'c:' ) !== false ) {
$args['customer_id'] = trim( str_replace( 'c:', '', $search ) );
- // Any...
+ // Any...
} else {
$args['search'] = $search;
$args['search_columns'] = array( 'email' );
@@ -423,26 +439,28 @@ public function prepare_items() {
$this->_column_headers = array(
$this->get_columns(),
array(),
- $this->get_sortable_columns()
+ $this->get_sortable_columns(),
);
$this->items = $this->get_data();
$status = $this->get_status( 'total' );
- // Setup pagination
- $this->set_pagination_args( array(
- 'total_pages' => ceil( $this->counts[ $status ] / $this->per_page ),
- 'total_items' => $this->counts[ $status ],
- 'per_page' => $this->per_page
- ) );
+ // Setup pagination.
+ $this->set_pagination_args(
+ array(
+ 'total_pages' => ceil( $this->counts[ $status ] / $this->per_page ),
+ 'total_items' => $this->counts[ $status ],
+ 'per_page' => $this->per_page,
+ )
+ );
}
/**
* Generate the table navigation above or below the table.
* We're overriding this to turn off the referer param in `wp_nonce_field()`.
*
- * @param string $which
+ * @param string $which Which table nav we're rendering, top or bottom.
* @since 3.1.0.4
*/
protected function display_tablenav( $which ) {
diff --git a/includes/admin/customers/class-customer-table.php b/includes/admin/customers/class-customer-table.php
index b6978596c9b..11c2c19de58 100755
--- a/includes/admin/customers/class-customer-table.php
+++ b/includes/admin/customers/class-customer-table.php
@@ -9,7 +9,7 @@
* @since 1.5
*/
-// Exit if accessed directly
+// Exit if accessed directly.
defined( 'ABSPATH' ) || exit;
use EDD\Admin\List_Table;
@@ -30,11 +30,13 @@ class EDD_Customer_Reports_Table extends List_Table {
* @see WP_List_Table::__construct()
*/
public function __construct() {
- parent::__construct( array(
- 'singular' => 'customer',
- 'plural' => 'customers',
- 'ajax' => false
- ) );
+ parent::__construct(
+ array(
+ 'singular' => 'customer',
+ 'plural' => 'customers',
+ 'ajax' => false,
+ )
+ );
$this->process_bulk_action();
$this->get_counts();
@@ -57,8 +59,8 @@ protected function get_primary_column_name() {
*
* @since 1.5
*
- * @param array $item Contains all the data of the customers
- * @param string $column_name The name of the column
+ * @param array $item Contains all the data of the customers.
+ * @param string $column_name The name of the column.
*
* @return string Column Name
*/
@@ -68,27 +70,29 @@ public function column_default( $item, $column_name ) {
switch ( $column_name ) {
- case 'id' :
+ case 'id':
$value = esc_html( $item['id'] );
break;
- case 'email' :
+ case 'email':
$value = '' . esc_html( $item['email'] ) . '';
break;
- case 'order_count' :
- $url = edd_get_admin_url( array(
- 'page' => 'edd-payment-history',
- 'customer' => rawurlencode( $item['id'] ),
- ) );
+ case 'order_count':
+ $url = edd_get_admin_url(
+ array(
+ 'page' => 'edd-payment-history',
+ 'customer' => rawurlencode( $item['id'] ),
+ )
+ );
$value = '' . esc_html( number_format_i18n( $item['order_count'] ) ) . '';
break;
- case 'spent' :
+ case 'spent':
$value = edd_currency_filter( edd_format_amount( $item[ $column_name ] ) );
break;
- case 'date_created' :
+ case 'date_created':
$value = '';
break;
@@ -99,7 +103,7 @@ public function column_default( $item, $column_name ) {
break;
}
- // Filter & return
+ // Filter & return.
return apply_filters( 'edd_customers_column_' . esc_attr( $column_name ), $value, $item['id'] );
}
@@ -108,7 +112,7 @@ public function column_default( $item, $column_name ) {
*
* @since 3.0
*
- * @param array $item
+ * @param array $item The current item.
* @return string
*/
public function column_name( $item ) {
@@ -162,7 +166,7 @@ public function column_name( $item ) {
* Gets the row actions for the customer.
*
* @since 3.0
- * @param array $item
+ * @param array $item The current item.
* @return array
*/
private function get_row_actions( $item ) {
@@ -217,10 +221,10 @@ public function column_cb( $item ) {
return sprintf(
'',
- /*$1%s*/ 'customer',
- /*$2%s*/ esc_attr( $item['id'] ),
- /* translators: customer name or email */
- esc_html( sprintf( __( 'Select %s', 'easy-digital-downloads' ), $name ) )
+ 'customer',
+ esc_attr( $item['id'] ),
+ /* translators: %s: the customer name or email address */
+ esc_html( sprintf( _x( 'Select %s', 'Noun: The customer name or Email Address', 'easy-digital-downloads' ), $name ) )
);
}
@@ -241,14 +245,17 @@ public function get_counts() {
* @return array $columns Array of all the list table columns
*/
public function get_columns() {
- return apply_filters( 'edd_report_customer_columns', array(
- 'cb' => '',
- 'name' => __( 'Name', 'easy-digital-downloads' ),
- 'email' => __( 'Email', 'easy-digital-downloads' ),
- 'order_count' => __( 'Orders', 'easy-digital-downloads' ),
- 'spent' => __( 'Spent', 'easy-digital-downloads' ),
- 'date_created' => __( 'Date', 'easy-digital-downloads' )
- ) );
+ return apply_filters(
+ 'edd_report_customer_columns',
+ array(
+ 'cb' => '',
+ 'name' => __( 'Name', 'easy-digital-downloads' ),
+ 'email' => __( 'Email', 'easy-digital-downloads' ),
+ 'order_count' => __( 'Orders', 'easy-digital-downloads' ),
+ 'spent' => __( 'Spent', 'easy-digital-downloads' ),
+ 'date_created' => __( 'Date', 'easy-digital-downloads' ),
+ )
+ );
}
/**
@@ -259,11 +266,11 @@ public function get_columns() {
*/
public function get_sortable_columns() {
return array(
- 'date_created' => array( 'date_created', true ),
- 'name' => array( 'name', true ),
- 'email' => array( 'email', true ),
- 'order_count' => array( 'purchase_count', false ),
- 'spent' => array( 'purchase_value', false )
+ 'date_created' => array( 'date_created', true ),
+ 'name' => array( 'name', true ),
+ 'email' => array( 'email', true ),
+ 'order_count' => array( 'purchase_count', false ),
+ 'spent' => array( 'purchase_value', false ),
);
}
@@ -275,7 +282,7 @@ public function get_sortable_columns() {
*/
public function get_bulk_actions() {
return array(
- 'delete' => __( 'Delete', 'easy-digital-downloads' )
+ 'delete' => __( 'Delete', 'easy-digital-downloads' ),
);
}
@@ -305,7 +312,7 @@ public function process_bulk_action() {
foreach ( $ids as $id ) {
switch ( $this->current_action() ) {
- case 'delete' :
+ case 'delete':
edd_delete_customer( $id );
break;
}
@@ -369,7 +376,7 @@ public function get_data() {
$args['search_columns'] = array( 'name', 'email' );
}
- // Parse pagination
+ // Parse pagination.
$this->args = $this->parse_pagination_args( $args );
if ( is_email( $search ) ) {
@@ -387,10 +394,10 @@ public function get_data() {
)
);
} else {
- $customers = edd_get_customers( $this->args );
+ $customers = edd_get_customers( $this->args );
}
- // Get the data
+ // Get the data.
if ( ! empty( $customers ) ) {
foreach ( $customers as $customer ) {
$data[] = array(
@@ -419,7 +426,7 @@ public function prepare_items() {
$this->_column_headers = array(
$this->get_columns(),
array(),
- $this->get_sortable_columns()
+ $this->get_sortable_columns(),
);
$this->items = $this->get_data();
@@ -430,19 +437,21 @@ public function prepare_items() {
// If $this->per_page is 0, then set total pages to 1.
$total_pages = $this->per_page ? ceil( (int) $this->counts[ $status ] / (int) $this->per_page ) : 1;
- // Setup pagination
- $this->set_pagination_args( array(
- 'total_pages' => $total_pages,
- 'total_items' => $this->counts[ $status ],
- 'per_page' => $this->per_page,
- ) );
+ // Setup pagination.
+ $this->set_pagination_args(
+ array(
+ 'total_pages' => $total_pages,
+ 'total_items' => $this->counts[ $status ],
+ 'per_page' => $this->per_page,
+ )
+ );
}
/**
* Generate the table navigation above or below the table.
* We're overriding this to turn off the referer param in `wp_nonce_field()`.
*
- * @param string $which
+ * @param string $which Which part of the table nav we're rendering, top or bottom.
* @since 3.1.0.4
*/
protected function display_tablenav( $which ) {
diff --git a/includes/admin/customers/customer-actions.php b/includes/admin/customers/customer-actions.php
index 2b3278ce1c9..831341dcf64 100644
--- a/includes/admin/customers/customer-actions.php
+++ b/includes/admin/customers/customer-actions.php
@@ -262,12 +262,12 @@ function edd_add_customer_email( $args = array() ) {
$user = wp_get_current_user();
$user_login = ! empty( $user->user_login ) ? $user->user_login : edd_get_bot_name();
- /* translators: 1. email address; 2. username */
+ /* translators: 1: email address, 2: username */
$customer_note = sprintf( __( 'Email address %1$s added by %2$s', 'easy-digital-downloads' ), $email, $user_login );
$customer->add_note( $customer_note );
if ( $primary ) {
- /* translators: 1. email address; 2. username */
+ /* translators: 1: email address, 2: username */
$customer_note = sprintf( __( 'Email address %1$s set as primary by %2$s', 'easy-digital-downloads' ), $email, $user_login );
$customer->add_note( $customer_note );
}
@@ -329,7 +329,7 @@ function edd_remove_customer_email() {
);
$user = wp_get_current_user();
$user_login = ! empty( $user->user_login ) ? $user->user_login : edd_get_bot_name();
- /* translators: 1. email address; 2. username */
+ /* translators: 1: email address, 2: username */
$customer_note = sprintf( __( 'Email address %1$s removed by %2$s', 'easy-digital-downloads' ), sanitize_email( $_GET['email'] ), $user_login );
$customer->add_note( $customer_note );
@@ -389,7 +389,8 @@ function edd_set_customer_primary_email() {
);
$user = wp_get_current_user();
$user_login = ! empty( $user->user_login ) ? $user->user_login : edd_get_bot_name();
- $customer_note = sprintf( __( 'Email address %s set as primary by %s', 'easy-digital-downloads' ), sanitize_email( $_GET['email'] ), $user_login );
+ /* translators: 1: email address, 2: username */
+ $customer_note = sprintf( __( 'Email address %1$s set as primary by %2$s', 'easy-digital-downloads' ), sanitize_email( $_GET['email'] ), $user_login );
$customer->add_note( $customer_note );
} else {
diff --git a/includes/admin/customers/customers.php b/includes/admin/customers/customers.php
index 0a58fad120b..5d103cfc10d 100644
--- a/includes/admin/customers/customers.php
+++ b/includes/admin/customers/customers.php
@@ -10,7 +10,7 @@
*/
// Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
+defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
/** Navigation ****************************************************************/
@@ -21,42 +21,28 @@
* @param string $active_tab The currently active tab. Default is empty string.
*/
function edd_customers_page_primary_nav( $active_tab = '' ) {
-
- ob_start();?>
-
-
-
- $active_tab,
+ 'show_search' => true,
+ )
+ );
+ $navigation->render();
}
/**
@@ -250,27 +236,24 @@ function edd_customers_list( $active_tab = 'customers' ) {
// Initialize the list table.
$customers_table = new $list_table_class();
$customers_table->prepare_items();
+ edd_customers_page_primary_nav( $active_tab );
?>
' . __( 'For more information:', 'easy-digital-downloads' ) . '
' . + /* translators: %s: Documentation URL */ '' . sprintf( __( 'Visit the documentation on the Easy Digital Downloads website.', 'easy-digital-downloads' ), $docs_url ) . '
' . '' . sprintf( + /* translators: %s: Upgrade URL */ __( 'Need more from your Easy Digital Downloads store? Upgrade Now!', 'easy-digital-downloads' ), $upgrade_url ) . '
' ); } - $screen->add_help_tab( array( - 'id' => 'edd-discount-general', - 'title' => __( 'General', 'easy-digital-downloads' ), - 'content' => - '' . __( 'Discount codes allow you to offer buyers special discounts by having them enter predefined codes during checkout.', 'easy-digital-downloads' ) . '
' . - '' . __( 'Discount codes that are set to "inactive" cannot be redeemed.', 'easy-digital-downloads' ) . '
' . - '' . __( 'Discount codes can be setup to only be used only one time by each customer. If a customer attempts to use a code a second time, they will be given an error.', 'easy-digital-downloads' ) . '
' . - '' . __( 'Discount codes that have already been used cannot be deleted for data integrity and reporting purposes.', 'easy-digital-downloads' ) . '
' - ) ); + $screen->add_help_tab( + array( + 'id' => 'edd-discount-general', + 'title' => __( 'General', 'easy-digital-downloads' ), + 'content' => + '' . __( 'Discount codes allow you to offer buyers special discounts by having them enter predefined codes during checkout.', 'easy-digital-downloads' ) . '
' . + '' . __( 'Discount codes that are set to "inactive" cannot be redeemed.', 'easy-digital-downloads' ) . '
' . + '' . __( 'Discount codes can be setup to only be used only one time by each customer. If a customer attempts to use a code a second time, they will be given an error.', 'easy-digital-downloads' ) . '
' . + '' . __( 'Discount codes that have already been used cannot be deleted for data integrity and reporting purposes.', 'easy-digital-downloads' ) . '
', + ) + ); - $screen->add_help_tab( array( - 'id' => 'edd-discount-add', - 'title' => __( 'Adding Discounts', 'easy-digital-downloads' ), - 'content' => - '' . __( 'You can create any number of discount codes easily from this page.', 'easy-digital-downloads' ) . '
' . - '' . __( 'Discount codes have several options:', 'easy-digital-downloads' ) . '
' . - '' . __( 'You can create any number of discount codes easily from this page.', 'easy-digital-downloads' ) . '
' . + '' . __( 'Discount codes have several options:', 'easy-digital-downloads' ) . '
' . + '+ +
' . __( 'For more information:', 'easy-digital-downloads' ) . '
' . + /* translators: %s: Documentation URL */ '' . sprintf( __( 'Visit the documentation on the Easy Digital Downloads website.', 'easy-digital-downloads' ), $docs_url ) . '
' . '' . sprintf( + /* translators: %s: Upgrade URL */ __( 'Need more from your Easy Digital Downloads store? Upgrade Now!', 'easy-digital-downloads' ), $upgrade_url ) . '
' ); } - $screen->add_help_tab( array( - 'id' => 'edd-download-configuration', - 'title' => sprintf( __( '%s Settings', 'easy-digital-downloads' ), edd_get_label_singular() ), - 'content' => - '' . __( 'File Download Limit - Define how many times customers are allowed to download their purchased files. Leave at 0 for unlimited. Resending the purchase receipt will permit the customer one additional download if their limit has already been reached.', 'easy-digital-downloads' ) . '
' . - - '' . __( 'Accounting Options - If enabled, define an individual SKU or product number for this download.', 'easy-digital-downloads' ) . '
' . - - '' . __( 'Button Options - Disable the automatic output of the purchase button. If disabled, no button will be added to the download page unless the [purchase_link] shortcode is used.', 'easy-digital-downloads' ) . '
' . __( 'Enable variable pricing - By enabling variable pricing, multiple download options and prices can be configured.', 'easy-digital-downloads' ) . '
' . - - '' . __( 'Enable multi-option purchases - By enabling multi-option purchases customers can add multiple variable price items to their cart at once.', 'easy-digital-downloads' ) . '
' - ) ); - - $screen->add_help_tab( array( - 'id' => 'edd-download-files', - 'title' => sprintf( __( '%s Files', 'easy-digital-downloads' ), edd_get_label_singular() ), - 'content' => - '' . __( 'Product Type Options - Choose a default product type or a bundle. Bundled products automatically include access to other download's files when purchased.', 'easy-digital-downloads' ) . '
' . + $screen->add_help_tab( + array( + 'id' => 'edd-download-configuration', + /* translators: %s: Download singular label */ + 'title' => sprintf( __( '%s Settings', 'easy-digital-downloads' ), edd_get_label_singular() ), + 'content' => + '' . __( 'File Download Limit - Define how many times customers are allowed to download their purchased files. Leave at 0 for unlimited. Resending the purchase receipt will permit the customer one additional download if their limit has already been reached.', 'easy-digital-downloads' ) . '
' . + '' . __( 'Accounting Options - If enabled, define an individual SKU or product number for this download.', 'easy-digital-downloads' ) . '
' . + '' . __( 'Button Options - Disable the automatic output of the purchase button. If disabled, no button will be added to the download page unless the [purchase_link] shortcode is used.', 'easy-digital-downloads' ) . '
' . __( 'File Downloads - Define download file names and their respective file URL. Multiple files can be assigned to a single price, or variable prices.', 'easy-digital-downloads' ) . '
' - ) ); + $screen->add_help_tab( + array( + 'id' => 'edd-download-prices', + /* translators: %s: Download singular label */ + 'title' => sprintf( __( '%s Prices', 'easy-digital-downloads' ), edd_get_label_singular() ), + 'content' => + '' . __( 'Enable variable pricing - By enabling variable pricing, multiple download options and prices can be configured.', 'easy-digital-downloads' ) . '
' . + '' . __( 'Enable multi-option purchases - By enabling multi-option purchases customers can add multiple variable price items to their cart at once.', 'easy-digital-downloads' ) . '
', + ) + ); + $screen->add_help_tab( + array( + 'id' => 'edd-download-files', + /* translators: %s: Download singular label */ + 'title' => sprintf( __( '%s Files', 'easy-digital-downloads' ), edd_get_label_singular() ), + 'content' => + '' . __( 'Product Type Options - Choose a default product type or a bundle. Bundled products automatically include access to other download's files when purchased.', 'easy-digital-downloads' ) . '
' . + '' . __( 'File Downloads - Define download file names and their respective file URL. Multiple files can be assigned to a single price, or variable prices.', 'easy-digital-downloads' ) . '
', + ) + ); - $screen->add_help_tab( array( - 'id' => 'edd-product-notes', - 'title' => sprintf( __( '%s Instructions', 'easy-digital-downloads' ), edd_get_label_singular() ), - 'content' => '' . sprintf( __( 'Special instructions for this %s. These will be added to the sales receipt, and may be used by some extensions or themes.', 'easy-digital-downloads' ), strtolower( edd_get_label_singular() ) ) . '
' - ) ); + $screen->add_help_tab( + array( + 'id' => 'edd-product-notes', + /* translators: %s: Download singular label */ + 'title' => sprintf( __( '%s Instructions', 'easy-digital-downloads' ), edd_get_label_singular() ), + /* translators: %s: Download singular label */ + 'content' => '' . sprintf( __( 'Special instructions for this %s. These will be added to the sales receipt, and may be used by some extensions or themes.', 'easy-digital-downloads' ), strtolower( edd_get_label_singular() ) ) . '
', + ) + ); $colors = array( - 'gray', 'pink', 'blue', 'green', 'teal', 'black', 'dark gray', 'orange', 'purple', 'slate' + 'gray', + 'pink', + 'blue', + 'green', + 'teal', + 'black', + 'dark gray', + 'orange', + 'purple', + 'slate', ); - $screen->add_help_tab( array( - 'id' => 'edd-purchase-shortcode', - 'title' => __( 'Purchase Shortcode', 'easy-digital-downloads' ), - 'content' => - '' . __( 'Purchase Shortcode - If the automatic output of the purchase button has been disabled via the Download Configuration box, a shortcode can be used to output the button or link.', 'easy-digital-downloads' ) . '
' . - '[purchase_link id="#" price="1" text="Add to Cart" color="blue"]
' . sprintf( - __( 'For more information, see using Shortcodes on the WordPress.org Codex or Easy Digital Downloads Documentation', 'easy-digital-downloads' ), - 'https://codex.wordpress.org/Shortcode', - 'https://easydigitaldownloads.com/docs/purchase_link-shortcode/' - ) . '
' - ) ); + $screen->add_help_tab( + array( + 'id' => 'edd-purchase-shortcode', + 'title' => __( 'Purchase Shortcode', 'easy-digital-downloads' ), + 'content' => + '' . __( 'Purchase Shortcode - If the automatic output of the purchase button has been disabled via the Download Configuration box, a shortcode can be used to output the button or link.', 'easy-digital-downloads' ) . '
' . + '[purchase_link id="#" price="1" text="Add to Cart" color="blue"]
' . sprintf( + /* translators: 1: Shortcodes Codex URL, 2: EDD Documentation URL */ + __( 'For more information, see using Shortcodes on the WordPress.org Codex or Easy Digital Downloads Documentation', 'easy-digital-downloads' ), + 'https://codex.wordpress.org/Shortcode', + 'https://easydigitaldownloads.com/docs/purchase_link-shortcode/' + ) . '
', + ) + ); /** * Fires off in the EDD Downloads Contextual Help Screen diff --git a/includes/admin/downloads/dashboard-columns.php b/includes/admin/downloads/dashboard-columns.php index dc045924917..0d58031b2fa 100755 --- a/includes/admin/downloads/dashboard-columns.php +++ b/includes/admin/downloads/dashboard-columns.php @@ -266,8 +266,10 @@ function edd_add_download_filters() { 'options' => $options, 'selected' => $selected, 'data' => array( + /* translators: %s: Download Category taxonomy name */ 'placeholder' => sprintf( _x( 'Search %s', 'plural: Example: "Search Download Categories"', 'easy-digital-downloads' ), $category_labels['name'] ), 'search-type' => 'download_category', + /* translators: %s: Download Category taxonomy name */ 'search-placeholder' => sprintf( _x( 'Search %s', 'plural: Example: "Search Download Categories"', 'easy-digital-downloads' ), $category_labels['name'] ), ), ) @@ -322,6 +324,7 @@ function edd_price_field_quick_edit( $column_name, $post_type ) {