eventespresso / event-espresso-core

modules/ticket_selector/TicketSelectorRowStandard.php

Indentation +398 added lines, -398 removed lines

@@ -19,404 +19,404 @@
 class TicketSelectorRowStandard extends TicketSelectorRow
 {
 
-    /**
-     * @var TicketDetails $ticket_details
-     */
-    protected $ticket_details;
-
-    /**
-     * @var \EE_Ticket_Selector_Config $template_settings
-     */
-    protected $template_settings;
-
-    /**
-     * @var \EE_Tax_Config $tax_settings
-     */
-    protected $tax_settings;
-
-    /**
-     * @var boolean $prices_displayed_including_taxes
-     */
-    protected $prices_displayed_including_taxes;
-
-    /**
-     * @var int $row
-     */
-    protected $row;
-
-    /**
-     * @var int $cols
-     */
-    protected $cols;
-
-    /**
-     * @var boolean $hidden_input_qty
-     */
-    protected $hidden_input_qty;
-
-    /**
-     * @var string $ticket_datetime_classes
-     */
-    protected $ticket_datetime_classes;
-
-
-
-    /**
-     * TicketDetails constructor.
-     *
-     * @param TicketDetails  $ticket_details
-     * @param \EE_Tax_Config $tax_settings
-     * @param int            $total_tickets
-     * @param int            $max_atndz
-     * @param int            $row
-     * @param int            $cols
-     * @param boolean        $required_ticket_sold_out
-     * @param string         $event_status
-     * @param string         $ticket_datetime_classes
-     * @throws EE_Error
-     * @throws UnexpectedEntityException
-     */
-    public function __construct(
-        TicketDetails $ticket_details,
-        \EE_Tax_Config $tax_settings,
-        $total_tickets,
-        $max_atndz,
-        $row,
-        $cols,
-        $required_ticket_sold_out,
-        $event_status,
-        $ticket_datetime_classes
-    ) {
-        $this->ticket = $ticket_details->getTicket();
-        $this->ticket_details = $ticket_details;
-        $this->template_settings = $ticket_details->getTemplateSettings();
-        $this->tax_settings = $tax_settings;
-        $this->total_tickets = $total_tickets;
-        $this->max_atndz = $max_atndz;
-        $this->row = $row;
-        $this->cols = $cols;
-        $this->date_format = $ticket_details->getDateFormat();
-        $this->ticket_datetime_classes = $ticket_datetime_classes;
-        parent::__construct($this->ticket, $max_atndz, $this->date_format, $event_status, $required_ticket_sold_out);
-    }
-
-
-
-    /**
-     * other ticket rows will need to know if a required ticket is sold out,
-     * so that they are not offered for sale
-     *
-     * @return boolean
-     */
-    public function getRequiredTicketSoldOut()
-    {
-        return $this->required_ticket_sold_out;
-    }
-
-
-
-    /**
-     * @return int
-     */
-    public function getCols()
-    {
-        return $this->cols;
-    }
-
-
-
-    /**
-     * getHtml
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function getHtml()
-    {
-        $min = 0;
-        $max = $this->ticket->max();
-        $remaining = $this->ticket->remaining();
-        if ($this->ticket->is_on_sale() && $this->ticket->is_remaining()) {
-            list($min, $max) = $this->setTicketMinAndMax($remaining);
-        } else {
-            // set flag if ticket is required (flag is set to start date so that future tickets are not blocked)
-            $this->required_ticket_sold_out = $this->ticket->required() && ! $remaining
-                ? $this->ticket->start_date()
-                : $this->required_ticket_sold_out;
-        }
-        list($ticket_price, $ticket_bundle) = $this->getTicketPriceDetails();
-        list($tkt_status, $ticket_status, $status_class) = $this->getTicketStatusClasses($remaining);
-        /**
-         * Allow plugins to hook in and abort the generation and display of this row to do
-         * something else if they want.
-         * For an addon to abort things, all they have to do is register a filter with this hook, and
-         * return a value that is NOT false.  Whatever is returned gets echoed instead of the
-         * current row.
-         *
-         * @var string|bool
-         */
-        $ticket_selector_row_html = apply_filters(
-            'FHEE__ticket_selector_chart_template__do_ticket_entire_row',
-            false,
-            $this->ticket,
-            $max,
-            $min,
-            $this->required_ticket_sold_out,
-            $ticket_price,
-            $ticket_bundle,
-            $ticket_status,
-            $status_class
-        );
-        if ($ticket_selector_row_html !== false) {
-            return $ticket_selector_row_html;
-        }
-        $ticket_selector_row_html = \EEH_HTML::tr(
-            '', '',
-            "tckt-slctr-tbl-tr {$status_class}{$this->ticket_datetime_classes} " . espresso_get_object_css_class($this->ticket)
-        );
-        /**
-         * Allow plugins to hook in and abort the generation and display of the contents of this
-         * row to do something else if they want.
-         * For an addon to abort things, all they have to do is register a filter with this hook, and
-         * return a value that is NOT false.  Whatever is returned gets echoed instead of the
-         * current row.
-         *
-         * @var string|bool
-         */
-        $new_row_cells_content = apply_filters(
-            'FHEE__ticket_selector_chart_template__do_ticket_inside_row',
-            false,
-            $this->ticket,
-            $max,
-            $min,
-            $this->required_ticket_sold_out,
-            $ticket_price,
-            $ticket_bundle,
-            $ticket_status,
-            $status_class
-        );
-        if ($new_row_cells_content !== false && $this->max_atndz === 1) {
-            return $ticket_selector_row_html
-                   . $new_row_cells_content
-                   . $this->ticketQtyAndIdHiddenInputs()
-                   . \EEH_HTML::trx();
-        }
-        if ($new_row_cells_content !== false) {
-            return $ticket_selector_row_html
-                   . $new_row_cells_content
-                   . \EEH_HTML::trx();
-        }
-        $this->hidden_input_qty = $this->max_atndz > 1 ? true : false;
-
-        $ticket_selector_row_html .= $this->ticketNameTableCell();
-        $ticket_selector_row_html .= $this->ticketPriceTableCell($ticket_price, $ticket_bundle);
-        $ticket_selector_row_html .= \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-qty cntr');
-        $this->setTicketStatusDisplay($tkt_status, $ticket_status, $remaining);
-        if (empty($this->ticket_status_display)) {
-            if ($this->max_atndz === 1) {
-                // only ONE attendee is allowed to register at a time
-                $ticket_selector_row_html .= $this->onlyOneAttendeeCanRegister();
-            } else if ($max > 0) {
-                $ticket_selector_row_html .= $this->ticketQuantitySelector($min, $max);
-            }
-        }
-        $ticket_selector_row_html .= $this->ticket_status_display;
-        $ticket_selector_row_html .= $this->ticketQtyAndIdHiddenInputs();
-        $ticket_selector_row_html .= $this->ticket_details->display($ticket_price, $remaining, $this->cols);
-        $ticket_selector_row_html .= \EEH_HTML::tdx();
-        $ticket_selector_row_html .= \EEH_HTML::trx();
-
-
-        $this->row++;
-        return $ticket_selector_row_html;
-    }
-
-
-
-    /**
-     * setTicketMinAndMax
-     *
-     * @param int $remaining
-     * @return array
-     * @throws EE_Error
-     */
-    protected function setTicketMinAndMax($remaining)
-    {
-        // offer the number of $tickets_remaining or $this->max_atndz, whichever is smaller
-        $max = min($remaining, $this->max_atndz);
-        // but... we also want to restrict the number of tickets by the ticket max setting,
-        // however, the max still can't be higher than what was just set above
-        $max = $this->ticket->max() > 0 ? min($this->ticket->max(), $max) : $max;
-        // and we also want to restrict the minimum number of tickets by the ticket min setting
-        $min = $this->ticket->min() > 0 ? $this->ticket->min() : 0;
-        // and if the ticket is required, then make sure that min qty is at least 1
-        $min = $this->ticket->required() ? max($min, 1) : $min;
-        return array($min, $max);
-    }
-
-
-
-    /**
-     * getTicketPriceDetails
-     *
-     * @return array
-     * @throws EE_Error
-     */
-    protected function getTicketPriceDetails()
-    {
-        $ticket_price = $this->tax_settings->prices_displayed_including_taxes
-            ? $this->ticket->get_ticket_total_with_taxes()
-            : $this->ticket->get_ticket_subtotal();
-        $ticket_bundle = false;
-        $ticket_min = $this->ticket->min();
-        // for ticket bundles, set min and max qty the same
-        if ($ticket_min !== 0 && $ticket_min === $this->ticket->max()) {
-            $ticket_price *= $ticket_min;
-            $ticket_bundle = true;
-        }
-        $ticket_price = apply_filters(
-            'FHEE__ticket_selector_chart_template__ticket_price',
-            $ticket_price,
-            $this->ticket
-        );
-        return array($ticket_price, $ticket_bundle);
-    }
-
-
-
-
-    /**
-     * ticketNameTableCell
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    protected function ticketNameTableCell()
-    {
-        $html = \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-name');
-        $html .= \EEH_HTML::strong($this->ticket->get_pretty('TKT_name'));
-        $html .= $this->ticket_details->getShowHideLinks();
-        if ($this->ticket->required()) {
-            $html .= \EEH_HTML::p(
-                    apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_required_message',
-                            esc_html__('This ticket is required and must be purchased.', 'event_espresso')
-                    ),
-                    '', 'ticket-required-pg'
-            );
-        }
-        $html .= \EEH_HTML::tdx();
-        return $html;
-    }
-
-
-
-    /**
-     * ticketPriceTableCell
-     *
-     * @param float $ticket_price
-     * @param bool  $ticket_bundle
-     * @return string
-     * @throws EE_Error
-     */
-    protected function ticketPriceTableCell($ticket_price, $ticket_bundle)
-    {
-        $html = '';
-        if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) {
-            $html .= \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-price jst-rght');
-            $html .= \EEH_Template::format_currency($ticket_price);
-            $html .= $this->ticket->taxable()
-                ? \EEH_HTML::span( '*', '', 'taxable-tickets-asterisk grey-text' )
-                : '';
-            $html .= ' ';
-            $html .= \EEH_HTML::span(
-                $ticket_bundle
-                    ? apply_filters(
-                        'FHEE__ticket_selector_chart_template__per_ticket_bundle_text',
-                        __(' / bundle', 'event_espresso')
-                    )
-                    : apply_filters(
-                        'FHEE__ticket_selector_chart_template__per_ticket_text',
-                        __('', 'event_espresso')
-                    ),
-                '', 'smaller-text no-bold'
-            );
-            $html .= ' ';
-            $html .= \EEH_HTML::tdx();
-            $this->cols++;
-        }
-        return $html;
-    }
-
-
-
-    /**
-     * onlyOneAttendeeCanRegister
-     *
-     * @return string
-     */
-    protected function onlyOneAttendeeCanRegister()
-    {
-        // display submit button since we have tickets available
-        add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
-        $this->hidden_input_qty = false;
-        $html = '<input type="radio" name="tkt-slctr-qty-' . $this->EVT_ID . '"';
-        $html .= ' id="ticket-selector-tbl-qty-slct-' . $this->EVT_ID . '-' . $this->row . '"';
-        $html .= ' class="ticket-selector-tbl-qty-slct" value="' . $this->row . '-1"';
-        $html .= $this->total_tickets === 1 ? ' checked="checked"' : '';
-        $html .= ' title=""/>';
-        return $html;
-    }
-
-
-
-    /**
-     * ticketQuantitySelector
-     *
-     * @param int $min
-     * @param int $max
-     * @return string
-     * @throws EE_Error
-     */
-    protected function ticketQuantitySelector($min = 0, $max = 0)
-    {
-        // display submit button since we have tickets available
-        add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
-        $this->hidden_input_qty = false;
-        $html = '<select name="tkt-slctr-qty-' . $this->EVT_ID . '[]"';
-        $html .= ' id="ticket-selector-tbl-qty-slct-' . $this->EVT_ID . '-' . $this->row . '"';
-        $html .= ' class="ticket-selector-tbl-qty-slct">';
-        // this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
-        if ($min !== 0 && ! $this->ticket->required()) {
-            $html .= '<option value="0">&nbsp;0&nbsp;</option>';
-        }
-        // offer ticket quantities from the min to the max
-        for ($i = $min; $i <= $max; $i++) {
-            $html .= '<option value="' . $i . '">&nbsp;' . $i . '&nbsp;</option>';
-        }
-        $html .= '</select>';
-        return $html;
-    }
-
-
-
-    /**
-     * getHiddenInputs
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    protected function ticketQtyAndIdHiddenInputs()
-    {
-        $html = '';
-        // depending on group reg we need to change the format for qty
-        if ($this->hidden_input_qty) {
-            $html .= '<input type="hidden" name="tkt-slctr-qty-' . $this->EVT_ID . '[]" value="0"/>';
-        }
-        $html .= '<input type="hidden" name="tkt-slctr-ticket-id-' . $this->EVT_ID . '[]"';
-        $html .= ' value="' . $this->ticket->ID() . '"/>';
-        return $html;
-    }
+	/**
+	 * @var TicketDetails $ticket_details
+	 */
+	protected $ticket_details;
+
+	/**
+	 * @var \EE_Ticket_Selector_Config $template_settings
+	 */
+	protected $template_settings;
+
+	/**
+	 * @var \EE_Tax_Config $tax_settings
+	 */
+	protected $tax_settings;
+
+	/**
+	 * @var boolean $prices_displayed_including_taxes
+	 */
+	protected $prices_displayed_including_taxes;
+
+	/**
+	 * @var int $row
+	 */
+	protected $row;
+
+	/**
+	 * @var int $cols
+	 */
+	protected $cols;
+
+	/**
+	 * @var boolean $hidden_input_qty
+	 */
+	protected $hidden_input_qty;
+
+	/**
+	 * @var string $ticket_datetime_classes
+	 */
+	protected $ticket_datetime_classes;
+
+
+
+	/**
+	 * TicketDetails constructor.
+	 *
+	 * @param TicketDetails  $ticket_details
+	 * @param \EE_Tax_Config $tax_settings
+	 * @param int            $total_tickets
+	 * @param int            $max_atndz
+	 * @param int            $row
+	 * @param int            $cols
+	 * @param boolean        $required_ticket_sold_out
+	 * @param string         $event_status
+	 * @param string         $ticket_datetime_classes
+	 * @throws EE_Error
+	 * @throws UnexpectedEntityException
+	 */
+	public function __construct(
+		TicketDetails $ticket_details,
+		\EE_Tax_Config $tax_settings,
+		$total_tickets,
+		$max_atndz,
+		$row,
+		$cols,
+		$required_ticket_sold_out,
+		$event_status,
+		$ticket_datetime_classes
+	) {
+		$this->ticket = $ticket_details->getTicket();
+		$this->ticket_details = $ticket_details;
+		$this->template_settings = $ticket_details->getTemplateSettings();
+		$this->tax_settings = $tax_settings;
+		$this->total_tickets = $total_tickets;
+		$this->max_atndz = $max_atndz;
+		$this->row = $row;
+		$this->cols = $cols;
+		$this->date_format = $ticket_details->getDateFormat();
+		$this->ticket_datetime_classes = $ticket_datetime_classes;
+		parent::__construct($this->ticket, $max_atndz, $this->date_format, $event_status, $required_ticket_sold_out);
+	}
+
+
+
+	/**
+	 * other ticket rows will need to know if a required ticket is sold out,
+	 * so that they are not offered for sale
+	 *
+	 * @return boolean
+	 */
+	public function getRequiredTicketSoldOut()
+	{
+		return $this->required_ticket_sold_out;
+	}
+
+
+
+	/**
+	 * @return int
+	 */
+	public function getCols()
+	{
+		return $this->cols;
+	}
+
+
+
+	/**
+	 * getHtml
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function getHtml()
+	{
+		$min = 0;
+		$max = $this->ticket->max();
+		$remaining = $this->ticket->remaining();
+		if ($this->ticket->is_on_sale() && $this->ticket->is_remaining()) {
+			list($min, $max) = $this->setTicketMinAndMax($remaining);
+		} else {
+			// set flag if ticket is required (flag is set to start date so that future tickets are not blocked)
+			$this->required_ticket_sold_out = $this->ticket->required() && ! $remaining
+				? $this->ticket->start_date()
+				: $this->required_ticket_sold_out;
+		}
+		list($ticket_price, $ticket_bundle) = $this->getTicketPriceDetails();
+		list($tkt_status, $ticket_status, $status_class) = $this->getTicketStatusClasses($remaining);
+		/**
+		 * Allow plugins to hook in and abort the generation and display of this row to do
+		 * something else if they want.
+		 * For an addon to abort things, all they have to do is register a filter with this hook, and
+		 * return a value that is NOT false.  Whatever is returned gets echoed instead of the
+		 * current row.
+		 *
+		 * @var string|bool
+		 */
+		$ticket_selector_row_html = apply_filters(
+			'FHEE__ticket_selector_chart_template__do_ticket_entire_row',
+			false,
+			$this->ticket,
+			$max,
+			$min,
+			$this->required_ticket_sold_out,
+			$ticket_price,
+			$ticket_bundle,
+			$ticket_status,
+			$status_class
+		);
+		if ($ticket_selector_row_html !== false) {
+			return $ticket_selector_row_html;
+		}
+		$ticket_selector_row_html = \EEH_HTML::tr(
+			'', '',
+			"tckt-slctr-tbl-tr {$status_class}{$this->ticket_datetime_classes} " . espresso_get_object_css_class($this->ticket)
+		);
+		/**
+		 * Allow plugins to hook in and abort the generation and display of the contents of this
+		 * row to do something else if they want.
+		 * For an addon to abort things, all they have to do is register a filter with this hook, and
+		 * return a value that is NOT false.  Whatever is returned gets echoed instead of the
+		 * current row.
+		 *
+		 * @var string|bool
+		 */
+		$new_row_cells_content = apply_filters(
+			'FHEE__ticket_selector_chart_template__do_ticket_inside_row',
+			false,
+			$this->ticket,
+			$max,
+			$min,
+			$this->required_ticket_sold_out,
+			$ticket_price,
+			$ticket_bundle,
+			$ticket_status,
+			$status_class
+		);
+		if ($new_row_cells_content !== false && $this->max_atndz === 1) {
+			return $ticket_selector_row_html
+				   . $new_row_cells_content
+				   . $this->ticketQtyAndIdHiddenInputs()
+				   . \EEH_HTML::trx();
+		}
+		if ($new_row_cells_content !== false) {
+			return $ticket_selector_row_html
+				   . $new_row_cells_content
+				   . \EEH_HTML::trx();
+		}
+		$this->hidden_input_qty = $this->max_atndz > 1 ? true : false;
+
+		$ticket_selector_row_html .= $this->ticketNameTableCell();
+		$ticket_selector_row_html .= $this->ticketPriceTableCell($ticket_price, $ticket_bundle);
+		$ticket_selector_row_html .= \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-qty cntr');
+		$this->setTicketStatusDisplay($tkt_status, $ticket_status, $remaining);
+		if (empty($this->ticket_status_display)) {
+			if ($this->max_atndz === 1) {
+				// only ONE attendee is allowed to register at a time
+				$ticket_selector_row_html .= $this->onlyOneAttendeeCanRegister();
+			} else if ($max > 0) {
+				$ticket_selector_row_html .= $this->ticketQuantitySelector($min, $max);
+			}
+		}
+		$ticket_selector_row_html .= $this->ticket_status_display;
+		$ticket_selector_row_html .= $this->ticketQtyAndIdHiddenInputs();
+		$ticket_selector_row_html .= $this->ticket_details->display($ticket_price, $remaining, $this->cols);
+		$ticket_selector_row_html .= \EEH_HTML::tdx();
+		$ticket_selector_row_html .= \EEH_HTML::trx();
+
+
+		$this->row++;
+		return $ticket_selector_row_html;
+	}
+
+
+
+	/**
+	 * setTicketMinAndMax
+	 *
+	 * @param int $remaining
+	 * @return array
+	 * @throws EE_Error
+	 */
+	protected function setTicketMinAndMax($remaining)
+	{
+		// offer the number of $tickets_remaining or $this->max_atndz, whichever is smaller
+		$max = min($remaining, $this->max_atndz);
+		// but... we also want to restrict the number of tickets by the ticket max setting,
+		// however, the max still can't be higher than what was just set above
+		$max = $this->ticket->max() > 0 ? min($this->ticket->max(), $max) : $max;
+		// and we also want to restrict the minimum number of tickets by the ticket min setting
+		$min = $this->ticket->min() > 0 ? $this->ticket->min() : 0;
+		// and if the ticket is required, then make sure that min qty is at least 1
+		$min = $this->ticket->required() ? max($min, 1) : $min;
+		return array($min, $max);
+	}
+
+
+
+	/**
+	 * getTicketPriceDetails
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 */
+	protected function getTicketPriceDetails()
+	{
+		$ticket_price = $this->tax_settings->prices_displayed_including_taxes
+			? $this->ticket->get_ticket_total_with_taxes()
+			: $this->ticket->get_ticket_subtotal();
+		$ticket_bundle = false;
+		$ticket_min = $this->ticket->min();
+		// for ticket bundles, set min and max qty the same
+		if ($ticket_min !== 0 && $ticket_min === $this->ticket->max()) {
+			$ticket_price *= $ticket_min;
+			$ticket_bundle = true;
+		}
+		$ticket_price = apply_filters(
+			'FHEE__ticket_selector_chart_template__ticket_price',
+			$ticket_price,
+			$this->ticket
+		);
+		return array($ticket_price, $ticket_bundle);
+	}
+
+
+
+
+	/**
+	 * ticketNameTableCell
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function ticketNameTableCell()
+	{
+		$html = \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-name');
+		$html .= \EEH_HTML::strong($this->ticket->get_pretty('TKT_name'));
+		$html .= $this->ticket_details->getShowHideLinks();
+		if ($this->ticket->required()) {
+			$html .= \EEH_HTML::p(
+					apply_filters(
+							'FHEE__ticket_selector_chart_template__ticket_required_message',
+							esc_html__('This ticket is required and must be purchased.', 'event_espresso')
+					),
+					'', 'ticket-required-pg'
+			);
+		}
+		$html .= \EEH_HTML::tdx();
+		return $html;
+	}
+
+
+
+	/**
+	 * ticketPriceTableCell
+	 *
+	 * @param float $ticket_price
+	 * @param bool  $ticket_bundle
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function ticketPriceTableCell($ticket_price, $ticket_bundle)
+	{
+		$html = '';
+		if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) {
+			$html .= \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-price jst-rght');
+			$html .= \EEH_Template::format_currency($ticket_price);
+			$html .= $this->ticket->taxable()
+				? \EEH_HTML::span( '*', '', 'taxable-tickets-asterisk grey-text' )
+				: '';
+			$html .= '&nbsp;';
+			$html .= \EEH_HTML::span(
+				$ticket_bundle
+					? apply_filters(
+						'FHEE__ticket_selector_chart_template__per_ticket_bundle_text',
+						__(' / bundle', 'event_espresso')
+					)
+					: apply_filters(
+						'FHEE__ticket_selector_chart_template__per_ticket_text',
+						__('', 'event_espresso')
+					),
+				'', 'smaller-text no-bold'
+			);
+			$html .= '&nbsp;';
+			$html .= \EEH_HTML::tdx();
+			$this->cols++;
+		}
+		return $html;
+	}
+
+
+
+	/**
+	 * onlyOneAttendeeCanRegister
+	 *
+	 * @return string
+	 */
+	protected function onlyOneAttendeeCanRegister()
+	{
+		// display submit button since we have tickets available
+		add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
+		$this->hidden_input_qty = false;
+		$html = '<input type="radio" name="tkt-slctr-qty-' . $this->EVT_ID . '"';
+		$html .= ' id="ticket-selector-tbl-qty-slct-' . $this->EVT_ID . '-' . $this->row . '"';
+		$html .= ' class="ticket-selector-tbl-qty-slct" value="' . $this->row . '-1"';
+		$html .= $this->total_tickets === 1 ? ' checked="checked"' : '';
+		$html .= ' title=""/>';
+		return $html;
+	}
+
+
+
+	/**
+	 * ticketQuantitySelector
+	 *
+	 * @param int $min
+	 * @param int $max
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function ticketQuantitySelector($min = 0, $max = 0)
+	{
+		// display submit button since we have tickets available
+		add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
+		$this->hidden_input_qty = false;
+		$html = '<select name="tkt-slctr-qty-' . $this->EVT_ID . '[]"';
+		$html .= ' id="ticket-selector-tbl-qty-slct-' . $this->EVT_ID . '-' . $this->row . '"';
+		$html .= ' class="ticket-selector-tbl-qty-slct">';
+		// this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
+		if ($min !== 0 && ! $this->ticket->required()) {
+			$html .= '<option value="0">&nbsp;0&nbsp;</option>';
+		}
+		// offer ticket quantities from the min to the max
+		for ($i = $min; $i <= $max; $i++) {
+			$html .= '<option value="' . $i . '">&nbsp;' . $i . '&nbsp;</option>';
+		}
+		$html .= '</select>';
+		return $html;
+	}
+
+
+
+	/**
+	 * getHiddenInputs
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function ticketQtyAndIdHiddenInputs()
+	{
+		$html = '';
+		// depending on group reg we need to change the format for qty
+		if ($this->hidden_input_qty) {
+			$html .= '<input type="hidden" name="tkt-slctr-qty-' . $this->EVT_ID . '[]" value="0"/>';
+		}
+		$html .= '<input type="hidden" name="tkt-slctr-ticket-id-' . $this->EVT_ID . '[]"';
+		$html .= ' value="' . $this->ticket->ID() . '"/>';
+		return $html;
+	}
 
 }
 // End of file TicketSelectorRowStandard.php

core/libraries/rest_api/controllers/rpc/Checkin.php

Indentation +110 added lines, -110 removed lines

@@ -14,7 +14,7 @@ 
 use EventEspresso\core\libraries\rest_api\controllers\model\Read;
 
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -31,116 +31,116 @@ 
 class Checkin extends Base
 {
 
-    /**
-     * @param WP_REST_Request $request
-     * @return WP_Error|WP_REST_Response
-     */
-    public static function handle_request_toggle_checkin(WP_REST_Request $request)
-    {
-        $controller = new Checkin();
-        return $controller->_create_checkin_checkout_object($request);
-    }
+	/**
+	 * @param WP_REST_Request $request
+	 * @return WP_Error|WP_REST_Response
+	 */
+	public static function handle_request_toggle_checkin(WP_REST_Request $request)
+	{
+		$controller = new Checkin();
+		return $controller->_create_checkin_checkout_object($request);
+	}
 
 
 
