' . sprintf(
+ __('Viewing Events that the %s promotion applies to.', 'event_espresso'),
+ $pro_linked
+ ) . '
';
}
return $content;
}
-
/**
* Child scope classes indicate what gets returned when a "name" is requested.
*
- * @since 1.0.0
- * @param int | EE_Event | EE_Event[] $EVT_ID
+ * @param int | EE_Event | EE_Event[] $EVT_ID
* Event ID (or array of IDs) or EE_Event object for the EE_Event object being utilized.
- * @param bool | string $link
+ * @param bool | string $link
* if FALSE then just return name,
* otherwise 'front' wraps name in link to frontend details,
* 'admin' wraps name in link to backend details.
- * @param int $PRO_ID
+ * @param int $PRO_ID
* Optional. Providing the Promotion ID allows identification in downstream code
* for what promotion is being handled. (i.e. adding it to the query_args for the links).
* @return string
+ * @since 1.0.0
*/
public function name($EVT_ID, $link = false, $PRO_ID = 0)
{
- if (empty($EVT_ID) || ( is_array($EVT_ID) && count($EVT_ID) > 1 )) {
+ if (empty($EVT_ID) || (is_array($EVT_ID) && count($EVT_ID) > 1)) {
switch ($link) {
case 'front':
// @todo eventually a filter could be added here so that the link goes to a filtered archive view of the events JUST for this promotion in the frontend. For now we won't do anything (cause I doubt this will be used much).
@@ -110,18 +126,21 @@ public function name($EVT_ID, $link = false, $PRO_ID = 0)
break;
case 'admin':
- $EVT_IDs = is_array($EVT_ID) && !empty($EVT_ID) ? implode(',', $EVT_ID) : '';
- $query_args = !empty($EVT_IDs) ? array( 'EVT_IDs' =>$EVT_IDs, 'PRO_ID' => $PRO_ID ) : array();
- $url = add_query_arg($query_args, $this->get_admin_url(null));
- $prepend = '';
- $append = '';
+ $EVT_IDs = is_array($EVT_ID) && ! empty($EVT_ID) ? implode(',', $EVT_ID) : '';
+ $query_args = ! empty($EVT_IDs) ? ['EVT_IDs' => $EVT_IDs, 'PRO_ID' => $PRO_ID] : [];
+ $url = add_query_arg($query_args, $this->get_admin_url(null));
+ $prepend = '';
+ $append = '';
break;
default:
$prepend = $append = '';
break;
}
- $count = is_array($EVT_ID) ? count($EVT_ID) : 0;
+ $count = is_array($EVT_ID) ? count($EVT_ID) : 0;
$promo_count = $this->get_promo_count_display($count);
return $this->get_scope_icon() . $prepend . $this->label->plural . $append . $promo_count;
}
@@ -130,54 +149,62 @@ public function name($EVT_ID, $link = false, $PRO_ID = 0)
switch ($link) {
case 'front':
- $url = $this->get_frontend_url($evt->ID());
- $prepend = '';
- $append = '';
+ $url = $this->get_frontend_url($evt->ID());
+ $prepend = '';
+ $append = '';
break;
case 'admin':
- $url = $this->get_admin_url($evt->ID());
- $prepend = '';
- $append = '';
+ $url = $this->get_admin_url($evt->ID());
+ $prepend =
+ '';
+ $append = '';
break;
default:
$prepend = $append = '';
break;
}
- return $this->get_scope_icon() . $prepend . $evt->name() . $append;
+ $event_name = '' . $evt->name() . '';
+ return $this->get_scope_icon() . $prepend . $event_name . $append;
}
-
/**
* This returns a html span string for the event scope icon.
*
- * @since 1.0.0
- * @param bool $class_only used to indicate if we only want to return the icon class
- * or the entire html string.
+ * @param bool $class_only used to indicate if we only want to return the icon class
+ * or the entire html string.
* @return string
+ * @since 1.0.0
*/
public function get_scope_icon($class_only = false)
{
return $class_only
? 'dashicons dashicons-flag'
- : '';
+ : '';
}
-
/**
* Child scope classes indicate what gets returned when a "description" is requested.
*
- * @since 1.0.0
- * @param int | EE_Event | EE_Event[] $EVT_ID (or array of IDS) or EE_Event object for the EE_Event object being utilized
+ * @param int | EE_Event | EE_Event[] $EVT_ID (or array of IDS) or EE_Event object for the EE_Event object being
+ * utilized
* @return string
+ * @since 1.0.0
*/
public function description($EVT_ID)
{
if (empty($EVT_ID) || is_array($EVT_ID)) {
- return __('Applied to all events.', 'event_espresso');
+ return esc_html__('Applied to all events.', 'event_espresso');
}
$evt = $EVT_ID instanceof EE_Event ? $EVT_ID : $this->_get_model_object($EVT_ID);
@@ -185,14 +212,13 @@ public function description($EVT_ID)
}
-
/**
* Child scope classes indicate what gets returned when the admin_url is requested.
* Admin url usually points to the details page for the given id.
*
- * @since 1.0.0
- * @param int | EE_Event[] $EVT_ID ID or array of ids for the EE_Event object being utilized
+ * @param int | EE_Event[] $EVT_ID ID or array of ids for the EE_Event object being utilized
* @return string
+ * @since 1.0.0
*/
public function get_admin_url($EVT_ID)
{
@@ -201,27 +227,24 @@ public function get_admin_url($EVT_ID)
return $base_url;
}
- $query_args = array(
+ $query_args = [
'action' => 'edit',
- 'post' => $EVT_ID
- );
- EE_Registry::instance()->load_helper('URL');
+ 'post' => $EVT_ID,
+ ];
return EEH_URL::add_query_args_and_nonce($query_args, $base_url);
}
-
/**
* Child scope classes indicate what gets returned when the frontend_url is requested.
* Frontend url usually points to the single page view for the given id.
*
- * @since 1.0.0
- * @param int | EE_Event[] $EVT_ID ID or array of ids for the EE_Event object being utilized
+ * @param int | EE_Event[] $EVT_ID ID or array of ids for the EE_Event object being utilized
* @return string
+ * @since 1.0.0
*/
public function get_frontend_url($EVT_ID)
{
- EE_Registry::instance()->load_helper('Event_View');
if (empty($EVT_ID) || is_array($EVT_ID)) {
return EEH_Event_View::event_archive_url();
}
@@ -230,74 +253,84 @@ public function get_frontend_url($EVT_ID)
}
-
-
-
/**
* Generate the html for selecting events that a promotion applies to.
*
- * @since 1.0.0
- *
* @param integer $PRO_ID The promotion ID for the applies to selector we are retrieving.
* @return string html
+ * @since 1.0.0
+ *
*/
public function get_admin_applies_to_selector($PRO_ID)
{
-
- $applied_filters = $this->_maybe_overload_request_with_saved_filters($PRO_ID);
- $total_items = $this->_get_total_items();
+ $show_filters = $this->_maybe_overload_request_with_saved_filters($PRO_ID);
+ $total_items = $this->_get_total_items();
$items_to_select = $this->get_scope_items();
- $selected_items = $this->_get_applied_to_item_ids($PRO_ID);
- $template_args = array(
- 'scope_slug' => $this->slug,
- 'scope' => $this,
- 'header_content' => sprintf(__('%sCheck off the specific events that this promotion will be applied to.%s', 'event_espresso'), '
', '
'),
- 'filters' => $this->_get_applies_to_filters(),
- 'show_filters' => $applied_filters,
- 'items_to_select' => $this->_get_applies_to_items_to_select($items_to_select, $selected_items, $PRO_ID),
- 'items_paging' => $this->_get_applies_to_items_paging($total_items),
- 'selected_items' => $selected_items,
+ $selected_items = $this->_get_applied_to_item_ids($PRO_ID);
+ $template_args = [
+ 'scope_slug' => $this->slug,
+ 'scope' => $this,
+ 'header_content' => sprintf(
+ __('%sCheck off the specific events that this promotion will be applied to.%s', 'event_espresso'),
+ '
'
+ esc_html__('%sNo results for the given query%s', 'event_espresso'),
+ '
',
+ '
'
);
// paging list
$total_items = $this->_get_total_items();
@@ -570,14 +570,14 @@ protected function _get_applies_to_items_to_select($items_to_select, $selected_i
) ] instanceof EE_Base_Class
) {
return sprintf(
- __(
+ esc_html__(
'There are no active %s to assign to this scope. You will need to create some first.',
'event_espresso'
),
$this->label->plural
);
}
- $checkboxes = '
';
return $checkboxes;
}
@@ -619,16 +620,16 @@ protected function _get_applies_to_items_to_select($items_to_select, $selected_i
*/
protected function _get_applies_to_items_paging($total_items)
{
- EE_Registry::instance()->load_helper('Template');
- $current_page = isset($_REQUEST['paged']) ? $_REQUEST['paged'] : 1;
- $perpage = isset($_REQUEST['perpage']) ? $_REQUEST['perpage'] : $this->_per_page;
- $url = isset($_REQUEST['redirect_url']) ? $_REQUEST['redirect_url'] : $_SERVER['REQUEST_URI'];
- return ' ' . EEH_Template::get_paging_html(
+ $current_page = isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 1;
+ $perpage = isset($_REQUEST['perpage']) ? absint($_REQUEST['perpage']) : $this->_per_page;
+ $url = isset($_REQUEST['redirect_url']) ? esc_url_raw($_REQUEST['redirect_url']) : $_SERVER['REQUEST_URI'];
+ return EEH_Template::get_paging_html(
$total_items,
$current_page,
$perpage,
$url
- );
+ )
+ . ' ';
}
@@ -651,7 +652,7 @@ private function _verify_properties_set()
if (empty($this->slug)) {
throw new EE_Error(
sprintf(
- __(
+ esc_html__(
'The %s class has not set the $slug property. This is used as a identifier for this scope and is necessary.',
'event_espresso'
),
@@ -913,13 +914,13 @@ public function generate_promotion_line_item(
// verify EE_Line_Item
if (! $parent_line_item instanceof EE_Line_Item) {
throw new EE_Error(
- __('A valid EE_Line_Item object is required to generate a promotion line item.', 'event_espresso')
+ esc_html__('A valid EE_Line_Item object is required to generate a promotion line item.', 'event_espresso')
);
}
// verify EE_Promotion
if (! $promotion instanceof EE_Promotion) {
throw new EE_Error(
- __('A valid EE_Promotion object is required to generate a promotion line item.', 'event_espresso')
+ esc_html__('A valid EE_Promotion object is required to generate a promotion line item.', 'event_espresso')
);
}
$promo_name = ! empty($promo_name) ? $promo_name : $promotion->name();
diff --git a/lib/scopes/templates/promotion_applies_to_filters.template.php b/lib/scopes/templates/promotion_applies_to_filters.template.php
new file mode 100644
index 0000000..b52fba4
--- /dev/null
+++ b/lib/scopes/templates/promotion_applies_to_filters.template.php
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
>
+
+ label->plural)
+ ); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ getHtml(); ?>
+
+
+
+
+ getHtml(); ?>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/scopes/templates/promotion_applies_to_wrapper.template.php b/lib/scopes/templates/promotion_applies_to_wrapper.template.php
index 231ae38..20b5183 100644
--- a/lib/scopes/templates/promotion_applies_to_wrapper.template.php
+++ b/lib/scopes/templates/promotion_applies_to_wrapper.template.php
@@ -2,24 +2,26 @@
/**
* This file is the template for the promotions applies to metabox wrapper.
*
- * @since 1.0.0
- * @package EE4 Promotions
+ * @since 1.0.0
+ * @package EE4 Promotions
* @subpackage admin
*/
+
/**
* Template variables in use for this template
- * @type string $scope_slug The slug for the scope this template serves.
- * @type EE_Promotion_Scope $scope The EE_Promotion_Scope object for labels etc.
- * @type string $header_content Any header content for this template and scope.
- * @type string $filters Any filters this selector might use
- * @type bool $show_filters Whether to show the filters container by default.
- * @type string $items_to_select All the selectable items for this page view.
- * @type string $items_paging This will be the html string for the paging of items.
- * @type array $selected_items Array of IDs for the selected items
+ *
+ * @var string $scope_slug The slug for the scope this template serves.
+ * @var EE_Promotion_Scope $scope The EE_Promotion_Scope object for labels etc.
+ * @var string $header_content Any header content for this template and scope.
+ * @var string $filters Any filters this selector might use
+ * @var string $items_to_select All the selectable items for this page view.
+ * @var string $items_paging This will be the html string for the paging of items.
+ * @var array $selected_items Array of IDs for the selected items
* that this promotion applies to.
- * @type string $display_selected_label The test for the display selected label trigger/toggle.
+ * @var string $display_selected_label The test for the display selected label trigger/toggle.
+ * @var int $number_of_selected_items
+ * @var string $footer_content
*/
-$show_filters = ! $show_filters ? ' style="display:none"' : '';
?>
@@ -28,40 +30,62 @@
if ($number_of_selected_items < 2) {
// singular : This promotion is currently only applied to 1 event
echo sprintf(
- __('This promotion is currently only applied to :%3$s %1$s %2$s %3$s', 'event_espresso'),
- '' . $number_of_selected_items . '',
- strtolower($scope->label->singular),
+ esc_html__('This promotion is currently only applied to :%3$s %1$s %2$s %3$s', 'event_espresso'),
+ ''
+ . $number_of_selected_items
+ . '',
+ '' . strtolower($scope->label->plural) . '',
' '
);
} else {
// plural : This promotion is currently applied to 5 events
echo sprintf(
- __('This promotion is currently applied to :%3$s %1$s %2$s %3$s', 'event_espresso'),
- '' . $number_of_selected_items . '',
- strtolower($scope->label->plural),
+ esc_html__('This promotion is currently applied to :%3$s %1$s %2$s %3$s', 'event_espresso'),
+ ''
+ . $number_of_selected_items
+ . '',
+ '' . strtolower($scope->label->plural) . '',
' '
);
}
?>