@@ -15,117 +15,117 @@ |
||
15 | 15 | abstract class EE_Offsite_Gateway extends EE_Gateway |
16 | 16 | { |
17 | 17 | |
18 | - /** |
|
19 | - * whether or not the gateway uses an IPN |
|
20 | - * that is sent in a separate request than the returning registrant. |
|
21 | - * if false, then we need to process the payment results manually |
|
22 | - * as soon as the registrant returns from the off-site gateway |
|
23 | - * |
|
24 | - * @type bool |
|
25 | - */ |
|
26 | - protected $_uses_separate_IPN_request = false; |
|
18 | + /** |
|
19 | + * whether or not the gateway uses an IPN |
|
20 | + * that is sent in a separate request than the returning registrant. |
|
21 | + * if false, then we need to process the payment results manually |
|
22 | + * as soon as the registrant returns from the off-site gateway |
|
23 | + * |
|
24 | + * @type bool |
|
25 | + */ |
|
26 | + protected $_uses_separate_IPN_request = false; |
|
27 | 27 | |
28 | 28 | |
29 | - /** |
|
30 | - * @return EE_Offsite_Gateway |
|
31 | - */ |
|
32 | - public function __construct() |
|
33 | - { |
|
34 | - $this->_supports_receiving_refunds = true; |
|
35 | - parent::__construct(); |
|
36 | - } |
|
29 | + /** |
|
30 | + * @return EE_Offsite_Gateway |
|
31 | + */ |
|
32 | + public function __construct() |
|
33 | + { |
|
34 | + $this->_supports_receiving_refunds = true; |
|
35 | + parent::__construct(); |
|
36 | + } |
|
37 | 37 | |
38 | 38 | |
39 | - /** |
|
40 | - * Adds information into the payment object's redirect_url and redirect_args so |
|
41 | - * client code can use that payment to know where (and with what information) |
|
42 | - * to redirect the user to in order to make the payment on the offsite gateway's website. |
|
43 | - * Saving the payment from within this method is unnecessary, |
|
44 | - * as it is the responsibility of client code to save it. |
|
45 | - * |
|
46 | - * @param EE_Payment $payment to process |
|
47 | - * @param array $billing_info |
|
48 | - * @param string $return_url URL to send the user to after a successful payment on the payment provider's |
|
49 | - * website |
|
50 | - * @param string $notify_url URL to send the instant payment notification |
|
51 | - * @param string $cancel_url URL to send the user to after a cancelled payment attempt on teh payment |
|
52 | - * provider's website |
|
53 | - * @return EE_Payment |
|
54 | - */ |
|
55 | - abstract public function set_redirection_info( |
|
56 | - $payment, |
|
57 | - $billing_info = array(), |
|
58 | - $return_url = null, |
|
59 | - $notify_url = null, |
|
60 | - $cancel_url = null |
|
61 | - ); |
|
39 | + /** |
|
40 | + * Adds information into the payment object's redirect_url and redirect_args so |
|
41 | + * client code can use that payment to know where (and with what information) |
|
42 | + * to redirect the user to in order to make the payment on the offsite gateway's website. |
|
43 | + * Saving the payment from within this method is unnecessary, |
|
44 | + * as it is the responsibility of client code to save it. |
|
45 | + * |
|
46 | + * @param EE_Payment $payment to process |
|
47 | + * @param array $billing_info |
|
48 | + * @param string $return_url URL to send the user to after a successful payment on the payment provider's |
|
49 | + * website |
|
50 | + * @param string $notify_url URL to send the instant payment notification |
|
51 | + * @param string $cancel_url URL to send the user to after a cancelled payment attempt on teh payment |
|
52 | + * provider's website |
|
53 | + * @return EE_Payment |
|
54 | + */ |
|
55 | + abstract public function set_redirection_info( |
|
56 | + $payment, |
|
57 | + $billing_info = array(), |
|
58 | + $return_url = null, |
|
59 | + $notify_url = null, |
|
60 | + $cancel_url = null |
|
61 | + ); |
|
62 | 62 | |
63 | 63 | |
64 | - /** |
|
65 | - * Often used for IPNs. But applies the info in $update_info to the payment. |
|
66 | - * What is $update_info? Often the contents of $_REQUEST, but not necessarily. Whatever |
|
67 | - * the payment method passes in. Saving the payment from within this method is unnecessary, |
|
68 | - * as it is the responsibility of client code to save it. |
|
69 | - * |
|
70 | - * @param array $update_info of whatever |
|
71 | - * @param EEI_Transaction $transaction |
|
72 | - * @return EEI_Payment updated |
|
73 | - */ |
|
74 | - abstract public function handle_payment_update($update_info, $transaction); |
|
64 | + /** |
|
65 | + * Often used for IPNs. But applies the info in $update_info to the payment. |
|
66 | + * What is $update_info? Often the contents of $_REQUEST, but not necessarily. Whatever |
|
67 | + * the payment method passes in. Saving the payment from within this method is unnecessary, |
|
68 | + * as it is the responsibility of client code to save it. |
|
69 | + * |
|
70 | + * @param array $update_info of whatever |
|
71 | + * @param EEI_Transaction $transaction |
|
72 | + * @return EEI_Payment updated |
|
73 | + */ |
|
74 | + abstract public function handle_payment_update($update_info, $transaction); |
|
75 | 75 | |
76 | 76 | |
77 | - /** |
|
78 | - * uses_separate_IPN_request |
|
79 | - * |
|
80 | - * return true or false for whether or not the gateway uses an IPN |
|
81 | - * that is sent in a separate request than the returning registrant. |
|
82 | - * if false, then we need to process the payment results manually |
|
83 | - * as soon as the registrant returns from the off-site gateway |
|
84 | - * |
|
85 | - * @deprecated since version 4.8.39.rc.001 please use handle_IPN_in_this_request() instead |
|
86 | - * |
|
87 | - * @return bool |
|
88 | - */ |
|
89 | - public function uses_separate_IPN_request() |
|
90 | - { |
|
91 | - return $this->_uses_separate_IPN_request; |
|
92 | - } |
|
77 | + /** |
|
78 | + * uses_separate_IPN_request |
|
79 | + * |
|
80 | + * return true or false for whether or not the gateway uses an IPN |
|
81 | + * that is sent in a separate request than the returning registrant. |
|
82 | + * if false, then we need to process the payment results manually |
|
83 | + * as soon as the registrant returns from the off-site gateway |
|
84 | + * |
|
85 | + * @deprecated since version 4.8.39.rc.001 please use handle_IPN_in_this_request() instead |
|
86 | + * |
|
87 | + * @return bool |
|
88 | + */ |
|
89 | + public function uses_separate_IPN_request() |
|
90 | + { |
|
91 | + return $this->_uses_separate_IPN_request; |
|
92 | + } |
|
93 | 93 | |
94 | 94 | |
95 | - /** |
|
96 | - * set_uses_separate_IPN_request |
|
97 | - * |
|
98 | - * @access protected |
|
99 | - * @param boolean $uses_separate_IPN_request |
|
100 | - */ |
|
101 | - protected function set_uses_separate_IPN_request($uses_separate_IPN_request) |
|
102 | - { |
|
103 | - $this->_uses_separate_IPN_request = filter_var($uses_separate_IPN_request, FILTER_VALIDATE_BOOLEAN); |
|
104 | - } |
|
95 | + /** |
|
96 | + * set_uses_separate_IPN_request |
|
97 | + * |
|
98 | + * @access protected |
|
99 | + * @param boolean $uses_separate_IPN_request |
|
100 | + */ |
|
101 | + protected function set_uses_separate_IPN_request($uses_separate_IPN_request) |
|
102 | + { |
|
103 | + $this->_uses_separate_IPN_request = filter_var($uses_separate_IPN_request, FILTER_VALIDATE_BOOLEAN); |
|
104 | + } |
|
105 | 105 | |
106 | - /** |
|
107 | - * Allows gateway to dynamically decide whether or not to handle a payment update |
|
108 | - * by overriding this method. By default, if this is a "true" IPN (meaning |
|
109 | - * it's a separate request from when the user returns from the offsite gateway) |
|
110 | - * and this gateway class is setup to handle IPNs in separate "true" IPNs, then |
|
111 | - * this will return true, otherwise it will return false. |
|
112 | - * If however, this is a request when the user is returning |
|
113 | - * from an offsite gateway, and this gateway class is setup to process the payment |
|
114 | - * data when the user returns, then this will return true. |
|
115 | - * |
|
116 | - * @param array $request_data |
|
117 | - * @param boolean $separate_IPN_request |
|
118 | - * @return boolean |
|
119 | - */ |
|
120 | - public function handle_IPN_in_this_request($request_data, $separate_IPN_request) |
|
121 | - { |
|
122 | - if ($separate_IPN_request) { |
|
123 | - // payment data being sent in a request separate from the user |
|
124 | - // it is this other request that will update the TXN and payment info |
|
125 | - return $this->_uses_separate_IPN_request; |
|
126 | - } else { |
|
127 | - // it's a request where the user returned from an offsite gateway WITH the payment data |
|
128 | - return ! $this->_uses_separate_IPN_request; |
|
129 | - } |
|
130 | - } |
|
106 | + /** |
|
107 | + * Allows gateway to dynamically decide whether or not to handle a payment update |
|
108 | + * by overriding this method. By default, if this is a "true" IPN (meaning |
|
109 | + * it's a separate request from when the user returns from the offsite gateway) |
|
110 | + * and this gateway class is setup to handle IPNs in separate "true" IPNs, then |
|
111 | + * this will return true, otherwise it will return false. |
|
112 | + * If however, this is a request when the user is returning |
|
113 | + * from an offsite gateway, and this gateway class is setup to process the payment |
|
114 | + * data when the user returns, then this will return true. |
|
115 | + * |
|
116 | + * @param array $request_data |
|
117 | + * @param boolean $separate_IPN_request |
|
118 | + * @return boolean |
|
119 | + */ |
|
120 | + public function handle_IPN_in_this_request($request_data, $separate_IPN_request) |
|
121 | + { |
|
122 | + if ($separate_IPN_request) { |
|
123 | + // payment data being sent in a request separate from the user |
|
124 | + // it is this other request that will update the TXN and payment info |
|
125 | + return $this->_uses_separate_IPN_request; |
|
126 | + } else { |
|
127 | + // it's a request where the user returned from an offsite gateway WITH the payment data |
|
128 | + return ! $this->_uses_separate_IPN_request; |
|
129 | + } |
|
130 | + } |
|
131 | 131 | } |
@@ -15,36 +15,36 @@ |
||
15 | 15 | abstract class EE_Onsite_Gateway extends EE_Gateway |
16 | 16 | { |
17 | 17 | |
18 | - /** |
|
19 | - * @return EE_Onsite_Gateway |
|
20 | - */ |
|
21 | - public function __construct() |
|
22 | - { |
|
23 | - $this->_supports_sending_refunds = true; |
|
24 | - parent::__construct(); |
|
25 | - } |
|
18 | + /** |
|
19 | + * @return EE_Onsite_Gateway |
|
20 | + */ |
|
21 | + public function __construct() |
|
22 | + { |
|
23 | + $this->_supports_sending_refunds = true; |
|
24 | + parent::__construct(); |
|
25 | + } |
|
26 | 26 | |
27 | - /** |
|
28 | - * Asks the gateway to do whatever it does to process the payment. Onsite gateways will |
|
29 | - * usually send a request directly to the payment provider and update the payment's status based on that; |
|
30 | - * whereas offsite gateways will usually just update the payment with the URL and query parameters to use |
|
31 | - * for sending the request via http_remote_request(). Saving the payment from within this method is unnecessary, |
|
32 | - * as it is the responsibility of client code to save it. |
|
33 | - * |
|
34 | - * @param EEI_Payment $payment |
|
35 | - * @param array $billing_info { |
|
36 | - * @type $first_name string |
|
37 | - * @type $last_name string |
|
38 | - * @type $email string |
|
39 | - * @type $address string |
|
40 | - * @type $address2 string |
|
41 | - * @type $city string |
|
42 | - * @type $state string name of the state (NOT int) |
|
43 | - * @type $country string 2-character ISO code see http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 |
|
44 | - * @type $zip string |
|
45 | - * @type $phone string |
|
46 | - * } unless a child class specifies these array keys are NOT present |
|
47 | - * @return EE_Payment updated |
|
48 | - */ |
|
49 | - abstract public function do_direct_payment($payment, $billing_info = null); |
|
27 | + /** |
|
28 | + * Asks the gateway to do whatever it does to process the payment. Onsite gateways will |
|
29 | + * usually send a request directly to the payment provider and update the payment's status based on that; |
|
30 | + * whereas offsite gateways will usually just update the payment with the URL and query parameters to use |
|
31 | + * for sending the request via http_remote_request(). Saving the payment from within this method is unnecessary, |
|
32 | + * as it is the responsibility of client code to save it. |
|
33 | + * |
|
34 | + * @param EEI_Payment $payment |
|
35 | + * @param array $billing_info { |
|
36 | + * @type $first_name string |
|
37 | + * @type $last_name string |
|
38 | + * @type $email string |
|
39 | + * @type $address string |
|
40 | + * @type $address2 string |
|
41 | + * @type $city string |
|
42 | + * @type $state string name of the state (NOT int) |
|
43 | + * @type $country string 2-character ISO code see http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 |
|
44 | + * @type $zip string |
|
45 | + * @type $phone string |
|
46 | + * } unless a child class specifies these array keys are NOT present |
|
47 | + * @return EE_Payment updated |
|
48 | + */ |
|
49 | + abstract public function do_direct_payment($payment, $billing_info = null); |
|
50 | 50 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | if (! defined('EVENT_ESPRESSO_VERSION')) { |
3 | - exit('No direct script access allowed'); |
|
3 | + exit('No direct script access allowed'); |
|
4 | 4 | } |
5 | 5 | /** |
6 | 6 | * payment_details_content |
@@ -10,5 +10,5 @@ discard block |
||
10 | 10 | */ |
11 | 11 | $gateway_response = $payment->gateway_response(); |
12 | 12 | if (! empty($gateway_response)) { |
13 | - echo '<span class="error payment-problem">' . $gateway_response . '</span>'; |
|
13 | + echo '<span class="error payment-problem">' . $gateway_response . '</span>'; |
|
14 | 14 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if (! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
3 | 3 | exit('No direct script access allowed'); |
4 | 4 | } |
5 | 5 | /** |
@@ -9,6 +9,6 @@ discard block |
||
9 | 9 | * @var EE_Payment_Method $payment_method |
10 | 10 | */ |
11 | 11 | $gateway_response = $payment->gateway_response(); |
12 | -if (! empty($gateway_response)) { |
|
13 | - echo '<span class="error payment-problem">' . $gateway_response . '</span>'; |
|
12 | +if ( ! empty($gateway_response)) { |
|
13 | + echo '<span class="error payment-problem">'.$gateway_response.'</span>'; |
|
14 | 14 | } |
@@ -71,22 +71,22 @@ discard block |
||
71 | 71 | |
72 | 72 | $name_html = $line_item_related_object instanceof EEI_Line_Item_Object |
73 | 73 | ? $line_item_related_object->name() : $line_item->name(); |
74 | - $name_html = $name_link ? '<a href="' . $name_link . '">' . $name_html . '</a>' |
|
74 | + $name_html = $name_link ? '<a href="'.$name_link.'">'.$name_html.'</a>' |
|
75 | 75 | : $name_html; |
76 | 76 | $name_html .= $line_item->is_taxable() ? ' *' : ''; |
77 | 77 | // maybe preface with icon? |
78 | 78 | $name_html = $line_item_related_object instanceof EEI_Has_Icon |
79 | - ? $line_item_related_object->get_icon() . $name_html |
|
79 | + ? $line_item_related_object->get_icon().$name_html |
|
80 | 80 | : $name_html; |
81 | - $name_html = '<span class="ee-line-item-name linked">' . $name_html . '</span><br>'; |
|
82 | - $name_html .= sprintf( |
|
81 | + $name_html = '<span class="ee-line-item-name linked">'.$name_html.'</span><br>'; |
|
82 | + $name_html .= sprintf( |
|
83 | 83 | _x('%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'), |
84 | 84 | '<span class="ee-line-item-related-parent-object">', |
85 | 85 | $line_item->parent() instanceof EE_Line_Item |
86 | 86 | ? $line_item->parent()->OBJ_type_i18n() |
87 | 87 | : __('Item:', 'event_espresso'), |
88 | 88 | $parent_related_object_link |
89 | - ? '<a href="' . $parent_related_object_link . '">' . $parent_related_object_name . '</a>' |
|
89 | + ? '<a href="'.$parent_related_object_link.'">'.$parent_related_object_name.'</a>' |
|
90 | 90 | : $parent_related_object_name, |
91 | 91 | '</span>' |
92 | 92 | ); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | $type_html .= $this->_get_cancellations($line_item); |
97 | 97 | $type_html .= $line_item->OBJ_type() ? '<br />' : ''; |
98 | 98 | $code = $line_item_related_object instanceof EEI_Has_Code ? $line_item_related_object->code() : ''; |
99 | - $type_html .= ! empty($code) ? '<span class="ee-line-item-id">' . sprintf(__('Code: %s', 'event_espresso'), $code) . '</span>' : ''; |
|
99 | + $type_html .= ! empty($code) ? '<span class="ee-line-item-id">'.sprintf(__('Code: %s', 'event_espresso'), $code).'</span>' : ''; |
|
100 | 100 | $html .= EEH_HTML::td($type_html, '', 'jst-left'); |
101 | 101 | |
102 | 102 | // Date column |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | $datetimes = $line_item_related_object->datetimes(); |
106 | 106 | foreach ($datetimes as $datetime) { |
107 | 107 | if ($datetime instanceof EE_Datetime) { |
108 | - $datetime_content .= $datetime->get_dtt_display_name() . '<br>'; |
|
108 | + $datetime_content .= $datetime->get_dtt_display_name().'<br>'; |
|
109 | 109 | } |
110 | 110 | } |
111 | 111 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | // Amount Column |
115 | 115 | if ($line_item->is_percent()) { |
116 | - $html .= EEH_HTML::td($line_item->percent() . '%', '', 'jst-rght'); |
|
116 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'jst-rght'); |
|
117 | 117 | } else { |
118 | 118 | $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'jst-rght'); |
119 | 119 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | // start of row |
139 | 139 | $html = EEH_HTML::tr('', 'admin-primary-mbox-taxes-tr'); |
140 | 140 | // name th |
141 | - $html .= EEH_HTML::th($line_item->name() . '(' . $line_item->get_pretty('LIN_percent') . '%)', '', 'jst-rght', '', ' colspan="3"'); |
|
141 | + $html .= EEH_HTML::th($line_item->name().'('.$line_item->get_pretty('LIN_percent').'%)', '', 'jst-rght', '', ' colspan="3"'); |
|
142 | 142 | // total th |
143 | 143 | $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
144 | 144 | // end of row |
@@ -171,9 +171,9 @@ discard block |
||
171 | 171 | $html = EEH_HTML::tr('', '', 'admin-primary-mbox-total-tr'); |
172 | 172 | // Total th label |
173 | 173 | if ($total_match) { |
174 | - $total_label = sprintf(__('This registration\'s total %s:', 'event_espresso'), '(' . EE_Registry::instance()->CFG->currency->code . ')'); |
|
174 | + $total_label = sprintf(__('This registration\'s total %s:', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')'); |
|
175 | 175 | } else { |
176 | - $total_label = sprintf(__('This registration\'s approximate total %s', 'event_espresso'), '(' . EE_Registry::instance()->CFG->currency->code . ')'); |
|
176 | + $total_label = sprintf(__('This registration\'s approximate total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')'); |
|
177 | 177 | $total_label .= '<br>'; |
178 | 178 | $total_label .= '<p class="ee-footnote-text">' |
179 | 179 | . sprintf( |
@@ -13,191 +13,191 @@ |
||
13 | 13 | class EE_Admin_Table_Registration_Line_Item_Display_Strategy extends EE_Admin_Table_Line_Item_Display_Strategy |
14 | 14 | { |
15 | 15 | |
16 | - /** |
|
17 | - * Table header for display. |
|
18 | - * @since 4.8 |
|
19 | - * @param array $options |
|
20 | - * @return string |
|
21 | - */ |
|
22 | - protected function _table_header($options) |
|
23 | - { |
|
24 | - $html = EEH_HTML::table('', '', $options['table_css_class']); |
|
25 | - $html .= EEH_HTML::thead(); |
|
26 | - $html .= EEH_HTML::tr(); |
|
27 | - $html .= EEH_HTML::th(__('Name', 'event_espresso'), '', 'jst-left'); |
|
28 | - $html .= EEH_HTML::th(__('Type', 'event_espresso'), '', 'jst-left'); |
|
29 | - $html .= EEH_HTML::th(__('Date(s)', 'event_espresso'), '', 'jst-left'); |
|
30 | - $html .= EEH_HTML::th(__('Amount', 'event_espresso'), '', 'jst-cntr'); |
|
31 | - $html .= EEH_HTML::tbody(); |
|
32 | - return $html; |
|
33 | - } |
|
34 | - |
|
35 | - |
|
36 | - |
|
37 | - |
|
38 | - |
|
39 | - /** |
|
40 | - * _item_row |
|
41 | - * |
|
42 | - * @param EE_Line_Item $line_item |
|
43 | - * @param array $options |
|
44 | - * @return mixed |
|
45 | - */ |
|
46 | - protected function _item_row(EE_Line_Item $line_item, $options = array()) |
|
47 | - { |
|
48 | - $line_item_related_object = $line_item->get_object(); |
|
49 | - $parent_line_item_related_object = $line_item->parent() instanceof EE_Line_Item |
|
50 | - ? $line_item->parent()->get_object() |
|
51 | - : null; |
|
52 | - // start of row |
|
53 | - $row_class = $options['odd'] ? 'item odd' : 'item'; |
|
54 | - $html = EEH_HTML::tr('', '', $row_class); |
|
55 | - |
|
56 | - |
|
57 | - // Name Column |
|
58 | - $name_link = $line_item_related_object instanceof EEI_Admin_Links ? $line_item_related_object->get_admin_details_link() : ''; |
|
59 | - |
|
60 | - // related object scope. |
|
61 | - $parent_related_object_name = $parent_line_item_related_object instanceof EEI_Line_Item_Object |
|
62 | - ? $parent_line_item_related_object->name() |
|
63 | - : ''; |
|
64 | - $parent_related_object_name = empty($parent_related_object_name) && $line_item->parent() instanceof EE_Line_Item |
|
65 | - ? $line_item->parent()->name() |
|
66 | - : $parent_related_object_name; |
|
67 | - $parent_related_object_link = $parent_line_item_related_object instanceof EEI_Admin_Links |
|
68 | - ? $parent_line_item_related_object->get_admin_details_link() |
|
69 | - : ''; |
|
70 | - |
|
71 | - |
|
72 | - $name_html = $line_item_related_object instanceof EEI_Line_Item_Object |
|
73 | - ? $line_item_related_object->name() : $line_item->name(); |
|
74 | - $name_html = $name_link ? '<a href="' . $name_link . '">' . $name_html . '</a>' |
|
75 | - : $name_html; |
|
76 | - $name_html .= $line_item->is_taxable() ? ' *' : ''; |
|
77 | - // maybe preface with icon? |
|
78 | - $name_html = $line_item_related_object instanceof EEI_Has_Icon |
|
79 | - ? $line_item_related_object->get_icon() . $name_html |
|
80 | - : $name_html; |
|
81 | - $name_html = '<span class="ee-line-item-name linked">' . $name_html . '</span><br>'; |
|
82 | - $name_html .= sprintf( |
|
83 | - _x('%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'), |
|
84 | - '<span class="ee-line-item-related-parent-object">', |
|
85 | - $line_item->parent() instanceof EE_Line_Item |
|
86 | - ? $line_item->parent()->OBJ_type_i18n() |
|
87 | - : __('Item:', 'event_espresso'), |
|
88 | - $parent_related_object_link |
|
89 | - ? '<a href="' . $parent_related_object_link . '">' . $parent_related_object_name . '</a>' |
|
90 | - : $parent_related_object_name, |
|
91 | - '</span>' |
|
92 | - ); |
|
93 | - |
|
94 | - $name_html = apply_filters( |
|
95 | - 'FHEE__EE_Admin_Table_Registration_Line_Item_Display_Strategy___item_row__name_html', |
|
96 | - $name_html, |
|
97 | - $line_item, |
|
98 | - $options |
|
99 | - ); |
|
16 | + /** |
|
17 | + * Table header for display. |
|
18 | + * @since 4.8 |
|
19 | + * @param array $options |
|
20 | + * @return string |
|
21 | + */ |
|
22 | + protected function _table_header($options) |
|
23 | + { |
|
24 | + $html = EEH_HTML::table('', '', $options['table_css_class']); |
|
25 | + $html .= EEH_HTML::thead(); |
|
26 | + $html .= EEH_HTML::tr(); |
|
27 | + $html .= EEH_HTML::th(__('Name', 'event_espresso'), '', 'jst-left'); |
|
28 | + $html .= EEH_HTML::th(__('Type', 'event_espresso'), '', 'jst-left'); |
|
29 | + $html .= EEH_HTML::th(__('Date(s)', 'event_espresso'), '', 'jst-left'); |
|
30 | + $html .= EEH_HTML::th(__('Amount', 'event_espresso'), '', 'jst-cntr'); |
|
31 | + $html .= EEH_HTML::tbody(); |
|
32 | + return $html; |
|
33 | + } |
|
34 | + |
|
35 | + |
|
36 | + |
|
37 | + |
|
38 | + |
|
39 | + /** |
|
40 | + * _item_row |
|
41 | + * |
|
42 | + * @param EE_Line_Item $line_item |
|
43 | + * @param array $options |
|
44 | + * @return mixed |
|
45 | + */ |
|
46 | + protected function _item_row(EE_Line_Item $line_item, $options = array()) |
|
47 | + { |
|
48 | + $line_item_related_object = $line_item->get_object(); |
|
49 | + $parent_line_item_related_object = $line_item->parent() instanceof EE_Line_Item |
|
50 | + ? $line_item->parent()->get_object() |
|
51 | + : null; |
|
52 | + // start of row |
|
53 | + $row_class = $options['odd'] ? 'item odd' : 'item'; |
|
54 | + $html = EEH_HTML::tr('', '', $row_class); |
|
55 | + |
|
56 | + |
|
57 | + // Name Column |
|
58 | + $name_link = $line_item_related_object instanceof EEI_Admin_Links ? $line_item_related_object->get_admin_details_link() : ''; |
|
59 | + |
|
60 | + // related object scope. |
|
61 | + $parent_related_object_name = $parent_line_item_related_object instanceof EEI_Line_Item_Object |
|
62 | + ? $parent_line_item_related_object->name() |
|
63 | + : ''; |
|
64 | + $parent_related_object_name = empty($parent_related_object_name) && $line_item->parent() instanceof EE_Line_Item |
|
65 | + ? $line_item->parent()->name() |
|
66 | + : $parent_related_object_name; |
|
67 | + $parent_related_object_link = $parent_line_item_related_object instanceof EEI_Admin_Links |
|
68 | + ? $parent_line_item_related_object->get_admin_details_link() |
|
69 | + : ''; |
|
70 | + |
|
71 | + |
|
72 | + $name_html = $line_item_related_object instanceof EEI_Line_Item_Object |
|
73 | + ? $line_item_related_object->name() : $line_item->name(); |
|
74 | + $name_html = $name_link ? '<a href="' . $name_link . '">' . $name_html . '</a>' |
|
75 | + : $name_html; |
|
76 | + $name_html .= $line_item->is_taxable() ? ' *' : ''; |
|
77 | + // maybe preface with icon? |
|
78 | + $name_html = $line_item_related_object instanceof EEI_Has_Icon |
|
79 | + ? $line_item_related_object->get_icon() . $name_html |
|
80 | + : $name_html; |
|
81 | + $name_html = '<span class="ee-line-item-name linked">' . $name_html . '</span><br>'; |
|
82 | + $name_html .= sprintf( |
|
83 | + _x('%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'), |
|
84 | + '<span class="ee-line-item-related-parent-object">', |
|
85 | + $line_item->parent() instanceof EE_Line_Item |
|
86 | + ? $line_item->parent()->OBJ_type_i18n() |
|
87 | + : __('Item:', 'event_espresso'), |
|
88 | + $parent_related_object_link |
|
89 | + ? '<a href="' . $parent_related_object_link . '">' . $parent_related_object_name . '</a>' |
|
90 | + : $parent_related_object_name, |
|
91 | + '</span>' |
|
92 | + ); |
|
93 | + |
|
94 | + $name_html = apply_filters( |
|
95 | + 'FHEE__EE_Admin_Table_Registration_Line_Item_Display_Strategy___item_row__name_html', |
|
96 | + $name_html, |
|
97 | + $line_item, |
|
98 | + $options |
|
99 | + ); |
|
100 | 100 | |
101 | - $html .= EEH_HTML::td($name_html, '', 'jst-left'); |
|
102 | - // Type Column |
|
103 | - $type_html = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n() : ''; |
|
104 | - $type_html .= $this->_get_cancellations($line_item); |
|
105 | - $type_html .= $line_item->OBJ_type() ? '<br />' : ''; |
|
106 | - $code = $line_item_related_object instanceof EEI_Has_Code ? $line_item_related_object->code() : ''; |
|
107 | - $type_html .= ! empty($code) ? '<span class="ee-line-item-id">' . sprintf(__('Code: %s', 'event_espresso'), $code) . '</span>' : ''; |
|
108 | - $html .= EEH_HTML::td($type_html, '', 'jst-left'); |
|
109 | - |
|
110 | - // Date column |
|
111 | - $datetime_content = ''; |
|
112 | - if ($line_item_related_object instanceof EE_Ticket) { |
|
113 | - $datetimes = $line_item_related_object->datetimes(); |
|
114 | - foreach ($datetimes as $datetime) { |
|
115 | - if ($datetime instanceof EE_Datetime) { |
|
116 | - $datetime_content .= $datetime->get_dtt_display_name() . '<br>'; |
|
117 | - } |
|
118 | - } |
|
119 | - } |
|
120 | - $html .= EEH_HTML::td($datetime_content, '', 'jst-left'); |
|
121 | - |
|
122 | - // Amount Column |
|
123 | - if ($line_item->is_percent()) { |
|
124 | - $html .= EEH_HTML::td($line_item->percent() . '%', '', 'jst-rght'); |
|
125 | - } else { |
|
126 | - $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'jst-rght'); |
|
127 | - } |
|
128 | - |
|
129 | - |
|
130 | - // finish things off and return |
|
131 | - $html .= EEH_HTML::trx(); |
|
132 | - return $html; |
|
133 | - } |
|
134 | - |
|
135 | - |
|
136 | - |
|
137 | - /** |
|
138 | - * _tax_row |
|
139 | - * |
|
140 | - * @param EE_Line_Item $line_item |
|
141 | - * @param array $options |
|
142 | - * @return mixed |
|
143 | - */ |
|
144 | - protected function _tax_row(EE_Line_Item $line_item, $options = array()) |
|
145 | - { |
|
146 | - // start of row |
|
147 | - $html = EEH_HTML::tr('', 'admin-primary-mbox-taxes-tr'); |
|
148 | - // name th |
|
149 | - $html .= EEH_HTML::th($line_item->name() . '(' . $line_item->get_pretty('LIN_percent') . '%)', '', 'jst-rght', '', ' colspan="3"'); |
|
150 | - // total th |
|
151 | - $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
152 | - // end of row |
|
153 | - $html .= EEH_HTML::trx(); |
|
154 | - return $html; |
|
155 | - } |
|
156 | - |
|
157 | - |
|
158 | - |
|
159 | - |
|
160 | - |
|
161 | - /** |
|
162 | - * _total_row |
|
163 | - * |
|
164 | - * @param EE_Line_Item $line_item |
|
165 | - * @param array $options |
|
166 | - * @return mixed |
|
167 | - */ |
|
168 | - protected function _total_row(EE_Line_Item $line_item, $options = array()) |
|
169 | - { |
|
170 | - |
|
171 | - $registration = isset($options['EE_Registration']) ? $options['EE_Registration'] : null; |
|
172 | - $registration_total = $registration instanceof EE_Registration ? $registration->pretty_final_price() : 0; |
|
173 | - // if no valid registration object then we're not going to show the approximate text. |
|
174 | - $total_match = $registration instanceof EE_Registration |
|
175 | - ? $registration->final_price() === $line_item->total() |
|
176 | - : true; |
|
177 | - |
|
178 | - // start of row |
|
179 | - $html = EEH_HTML::tr('', '', 'admin-primary-mbox-total-tr'); |
|
180 | - // Total th label |
|
181 | - if ($total_match) { |
|
182 | - $total_label = sprintf(__('This registration\'s total %s:', 'event_espresso'), '(' . EE_Registry::instance()->CFG->currency->code . ')'); |
|
183 | - } else { |
|
184 | - $total_label = sprintf(__('This registration\'s approximate total %s', 'event_espresso'), '(' . EE_Registry::instance()->CFG->currency->code . ')'); |
|
185 | - $total_label .= '<br>'; |
|
186 | - $total_label .= '<p class="ee-footnote-text">' |
|
187 | - . sprintf( |
|
188 | - __('The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others. This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso'), |
|
189 | - '<strong>', |
|
190 | - $registration_total, |
|
191 | - '</strong>' |
|
192 | - ) |
|
193 | - . '</p>'; |
|
194 | - } |
|
195 | - $html .= EEH_HTML::th($total_label, '', 'jst-rght', '', ' colspan="3"'); |
|
196 | - // total th |
|
197 | - |
|
198 | - $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
199 | - // end of row |
|
200 | - $html .= EEH_HTML::trx(); |
|
201 | - return $html; |
|
202 | - } |
|
101 | + $html .= EEH_HTML::td($name_html, '', 'jst-left'); |
|
102 | + // Type Column |
|
103 | + $type_html = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n() : ''; |
|
104 | + $type_html .= $this->_get_cancellations($line_item); |
|
105 | + $type_html .= $line_item->OBJ_type() ? '<br />' : ''; |
|
106 | + $code = $line_item_related_object instanceof EEI_Has_Code ? $line_item_related_object->code() : ''; |
|
107 | + $type_html .= ! empty($code) ? '<span class="ee-line-item-id">' . sprintf(__('Code: %s', 'event_espresso'), $code) . '</span>' : ''; |
|
108 | + $html .= EEH_HTML::td($type_html, '', 'jst-left'); |
|
109 | + |
|
110 | + // Date column |
|
111 | + $datetime_content = ''; |
|
112 | + if ($line_item_related_object instanceof EE_Ticket) { |
|
113 | + $datetimes = $line_item_related_object->datetimes(); |
|
114 | + foreach ($datetimes as $datetime) { |
|
115 | + if ($datetime instanceof EE_Datetime) { |
|
116 | + $datetime_content .= $datetime->get_dtt_display_name() . '<br>'; |
|
117 | + } |
|
118 | + } |
|
119 | + } |
|
120 | + $html .= EEH_HTML::td($datetime_content, '', 'jst-left'); |
|
121 | + |
|
122 | + // Amount Column |
|
123 | + if ($line_item->is_percent()) { |
|
124 | + $html .= EEH_HTML::td($line_item->percent() . '%', '', 'jst-rght'); |
|
125 | + } else { |
|
126 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'jst-rght'); |
|
127 | + } |
|
128 | + |
|
129 | + |
|
130 | + // finish things off and return |
|
131 | + $html .= EEH_HTML::trx(); |
|
132 | + return $html; |
|
133 | + } |
|
134 | + |
|
135 | + |
|
136 | + |
|
137 | + /** |
|
138 | + * _tax_row |
|
139 | + * |
|
140 | + * @param EE_Line_Item $line_item |
|
141 | + * @param array $options |
|
142 | + * @return mixed |
|
143 | + */ |
|
144 | + protected function _tax_row(EE_Line_Item $line_item, $options = array()) |
|
145 | + { |
|
146 | + // start of row |
|
147 | + $html = EEH_HTML::tr('', 'admin-primary-mbox-taxes-tr'); |
|
148 | + // name th |
|
149 | + $html .= EEH_HTML::th($line_item->name() . '(' . $line_item->get_pretty('LIN_percent') . '%)', '', 'jst-rght', '', ' colspan="3"'); |
|
150 | + // total th |
|
151 | + $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
152 | + // end of row |
|
153 | + $html .= EEH_HTML::trx(); |
|
154 | + return $html; |
|
155 | + } |
|
156 | + |
|
157 | + |
|
158 | + |
|
159 | + |
|
160 | + |
|
161 | + /** |
|
162 | + * _total_row |
|
163 | + * |
|
164 | + * @param EE_Line_Item $line_item |
|
165 | + * @param array $options |
|
166 | + * @return mixed |
|
167 | + */ |
|
168 | + protected function _total_row(EE_Line_Item $line_item, $options = array()) |
|
169 | + { |
|
170 | + |
|
171 | + $registration = isset($options['EE_Registration']) ? $options['EE_Registration'] : null; |
|
172 | + $registration_total = $registration instanceof EE_Registration ? $registration->pretty_final_price() : 0; |
|
173 | + // if no valid registration object then we're not going to show the approximate text. |
|
174 | + $total_match = $registration instanceof EE_Registration |
|
175 | + ? $registration->final_price() === $line_item->total() |
|
176 | + : true; |
|
177 | + |
|
178 | + // start of row |
|
179 | + $html = EEH_HTML::tr('', '', 'admin-primary-mbox-total-tr'); |
|
180 | + // Total th label |
|
181 | + if ($total_match) { |
|
182 | + $total_label = sprintf(__('This registration\'s total %s:', 'event_espresso'), '(' . EE_Registry::instance()->CFG->currency->code . ')'); |
|
183 | + } else { |
|
184 | + $total_label = sprintf(__('This registration\'s approximate total %s', 'event_espresso'), '(' . EE_Registry::instance()->CFG->currency->code . ')'); |
|
185 | + $total_label .= '<br>'; |
|
186 | + $total_label .= '<p class="ee-footnote-text">' |
|
187 | + . sprintf( |
|
188 | + __('The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others. This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso'), |
|
189 | + '<strong>', |
|
190 | + $registration_total, |
|
191 | + '</strong>' |
|
192 | + ) |
|
193 | + . '</p>'; |
|
194 | + } |
|
195 | + $html .= EEH_HTML::th($total_label, '', 'jst-rght', '', ' colspan="3"'); |
|
196 | + // total th |
|
197 | + |
|
198 | + $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
199 | + // end of row |
|
200 | + $html .= EEH_HTML::trx(); |
|
201 | + return $html; |
|
202 | + } |
|
203 | 203 | } |
@@ -22,30 +22,30 @@ |
||
22 | 22 | |
23 | 23 | interface JobHandlerInterface |
24 | 24 | { |
25 | - /** |
|
26 | - * Performs any necessary setup for starting the job. This is also a good |
|
27 | - * place to setup the $job_arguments which will be used for subsequent HTTP requests |
|
28 | - * when continue_job will be called |
|
29 | - * @param JobParameters $job_parameters |
|
30 | - * @throws BatchRequestException |
|
31 | - * @return JobStepResponse |
|
32 | - */ |
|
33 | - public function create_job(JobParameters $job_parameters); |
|
25 | + /** |
|
26 | + * Performs any necessary setup for starting the job. This is also a good |
|
27 | + * place to setup the $job_arguments which will be used for subsequent HTTP requests |
|
28 | + * when continue_job will be called |
|
29 | + * @param JobParameters $job_parameters |
|
30 | + * @throws BatchRequestException |
|
31 | + * @return JobStepResponse |
|
32 | + */ |
|
33 | + public function create_job(JobParameters $job_parameters); |
|
34 | 34 | |
35 | - /** |
|
36 | - * Performs another step of the job |
|
37 | - * @param JobParameters $job_parameters |
|
38 | - * @param int $batch_size |
|
39 | - * @return JobStepResponse |
|
40 | - * @throws BatchRequestException |
|
41 | - */ |
|
42 | - public function continue_job(JobParameters $job_parameters, $batch_size = 50); |
|
35 | + /** |
|
36 | + * Performs another step of the job |
|
37 | + * @param JobParameters $job_parameters |
|
38 | + * @param int $batch_size |
|
39 | + * @return JobStepResponse |
|
40 | + * @throws BatchRequestException |
|
41 | + */ |
|
42 | + public function continue_job(JobParameters $job_parameters, $batch_size = 50); |
|
43 | 43 | |
44 | - /** |
|
45 | - * Performs any clean-up logic when we know the job is completed |
|
46 | - * @param JobParameters $job_parameters |
|
47 | - * @return JobStepResponse |
|
48 | - * @throws BatchRequestException |
|
49 | - */ |
|
50 | - public function cleanup_job(JobParameters $job_parameters); |
|
44 | + /** |
|
45 | + * Performs any clean-up logic when we know the job is completed |
|
46 | + * @param JobParameters $job_parameters |
|
47 | + * @return JobStepResponse |
|
48 | + * @throws BatchRequestException |
|
49 | + */ |
|
50 | + public function cleanup_job(JobParameters $job_parameters); |
|
51 | 51 | } |
@@ -13,146 +13,146 @@ |
||
13 | 13 | class EE_Response |
14 | 14 | { |
15 | 15 | |
16 | - /** |
|
17 | - * @access protected |
|
18 | - * @type array $_notice |
|
19 | - */ |
|
20 | - protected $_notice = array(); |
|
21 | - |
|
22 | - /** |
|
23 | - * rendered output to be returned to WP |
|
24 | - * |
|
25 | - * @access protected |
|
26 | - * @type string |
|
27 | - */ |
|
28 | - protected $_output = ''; |
|
29 | - |
|
30 | - /** |
|
31 | - * @access protected |
|
32 | - * @type bool |
|
33 | - */ |
|
34 | - protected $request_terminated = false; |
|
35 | - |
|
36 | - /** |
|
37 | - * @access protected |
|
38 | - * @type bool |
|
39 | - */ |
|
40 | - protected $deactivate_plugin = false; |
|
41 | - |
|
42 | - |
|
43 | - /** |
|
44 | - * @deprecated 4.9.53 |
|
45 | - * @return \EE_Response |
|
46 | - */ |
|
47 | - public function __construct() |
|
48 | - { |
|
49 | - $this->terminate_request(false); |
|
50 | - EE_Error::doing_it_wrong( |
|
51 | - __METHOD__, |
|
52 | - sprintf( |
|
53 | - esc_html__( |
|
54 | - 'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
55 | - 'event_espresso' |
|
56 | - ), |
|
57 | - 'EventEspresso\core\services\request\Response', |
|
58 | - '\core\services\request', |
|
59 | - 'EventEspresso\core\services\request' |
|
60 | - ), |
|
61 | - '4.9.53' |
|
62 | - ); |
|
63 | - } |
|
64 | - |
|
65 | - |
|
66 | - /** |
|
67 | - * @deprecated 4.9.53 |
|
68 | - * @param $key |
|
69 | - * @param $value |
|
70 | - * @return void |
|
71 | - */ |
|
72 | - public function set_notice($key, $value) |
|
73 | - { |
|
74 | - $this->_notice[ $key ] = $value; |
|
75 | - } |
|
76 | - |
|
77 | - |
|
78 | - /** |
|
79 | - * @deprecated 4.9.53 |
|
80 | - * @param $key |
|
81 | - * @return mixed |
|
82 | - */ |
|
83 | - public function get_notice($key) |
|
84 | - { |
|
85 | - return isset($this->_notice[ $key ]) ? $this->_notice[ $key ] : null; |
|
86 | - } |
|
87 | - |
|
88 | - |
|
89 | - /** |
|
90 | - * @deprecated 4.9.53 |
|
91 | - * @return array |
|
92 | - */ |
|
93 | - public function get_notices() |
|
94 | - { |
|
95 | - return $this->_notice; |
|
96 | - } |
|
97 | - |
|
98 | - |
|
99 | - /** |
|
100 | - * @deprecated 4.9.53 |
|
101 | - * @param $string |
|
102 | - * @param bool $append |
|
103 | - */ |
|
104 | - public function add_output($string, $append = true) |
|
105 | - { |
|
106 | - $this->_output = $append ? $this->_output . $string : $string . $this->_output; |
|
107 | - } |
|
108 | - |
|
109 | - |
|
110 | - /** |
|
111 | - * @deprecated 4.9.53 |
|
112 | - * @return string |
|
113 | - */ |
|
114 | - public function get_output() |
|
115 | - { |
|
116 | - return $this->_output; |
|
117 | - } |
|
118 | - |
|
119 | - |
|
120 | - /** |
|
121 | - * @deprecated 4.9.53 |
|
122 | - * @return boolean |
|
123 | - */ |
|
124 | - public function request_terminated() |
|
125 | - { |
|
126 | - return $this->request_terminated; |
|
127 | - } |
|
128 | - |
|
129 | - |
|
130 | - /** |
|
131 | - * @deprecated 4.9.53 |
|
132 | - * @param boolean $request_terminated |
|
133 | - */ |
|
134 | - public function terminate_request($request_terminated = true) |
|
135 | - { |
|
136 | - $this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN); |
|
137 | - } |
|
138 | - |
|
139 | - |
|
140 | - /** |
|
141 | - * @deprecated 4.9.53 |
|
142 | - * @return boolean |
|
143 | - */ |
|
144 | - public function plugin_deactivated() |
|
145 | - { |
|
146 | - return $this->deactivate_plugin; |
|
147 | - } |
|
148 | - |
|
149 | - |
|
150 | - /** |
|
151 | - * @deprecated 4.9.53 |
|
152 | - * sets $deactivate_plugin to true |
|
153 | - */ |
|
154 | - public function deactivate_plugin() |
|
155 | - { |
|
156 | - $this->deactivate_plugin = true; |
|
157 | - } |
|
16 | + /** |
|
17 | + * @access protected |
|
18 | + * @type array $_notice |
|
19 | + */ |
|
20 | + protected $_notice = array(); |
|
21 | + |
|
22 | + /** |
|
23 | + * rendered output to be returned to WP |
|
24 | + * |
|
25 | + * @access protected |
|
26 | + * @type string |
|
27 | + */ |
|
28 | + protected $_output = ''; |
|
29 | + |
|
30 | + /** |
|
31 | + * @access protected |
|
32 | + * @type bool |
|
33 | + */ |
|
34 | + protected $request_terminated = false; |
|
35 | + |
|
36 | + /** |
|
37 | + * @access protected |
|
38 | + * @type bool |
|
39 | + */ |
|
40 | + protected $deactivate_plugin = false; |
|
41 | + |
|
42 | + |
|
43 | + /** |
|
44 | + * @deprecated 4.9.53 |
|
45 | + * @return \EE_Response |
|
46 | + */ |
|
47 | + public function __construct() |
|
48 | + { |
|
49 | + $this->terminate_request(false); |
|
50 | + EE_Error::doing_it_wrong( |
|
51 | + __METHOD__, |
|
52 | + sprintf( |
|
53 | + esc_html__( |
|
54 | + 'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
55 | + 'event_espresso' |
|
56 | + ), |
|
57 | + 'EventEspresso\core\services\request\Response', |
|
58 | + '\core\services\request', |
|
59 | + 'EventEspresso\core\services\request' |
|
60 | + ), |
|
61 | + '4.9.53' |
|
62 | + ); |
|
63 | + } |
|
64 | + |
|
65 | + |
|
66 | + /** |
|
67 | + * @deprecated 4.9.53 |
|
68 | + * @param $key |
|
69 | + * @param $value |
|
70 | + * @return void |
|
71 | + */ |
|
72 | + public function set_notice($key, $value) |
|
73 | + { |
|
74 | + $this->_notice[ $key ] = $value; |
|
75 | + } |
|
76 | + |
|
77 | + |
|
78 | + /** |
|
79 | + * @deprecated 4.9.53 |
|
80 | + * @param $key |
|
81 | + * @return mixed |
|
82 | + */ |
|
83 | + public function get_notice($key) |
|
84 | + { |
|
85 | + return isset($this->_notice[ $key ]) ? $this->_notice[ $key ] : null; |
|
86 | + } |
|
87 | + |
|
88 | + |
|
89 | + /** |
|
90 | + * @deprecated 4.9.53 |
|
91 | + * @return array |
|
92 | + */ |
|
93 | + public function get_notices() |
|
94 | + { |
|
95 | + return $this->_notice; |
|
96 | + } |
|
97 | + |
|
98 | + |
|
99 | + /** |
|
100 | + * @deprecated 4.9.53 |
|
101 | + * @param $string |
|
102 | + * @param bool $append |
|
103 | + */ |
|
104 | + public function add_output($string, $append = true) |
|
105 | + { |
|
106 | + $this->_output = $append ? $this->_output . $string : $string . $this->_output; |
|
107 | + } |
|
108 | + |
|
109 | + |
|
110 | + /** |
|
111 | + * @deprecated 4.9.53 |
|
112 | + * @return string |
|
113 | + */ |
|
114 | + public function get_output() |
|
115 | + { |
|
116 | + return $this->_output; |
|
117 | + } |
|
118 | + |
|
119 | + |
|
120 | + /** |
|
121 | + * @deprecated 4.9.53 |
|
122 | + * @return boolean |
|
123 | + */ |
|
124 | + public function request_terminated() |
|
125 | + { |
|
126 | + return $this->request_terminated; |
|
127 | + } |
|
128 | + |
|
129 | + |
|
130 | + /** |
|
131 | + * @deprecated 4.9.53 |
|
132 | + * @param boolean $request_terminated |
|
133 | + */ |
|
134 | + public function terminate_request($request_terminated = true) |
|
135 | + { |
|
136 | + $this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN); |
|
137 | + } |
|
138 | + |
|
139 | + |
|
140 | + /** |
|
141 | + * @deprecated 4.9.53 |
|
142 | + * @return boolean |
|
143 | + */ |
|
144 | + public function plugin_deactivated() |
|
145 | + { |
|
146 | + return $this->deactivate_plugin; |
|
147 | + } |
|
148 | + |
|
149 | + |
|
150 | + /** |
|
151 | + * @deprecated 4.9.53 |
|
152 | + * sets $deactivate_plugin to true |
|
153 | + */ |
|
154 | + public function deactivate_plugin() |
|
155 | + { |
|
156 | + $this->deactivate_plugin = true; |
|
157 | + } |
|
158 | 158 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | */ |
72 | 72 | public function set_notice($key, $value) |
73 | 73 | { |
74 | - $this->_notice[ $key ] = $value; |
|
74 | + $this->_notice[$key] = $value; |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | */ |
83 | 83 | public function get_notice($key) |
84 | 84 | { |
85 | - return isset($this->_notice[ $key ]) ? $this->_notice[ $key ] : null; |
|
85 | + return isset($this->_notice[$key]) ? $this->_notice[$key] : null; |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | */ |
104 | 104 | public function add_output($string, $append = true) |
105 | 105 | { |
106 | - $this->_output = $append ? $this->_output . $string : $string . $this->_output; |
|
106 | + $this->_output = $append ? $this->_output.$string : $string.$this->_output; |
|
107 | 107 | } |
108 | 108 | |
109 | 109 |
@@ -13,46 +13,46 @@ |
||
13 | 13 | class EE_Request_Stack_Builder |
14 | 14 | { |
15 | 15 | |
16 | - /** |
|
17 | - * EE_Request_Stack_Builder |
|
18 | - */ |
|
19 | - public function __construct() |
|
20 | - { |
|
21 | - EE_Error::doing_it_wrong( |
|
22 | - __METHOD__, |
|
23 | - sprintf( |
|
24 | - esc_html__( |
|
25 | - 'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
26 | - 'event_espresso' |
|
27 | - ), |
|
28 | - 'EventEspresso\core\services\request\RequestStackBuilder', |
|
29 | - '\core\services\request', |
|
30 | - 'EventEspresso\core\services\request' |
|
31 | - ), |
|
32 | - '4.9.53' |
|
33 | - ); |
|
34 | - } |
|
16 | + /** |
|
17 | + * EE_Request_Stack_Builder |
|
18 | + */ |
|
19 | + public function __construct() |
|
20 | + { |
|
21 | + EE_Error::doing_it_wrong( |
|
22 | + __METHOD__, |
|
23 | + sprintf( |
|
24 | + esc_html__( |
|
25 | + 'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
26 | + 'event_espresso' |
|
27 | + ), |
|
28 | + 'EventEspresso\core\services\request\RequestStackBuilder', |
|
29 | + '\core\services\request', |
|
30 | + 'EventEspresso\core\services\request' |
|
31 | + ), |
|
32 | + '4.9.53' |
|
33 | + ); |
|
34 | + } |
|
35 | 35 | |
36 | - /** |
|
37 | - * @deprecated 4.9.53 |
|
38 | - */ |
|
39 | - public function unshift() |
|
40 | - { |
|
41 | - } |
|
36 | + /** |
|
37 | + * @deprecated 4.9.53 |
|
38 | + */ |
|
39 | + public function unshift() |
|
40 | + { |
|
41 | + } |
|
42 | 42 | |
43 | 43 | |
44 | - /** |
|
45 | - * @deprecated 4.9.53 |
|
46 | - */ |
|
47 | - public function push() |
|
48 | - { |
|
49 | - } |
|
44 | + /** |
|
45 | + * @deprecated 4.9.53 |
|
46 | + */ |
|
47 | + public function push() |
|
48 | + { |
|
49 | + } |
|
50 | 50 | |
51 | 51 | |
52 | - /** |
|
53 | - * @deprecated 4.9.53 |
|
54 | - */ |
|
55 | - public function resolve(EEI_Request_Decorator $application) |
|
56 | - { |
|
57 | - } |
|
52 | + /** |
|
53 | + * @deprecated 4.9.53 |
|
54 | + */ |
|
55 | + public function resolve(EEI_Request_Decorator $application) |
|
56 | + { |
|
57 | + } |
|
58 | 58 | } |
@@ -13,25 +13,25 @@ |
||
13 | 13 | { |
14 | 14 | |
15 | 15 | |
16 | - /** |
|
17 | - * @deprecated 4.9.53 |
|
18 | - * @param EEI_Request_Decorator $application |
|
19 | - * @param array $middlewares |
|
20 | - */ |
|
21 | - public function __construct(EEI_Request_Decorator $application, $middlewares = array()) |
|
22 | - { |
|
23 | - EE_Error::doing_it_wrong( |
|
24 | - __METHOD__, |
|
25 | - sprintf( |
|
26 | - esc_html__( |
|
27 | - 'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
28 | - 'event_espresso' |
|
29 | - ), |
|
30 | - 'EventEspresso\core\services\request\RequestStack', |
|
31 | - '\core\services\request', |
|
32 | - 'EventEspresso\core\services\request' |
|
33 | - ), |
|
34 | - '4.9.53' |
|
35 | - ); |
|
36 | - } |
|
16 | + /** |
|
17 | + * @deprecated 4.9.53 |
|
18 | + * @param EEI_Request_Decorator $application |
|
19 | + * @param array $middlewares |
|
20 | + */ |
|
21 | + public function __construct(EEI_Request_Decorator $application, $middlewares = array()) |
|
22 | + { |
|
23 | + EE_Error::doing_it_wrong( |
|
24 | + __METHOD__, |
|
25 | + sprintf( |
|
26 | + esc_html__( |
|
27 | + 'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
28 | + 'event_espresso' |
|
29 | + ), |
|
30 | + 'EventEspresso\core\services\request\RequestStack', |
|
31 | + '\core\services\request', |
|
32 | + 'EventEspresso\core\services\request' |
|
33 | + ), |
|
34 | + '4.9.53' |
|
35 | + ); |
|
36 | + } |
|
37 | 37 | } |
@@ -11,66 +11,66 @@ |
||
11 | 11 | class EE_Load_Textdomain extends EE_Base |
12 | 12 | { |
13 | 13 | |
14 | - /** |
|
15 | - * holds the current lang in WP |
|
16 | - * |
|
17 | - * @var string |
|
18 | - */ |
|
19 | - private static $_lang; |
|
14 | + /** |
|
15 | + * holds the current lang in WP |
|
16 | + * |
|
17 | + * @var string |
|
18 | + */ |
|
19 | + private static $_lang; |
|
20 | 20 | |
21 | 21 | |
22 | - /** |
|
23 | - * this takes care of retrieving a matching textdomain for event espresso for the current WPLANG from EE GitHub |
|
24 | - * repo (if necessary) and then loading it for translations. should only be called in wp plugins_loaded callback |
|
25 | - * |
|
26 | - * @return void |
|
27 | - */ |
|
28 | - public static function load_textdomain() |
|
29 | - { |
|
30 | - self::_maybe_get_langfile(); |
|
31 | - // now load the textdomain |
|
32 | - if (! empty(self::$_lang) && is_readable(EE_LANGUAGES_SAFE_DIR . 'event_espresso-' . self::$_lang . '.mo')) { |
|
33 | - load_plugin_textdomain('event_espresso', false, EE_LANGUAGES_SAFE_LOC); |
|
34 | - } elseif (! empty(self::$_lang) |
|
35 | - && is_readable(EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . self::$_lang . '.mo') |
|
36 | - ) { |
|
37 | - load_textdomain('event_espresso', EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . self::$_lang . '.mo'); |
|
38 | - } else { |
|
39 | - load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME) . '/languages/'); |
|
40 | - } |
|
41 | - } |
|
22 | + /** |
|
23 | + * this takes care of retrieving a matching textdomain for event espresso for the current WPLANG from EE GitHub |
|
24 | + * repo (if necessary) and then loading it for translations. should only be called in wp plugins_loaded callback |
|
25 | + * |
|
26 | + * @return void |
|
27 | + */ |
|
28 | + public static function load_textdomain() |
|
29 | + { |
|
30 | + self::_maybe_get_langfile(); |
|
31 | + // now load the textdomain |
|
32 | + if (! empty(self::$_lang) && is_readable(EE_LANGUAGES_SAFE_DIR . 'event_espresso-' . self::$_lang . '.mo')) { |
|
33 | + load_plugin_textdomain('event_espresso', false, EE_LANGUAGES_SAFE_LOC); |
|
34 | + } elseif (! empty(self::$_lang) |
|
35 | + && is_readable(EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . self::$_lang . '.mo') |
|
36 | + ) { |
|
37 | + load_textdomain('event_espresso', EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . self::$_lang . '.mo'); |
|
38 | + } else { |
|
39 | + load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME) . '/languages/'); |
|
40 | + } |
|
41 | + } |
|
42 | 42 | |
43 | 43 | |
44 | - /** |
|
45 | - * The purpose of this method is to sideload the lang file for the given WPLANG locale (if necessary). |
|
46 | - * |
|
47 | - * @access private |
|
48 | - * @static |
|
49 | - * @return void |
|
50 | - */ |
|
51 | - private static function _maybe_get_langfile() |
|
52 | - { |
|
53 | - self::$_lang = get_locale(); |
|
54 | - if ($has_check = get_option('ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION) |
|
55 | - || empty(self::$_lang) |
|
56 | - ) { |
|
57 | - return; |
|
58 | - } |
|
44 | + /** |
|
45 | + * The purpose of this method is to sideload the lang file for the given WPLANG locale (if necessary). |
|
46 | + * |
|
47 | + * @access private |
|
48 | + * @static |
|
49 | + * @return void |
|
50 | + */ |
|
51 | + private static function _maybe_get_langfile() |
|
52 | + { |
|
53 | + self::$_lang = get_locale(); |
|
54 | + if ($has_check = get_option('ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION) |
|
55 | + || empty(self::$_lang) |
|
56 | + ) { |
|
57 | + return; |
|
58 | + } |
|
59 | 59 | |
60 | - // if lang is en_US or empty then lets just get out. (Event Espresso core is en_US) |
|
61 | - if (empty(self::$_lang) || self::$_lang == 'en_US') { |
|
62 | - return; |
|
63 | - } |
|
60 | + // if lang is en_US or empty then lets just get out. (Event Espresso core is en_US) |
|
61 | + if (empty(self::$_lang) || self::$_lang == 'en_US') { |
|
62 | + return; |
|
63 | + } |
|
64 | 64 | |
65 | - // made it here so let's get the file from the github repo |
|
66 | - $sideloader_args = array( |
|
67 | - '_upload_to' => EE_PLUGIN_DIR_PATH . 'languages/', |
|
68 | - '_upload_from' => 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso-' . self::$_lang . '.mo?raw=true', |
|
69 | - '_new_file_name' => 'event_espresso-' . self::$_lang . '.mo', |
|
70 | - ); |
|
71 | - $sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, false); |
|
65 | + // made it here so let's get the file from the github repo |
|
66 | + $sideloader_args = array( |
|
67 | + '_upload_to' => EE_PLUGIN_DIR_PATH . 'languages/', |
|
68 | + '_upload_from' => 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso-' . self::$_lang . '.mo?raw=true', |
|
69 | + '_new_file_name' => 'event_espresso-' . self::$_lang . '.mo', |
|
70 | + ); |
|
71 | + $sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, false); |
|
72 | 72 | |
73 | - $sideloader->sideload(); |
|
74 | - update_option('ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION, 1); |
|
75 | - } |
|
73 | + $sideloader->sideload(); |
|
74 | + update_option('ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION, 1); |
|
75 | + } |
|
76 | 76 | } |
@@ -29,14 +29,14 @@ discard block |
||
29 | 29 | { |
30 | 30 | self::_maybe_get_langfile(); |
31 | 31 | // now load the textdomain |
32 | - if (! empty(self::$_lang) && is_readable(EE_LANGUAGES_SAFE_DIR . 'event_espresso-' . self::$_lang . '.mo')) { |
|
32 | + if ( ! empty(self::$_lang) && is_readable(EE_LANGUAGES_SAFE_DIR.'event_espresso-'.self::$_lang.'.mo')) { |
|
33 | 33 | load_plugin_textdomain('event_espresso', false, EE_LANGUAGES_SAFE_LOC); |
34 | - } elseif (! empty(self::$_lang) |
|
35 | - && is_readable(EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . self::$_lang . '.mo') |
|
34 | + } elseif ( ! empty(self::$_lang) |
|
35 | + && is_readable(EE_LANGUAGES_SAFE_DIR.'event-espresso-4-'.self::$_lang.'.mo') |
|
36 | 36 | ) { |
37 | - load_textdomain('event_espresso', EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . self::$_lang . '.mo'); |
|
37 | + load_textdomain('event_espresso', EE_LANGUAGES_SAFE_DIR.'event-espresso-4-'.self::$_lang.'.mo'); |
|
38 | 38 | } else { |
39 | - load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME) . '/languages/'); |
|
39 | + load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME).'/languages/'); |
|
40 | 40 | } |
41 | 41 | } |
42 | 42 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | private static function _maybe_get_langfile() |
52 | 52 | { |
53 | 53 | self::$_lang = get_locale(); |
54 | - if ($has_check = get_option('ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION) |
|
54 | + if ($has_check = get_option('ee_lang_check_'.self::$_lang.'_'.EVENT_ESPRESSO_VERSION) |
|
55 | 55 | || empty(self::$_lang) |
56 | 56 | ) { |
57 | 57 | return; |
@@ -64,13 +64,13 @@ discard block |
||
64 | 64 | |
65 | 65 | // made it here so let's get the file from the github repo |
66 | 66 | $sideloader_args = array( |
67 | - '_upload_to' => EE_PLUGIN_DIR_PATH . 'languages/', |
|
68 | - '_upload_from' => 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso-' . self::$_lang . '.mo?raw=true', |
|
69 | - '_new_file_name' => 'event_espresso-' . self::$_lang . '.mo', |
|
67 | + '_upload_to' => EE_PLUGIN_DIR_PATH.'languages/', |
|
68 | + '_upload_from' => 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso-'.self::$_lang.'.mo?raw=true', |
|
69 | + '_new_file_name' => 'event_espresso-'.self::$_lang.'.mo', |
|
70 | 70 | ); |
71 | 71 | $sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, false); |
72 | 72 | |
73 | 73 | $sideloader->sideload(); |
74 | - update_option('ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION, 1); |
|
74 | + update_option('ee_lang_check_'.self::$_lang.'_'.EVENT_ESPRESSO_VERSION, 1); |
|
75 | 75 | } |
76 | 76 | } |