-    /**
-     * Toggles whether the user is checked in or not.
-     *
-     * @param WP_REST_Request $request
-     * @return WP_Error|WP_REST_Response
-     */
-    protected function _create_checkin_checkout_object(WP_REST_Request $request)
-    {
-        $reg_id = $request->get_param('REG_ID');
-        $dtt_id = $request->get_param('DTT_ID');
-        $force = $request->get_param('force');
-        if ($force == 'true') {
-            $force = true;
-        } else {
-            $force = false;
-        }
-        $reg = EEM_Registration::instance()->get_one_by_ID($reg_id);
-        if (! $reg instanceof EE_Registration) {
-            return $this->send_response(
-                new WP_Error(
-                    'rest_registration_toggle_checkin_invalid_id',
-                    sprintf(
-                        __('You cannot checkin registration with ID %1$s because it doesn\'t exist.',
-                            'event_espresso'),
-                        $reg_id
-                    ),
-                    array('status' => 422)
-                )
-            );
-        }
-        if (! EE_Capabilities::instance()
-                             ->current_user_can('ee_edit_checkin', 'rest_api_checkin_endpoint', $reg_id)
-        ) {
-            return $this->send_response(
-                new WP_Error(
-                    'rest_user_cannot_toggle_checkin',
-                    sprintf(
-                        __('You are not allowed to checkin registration with ID %1$s.', 'event_espresso'),
-                        $reg_id
-                    ),
-                    array('status' => 403)
-                )
-            );
-        }
-        $success = $reg->toggle_checkin_status($dtt_id, ! $force);
-        if ($success === false) {
-            //check if we know they can't check in because they're not approved and we aren't forcing
-            if (! $reg->is_approved() && ! $force) {
-                //rely on EE_Error::add_error messages to have been added to give more data about why it failed
-                return $this->send_response(
-                    new WP_Error(
-                        'rest_toggle_checkin_failed',
-                        __('Registration check-in failed because the registration is not approved. You may attempt to force checking in though.',
-                            'event_espresso')
-                    )
-                );
-            }
-            return $this->send_response(
-                new WP_Error(
-                    'rest_toggle_checkin_failed_not_forceable',
-                    __('Registration checkin failed. Please see additional error data.', 'event_espresso')
-                )
-            );
-        }
-        $checkin = EEM_Checkin::instance()->get_one(
-            array(
-                array(
-                    'REG_ID' => $reg_id,
-                    'DTT_ID' => $dtt_id,
-                ),
-                'order_by' => array(
-                    'CHK_timestamp' => 'DESC',
-                ),
-            )
-        );
-        if (! $checkin instanceof EE_Checkin) {
-            return $this->send_response(
-                new WP_Error(
-                    'rest_toggle_checkin_error',
-                    sprintf(
-                        __('Supposedly we created a new checkin object for registration %1$s at datetime %2$s, but we can\'t find it.',
-                            'event_espresso'),
-                        $reg_id,
-                        $dtt_id
-                    )
-                )
-            );
-        }
-        $requested_version = $this->get_requested_version($request->get_route());
-        $get_request = new WP_REST_Request(
-            'GET',
-            EED_Core_Rest_Api::ee_api_namespace . $requested_version . '/checkins/' . $checkin->ID()
-        );
-        $get_request->set_url_params(
-            array(
-                'id' => $checkin->ID(),
-            )
-        );
-        return Read::handle_request_get_one($get_request);
-    }
+	/**
+	 * Toggles whether the user is checked in or not.
+	 *
+	 * @param WP_REST_Request $request
+	 * @return WP_Error|WP_REST_Response
+	 */
+	protected function _create_checkin_checkout_object(WP_REST_Request $request)
+	{
+		$reg_id = $request->get_param('REG_ID');
+		$dtt_id = $request->get_param('DTT_ID');
+		$force = $request->get_param('force');
+		if ($force == 'true') {
+			$force = true;
+		} else {
+			$force = false;
+		}
+		$reg = EEM_Registration::instance()->get_one_by_ID($reg_id);
+		if (! $reg instanceof EE_Registration) {
+			return $this->send_response(
+				new WP_Error(
+					'rest_registration_toggle_checkin_invalid_id',
+					sprintf(
+						__('You cannot checkin registration with ID %1$s because it doesn\'t exist.',
+							'event_espresso'),
+						$reg_id
+					),
+					array('status' => 422)
+				)
+			);
+		}
+		if (! EE_Capabilities::instance()
+							 ->current_user_can('ee_edit_checkin', 'rest_api_checkin_endpoint', $reg_id)
+		) {
+			return $this->send_response(
+				new WP_Error(
+					'rest_user_cannot_toggle_checkin',
+					sprintf(
+						__('You are not allowed to checkin registration with ID %1$s.', 'event_espresso'),
+						$reg_id
+					),
+					array('status' => 403)
+				)
+			);
+		}
+		$success = $reg->toggle_checkin_status($dtt_id, ! $force);
+		if ($success === false) {
+			//check if we know they can't check in because they're not approved and we aren't forcing
+			if (! $reg->is_approved() && ! $force) {
+				//rely on EE_Error::add_error messages to have been added to give more data about why it failed
+				return $this->send_response(
+					new WP_Error(
+						'rest_toggle_checkin_failed',
+						__('Registration check-in failed because the registration is not approved. You may attempt to force checking in though.',
+							'event_espresso')
+					)
+				);
+			}
+			return $this->send_response(
+				new WP_Error(
+					'rest_toggle_checkin_failed_not_forceable',
+					__('Registration checkin failed. Please see additional error data.', 'event_espresso')
+				)
+			);
+		}
+		$checkin = EEM_Checkin::instance()->get_one(
+			array(
+				array(
+					'REG_ID' => $reg_id,
+					'DTT_ID' => $dtt_id,
+				),
+				'order_by' => array(
+					'CHK_timestamp' => 'DESC',
+				),
+			)
+		);
+		if (! $checkin instanceof EE_Checkin) {
+			return $this->send_response(
+				new WP_Error(
+					'rest_toggle_checkin_error',
+					sprintf(
+						__('Supposedly we created a new checkin object for registration %1$s at datetime %2$s, but we can\'t find it.',
+							'event_espresso'),
+						$reg_id,
+						$dtt_id
+					)
+				)
+			);
+		}
+		$requested_version = $this->get_requested_version($request->get_route());
+		$get_request = new WP_REST_Request(
+			'GET',
+			EED_Core_Rest_Api::ee_api_namespace . $requested_version . '/checkins/' . $checkin->ID()
+		);
+		$get_request->set_url_params(
+			array(
+				'id' => $checkin->ID(),
+			)
+		);
+		return Read::handle_request_get_one($get_request);
+	}
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
 use EventEspresso\core\libraries\rest_api\controllers\Base as Base;
 use EventEspresso\core\libraries\rest_api\controllers\model\Read;
 
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 
@@ -60,7 +60,7 @@ 
             $force = false;
         }
         $reg = EEM_Registration::instance()->get_one_by_ID($reg_id);
-        if (! $reg instanceof EE_Registration) {
+        if ( ! $reg instanceof EE_Registration) {
             return $this->send_response(
                 new WP_Error(
                     'rest_registration_toggle_checkin_invalid_id',
@@ -73,7 +73,7 @@ 
                 )
             );
         }
-        if (! EE_Capabilities::instance()
+        if ( ! EE_Capabilities::instance()
                              ->current_user_can('ee_edit_checkin', 'rest_api_checkin_endpoint', $reg_id)
         ) {
             return $this->send_response(
@@ -90,7 +90,7 @@ 
         $success = $reg->toggle_checkin_status($dtt_id, ! $force);
         if ($success === false) {
             //check if we know they can't check in because they're not approved and we aren't forcing
-            if (! $reg->is_approved() && ! $force) {
+            if ( ! $reg->is_approved() && ! $force) {
                 //rely on EE_Error::add_error messages to have been added to give more data about why it failed
                 return $this->send_response(
                     new WP_Error(
@@ -118,7 +118,7 @@ 
                 ),
             )
         );
-        if (! $checkin instanceof EE_Checkin) {
+        if ( ! $checkin instanceof EE_Checkin) {
             return $this->send_response(
                 new WP_Error(
                     'rest_toggle_checkin_error',
@@ -134,7 +134,7 @@ 
         $requested_version = $this->get_requested_version($request->get_route());
         $get_request = new WP_REST_Request(
             'GET',
-            EED_Core_Rest_Api::ee_api_namespace . $requested_version . '/checkins/' . $checkin->ID()
+            EED_Core_Rest_Api::ee_api_namespace.$requested_version.'/checkins/'.$checkin->ID()
         );
         $get_request->set_url_params(
             array(

espresso.php

Indentation +219 added lines, -219 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('ABSPATH')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 /*
   Plugin Name:		Event Espresso
@@ -40,243 +40,243 @@ 
  * @since            4.0
  */
 if (function_exists('espresso_version')) {
-    /**
-     *    espresso_duplicate_plugin_error
-     *    displays if more than one version of EE is activated at the same time
-     */
-    function espresso_duplicate_plugin_error()
-    {
-        ?>
+	/**
+	 *    espresso_duplicate_plugin_error
+	 *    displays if more than one version of EE is activated at the same time
+	 */
+	function espresso_duplicate_plugin_error()
+	{
+		?>
         <div class="error">
             <p>
                 <?php echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                ); ?>
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+				); ?>
             </p>
         </div>
         <?php
-        espresso_deactivate_plugin(plugin_basename(__FILE__));
-    }
+		espresso_deactivate_plugin(plugin_basename(__FILE__));
+	}
 
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.3.9');
-    if ( ! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '5.3.9');
+	if ( ! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                            esc_html__(
-                                    'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                                    'event_espresso'
-                            ),
-                            EE_MIN_PHP_VER_REQUIRED,
-                            PHP_VERSION,
-                            '<br/>',
-                            '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+							esc_html__(
+									'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+									'event_espresso'
+							),
+							EE_MIN_PHP_VER_REQUIRED,
+							PHP_VERSION,
+							'<br/>',
+							'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.9.35.rc.007');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.9.35.rc.007');
+		}
 
-        // define versions
-        define('EVENT_ESPRESSO_VERSION', espresso_version());
-        define('EE_MIN_WP_VER_REQUIRED', '4.1');
-        define('EE_MIN_WP_VER_RECOMMENDED', '4.4.2');
-        define('EE_MIN_PHP_VER_RECOMMENDED', '5.4.44');
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        //used to be DIRECTORY_SEPARATOR, but that caused issues on windows
-        if ( ! defined('DS')) {
-            define('DS', '/');
-        }
-        if ( ! defined('PS')) {
-            define('PS', PATH_SEPARATOR);
-        }
-        if ( ! defined('SP')) {
-            define('SP', ' ');
-        }
-        if ( ! defined('EENL')) {
-            define('EENL', "\n");
-        }
-        define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
-        // define the plugin directory and URL
-        define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
-        define('EE_PLUGIN_DIR_PATH', plugin_dir_path(EVENT_ESPRESSO_MAIN_FILE));
-        define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE));
-        // main root folder paths
-        define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS);
-        define('EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS);
-        define('EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS);
-        define('EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS);
-        define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS);
-        define('EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS);
-        define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS);
-        define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS);
-        // core system paths
-        define('EE_ADMIN', EE_CORE . 'admin' . DS);
-        define('EE_CPTS', EE_CORE . 'CPTs' . DS);
-        define('EE_CLASSES', EE_CORE . 'db_classes' . DS);
-        define('EE_INTERFACES', EE_CORE . 'interfaces' . DS);
-        define('EE_BUSINESS', EE_CORE . 'business' . DS);
-        define('EE_MODELS', EE_CORE . 'db_models' . DS);
-        define('EE_HELPERS', EE_CORE . 'helpers' . DS);
-        define('EE_LIBRARIES', EE_CORE . 'libraries' . DS);
-        define('EE_TEMPLATES', EE_CORE . 'templates' . DS);
-        define('EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS);
-        define('EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS);
-        define('EE_FORM_SECTIONS', EE_LIBRARIES . 'form_sections' . DS);
-        // gateways
-        define('EE_GATEWAYS', EE_MODULES . 'gateways' . DS);
-        define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS);
-        // asset URL paths
-        define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS);
-        define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS);
-        define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL . 'images' . DS);
-        define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS);
-        define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/');
-        define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/');
-        // define upload paths
-        $uploads = wp_upload_dir();
-        // define the uploads directory and URL
-        define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'] . DS . 'espresso' . DS);
-        define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'] . DS . 'espresso' . DS);
-        // define the templates directory and URL
-        define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'templates' . DS);
-        define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'templates' . DS);
-        // define the gateway directory and URL
-        define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'gateways' . DS);
-        define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'gateways' . DS);
-        // languages folder/path
-        define('EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS);
-        define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS);
-        //check for dompdf fonts in uploads
-        if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS)) {
-            define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS);
-        }
-        //ajax constants
-        define(
-                'EE_FRONT_AJAX',
-                isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax']) ? true : false
-        );
-        define(
-                'EE_ADMIN_AJAX',
-                isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax']) ? true : false
-        );
-        //just a handy constant occasionally needed for finding values representing infinity in the DB
-        //you're better to use this than its straight value (currently -1) in case you ever
-        //want to change its default value! or find when -1 means infinity
-        define('EE_INF_IN_DB', -1);
-        define('EE_INF', INF > (float)PHP_INT_MAX ? INF : PHP_INT_MAX);
-        define('EE_DEBUG', false);
-        // for older WP versions
-        if ( ! defined('MONTH_IN_SECONDS')) {
-            define('MONTH_IN_SECONDS', DAY_IN_SECONDS * 30);
-        }
-        /**
-         *    espresso_plugin_activation
-         *    adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-        }
+		// define versions
+		define('EVENT_ESPRESSO_VERSION', espresso_version());
+		define('EE_MIN_WP_VER_REQUIRED', '4.1');
+		define('EE_MIN_WP_VER_RECOMMENDED', '4.4.2');
+		define('EE_MIN_PHP_VER_RECOMMENDED', '5.4.44');
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		//used to be DIRECTORY_SEPARATOR, but that caused issues on windows
+		if ( ! defined('DS')) {
+			define('DS', '/');
+		}
+		if ( ! defined('PS')) {
+			define('PS', PATH_SEPARATOR);
+		}
+		if ( ! defined('SP')) {
+			define('SP', ' ');
+		}
+		if ( ! defined('EENL')) {
+			define('EENL', "\n");
+		}
+		define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
+		// define the plugin directory and URL
+		define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
+		define('EE_PLUGIN_DIR_PATH', plugin_dir_path(EVENT_ESPRESSO_MAIN_FILE));
+		define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE));
+		// main root folder paths
+		define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS);
+		define('EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS);
+		define('EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS);
+		define('EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS);
+		define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS);
+		define('EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS);
+		define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS);
+		define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS);
+		// core system paths
+		define('EE_ADMIN', EE_CORE . 'admin' . DS);
+		define('EE_CPTS', EE_CORE . 'CPTs' . DS);
+		define('EE_CLASSES', EE_CORE . 'db_classes' . DS);
+		define('EE_INTERFACES', EE_CORE . 'interfaces' . DS);
+		define('EE_BUSINESS', EE_CORE . 'business' . DS);
+		define('EE_MODELS', EE_CORE . 'db_models' . DS);
+		define('EE_HELPERS', EE_CORE . 'helpers' . DS);
+		define('EE_LIBRARIES', EE_CORE . 'libraries' . DS);
+		define('EE_TEMPLATES', EE_CORE . 'templates' . DS);
+		define('EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS);
+		define('EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS);
+		define('EE_FORM_SECTIONS', EE_LIBRARIES . 'form_sections' . DS);
+		// gateways
+		define('EE_GATEWAYS', EE_MODULES . 'gateways' . DS);
+		define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS);
+		// asset URL paths
+		define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS);
+		define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS);
+		define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL . 'images' . DS);
+		define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS);
+		define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/');
+		define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/');
+		// define upload paths
+		$uploads = wp_upload_dir();
+		// define the uploads directory and URL
+		define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'] . DS . 'espresso' . DS);
+		define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'] . DS . 'espresso' . DS);
+		// define the templates directory and URL
+		define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'templates' . DS);
+		define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'templates' . DS);
+		// define the gateway directory and URL
+		define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'gateways' . DS);
+		define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'gateways' . DS);
+		// languages folder/path
+		define('EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS);
+		define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS);
+		//check for dompdf fonts in uploads
+		if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS)) {
+			define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS);
+		}
+		//ajax constants
+		define(
+				'EE_FRONT_AJAX',
+				isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax']) ? true : false
+		);
+		define(
+				'EE_ADMIN_AJAX',
+				isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax']) ? true : false
+		);
+		//just a handy constant occasionally needed for finding values representing infinity in the DB
+		//you're better to use this than its straight value (currently -1) in case you ever
+		//want to change its default value! or find when -1 means infinity
+		define('EE_INF_IN_DB', -1);
+		define('EE_INF', INF > (float)PHP_INT_MAX ? INF : PHP_INT_MAX);
+		define('EE_DEBUG', false);
+		// for older WP versions
+		if ( ! defined('MONTH_IN_SECONDS')) {
+			define('MONTH_IN_SECONDS', DAY_IN_SECONDS * 30);
+		}
+		/**
+		 *    espresso_plugin_activation
+		 *    adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
-        /**
-         *    espresso_load_error_handling
-         *    this function loads EE's class for handling exceptions and errors
-         */
-        function espresso_load_error_handling()
-        {
-            // load debugging tools
-            if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
-                require_once(EE_HELPERS . 'EEH_Debug_Tools.helper.php');
-                EEH_Debug_Tools::instance();
-            }
-            // load error handling
-            if (is_readable(EE_CORE . 'EE_Error.core.php')) {
-                require_once(EE_CORE . 'EE_Error.core.php');
-            } else {
-                wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
-            }
-        }
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		/**
+		 *    espresso_load_error_handling
+		 *    this function loads EE's class for handling exceptions and errors
+		 */
+		function espresso_load_error_handling()
+		{
+			// load debugging tools
+			if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
+				require_once(EE_HELPERS . 'EEH_Debug_Tools.helper.php');
+				EEH_Debug_Tools::instance();
+			}
+			// load error handling
+			if (is_readable(EE_CORE . 'EE_Error.core.php')) {
+				require_once(EE_CORE . 'EE_Error.core.php');
+			} else {
+				wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
+			}
+		}
 
-        /**
-         *    espresso_load_required
-         *    given a class name and path, this function will load that file or throw an exception
-         *
-         * @param    string $classname
-         * @param    string $full_path_to_file
-         * @throws    EE_Error
-         */
-        function espresso_load_required($classname, $full_path_to_file)
-        {
-            static $error_handling_loaded = false;
-            if ( ! $error_handling_loaded) {
-                espresso_load_error_handling();
-                $error_handling_loaded = true;
-            }
-            if (is_readable($full_path_to_file)) {
-                require_once($full_path_to_file);
-            } else {
-                throw new EE_Error (
-                        sprintf(
-                                esc_html__(
-                                        'The %s class file could not be located or is not readable due to file permissions.',
-                                        'event_espresso'
-                                ),
-                                $classname
-                        )
-                );
-            }
-        }
+		/**
+		 *    espresso_load_required
+		 *    given a class name and path, this function will load that file or throw an exception
+		 *
+		 * @param    string $classname
+		 * @param    string $full_path_to_file
+		 * @throws    EE_Error
+		 */
+		function espresso_load_required($classname, $full_path_to_file)
+		{
+			static $error_handling_loaded = false;
+			if ( ! $error_handling_loaded) {
+				espresso_load_error_handling();
+				$error_handling_loaded = true;
+			}
+			if (is_readable($full_path_to_file)) {
+				require_once($full_path_to_file);
+			} else {
+				throw new EE_Error (
+						sprintf(
+								esc_html__(
+										'The %s class file could not be located or is not readable due to file permissions.',
+										'event_espresso'
+								),
+								$classname
+						)
+				);
+			}
+		}
 
-        espresso_load_required('EEH_Base', EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php');
-        espresso_load_required('EEH_File', EE_CORE . 'helpers' . DS . 'EEH_File.helper.php');
-        espresso_load_required('EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php');
-        new EE_Bootstrap();
-    }
+		espresso_load_required('EEH_Base', EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php');
+		espresso_load_required('EEH_File', EE_CORE . 'helpers' . DS . 'EEH_File.helper.php');
+		espresso_load_required('EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php');
+		new EE_Bootstrap();
+	}
 }
 if ( ! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if ( ! function_exists('deactivate_plugins')) {
-            require_once(ABSPATH . 'wp-admin/includes/plugin.php');
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if ( ! function_exists('deactivate_plugins')) {
+			require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }
\ No newline at end of file

core/entities/money/Money.php

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
      * Returns the money amount as an unformatted string
      * IF YOU REQUIRE A FORMATTED STRING, THEN USE Money::format()
      *
-     * @return string
+     * @return double
      */
     public function amount()
     {

Indentation +412 added lines, -412 removed lines

@@ -29,418 +29,418 @@
 class Money
 {
 
-    /**
-     * number of decimal places to be added to currencies for internal computations,
-     * but removed before any output or formatting is applied.
-     * This allows us to avoid rounding errors during calculations.
-     */
-    const EXTRA_PRECISION = 3;
-
-    /**
-     * @var int $amount
-     */
-    private $amount;
-
-    /**
-     * @var Currency $currency
-     */
-    private $currency;
-
-    /**
-     * @var Calculator $calculator
-     */
-    protected static $calculator;
-
-    /**
-     * @var MoneyFormatter[] $formatters
-     */
-    protected static $formatters;
-
-
-
-    /**
-     * Money constructor.
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @param Currency         $currency
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($amount, Currency $currency)
-    {
-        $this->currency = $currency;
-        $this->amount = (string)$this->parseAmount($amount);
-    }
-
-
-
-    /**
-     * factory method that returns a Money object using the currency corresponding to the site's country
-     * example: Money::forSite(12.5)
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @return Money
-     * @throws InvalidArgumentException
-     */
-    public static function forSite($amount)
-    {
-        $CNT_ISO = isset(EE_Registry::instance()->CFG->organization)
-                   && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config
-            ? EE_Registry::instance()->CFG->organization->CNT_ISO
-            : 'US';
-        return new self($amount, Currency::createFromCountryCode($CNT_ISO));
-    }
-
-
-
-    /**
-     * factory method that returns a Money object using the currency as specified by the supplied ISO country code
-     * example: Money::forCountry(12.5,'US')
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @param string           $CNT_ISO
-     * @return Money
-     * @throws InvalidArgumentException
-     */
-    public static function forCountry($amount, $CNT_ISO)
-    {
-        return new self($amount, Currency::createFromCountryCode($CNT_ISO));
-    }
-
-
-
-    /**
-     * factory method that returns a Money object using the currency as specified by the supplied currency code
-     * example: Money::forCurrency(12.5, 'USD')
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @param string           $currency_code
-     * @return Money
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     */
-    public static function forCurrency($amount, $currency_code)
-    {
-        return new self($amount, Currency::createFromCode($currency_code));
-    }
-
-
-
-    /**
-     * factory method that returns a Money object for the currency specified as if it were a class method
-     * example: Money::USD(12.5);
-     * money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     * example: $12.5 USD would equate to a value amount of 12.50
-     *
-     * @param string $currency_code
-     * @param array  $arguments
-     * @return Money
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     */
-    public static function __callStatic($currency_code, $arguments)
-    {
-        return new self($arguments[0], Currency::createFromCode($currency_code));
-    }
-
-
-
-    /**
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @return float|int|number|string
-     * @throws InvalidDataTypeException
-     */
-    private function parseAmount($amount)
-    {
-        $type = gettype($amount);
-        switch ($type) {
-            case 'integer' :
-            case 'double' :
-            case 'string' :
-                // shift the decimal position by the number of decimal places used internally
-                // ex: 12.5 for a currency using 2 decimal places, would become 1250
-                // then if our extra internal precision was 3, it would become 1250000
-                $amount *= pow(10, $this->precision());
-                // then round up the remaining value if there is still a fractional amount left
-                $amount = round($amount, 0, PHP_ROUND_HALF_UP);
-            break;
-            default  :
-                throw new InvalidDataTypeException(
-                    '$amount',
-                    $amount,
-                    'integer (or float or string)'
-                );
-        }
-        return $amount;
-    }
-
-
-
-    /**
-     * adds or subtracts additional decimal places based on the value of the Money::EXTRA_PRECISION constant
-     *
-     * @param bool $positive
-     * @return int
-     */
-    private function precision($positive = true)
-    {
-        $sign = $positive ? 1 : -1;
-        return ((int)$this->currency->decimalPlaces() + Money::EXTRA_PRECISION) * $sign;
-    }
-
-
-
-    /**
-     * Returns the money amount as an unformatted string
-     * IF YOU REQUIRE A FORMATTED STRING, THEN USE Money::format()
-     *
-     * @return string
-     */
-    public function amount()
-    {
-        // shift the decimal position BACK by the number of decimal places used internally
-        // ex: 1250 for a currency using 2 decimal places, would become 12.5
-        $amount = (string)$this->amount * pow(10, $this->precision(false));
-        // then shave off our extra internal precision using the number of decimal places for the currency
-        $amount = round($amount, $this->currency->decimalPlaces());
-        return $amount;
-    }
-
-
-
-    /**
-     * applies formatting based on the specified formatting level
-     * corresponding to one of the constants on \EventEspresso\core\services\currency\MoneyFormatter
-     *
-     * @param int $formatting_level
-     * @return string
-     */
-    public function format($formatting_level = MoneyFormatter::ADD_THOUSANDS)
-    {
-        $formatted_amount = $this->amount();
-        $formatters = $this->formatters();
-        // if we are applying thousands formatting...
-        if ($formatting_level >= MoneyFormatter::ADD_THOUSANDS) {
-            // then let's remove decimal formatting since it's included in thousands formatting
-            unset($formatters[MoneyFormatter::DECIMAL_ONLY]);
-        }
-        for ($x = 1; $x <= $formatting_level; $x++) {
-            if (isset($formatters[$x]) && $formatters[$x] instanceof MoneyFormatter) {
-                $formatted_amount = $formatters[$x]->format($formatted_amount, $this->currency);
-            }
-        }
-        return $formatted_amount;
-    }
-
-
-
-    /**
-     * Returns the Currency object for this money
-     *
-     * @return Currency
-     */
-    public function currency()
-    {
-        return $this->currency;
-    }
-
-
-
-    /**
-     * adds the supplied Money amount to this Money amount
-     * and returns a new Money object
-     *
-     * @param Money $other
-     * @return Money
-     * @throws InvalidArgumentException
-     */
-    public function add(Money $other)
-    {
-        $this->verifySameCurrency($other->currency());
-        return new Money(
-            $this->calculator()->add(
-                $this->amount(),
-                $other->amount()
-            ),
-            $this->currency()
-        );
-    }
-
-
-
-    /**
-     * subtracts the supplied Money amount from this Money amount
-     * and returns a new Money object
-     *
-     * @param Money $other
-     * @return Money
-     * @throws InvalidArgumentException
-     */
-    public function subtract(Money $other)
-    {
-        $this->verifySameCurrency($other->currency());
-        return new Money(
-            $this->calculator()->subtract(
-                $this->amount(),
-                $other->amount()
-            ),
-            $this->currency()
-        );
-    }
-
-
-
-    /**
-     * multiplies this Money amount by the supplied $multiplier
-     * and returns a new Money object
-     *
-     * @param float|int|string $multiplier
-     * @param int              $rounding_mode
-     * @return Money
-     * @throws InvalidDataTypeException
-     */
-    public function multiply($multiplier, $rounding_mode = Calculator::ROUND_HALF_UP)
-    {
-        return new Money(
-            $this->calculator()->multiply(
-                $this->amount(),
-                $multiplier,
-                $this->precision(),
-                $rounding_mode
-            ),
-            $this->currency()
-        );
-    }
-
-
-
-    /**
-     * divides this Money amount by the supplied $divisor
-     * and returns a new Money object
-     *
-     * @param float|int|string $divisor
-     * @param int              $rounding_mode
-     * @return Money
-     * @throws InvalidDataTypeException
-     */
-    public function divide($divisor, $rounding_mode = Calculator::ROUND_HALF_UP)
-    {
-        return new Money(
-            $this->calculator()->divide(
-                $this->amount(),
-                $divisor,
-                $this->precision(),
-                $rounding_mode
-            ),
-            $this->currency()
-        );
-    }
-
-
-
-    /**
-     * @param Currency $other_currency
-     * @throws InvalidArgumentException
-     */
-    public function verifySameCurrency(Currency $other_currency)
-    {
-        if ($this->currency()->equals($other_currency) !== true) {
-            throw new InvalidArgumentException(
-                esc_html__(
-                    'Currencies must be the same in order to add or subtract their values.',
-                    'event_espresso'
-                )
-            );
-        }
-    }
-
-
-
-    /**
-     * @return Calculator
-     */
-    protected function calculator()
-    {
-        $this->initializeCalculators();
-        return self::$calculator;
-    }
-
-
-
-    /**
-     * loops through a filterable array of Calculator services
-     * and selects the first one that is supported by the current server
-     */
-    protected function initializeCalculators()
-    {
-        if (self::$calculator instanceof Calculator) {
-            return;
-        }
-        $calculators = apply_filters(
-            'FHEE__EventEspresso\core\entities\money\Money__initializeCalculators__Calculator_array',
-            array(
-                '\EventEspresso\core\services\currency\DefaultCalculator',
-            )
-        );
-        foreach ($calculators as $calculator) {
-            if (! class_exists($calculator)) {
-                continue;
-            }
-            $calculator = new $calculator();
-            if ($calculator instanceof Calculator && $calculator->isSupported()) {
-                self::$calculator = $calculator;
-                break;
-            }
-        }
-    }
-
-
-
-    /**
-     * @return MoneyFormatter[]
-     */
-    protected function formatters()
-    {
-        $this->initializeFormatters();
-        return self::$formatters;
-    }
-
-
-
-    /**
-     * initializes a filterable array of MoneyFormatter services
-     */
-    protected function initializeFormatters()
-    {
-        if (! empty(self::$formatters)) {
-            return;
-        }
-        self::$formatters = apply_filters(
-            'FHEE__EventEspresso\core\entities\money\Money__initializeFormatters__MoneyFormatters_array',
-            array(
-                1 => new DecimalMoneyFormatter(),
-                2 => new ThousandsMoneyFormatter(),
-                3 => new CurrencySignMoneyFormatter(),
-                4 => new InternationalMoneyFormatter(),
-            )
-        );
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->format(MoneyFormatter::DECIMAL_ONLY);
-    }
+	/**
+	 * number of decimal places to be added to currencies for internal computations,
+	 * but removed before any output or formatting is applied.
+	 * This allows us to avoid rounding errors during calculations.
+	 */
+	const EXTRA_PRECISION = 3;
+
+	/**
+	 * @var int $amount
+	 */
+	private $amount;
+
+	/**
+	 * @var Currency $currency
+	 */
+	private $currency;
+
+	/**
+	 * @var Calculator $calculator
+	 */
+	protected static $calculator;
+
+	/**
+	 * @var MoneyFormatter[] $formatters
+	 */
+	protected static $formatters;
+
+
+
+	/**
+	 * Money constructor.
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @param Currency         $currency
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($amount, Currency $currency)
+	{
+		$this->currency = $currency;
+		$this->amount = (string)$this->parseAmount($amount);
+	}
+
+
+
+	/**
+	 * factory method that returns a Money object using the currency corresponding to the site's country
+	 * example: Money::forSite(12.5)
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @return Money
+	 * @throws InvalidArgumentException
+	 */
+	public static function forSite($amount)
+	{
+		$CNT_ISO = isset(EE_Registry::instance()->CFG->organization)
+				   && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config
+			? EE_Registry::instance()->CFG->organization->CNT_ISO
+			: 'US';
+		return new self($amount, Currency::createFromCountryCode($CNT_ISO));
+	}
+
+
+
+	/**
+	 * factory method that returns a Money object using the currency as specified by the supplied ISO country code
+	 * example: Money::forCountry(12.5,'US')
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @param string           $CNT_ISO
+	 * @return Money
+	 * @throws InvalidArgumentException
+	 */
+	public static function forCountry($amount, $CNT_ISO)
+	{
+		return new self($amount, Currency::createFromCountryCode($CNT_ISO));
+	}
+
+
+
+	/**
+	 * factory method that returns a Money object using the currency as specified by the supplied currency code
+	 * example: Money::forCurrency(12.5, 'USD')
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @param string           $currency_code
+	 * @return Money
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 */
+	public static function forCurrency($amount, $currency_code)
+	{
+		return new self($amount, Currency::createFromCode($currency_code));
+	}
+
+
+
+	/**
+	 * factory method that returns a Money object for the currency specified as if it were a class method
+	 * example: Money::USD(12.5);
+	 * money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 * example: $12.5 USD would equate to a value amount of 12.50
+	 *
+	 * @param string $currency_code
+	 * @param array  $arguments
+	 * @return Money
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 */
+	public static function __callStatic($currency_code, $arguments)
+	{
+		return new self($arguments[0], Currency::createFromCode($currency_code));
+	}
+
+
+
+	/**
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @return float|int|number|string
+	 * @throws InvalidDataTypeException
+	 */
+	private function parseAmount($amount)
+	{
+		$type = gettype($amount);
+		switch ($type) {
+			case 'integer' :
+			case 'double' :
+			case 'string' :
+				// shift the decimal position by the number of decimal places used internally
+				// ex: 12.5 for a currency using 2 decimal places, would become 1250
+				// then if our extra internal precision was 3, it would become 1250000
+				$amount *= pow(10, $this->precision());
+				// then round up the remaining value if there is still a fractional amount left
+				$amount = round($amount, 0, PHP_ROUND_HALF_UP);
+			break;
+			default  :
+				throw new InvalidDataTypeException(
+					'$amount',
+					$amount,
+					'integer (or float or string)'
+				);
+		}
+		return $amount;
+	}
+
+
+
+	/**
+	 * adds or subtracts additional decimal places based on the value of the Money::EXTRA_PRECISION constant
+	 *
+	 * @param bool $positive
+	 * @return int
+	 */
+	private function precision($positive = true)
+	{
+		$sign = $positive ? 1 : -1;
+		return ((int)$this->currency->decimalPlaces() + Money::EXTRA_PRECISION) * $sign;
+	}
+
+
+
+	/**
+	 * Returns the money amount as an unformatted string
+	 * IF YOU REQUIRE A FORMATTED STRING, THEN USE Money::format()
+	 *
+	 * @return string
+	 */
+	public function amount()
+	{
+		// shift the decimal position BACK by the number of decimal places used internally
+		// ex: 1250 for a currency using 2 decimal places, would become 12.5
+		$amount = (string)$this->amount * pow(10, $this->precision(false));
+		// then shave off our extra internal precision using the number of decimal places for the currency
+		$amount = round($amount, $this->currency->decimalPlaces());
+		return $amount;
+	}
+
+
+
+	/**
+	 * applies formatting based on the specified formatting level
+	 * corresponding to one of the constants on \EventEspresso\core\services\currency\MoneyFormatter
+	 *
+	 * @param int $formatting_level
+	 * @return string
+	 */
+	public function format($formatting_level = MoneyFormatter::ADD_THOUSANDS)
+	{
+		$formatted_amount = $this->amount();
+		$formatters = $this->formatters();
+		// if we are applying thousands formatting...
+		if ($formatting_level >= MoneyFormatter::ADD_THOUSANDS) {
+			// then let's remove decimal formatting since it's included in thousands formatting
+			unset($formatters[MoneyFormatter::DECIMAL_ONLY]);
+		}
+		for ($x = 1; $x <= $formatting_level; $x++) {
+			if (isset($formatters[$x]) && $formatters[$x] instanceof MoneyFormatter) {
+				$formatted_amount = $formatters[$x]->format($formatted_amount, $this->currency);
+			}
+		}
+		return $formatted_amount;
+	}
+
+
+
+	/**
+	 * Returns the Currency object for this money
+	 *
+	 * @return Currency
+	 */
+	public function currency()
+	{
+		return $this->currency;
+	}
+
+
+
+	/**
+	 * adds the supplied Money amount to this Money amount
+	 * and returns a new Money object
+	 *
+	 * @param Money $other
+	 * @return Money
+	 * @throws InvalidArgumentException
+	 */
+	public function add(Money $other)
+	{
+		$this->verifySameCurrency($other->currency());
+		return new Money(
+			$this->calculator()->add(
+				$this->amount(),
+				$other->amount()
+			),
+			$this->currency()
+		);
+	}
+
+
+
+	/**
+	 * subtracts the supplied Money amount from this Money amount
+	 * and returns a new Money object
+	 *
+	 * @param Money $other
+	 * @return Money
+	 * @throws InvalidArgumentException
+	 */
+	public function subtract(Money $other)
+	{
+		$this->verifySameCurrency($other->currency());
+		return new Money(
+			$this->calculator()->subtract(
+				$this->amount(),
+				$other->amount()
+			),
+			$this->currency()
+		);
+	}
+
+
+
+	/**
+	 * multiplies this Money amount by the supplied $multiplier
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $multiplier
+	 * @param int              $rounding_mode
+	 * @return Money
+	 * @throws InvalidDataTypeException
+	 */
+	public function multiply($multiplier, $rounding_mode = Calculator::ROUND_HALF_UP)
+	{
+		return new Money(
+			$this->calculator()->multiply(
+				$this->amount(),
+				$multiplier,
+				$this->precision(),
+				$rounding_mode
+			),
+			$this->currency()
+		);
+	}
+
+
+
+	/**
+	 * divides this Money amount by the supplied $divisor
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $divisor
+	 * @param int              $rounding_mode
+	 * @return Money
+	 * @throws InvalidDataTypeException
+	 */
+	public function divide($divisor, $rounding_mode = Calculator::ROUND_HALF_UP)
+	{
+		return new Money(
+			$this->calculator()->divide(
+				$this->amount(),
+				$divisor,
+				$this->precision(),
+				$rounding_mode
+			),
+			$this->currency()
+		);
+	}
+
+
+
+	/**
+	 * @param Currency $other_currency
+	 * @throws InvalidArgumentException
+	 */
+	public function verifySameCurrency(Currency $other_currency)
+	{
+		if ($this->currency()->equals($other_currency) !== true) {
+			throw new InvalidArgumentException(
+				esc_html__(
+					'Currencies must be the same in order to add or subtract their values.',
+					'event_espresso'
+				)
+			);
+		}
+	}
+
+
+
+	/**
+	 * @return Calculator
+	 */
+	protected function calculator()
+	{
+		$this->initializeCalculators();
+		return self::$calculator;
+	}
+
+
+
+	/**
+	 * loops through a filterable array of Calculator services
+	 * and selects the first one that is supported by the current server
+	 */
+	protected function initializeCalculators()
+	{
+		if (self::$calculator instanceof Calculator) {
+			return;
+		}
+		$calculators = apply_filters(
+			'FHEE__EventEspresso\core\entities\money\Money__initializeCalculators__Calculator_array',
+			array(
+				'\EventEspresso\core\services\currency\DefaultCalculator',
+			)
+		);
+		foreach ($calculators as $calculator) {
+			if (! class_exists($calculator)) {
+				continue;
+			}
+			$calculator = new $calculator();
+			if ($calculator instanceof Calculator && $calculator->isSupported()) {
+				self::$calculator = $calculator;
+				break;
+			}
+		}
+	}
+
+
+
+	/**
+	 * @return MoneyFormatter[]
+	 */
+	protected function formatters()
+	{
+		$this->initializeFormatters();
+		return self::$formatters;
+	}
+
+
+
+	/**
+	 * initializes a filterable array of MoneyFormatter services
+	 */
+	protected function initializeFormatters()
+	{
+		if (! empty(self::$formatters)) {
+			return;
+		}
+		self::$formatters = apply_filters(
+			'FHEE__EventEspresso\core\entities\money\Money__initializeFormatters__MoneyFormatters_array',
+			array(
+				1 => new DecimalMoneyFormatter(),
+				2 => new ThousandsMoneyFormatter(),
+				3 => new CurrencySignMoneyFormatter(),
+				4 => new InternationalMoneyFormatter(),
+			)
+		);
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->format(MoneyFormatter::DECIMAL_ONLY);
+	}
 
 
 

Spacing +5 added lines, -5 removed lines

@@ -69,7 +69,7 @@ 
     public function __construct($amount, Currency $currency)
     {
         $this->currency = $currency;
-        $this->amount = (string)$this->parseAmount($amount);
+        $this->amount = (string) $this->parseAmount($amount);
     }
 
 
@@ -191,7 +191,7 @@ 
     private function precision($positive = true)
     {
         $sign = $positive ? 1 : -1;
-        return ((int)$this->currency->decimalPlaces() + Money::EXTRA_PRECISION) * $sign;
+        return ((int) $this->currency->decimalPlaces() + Money::EXTRA_PRECISION) * $sign;
     }
 
 
@@ -206,7 +206,7 @@ 
     {
         // shift the decimal position BACK by the number of decimal places used internally
         // ex: 1250 for a currency using 2 decimal places, would become 12.5
-        $amount = (string)$this->amount * pow(10, $this->precision(false));
+        $amount = (string) $this->amount * pow(10, $this->precision(false));
         // then shave off our extra internal precision using the number of decimal places for the currency
         $amount = round($amount, $this->currency->decimalPlaces());
         return $amount;
@@ -389,7 +389,7 @@ 
             )
         );
         foreach ($calculators as $calculator) {
-            if (! class_exists($calculator)) {
+            if ( ! class_exists($calculator)) {
                 continue;
             }
             $calculator = new $calculator();
@@ -418,7 +418,7 @@ 
      */
     protected function initializeFormatters()
     {
-        if (! empty(self::$formatters)) {
+        if ( ! empty(self::$formatters)) {
             return;
         }
         self::$formatters = apply_filters(

core/services/currency/Calculator.php

Indentation +104 added lines, -104 removed lines

@@ -9,110 +9,110 @@
 interface Calculator
 {
 
-    /**
-     * Round val up to precision decimal places AWAY from zero,
-     * when it is half way there. Making 1.5 into 2 and -1.5 into -2.
-     */
-    const ROUND_HALF_UP   = PHP_ROUND_HALF_UP;
-
-    /**
-     * Round val down to precision decimal places TOWARDS zero,
-     * when it is half way there. Making 1.5 into 1 and -1.5 into -1.
-     */
-    const ROUND_HALF_DOWN = PHP_ROUND_HALF_DOWN;
-
-    /**
-     * Round val to precision decimal places towards the next even value.
-     */
-    const ROUND_HALF_EVEN = PHP_ROUND_HALF_EVEN;
-
-    /**
-     * Round val to precision decimal places towards the next odd value.
-     */
-    const ROUND_HALF_ODD  = PHP_ROUND_HALF_ODD;
-
-    /**
-     * Round val up to the next highest integer
-     */
-    const ROUND_UP = 5;
-
-    /**
-     * Round val down to the next lowest integer
-     */
-    const ROUND_DOWN = 6;
-
-
-
-    /**
-     * returns true if a calculator is supported as determined by loaded server extensions
-     *
-     * @return bool
-     */
-    public function isSupported();
-
-
-
-    /**
-     * adds the supplied Money amount to this Money amount
-     * and returns a new Money object
-     *
-     * @param string           $amount
-     * @param float|int|string $amount_to_add
-     * @return string
-     */
-    public function add($amount, $amount_to_add);
-
-
-
-    /**
-     * subtracts the supplied Money amount from this Money amount
-     * and returns a new Money object
-     *
-     * @param string           $amount
-     * @param float|int|string $amount_to_subtract
-     * @return string
-     */
-    public function subtract($amount, $amount_to_subtract);
-
-
-
-    /**
-     * multiplies this Money amount by the supplied $multiplier
-     * and returns a new Money object
-     *
-     * @param string           $amount
-     * @param float|int|string $multiplier
-     * @param int              $precision
-     * @param int              $rounding_mode
-     * @return string
-     */
-    public function multiply($amount, $multiplier, $precision, $rounding_mode);
-
-
-
-    /**
-     * divides this Money amount by the supplied $divisor
-     * and returns a new Money object
-     *
-     * @param string           $amount
-     * @param float|int|string $divisor
-     * @param int              $precision
-     * @param int              $rounding_mode
-     * @return string
-     */
-    public function divide($amount, $divisor, $precision, $rounding_mode);
-
-
-
-    /**
-     * adjust amount according to precision and rounding mode
-     *
-     * @param int|float $amount
-     * @param int       $precision
-     * @param int       $rounding_mode
-     * @return string
-     */
-    public function round($amount, $precision, $rounding_mode);
+	/**
+	 * Round val up to precision decimal places AWAY from zero,
+	 * when it is half way there. Making 1.5 into 2 and -1.5 into -2.
+	 */
+	const ROUND_HALF_UP   = PHP_ROUND_HALF_UP;
+
+	/**
+	 * Round val down to precision decimal places TOWARDS zero,
+	 * when it is half way there. Making 1.5 into 1 and -1.5 into -1.
+	 */
+	const ROUND_HALF_DOWN = PHP_ROUND_HALF_DOWN;
+
+	/**
+	 * Round val to precision decimal places towards the next even value.
+	 */
+	const ROUND_HALF_EVEN = PHP_ROUND_HALF_EVEN;
+
+	/**
+	 * Round val to precision decimal places towards the next odd value.
+	 */
+	const ROUND_HALF_ODD  = PHP_ROUND_HALF_ODD;
+
+	/**
+	 * Round val up to the next highest integer
+	 */
+	const ROUND_UP = 5;
+
+	/**
+	 * Round val down to the next lowest integer
+	 */
+	const ROUND_DOWN = 6;
+
+
+
+	/**
+	 * returns true if a calculator is supported as determined by loaded server extensions
+	 *
+	 * @return bool
+	 */
+	public function isSupported();
+
+
+
+	/**
+	 * adds the supplied Money amount to this Money amount
+	 * and returns a new Money object
+	 *
+	 * @param string           $amount
+	 * @param float|int|string $amount_to_add
+	 * @return string
+	 */
+	public function add($amount, $amount_to_add);
+
+
+
+	/**
+	 * subtracts the supplied Money amount from this Money amount
+	 * and returns a new Money object
+	 *
+	 * @param string           $amount
+	 * @param float|int|string $amount_to_subtract
+	 * @return string
+	 */
+	public function subtract($amount, $amount_to_subtract);
+
+
+
+	/**
+	 * multiplies this Money amount by the supplied $multiplier
+	 * and returns a new Money object
+	 *
+	 * @param string           $amount
+	 * @param float|int|string $multiplier
+	 * @param int              $precision
+	 * @param int              $rounding_mode
+	 * @return string
+	 */
+	public function multiply($amount, $multiplier, $precision, $rounding_mode);
+
+
+
+	/**
+	 * divides this Money amount by the supplied $divisor
+	 * and returns a new Money object
+	 *
+	 * @param string           $amount
+	 * @param float|int|string $divisor
+	 * @param int              $precision
+	 * @param int              $rounding_mode
+	 * @return string
+	 */
+	public function divide($amount, $divisor, $precision, $rounding_mode);
+
+
+
+	/**
+	 * adjust amount according to precision and rounding mode
+	 *
+	 * @param int|float $amount
+	 * @param int       $precision
+	 * @param int       $rounding_mode
+	 * @return string
+	 */
+	public function round($amount, $precision, $rounding_mode);
 
 
 }

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
      * Round val up to precision decimal places AWAY from zero,
      * when it is half way there. Making 1.5 into 2 and -1.5 into -2.
      */
-    const ROUND_HALF_UP   = PHP_ROUND_HALF_UP;
+    const ROUND_HALF_UP = PHP_ROUND_HALF_UP;
 
     /**
      * Round val down to precision decimal places TOWARDS zero,
@@ -29,7 +29,7 @@ 
     /**
      * Round val to precision decimal places towards the next odd value.
      */
-    const ROUND_HALF_ODD  = PHP_ROUND_HALF_ODD;
+    const ROUND_HALF_ODD = PHP_ROUND_HALF_ODD;
 
     /**
      * Round val up to the next highest integer

core/services/currency/CalculatorBase.php

Indentation +66 added lines, -66 removed lines

@@ -19,72 +19,72 @@
 abstract class CalculatorBase implements Calculator
 {
 
-    /**
-     * @param int|float $amount
-     * @param int       $precision
-     * @param int       $rounding_mode
-     * @return string
-     * @throws InvalidArgumentException
-     */
-    public function round($amount, $precision, $rounding_mode)
-    {
-        $this->verifyRoundingMode($rounding_mode);
-        if ($rounding_mode === Calculator::ROUND_UP) {
-            return (string) ceil($amount);
-        }
-        if ($rounding_mode === Calculator::ROUND_DOWN) {
-            return (string) floor($amount);
-        }
-        return (string) round($amount, $precision, $rounding_mode);
-    }
-
-
-
-    /**
-     * Asserts that rounding mode is a valid integer value.
-     *
-     * @param int $rounding_mode
-     * @throws InvalidArgumentException If $roundingMode is not valid
-     */
-    private function verifyRoundingMode($rounding_mode)
-    {
-        if (
-        ! in_array(
-            $rounding_mode,
-            array(
-                Calculator::ROUND_UP,
-                Calculator::ROUND_DOWN,
-                Calculator::ROUND_HALF_DOWN,
-                Calculator::ROUND_HALF_EVEN,
-                Calculator::ROUND_HALF_ODD,
-                Calculator::ROUND_HALF_UP,
-            ),
-            true
-        )
-        ) {
-            throw new InvalidArgumentException(
-                esc_html__(
-                    'Rounding mode should be one of the following: Calculator::ROUND_UP, Calculator::ROUND_DOWN, Calculator::ROUND_HALF_DOWN, Calculator::ROUND_HALF_EVEN, Calculator::ROUND_HALF_ODD, or Calculator::ROUND_HALF_UP.',
-                    'event_espresso'
-                )
-            );
-        }
-    }
-
-
-
-    /**
-     * @param $divisor
-     * @throws InvalidArgumentException
-     */
-    protected function validateDivisor($divisor)
-    {
-        if ((int)$divisor === 0) {
-            throw new InvalidArgumentException(
-                esc_html__('Division by zero.', 'event_espresso')
-            );
-        }
-    }
+	/**
+	 * @param int|float $amount
+	 * @param int       $precision
+	 * @param int       $rounding_mode
+	 * @return string
+	 * @throws InvalidArgumentException
+	 */
+	public function round($amount, $precision, $rounding_mode)
+	{
+		$this->verifyRoundingMode($rounding_mode);
+		if ($rounding_mode === Calculator::ROUND_UP) {
+			return (string) ceil($amount);
+		}
+		if ($rounding_mode === Calculator::ROUND_DOWN) {
+			return (string) floor($amount);
+		}
+		return (string) round($amount, $precision, $rounding_mode);
+	}
+
+
+
+	/**
+	 * Asserts that rounding mode is a valid integer value.
+	 *
+	 * @param int $rounding_mode
+	 * @throws InvalidArgumentException If $roundingMode is not valid
+	 */
+	private function verifyRoundingMode($rounding_mode)
+	{
+		if (
+		! in_array(
+			$rounding_mode,
+			array(
+				Calculator::ROUND_UP,
+				Calculator::ROUND_DOWN,
+				Calculator::ROUND_HALF_DOWN,
+				Calculator::ROUND_HALF_EVEN,
+				Calculator::ROUND_HALF_ODD,
+				Calculator::ROUND_HALF_UP,
+			),
+			true
+		)
+		) {
+			throw new InvalidArgumentException(
+				esc_html__(
+					'Rounding mode should be one of the following: Calculator::ROUND_UP, Calculator::ROUND_DOWN, Calculator::ROUND_HALF_DOWN, Calculator::ROUND_HALF_EVEN, Calculator::ROUND_HALF_ODD, or Calculator::ROUND_HALF_UP.',
+					'event_espresso'
+				)
+			);
+		}
+	}
+
+
+
+	/**
+	 * @param $divisor
+	 * @throws InvalidArgumentException
+	 */
+	protected function validateDivisor($divisor)
+	{
+		if ((int)$divisor === 0) {
+			throw new InvalidArgumentException(
+				esc_html__('Division by zero.', 'event_espresso')
+			);
+		}
+	}
 
 
 }

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
      */
     protected function validateDivisor($divisor)
     {
-        if ((int)$divisor === 0) {
+        if ((int) $divisor === 0) {
             throw new InvalidArgumentException(
                 esc_html__('Division by zero.', 'event_espresso')
             );

core/services/currency/MoneyFormatter.php

Indentation +38 added lines, -38 removed lines

@@ -19,44 +19,44 @@
 interface MoneyFormatter
 {
 
-    /**
-     * do NOT apply any formatting
-     * eg: 123456
-     */
-    const RAW = 0;
-
-    /**
-     * only format money amount by adding the decimal mark
-     * eg: 1234.56
-     */
-    const DECIMAL_ONLY = 1;
-
-    /**
-     * format money amount by adding decimal mark and thousands separator
-     * eg: 1,234.56
-     */
-    const ADD_THOUSANDS = 2;
-
-    /**
-     * format money amount by adding decimal mark, thousands separator, and currency sign
-     * eg: $1,234.56
-     */
-    const ADD_CURRENCY_SIGN = 3;
-
-    /**
-     * format money amount by adding decimal mark, thousands separator, currency sign, and currency code
-     * eg: USD $1,234.56
-     */
-    const INTERNATIONAL = 4;
-
-
-
-    /**
-     * @param string   $money_amount
-     * @param Currency $currency
-     * @return string
-     */
-    public function format($money_amount, Currency $currency);
+	/**
+	 * do NOT apply any formatting
+	 * eg: 123456
+	 */
+	const RAW = 0;
+
+	/**
+	 * only format money amount by adding the decimal mark
+	 * eg: 1234.56
+	 */
+	const DECIMAL_ONLY = 1;
+
+	/**
+	 * format money amount by adding decimal mark and thousands separator
+	 * eg: 1,234.56
+	 */
+	const ADD_THOUSANDS = 2;
+
+	/**
+	 * format money amount by adding decimal mark, thousands separator, and currency sign
+	 * eg: $1,234.56
+	 */
+	const ADD_CURRENCY_SIGN = 3;
+
+	/**
+	 * format money amount by adding decimal mark, thousands separator, currency sign, and currency code
+	 * eg: USD $1,234.56
+	 */
+	const INTERNATIONAL = 4;
+
+
+
+	/**
+	 * @param string   $money_amount
+	 * @param Currency $currency
+	 * @return string
+	 */
+	public function format($money_amount, Currency $currency);
 
 
 }

core/services/currency/DecimalMoneyFormatter.php

Indentation +9 added lines, -9 removed lines

@@ -21,15 +21,15 @@
 
 
 
-    /**
-     * @param string   $money_amount
-     * @param Currency $currency
-     * @return string
-     */
-    public function format($money_amount, Currency $currency)
-    {
-        return (string)round($money_amount, $currency->decimalPlaces());
-    }
+	/**
+	 * @param string   $money_amount
+	 * @param Currency $currency
+	 * @return string
+	 */
+	public function format($money_amount, Currency $currency)
+	{
+		return (string)round($money_amount, $currency->decimalPlaces());
+	}
 
 
 }

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      */
     public function format($money_amount, Currency $currency)
     {
-        return (string)round($money_amount, $currency->decimalPlaces());
+        return (string) round($money_amount, $currency->decimalPlaces());
     }
 
 

core/services/currency/ThousandsMoneyFormatter.php

Indentation +14 added lines, -14 removed lines

@@ -21,20 +21,20 @@
 
 
 
-    /**
-     * @param string   $money_amount
-     * @param Currency $currency
-     * @return string
-     */
-    public function format($money_amount, Currency $currency)
-    {
-        return number_format(
-            $money_amount,
-            $currency->decimalPlaces(),
-            $currency->decimalMark(),
-            $currency->thousands()
-        );
-    }
+	/**
+	 * @param string   $money_amount
+	 * @param Currency $currency
+	 * @return string
+	 */
+	public function format($money_amount, Currency $currency)
+	{
+		return number_format(
+			$money_amount,
+			$currency->decimalPlaces(),
+			$currency->decimalMark(),
+			$currency->thousands()
+		);
+	}
 
 
 }