AyeCode / invoicing

includes/api/class-getpaid-rest-report-sales-controller.php

Spacing +150 added lines, -150 removed lines

@@ -9,7 +9,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST reports controller class.
@@ -46,7 +46,7 @@ 
 	 *
 	 * @see register_rest_route()
 	 */
-	public function register_namespace_routes( $namespace ) {
+	public function register_namespace_routes($namespace) {
 
 		// Get sales report.
 		register_rest_route(
@@ -55,11 +55,11 @@ 
 			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_items' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'callback'            => array($this, 'get_items'),
+					'permission_callback' => array($this, 'get_items_permissions_check'),
 					'args'                => $this->get_collection_params(),
 				),
-				'schema' => array( $this, 'get_public_item_schema' ),
+				'schema' => array($this, 'get_public_item_schema'),
 			)
 		);
 
@@ -72,10 +72,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|boolean
 	 */
-	public function get_items_permissions_check( $request ) {
+	public function get_items_permissions_check($request) {
 
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+		if (!wpinv_current_user_can_manage_invoicing()) {
+			return new WP_Error('rest_cannot_view', __('Sorry, you cannot list resources.', 'invoicing'), array('status' => rest_authorization_required_code()));
 		}
 
 		return true;
@@ -87,12 +87,12 @@ 
 	 * @param WP_REST_Request $request
 	 * @return array|WP_Error
 	 */
-	public function get_items( $request ) {
+	public function get_items($request) {
 		$data   = array();
-		$item   = $this->prepare_item_for_response( null, $request );
-		$data[] = $this->prepare_response_for_collection( $item );
+		$item   = $this->prepare_item_for_response(null, $request);
+		$data[] = $this->prepare_response_for_collection($item);
 
-		return rest_ensure_response( $data );
+		return rest_ensure_response($data);
 	}
 
 	/**
@@ -102,139 +102,139 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response $response Response data.
 	 */
-	public function prepare_item_for_response( $_, $request ) {
+	public function prepare_item_for_response($_, $request) {
 
 		// Set report range.
-		$this->report_range = $this->get_date_range( $request );
+		$this->report_range = $this->get_date_range($request);
 
 		$report_data     = $this->get_report_data();
 		$period_totals   = array();
 
 		// Setup period totals by ensuring each period in the interval has data.
-		$start_date      = strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS;
+		$start_date      = strtotime($this->report_range['after']) + DAY_IN_SECONDS;
 
-		if ( 'month' === $this->groupby ) {
-			$start_date      = strtotime( date( 'Y-m-01', $start_date ) );
+		if ('month' === $this->groupby) {
+			$start_date = strtotime(date('Y-m-01', $start_date));
 		}
 
-		for ( $i = 0; $i < $this->interval; $i++ ) {
+		for ($i = 0; $i < $this->interval; $i++) {
 
-			switch ( $this->groupby ) {
+			switch ($this->groupby) {
 				case 'day' :
-					$time = date( 'Y-m-d', strtotime( "+{$i} DAY", $start_date ) );
+					$time = date('Y-m-d', strtotime("+{$i} DAY", $start_date));
 					break;
 				default :
-					$time = date( 'Y-m', strtotime( "+{$i} MONTH", $start_date ) );
+					$time = date('Y-m', strtotime("+{$i} MONTH", $start_date));
 					break;
 			}
 
 			// Set the defaults for each period.
-			$period_totals[ $time ] = array(
-				'sales'             => wpinv_round_amount( 0.00 ),
+			$period_totals[$time] = array(
+				'sales'             => wpinv_round_amount(0.00),
 				'invoices'          => 0,
-				'refunds'           => wpinv_round_amount( 0.00 ),
+				'refunds'           => wpinv_round_amount(0.00),
 				'items'             => 0,
 				'refunded_items'    => 0,
-				'tax'               => wpinv_round_amount( 0.00 ),
-				'refunded_tax'      => wpinv_round_amount( 0.00 ),
-				'subtotal'          => wpinv_round_amount( 0.00 ),
-				'refunded_subtotal' => wpinv_round_amount( 0.00 ),
-				'fees'              => wpinv_round_amount( 0.00 ),
-				'refunded_fees'     => wpinv_round_amount( 0.00 ),
-				'discount'          => wpinv_round_amount( 0.00 ),
+				'tax'               => wpinv_round_amount(0.00),
+				'refunded_tax'      => wpinv_round_amount(0.00),
+				'subtotal'          => wpinv_round_amount(0.00),
+				'refunded_subtotal' => wpinv_round_amount(0.00),
+				'fees'              => wpinv_round_amount(0.00),
+				'refunded_fees'     => wpinv_round_amount(0.00),
+				'discount'          => wpinv_round_amount(0.00),
 			);
 
 		}
 
 		// add total sales, total invoice count, total tax for each period
-		$date_format = ( 'day' === $this->groupby ) ? 'Y-m-d' : 'Y-m';
-		foreach ( $report_data->invoices as $invoice ) {
-			$time = date( $date_format, strtotime( $invoice->post_date ) );
+		$date_format = ('day' === $this->groupby) ? 'Y-m-d' : 'Y-m';
+		foreach ($report_data->invoices as $invoice) {
+			$time = date($date_format, strtotime($invoice->post_date));
 
-			if ( ! isset( $period_totals[ $time ] ) ) {
+			if (!isset($period_totals[$time])) {
 				continue;
 			}
 
-			$period_totals[ $time ]['sales']    = wpinv_round_amount( $invoice->total_sales );
-			$period_totals[ $time ]['tax']      = wpinv_round_amount( $invoice->total_tax );
-			$period_totals[ $time ]['subtotal'] = wpinv_round_amount( $invoice->subtotal );
-			$period_totals[ $time ]['fees']     = wpinv_round_amount( $invoice->total_fees );
+			$period_totals[$time]['sales']    = wpinv_round_amount($invoice->total_sales);
+			$period_totals[$time]['tax']      = wpinv_round_amount($invoice->total_tax);
+			$period_totals[$time]['subtotal'] = wpinv_round_amount($invoice->subtotal);
+			$period_totals[$time]['fees']     = wpinv_round_amount($invoice->total_fees);
 
 		}
 
-		foreach ( $report_data->refunds as $invoice ) {
-			$time = date( $date_format, strtotime( $invoice->post_date ) );
+		foreach ($report_data->refunds as $invoice) {
+			$time = date($date_format, strtotime($invoice->post_date));
 
-			if ( ! isset( $period_totals[ $time ] ) ) {
+			if (!isset($period_totals[$time])) {
 				continue;
 			}
 
-			$period_totals[ $time ]['refunds']           = wpinv_round_amount( $invoice->total_sales );
-			$period_totals[ $time ]['refunded_tax']      = wpinv_round_amount( $invoice->total_tax );
-			$period_totals[ $time ]['refunded_subtotal'] = wpinv_round_amount( $invoice->subtotal );
-			$period_totals[ $time ]['refunded_fees']     = wpinv_round_amount( $invoice->total_fees );
+			$period_totals[$time]['refunds']           = wpinv_round_amount($invoice->total_sales);
+			$period_totals[$time]['refunded_tax']      = wpinv_round_amount($invoice->total_tax);
+			$period_totals[$time]['refunded_subtotal'] = wpinv_round_amount($invoice->subtotal);
+			$period_totals[$time]['refunded_fees']     = wpinv_round_amount($invoice->total_fees);
 
 		}
 
-		foreach ( $report_data->invoice_counts as $invoice ) {
-			$time = date( $date_format, strtotime( $invoice->post_date ) );
+		foreach ($report_data->invoice_counts as $invoice) {
+			$time = date($date_format, strtotime($invoice->post_date));
 
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['invoices']   = (int) $invoice->count;
+			if (isset($period_totals[$time])) {
+				$period_totals[$time]['invoices'] = (int) $invoice->count;
 			}
 
 		}
 
 		// Add total invoice items for each period.
-		foreach ( $report_data->invoice_items as $invoice_item ) {
-			$time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $invoice_item->post_date ) ) : date( 'Y-m', strtotime( $invoice_item->post_date ) );
+		foreach ($report_data->invoice_items as $invoice_item) {
+			$time = ('day' === $this->groupby) ? date('Y-m-d', strtotime($invoice_item->post_date)) : date('Y-m', strtotime($invoice_item->post_date));
 
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['items'] = (int) $invoice_item->invoice_item_count;
+			if (isset($period_totals[$time])) {
+				$period_totals[$time]['items'] = (int) $invoice_item->invoice_item_count;
 			}
 
 		}
 
 		// Add total discount for each period.
-		foreach ( $report_data->coupons as $discount ) {
-			$time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $discount->post_date ) ) : date( 'Y-m', strtotime( $discount->post_date ) );
+		foreach ($report_data->coupons as $discount) {
+			$time = ('day' === $this->groupby) ? date('Y-m-d', strtotime($discount->post_date)) : date('Y-m', strtotime($discount->post_date));
 
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['discount'] = wpinv_round_amount( $discount->discount_amount );
+			if (isset($period_totals[$time])) {
+				$period_totals[$time]['discount'] = wpinv_round_amount($discount->discount_amount);
 			}
 
 		}
 
 		$report_data->totals            = $period_totals;
 		$report_data->grouped_by        = $this->groupby;
-		$report_data->interval          = max( $this->interval, 1 );
+		$report_data->interval          = max($this->interval, 1);
 		$report_data->currency          = wpinv_get_currency();
 		$report_data->currency_symbol   = wpinv_currency_symbol();
 		$report_data->currency_position = wpinv_currency_position();
 		$report_data->decimal_places    = wpinv_decimals();
 		$report_data->thousands_sep     = wpinv_thousands_separator();
 		$report_data->decimals_sep      = wpinv_decimal_separator();
-		$report_data->start_date        = date( 'Y-m-d', strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS );
-		$report_data->end_date          = date( 'Y-m-d', strtotime( $this->report_range['before'] ) - DAY_IN_SECONDS );
-		$report_data->start_date_locale = getpaid_format_date( date( 'Y-m-d', strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS ) );
-		$report_data->end_date_locale   = getpaid_format_date( date( 'Y-m-d', strtotime( $this->report_range['before'] ) - DAY_IN_SECONDS ) );
+		$report_data->start_date        = date('Y-m-d', strtotime($this->report_range['after']) + DAY_IN_SECONDS);
+		$report_data->end_date          = date('Y-m-d', strtotime($this->report_range['before']) - DAY_IN_SECONDS);
+		$report_data->start_date_locale = getpaid_format_date(date('Y-m-d', strtotime($this->report_range['after']) + DAY_IN_SECONDS));
+		$report_data->end_date_locale   = getpaid_format_date(date('Y-m-d', strtotime($this->report_range['before']) - DAY_IN_SECONDS));
 		$report_data->decimals_sep      = wpinv_decimal_separator();
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$context = !empty($request['context']) ? $request['context'] : 'view';
 		$data    = $report_data;
-		unset( $data->invoice_counts, $data->invoices, $data->coupons, $data->refunds, $data->invoice_items );
-		$data    = $this->add_additional_fields_to_object( (array) $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
+		unset($data->invoice_counts, $data->invoices, $data->coupons, $data->refunds, $data->invoice_items);
+		$data    = $this->add_additional_fields_to_object((array) $data, $request);
+		$data    = $this->filter_response_by_context($data, $context);
 
 		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-		$response->add_links( array(
+		$response = rest_ensure_response($data);
+		$response->add_links(array(
 			'about' => array(
-				'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+				'href' => rest_url(sprintf('%s/reports', $this->namespace)),
 			),
-		) );
+		));
 
-		return apply_filters( 'getpaid_rest_prepare_report_sales', $response, $report_data, $request );
+		return apply_filters('getpaid_rest_prepare_report_sales', $response, $report_data, $request);
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 * @return stdClass
 	 */
 	public function get_report_data() {
-		if ( empty( $this->report_data ) ) {
+		if (empty($this->report_data)) {
 			$this->query_report_data();
 		}
 		return $this->report_data;
@@ -256,7 +256,7 @@ 
 
 		// Prepare reports.
 		$this->report_data = (object) array(
-			'invoice_counts' => $this->query_invoice_counts(),//count, post_date
+			'invoice_counts' => $this->query_invoice_counts(), //count, post_date
 			'coupons'        => $this->query_coupon_counts(), // discount_amount, post_date
 			'invoice_items'  => $this->query_item_counts(), // invoice_item_count, post_date
 			'refunded_items' => $this->count_refunded_items(), // invoice_item_count, post_date
@@ -266,32 +266,32 @@ 
 		);
 
 		// Calculated totals.
-		$this->report_data->total_tax          = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_tax' ) ) );
-		$this->report_data->total_sales        = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_sales' ) ) );
-		$this->report_data->total_discount     = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_discount' ) ) );
-		$this->report_data->total_fees         = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_fees' ) ) );
-		$this->report_data->subtotal           = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'subtotal' ) ) );
-		$this->report_data->net_sales          = wpinv_round_amount( $this->report_data->total_sales - max( 0, $this->report_data->total_tax ) );
-		$this->report_data->total_refunded_tax = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_tax' ) ) );
-		$this->report_data->total_refunds      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_sales' ) ) );
-		$this->report_data->refunded_discount  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_discount' ) ) );
-		$this->report_data->refunded_fees      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_fees' ) ) );
-		$this->report_data->refunded_subtotal  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'subtotal' ) ) );
-		$this->report_data->net_refunds        = wpinv_round_amount( $this->report_data->total_refunds + max( 0, $this->report_data->total_refunded_tax ) );
+		$this->report_data->total_tax          = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_tax')));
+		$this->report_data->total_sales        = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_sales')));
+		$this->report_data->total_discount     = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_discount')));
+		$this->report_data->total_fees         = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_fees')));
+		$this->report_data->subtotal           = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'subtotal')));
+		$this->report_data->net_sales          = wpinv_round_amount($this->report_data->total_sales - max(0, $this->report_data->total_tax));
+		$this->report_data->total_refunded_tax = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_tax')));
+		$this->report_data->total_refunds      = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_sales')));
+		$this->report_data->refunded_discount  = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_discount')));
+		$this->report_data->refunded_fees      = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_fees')));
+		$this->report_data->refunded_subtotal  = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'subtotal')));
+		$this->report_data->net_refunds        = wpinv_round_amount($this->report_data->total_refunds + max(0, $this->report_data->total_refunded_tax));
 
 
 		// Calculate average based on net.
-		$this->report_data->average_sales       = wpinv_round_amount( $this->report_data->net_sales / max( $this->interval, 1 ), 2 );
-		$this->report_data->average_total_sales = wpinv_round_amount( $this->report_data->total_sales / max( $this->interval, 1 ), 2 );
+		$this->report_data->average_sales       = wpinv_round_amount($this->report_data->net_sales / max($this->interval, 1), 2);
+		$this->report_data->average_total_sales = wpinv_round_amount($this->report_data->total_sales / max($this->interval, 1), 2);
 
 		// Total invoices in this period, even if refunded.
-		$this->report_data->total_invoices = absint( array_sum( wp_list_pluck( $this->report_data->invoice_counts, 'count' ) ) );
+		$this->report_data->total_invoices = absint(array_sum(wp_list_pluck($this->report_data->invoice_counts, 'count')));
 
 		// Items invoiced in this period, even if refunded.
-		$this->report_data->total_items = absint( array_sum( wp_list_pluck( $this->report_data->invoice_items, 'invoice_item_count' ) ) );
+		$this->report_data->total_items = absint(array_sum(wp_list_pluck($this->report_data->invoice_items, 'invoice_item_count')));
 
 		// 3rd party filtering of report data
-		$this->report_data = apply_filters( 'getpaid_rest_api_filter_report_data', $this->report_data );
+		$this->report_data = apply_filters('getpaid_rest_api_filter_report_data', $this->report_data);
 	}
 
 	/**
@@ -316,11 +316,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal'),
 			)
 		);
 
@@ -347,11 +347,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal'),
 			)
 		);
 
@@ -378,11 +378,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal'),
 			)
 		);
 
@@ -406,7 +406,7 @@ 
 				),
 				'query_type'     => 'get_var',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'wpi-refunded' ),
+				'invoice_status' => array('wpi-refunded'),
 			)
 		);
 
@@ -453,11 +453,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-renewal'),
 			)
 		);
 
@@ -504,11 +504,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'wpi-refunded' ),
+				'invoice_status' => array('wpi-refunded'),
 			)
 		);
 
@@ -527,154 +527,154 @@ 
 			'type'       => 'object',
 			'properties' => array(
 				'total_sales' => array(
-					'description' => __( 'Gross sales in the period.', 'invoicing' ),
+					'description' => __('Gross sales in the period.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'net_sales' => array(
-					'description' => __( 'Net sales in the period.', 'invoicing' ),
+					'description' => __('Net sales in the period.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'average_sales' => array(
-					'description' => __( 'Average net daily sales.', 'invoicing' ),
+					'description' => __('Average net daily sales.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'average_total_sales' => array(
-					'description' => __( 'Average gross daily sales.', 'invoicing' ),
+					'description' => __('Average gross daily sales.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_invoices'  => array(
-					'description' => __( 'Number of paid invoices.', 'invoicing' ),
+					'description' => __('Number of paid invoices.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_items' => array(
-					'description' => __( 'Number of items purchased.', 'invoicing' ),
+					'description' => __('Number of items purchased.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'refunded_items' => array(
-					'description' => __( 'Number of items refunded.', 'invoicing' ),
+					'description' => __('Number of items refunded.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_tax' => array(
-					'description' => __( 'Total charged for taxes.', 'invoicing' ),
+					'description' => __('Total charged for taxes.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_refunded_tax' => array(
-					'description' => __( 'Total refunded for taxes.', 'invoicing' ),
+					'description' => __('Total refunded for taxes.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_fees' => array(
-					'description' => __( 'Total fees charged.', 'invoicing' ),
+					'description' => __('Total fees charged.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_refunds' => array(
-					'description' => __( 'Total of refunded invoices.', 'invoicing' ),
+					'description' => __('Total of refunded invoices.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'net_refunds' => array(
-					'description' => __( 'Net of refunded invoices.', 'invoicing' ),
+					'description' => __('Net of refunded invoices.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_discount' => array(
-					'description' => __( 'Total of discounts used.', 'invoicing' ),
+					'description' => __('Total of discounts used.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'totals' => array(
-					'description' => __( 'Totals.', 'invoicing' ),
+					'description' => __('Totals.', 'invoicing'),
 					'type'        => 'array',
 					'items'       => array(
 						'type'    => 'array',
 					),
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'interval' => array(
-					'description' => __( 'Number of months/days in the report period.', 'invoicing' ),
+					'description' => __('Number of months/days in the report period.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'previous_range'  => array(
-					'description' => __( 'The previous report period.', 'invoicing' ),
+					'description' => __('The previous report period.', 'invoicing'),
 					'type'        => 'array',
 					'items'       => array(
 						'type'    => 'string',
 					),
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'grouped_by' => array(
-					'description' => __( 'The period used to group the totals.', 'invoicing' ),
+					'description' => __('The period used to group the totals.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'enum'        => array( 'day', 'month' ),
+					'context'     => array('view'),
+					'enum'        => array('day', 'month'),
 					'readonly'    => true,
 				),
 				'currency' => array(
-					'description' => __( 'The default store currency.', 'invoicing' ),
+					'description' => __('The default store currency.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'currency_symbol' => array(
-					'description' => __( 'The default store currency symbol.', 'invoicing' ),
+					'description' => __('The default store currency symbol.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'currency_position' => array(
-					'description' => __( 'The default store currency position.', 'invoicing' ),
+					'description' => __('The default store currency position.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'decimal_places' => array(
-					'description' => __( 'The default store decimal places.', 'invoicing' ),
+					'description' => __('The default store decimal places.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'thousands_sep' => array(
-					'description' => __( 'The default store thousands separator.', 'invoicing' ),
+					'description' => __('The default store thousands separator.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'decimals_sep' => array(
-					'description' => __( 'The default store decimals separator.', 'invoicing' ),
+					'description' => __('The default store decimals separator.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 			),
 		);
 
-		return $this->add_additional_fields_schema( $schema );
+		return $this->add_additional_fields_schema($schema);
 
 	}
 

includes/api/class-getpaid-rest-date-based-controller.php

Spacing +91 added lines, -91 removed lines

@@ -7,7 +7,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST date based controller class.
@@ -43,15 +43,15 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array The appropriate date range.
 	 */
-	public function get_date_range( $request ) {
+	public function get_date_range($request) {
 
 		// If not supported, assume all time.
-		if ( ! in_array( $request['period'], array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year' ) ) ) {
+		if (!in_array($request['period'], array('custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year'))) {
 			$request['period'] = '7_days';
 		}
 
-		$date_range = call_user_func( array( $this, 'get_' . $request['period'] . '_date_range' ), $request );
-		$this->prepare_interval( $date_range );
+		$date_range = call_user_func(array($this, 'get_' . $request['period'] . '_date_range'), $request);
+		$this->prepare_interval($date_range);
 
 		return $date_range;
 
@@ -63,25 +63,25 @@ 
 	 * @param array $range Date range.
 	 * @return array The appropriate date range.
 	 */
-	public function prepare_interval( $range ) {
+	public function prepare_interval($range) {
 
-		$before = strtotime( $range['before'] ) - DAY_IN_SECONDS;
-		$after  = strtotime( $range['after'] ) + DAY_IN_SECONDS;
-		if ( 'day' === $this->groupby ) {
-			$difference     = max( DAY_IN_SECONDS, ( DAY_IN_SECONDS + $before - $after ) ); // Prevent division by 0;
-			$this->interval = absint( ceil( max( 1, $difference / DAY_IN_SECONDS ) ) );
+		$before = strtotime($range['before']) - DAY_IN_SECONDS;
+		$after  = strtotime($range['after']) + DAY_IN_SECONDS;
+		if ('day' === $this->groupby) {
+			$difference     = max(DAY_IN_SECONDS, (DAY_IN_SECONDS + $before - $after)); // Prevent division by 0;
+			$this->interval = absint(ceil(max(1, $difference / DAY_IN_SECONDS)));
 			return;
 		}
 
 		$this->interval = 0;
-		$min_date       = strtotime( date( 'Y-m-01', $after ) );
+		$min_date       = strtotime(date('Y-m-01', $after));
 
-		while ( $min_date <= $before ) {
-			$this->interval ++;
-			$min_date = strtotime( '+1 MONTH', $min_date );
+		while ($min_date <= $before) {
+			$this->interval++;
+			$min_date = strtotime('+1 MONTH', $min_date);
 		}
 
-		$this->interval = max( 1, $this->interval );
+		$this->interval = max(1, $this->interval);
 
 	}
 
@@ -91,17 +91,17 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array The appropriate date range.
 	 */
-	public function get_custom_date_range( $request ) {
+	public function get_custom_date_range($request) {
 
-		$after  = max( strtotime( '-20 years' ), strtotime( sanitize_text_field( $request['after'] ) ) );
-		$before = strtotime( '+1 day', current_time( 'timestamp' ) );
+		$after  = max(strtotime('-20 years'), strtotime(sanitize_text_field($request['after'])));
+		$before = strtotime('+1 day', current_time('timestamp'));
 
-		if ( ! empty( $request['before'] ) ) {
-			$before  = min( $before, strtotime( sanitize_text_field( $request['before'] ) ) );
+		if (!empty($request['before'])) {
+			$before = min($before, strtotime(sanitize_text_field($request['before'])));
 		}
 
 		// 3 months max for day view
-		if ( floor( ( $before - $after ) / MONTH_IN_SECONDS ) > 3 ) {
+		if (floor(($before - $after) / MONTH_IN_SECONDS) > 3) {
 			$this->groupby = 'month';
 		}
 
@@ -109,14 +109,14 @@ 
 		$difference           = $before - $after;
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', $before - $difference ),
-			'after'  => date( 'Y-m-d', $after - $difference ),
+			'before' => date('Y-m-d', $before - $difference),
+			'after'  => date('Y-m-d', $after - $difference),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', $before ),
-			'after' => date( 'Y-m-d', $after ),
+			'before' => date('Y-m-d', $before),
+			'after' => date('Y-m-d', $after),
 		);
 
 	}
@@ -135,8 +135,8 @@ 
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('+1 day', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-1 day', current_time('timestamp'))),
 		);
 
 	}
@@ -151,14 +151,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-3 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('-1 day', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-3 days', current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-2 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', current_time('timestamp')),
+			'after'  => date('Y-m-d', strtotime('-2 days', current_time('timestamp'))),
 		);
 
 	}
@@ -177,8 +177,8 @@ 
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', strtotime( 'sunday last week', current_time( 'timestamp' )  ) + 8 * DAY_IN_SECONDS ),
-			'after'  => date( 'Y-m-d', strtotime( 'sunday last week', current_time( 'timestamp' )  ) ),
+			'before' => date('Y-m-d', strtotime('sunday last week', current_time('timestamp')) + 8 * DAY_IN_SECONDS),
+			'after'  => date('Y-m-d', strtotime('sunday last week', current_time('timestamp'))),
 		);
 
 	}
@@ -193,14 +193,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' )  ) ),
-			'after'  => date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' )  ) - 8 * DAY_IN_SECONDS ),
+			'before' => date('Y-m-d', strtotime('monday last week', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('monday last week', current_time('timestamp')) - 8 * DAY_IN_SECONDS),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', strtotime( 'monday this week', current_time( 'timestamp' )  ) ),
-			'after'  => date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' )  ) - DAY_IN_SECONDS ),
+			'before' => date('Y-m-d', strtotime('monday this week', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('monday last week', current_time('timestamp')) - DAY_IN_SECONDS),
 		);
 
 	}
@@ -215,14 +215,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-15 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('-7 days', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-15 days', current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-8 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', current_time('timestamp')),
+			'after'  => date('Y-m-d', strtotime('-8 days', current_time('timestamp'))),
 		);
 
 	}
@@ -237,14 +237,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-61 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('-30 days', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-61 days', current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-31 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', current_time('timestamp')),
+			'after'  => date('Y-m-d', strtotime('-31 days', current_time('timestamp'))),
 		);
 
 	}
@@ -261,14 +261,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-181 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('-90 days', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-181 days', current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-91 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', current_time('timestamp')),
+			'after'  => date('Y-m-d', strtotime('-91 days', current_time('timestamp'))),
 		);
 
 	}
@@ -285,14 +285,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-361 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('-180 days', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-361 days', current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-181 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', current_time('timestamp')),
+			'after'  => date('Y-m-d', strtotime('-181 days', current_time('timestamp'))),
 		);
 
 	}
@@ -307,14 +307,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-121 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('-60 days', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-121 days', current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-61 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', current_time('timestamp')),
+			'after'  => date('Y-m-d', strtotime('-61 days', current_time('timestamp'))),
 		);
 
 	}
@@ -333,8 +333,8 @@ 
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-01', strtotime( 'next month', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-t', strtotime( 'last month', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-01', strtotime('next month', current_time('timestamp'))),
+			'after'  => date('Y-m-t', strtotime('last month', current_time('timestamp'))),
 		);
 
 	}
@@ -349,14 +349,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-1', strtotime( 'last month', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-t', strtotime( "-3 months", current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-1', strtotime('last month', current_time('timestamp'))),
+			'after'  => date('Y-m-t', strtotime("-3 months", current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-1', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-t', strtotime( "-2 months", current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-1', current_time('timestamp')),
+			'after'  => date('Y-m-t', strtotime("-2 months", current_time('timestamp'))),
 		);
 
 	}
@@ -414,9 +414,9 @@ 
 	 */
 	public function get_quarter() {
 
-		$month    = (int) date( 'n', current_time( 'timestamp' ) );
-		$quarters = array( 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4 );
-		return $quarters[ $month - 1 ];
+		$month    = (int) date('n', current_time('timestamp'));
+		$quarters = array(1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4);
+		return $quarters[$month - 1];
 
 	}
 
@@ -434,7 +434,7 @@ 
 
 		// Generate the report.
 		$quarters = $this->get_quarters();
-		return $quarters[ $this->get_quarter() + 1 ];
+		return $quarters[$this->get_quarter() + 1];
 
 	}
 
@@ -450,12 +450,12 @@ 
 
 		// Set the previous date range.
 		$this->previous_range = array_merge(
-			$quarters[ $quarter - 1 ],
-			array( 'period' => 'custom' )
+			$quarters[$quarter - 1],
+			array('period' => 'custom')
 		);
 
 		// Generate the report.
-		return $quarters[ $quarter ];
+		return $quarters[$quarter];
 
 	}
 
@@ -475,8 +475,8 @@ 
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', strtotime( 'next year January 1st', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( 'last year December 31st', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('next year January 1st', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('last year December 31st', current_time('timestamp'))),
 		);
 
 	}
@@ -494,15 +494,15 @@ 
 		$year          = (int) date('Y') - 3;
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( 'first day of january last year', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('first day of january last year', current_time('timestamp'))),
 			'after'  => "$year-12-31",
 		);
 
 		// Generate the report.
-		$year          = (int) date('Y') - 2;
+		$year = (int) date('Y') - 2;
 		return array(
 			'after'  => "$year-12-31",
-			'before' => date( 'Y-m-d', strtotime( 'first day of january this year', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('first day of january this year', current_time('timestamp'))),
 		);
 
 	}
@@ -514,21 +514,21 @@ 
 	 * @param string $date_field The date field.
 	 * @return string The appropriate SQL.
 	 */
-	public function get_date_range_sql( $request, $date_field ) {
+	public function get_date_range_sql($request, $date_field) {
 		global $wpdb;
 
 		$sql = '1=1';
-		$range = $this->get_date_range( $request );
+		$range = $this->get_date_range($request);
 
-		if ( ! empty( $range['after'] ) ) {
-			$sql .= ' AND ' .  $wpdb->prepare(
+		if (!empty($range['after'])) {
+			$sql .= ' AND ' . $wpdb->prepare(
 				"$date_field > %s",
 				$range['after']
 			);
 		}
 
-		if ( ! empty( $range['before'] ) ) {
-			$sql .= ' AND ' .  $wpdb->prepare(
+		if (!empty($range['before'])) {
+			$sql .= ' AND ' . $wpdb->prepare(
 				"$date_field < %s",
 				$range['before']
 			);
@@ -544,9 +544,9 @@ 
 	 * @param string $date_field The date field.
 	 * @return string The appropriate SQL.
 	 */
-	public function get_group_by_sql( $date_field ) {
+	public function get_group_by_sql($date_field) {
 
-		if ( 'day' === $this->groupby ) {
+		if ('day' === $this->groupby) {
 			return "YEAR($date_field), MONTH($date_field), DAY($date_field)";
 		}
 
@@ -560,32 +560,32 @@ 
 	 */
 	public function get_collection_params() {
 		return array(
-			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+			'context' => $this->get_context_param(array('default' => 'view')),
 			'period' => array(
-				'description'       => __( 'Limit to results of a specific period.', 'invoicing' ),
+				'description'       => __('Limit to results of a specific period.', 'invoicing'),
 				'type'              => 'string',
-				'enum'              => array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days' , '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter' ),
+				'enum'              => array('custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter'),
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'sanitize_text_field',
 				'default'           => '7_days',
 			),
 			'after' => array(
 				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+				'description'       => sprintf(__('Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing'), 'YYYY-MM-DD'),
 				'type'              => 'string',
 				'format'            => 'date',
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => date( 'Y-m-d', strtotime( '-8 days', current_time( 'timestamp' ) ) ),
+				'default'           => date('Y-m-d', strtotime('-8 days', current_time('timestamp'))),
 			),
 			'before' => array(
 				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+				'description'       => sprintf(__('Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing'), 'YYYY-MM-DD'),
 				'type'              => 'string',
 				'format'            => 'date',
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => date( 'Y-m-d', current_time( 'timestamp' ) ),
+				'default'           => date('Y-m-d', current_time('timestamp')),
 			),
 		);
 	}

includes/reports/class-getpaid-reports-report.php

Spacing +81 added lines, -81 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report Class.
@@ -23,26 +23,26 @@ 
 	 */
 	public function __construct() {
 
-		$this->views        = array(
+		$this->views = array(
 
             'items'     => array(
-				'label' => __( 'Items', 'invoicing' ),
+				'label' => __('Items', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Items',
 			),
 
 			'gateways'  => array(
-				'label' => __( 'Payment Methods', 'invoicing' ),
+				'label' => __('Payment Methods', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Gateways',
 			),
 
 			'discounts'  => array(
-				'label' => __( 'Discount Codes', 'invoicing' ),
+				'label' => __('Discount Codes', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Discounts',
 			),
 
         );
 
-		$this->views        = apply_filters( 'wpinv_report_views', $this->views );
+		$this->views = apply_filters('wpinv_report_views', $this->views);
 
 	}
 
@@ -53,8 +53,8 @@ 
 	public function get_range() {
 		$valid_ranges = $this->get_periods();
 
-		if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
-			return sanitize_key( $_GET['date_range'] );
+		if (isset($_GET['date_range']) && array_key_exists($_GET['date_range'], $valid_ranges)) {
+			return sanitize_key($_GET['date_range']);
 		}
 
 		return '7_days';
@@ -68,22 +68,22 @@ 
 	public function get_periods() {
 
 		$periods = array(
-			'today'        => __( 'Today', 'invoicing' ),
-			'yesterday'    => __( 'Yesterday', 'invoicing' ),
-			'week'         => __( 'This week', 'invoicing' ),
-			'last_week'    => __( 'Last week', 'invoicing' ),
-			'7_days'       => __( 'Last 7 days', 'invoicing' ),
-			'month'        => __( 'This month', 'invoicing' ),
-			'last_month'   => __( 'Last month', 'invoicing' ),
-			'30_days'      => __( 'Last 30 days', 'invoicing' ),
-			'quarter'      => __( 'This Quarter', 'invoicing' ),
-			'last_quarter' => __( 'Last Quarter', 'invoicing' ),
-			'year'         => __( 'This year', 'invoicing' ),
-			'last_year'    => __( 'Last Year', 'invoicing' ),
-			'custom'       => __( 'Custom Date Range', 'invoicing' ),
+			'today'        => __('Today', 'invoicing'),
+			'yesterday'    => __('Yesterday', 'invoicing'),
+			'week'         => __('This week', 'invoicing'),
+			'last_week'    => __('Last week', 'invoicing'),
+			'7_days'       => __('Last 7 days', 'invoicing'),
+			'month'        => __('This month', 'invoicing'),
+			'last_month'   => __('Last month', 'invoicing'),
+			'30_days'      => __('Last 30 days', 'invoicing'),
+			'quarter'      => __('This Quarter', 'invoicing'),
+			'last_quarter' => __('Last Quarter', 'invoicing'),
+			'year'         => __('This year', 'invoicing'),
+			'last_year'    => __('Last Year', 'invoicing'),
+			'custom'       => __('Custom Date Range', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_earning_periods', $periods );
+		return apply_filters('getpaid_earning_periods', $periods);
 	}
 
 	/**
@@ -96,21 +96,21 @@ 
 		?>
 
 			<form method="get" class="getpaid-filter-earnings float-right">
-				<?php getpaid_hidden_field( 'page', 'wpinv-reports' );  ?>
-				<?php getpaid_hidden_field( 'tab', 'reports' );  ?>
+				<?php getpaid_hidden_field('page', 'wpinv-reports'); ?>
+				<?php getpaid_hidden_field('tab', 'reports'); ?>
 				<select name='date_range'>
-					<?php foreach( $this->get_periods() as $key => $label ) :?>
-						<option value="<?php echo sanitize_key( $key ); ?>" <?php selected( $key, $range ); ?>><?php echo sanitize_text_field( $label ); ?></option>
-					<?php endforeach;?>
+					<?php foreach ($this->get_periods() as $key => $label) :?>
+						<option value="<?php echo sanitize_key($key); ?>" <?php selected($key, $range); ?>><?php echo sanitize_text_field($label); ?></option>
+					<?php endforeach; ?>
 				</select>
 				<span class="getpaid-date-range-picker <?php echo 'custom' == $range ? '' : 'd-none'; ?>">
 					<input type="text" name="from" class="getpaid-from align-middle" />
-						<?php _e( 'to', 'invoicing' ); ?>
+						<?php _e('to', 'invoicing'); ?>
 					<input type="text" name="to" class="getpaid-to align-middle" />
 				</span>
 				<button type="submit" class="button button-primary">
 					<i class="fa fa-chevron-right fa-lg"></i>
-					<span class="screen-reader-text"><?php _e( 'View Reports', 'invoicing' ); ?></span>
+					<span class="screen-reader-text"><?php _e('View Reports', 'invoicing'); ?></span>
 				</button>
 			</form>
 
@@ -159,17 +159,17 @@ 
 
 				<div class="col-12 col-md-4">
 					<div class="row getpaid-report-cards">
-						<?php foreach( $this->get_cards() as $key => $card ) : ?>
+						<?php foreach ($this->get_cards() as $key => $card) : ?>
 							<div class="col-12 mb-4">
 
-								<!-- <?php echo sanitize_text_field(  $card['label']  ); ?> Card -->
-								<div class="card p-0 m-0 shadow-none <?php echo sanitize_html_class( $key ); ?>">
+								<!-- <?php echo sanitize_text_field($card['label']); ?> Card -->
+								<div class="card p-0 m-0 shadow-none <?php echo sanitize_html_class($key); ?>">
 
 									<div class="card-body">
 
 										<p class="getpaid-current text-uppercase small mb-2">
-											<strong><?php echo sanitize_text_field( $card['label']  ); ?></strong>
-											<span title="<?php echo esc_attr( $card['description'] ); ?>" class="wpi-help-tip dashicons dashicons-editor-help text-muted" style="margin-top: -2px;"></span>
+											<strong><?php echo sanitize_text_field($card['label']); ?></strong>
+											<span title="<?php echo esc_attr($card['description']); ?>" class="wpi-help-tip dashicons dashicons-editor-help text-muted" style="margin-top: -2px;"></span>
 										</p>
 										<h5 class="font-weight-bold mb-0">
 											<span class="getpaid-report-card-value">
@@ -180,7 +180,7 @@ 
 
 										<hr>
 
-										<p class="getpaid-previous text-uppercase text-muted small mb-2"><strong><?php _e( 'Previous Period', 'invoicing' ); ?></strong></p>
+										<p class="getpaid-previous text-uppercase text-muted small mb-2"><strong><?php _e('Previous Period', 'invoicing'); ?></strong></p>
 										<h5 class="getpaid-report-card-previous-value font-weight-bold text-muted mb-0">
 											<span class="spinner is-active float-none"></span>
 										</h5>
@@ -188,7 +188,7 @@ 
 									</div>
 
 								</div>
-								<!-- <?php echo sanitize_text_field( $card['label'] ); ?> Card -->
+								<!-- <?php echo sanitize_text_field($card['label']); ?> Card -->
 
 							</div>
 						<?php endforeach; ?>
@@ -210,26 +210,26 @@ 
 	 */
 	public function display_left() {
 		$graphs = array(
-			'sales'    => __( 'Earnings', 'invoicing' ),
-			'refunds'  => __( 'Refunds', 'invoicing' ),
-			'tax'      => __( 'Taxes', 'invoicing' ),
-			'fees'     => __( 'Fees', 'invoicing' ),
-			'discount' => __( 'Discounts', 'invoicing' ),
-			'invoices' => __( 'Invoices', 'invoicing' ),
-			'items'    => __( 'Purchased Items', 'invoicing' ),
+			'sales'    => __('Earnings', 'invoicing'),
+			'refunds'  => __('Refunds', 'invoicing'),
+			'tax'      => __('Taxes', 'invoicing'),
+			'fees'     => __('Fees', 'invoicing'),
+			'discount' => __('Discounts', 'invoicing'),
+			'invoices' => __('Invoices', 'invoicing'),
+			'items'    => __('Purchased Items', 'invoicing'),
 		);
 
 		?>
 
-			<?php foreach ( $graphs as $key => $graph ) : ?>
+			<?php foreach ($graphs as $key => $graph) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0 single-report-card" style="max-width:100%">
 							<div class="card-header">
-								<strong><?php echo wpinv_clean( $graph ); ?></strong>
+								<strong><?php echo wpinv_clean($graph); ?></strong>
 							</div>
 							<div class="card-body">
-								<canvas id="getpaid-chartjs-<?php echo sanitize_key( $key ); ?>"></canvas>
+								<canvas id="getpaid-chartjs-<?php echo sanitize_key($key); ?>"></canvas>
 							</div>
 						</div>
 					</div>
@@ -244,14 +244,14 @@ 
 	 * Retrieves the download url.
 	 *
 	 */
-	public function get_download_url( $graph, $file_type ) {
+	public function get_download_url($graph, $file_type) {
 
 		return wp_nonce_url(
 			add_query_arg(
 				array(
 					'getpaid-admin-action' => 'download_graph',
-					'file_type'            => urlencode( $file_type ),
-					'graph'                => urlencode( $graph ),
+					'file_type'            => urlencode($file_type),
+					'graph'                => urlencode($graph),
 				)
 			),
 			'getpaid-nonce',
@@ -268,7 +268,7 @@ 
 
 		?>
 
-			<?php foreach ( $this->views as $key => $view ) : ?>
+			<?php foreach ($this->views as $key => $view) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0" style="max-width:100%">
@@ -278,17 +278,17 @@ 
 										<strong><?php echo $view['label']; ?></strong>
 									</div>
 									<div class="col-3">
-										<a title="<?php esc_attr_e( 'Download JSON', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'json' ) ); ?>">
+										<a title="<?php esc_attr_e('Download JSON', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'json')); ?>">
 											<i class="fa fa-download text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php _e( 'Download JSON', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php _e('Download JSON', 'invoicing'); ?></span>
 										</a>
-										<a title="<?php esc_attr_e( 'Download CSV', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'csv' ) ); ?>">
+										<a title="<?php esc_attr_e('Download CSV', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'csv')); ?>">
 											<i class="fa fa-file-csv text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php _e( 'Download CSV', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php _e('Download CSV', 'invoicing'); ?></span>
 										</a>
-										<a title="<?php esc_attr_e( 'Download XML', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'xml' ) ); ?>">
+										<a title="<?php esc_attr_e('Download XML', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'xml')); ?>">
 											<i class="fa fa-file-code text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php _e( 'Download XML', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php _e('Download XML', 'invoicing'); ?></span>
 										</a>
 									</div>
 								</div>
@@ -317,56 +317,56 @@ 
 
 		$cards = array(
 			'total_sales' => array(
-				'description' => __( 'Gross sales in the period.', 'invoicing' ),
-				'label'       => __( 'Gross Revenue', 'invoicing' ),
+				'description' => __('Gross sales in the period.', 'invoicing'),
+				'label'       => __('Gross Revenue', 'invoicing'),
 			),
 			'net_sales' => array(
-				'description' => __( 'Net sales in the period.', 'invoicing' ),
-				'label'       => __( 'Net Revenue', 'invoicing' ),
+				'description' => __('Net sales in the period.', 'invoicing'),
+				'label'       => __('Net Revenue', 'invoicing'),
 			),
 			'average_sales' => array(
-				'description' => __( 'Average net daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Net Sales', 'invoicing' ),
+				'description' => __('Average net daily/monthly sales.', 'invoicing'),
+				'label'       => __('Avg. Net Sales', 'invoicing'),
 			),
 			'average_total_sales' => array(
-				'description' => __( 'Average gross daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Gross Sales', 'invoicing' ),
+				'description' => __('Average gross daily/monthly sales.', 'invoicing'),
+				'label'       => __('Avg. Gross Sales', 'invoicing'),
 			),
 			'total_invoices'  => array(
-				'description' => __( 'Number of paid invoices.', 'invoicing' ),
-				'label'       => __( 'Paid Invoices', 'invoicing' ),
+				'description' => __('Number of paid invoices.', 'invoicing'),
+				'label'       => __('Paid Invoices', 'invoicing'),
 			),
 			'total_items' => array(
-				'description' => __( 'Number of items purchased.', 'invoicing' ),
-				'label'       => __( 'Purchased Items', 'invoicing' ),
+				'description' => __('Number of items purchased.', 'invoicing'),
+				'label'       => __('Purchased Items', 'invoicing'),
 			),
 			'refunded_items' => array(
-				'description' => __( 'Number of items refunded.', 'invoicing' ),
-				'label'       => __( 'Refunded Items', 'invoicing' ),
+				'description' => __('Number of items refunded.', 'invoicing'),
+				'label'       => __('Refunded Items', 'invoicing'),
 			),
 			'total_tax' => array(
-				'description' => __( 'Total charged for taxes.', 'invoicing' ),
-				'label'       => __( 'Tax', 'invoicing' ),
+				'description' => __('Total charged for taxes.', 'invoicing'),
+				'label'       => __('Tax', 'invoicing'),
 			),
 			'total_refunded_tax' => array(
-				'description' => __( 'Total refunded for taxes.', 'invoicing' ),
-				'label'       => __( 'Refunded Tax', 'invoicing' ),
+				'description' => __('Total refunded for taxes.', 'invoicing'),
+				'label'       => __('Refunded Tax', 'invoicing'),
 			),
 			'total_fees' => array(
-				'description' => __( 'Total fees charged.', 'invoicing' ),
-				'label'       => __( 'Fees', 'invoicing' ),
+				'description' => __('Total fees charged.', 'invoicing'),
+				'label'       => __('Fees', 'invoicing'),
 			),
 			'total_refunds' => array(
-				'description' => __( 'Total of refunded invoices.', 'invoicing' ),
-				'label'       => __( 'Refunded', 'invoicing' ),
+				'description' => __('Total of refunded invoices.', 'invoicing'),
+				'label'       => __('Refunded', 'invoicing'),
 			),
 			'total_discount'  => array(
-				'description' => __( 'Total of discounts used.', 'invoicing' ),
-				'label'       => __( 'Discounted', 'invoicing' ),
+				'description' => __('Total of discounts used.', 'invoicing'),
+				'label'       => __('Discounted', 'invoicing'),
 			),
 		);
 
-		return apply_filters( 'wpinv_report_cards', $cards );
+		return apply_filters('wpinv_report_cards', $cards);
 	}
 
 	

templates/invoice/line-items.php

Spacing +13 added lines, -13 removed lines

@@ -8,21 +8,21 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
-<?php do_action( 'getpaid_invoice_before_line_items', $invoice ); ?>
+<?php do_action('getpaid_invoice_before_line_items', $invoice); ?>
 
-    <h2 class="mt-5 mb-1 h4"><?php echo sprintf( esc_html__( '%s Items', 'invoicing' ), ucfirst( $invoice->get_invoice_quote_type() )); ?></h2>
+    <h2 class="mt-5 mb-1 h4"><?php echo sprintf(esc_html__('%s Items', 'invoicing'), ucfirst($invoice->get_invoice_quote_type())); ?></h2>
     <div class="getpaid-invoice-items mb-4 border">
 
 
-        <div class="getpaid-invoice-items-header <?php echo sanitize_html_class( $invoice->get_template() ); ?>">
+        <div class="getpaid-invoice-items-header <?php echo sanitize_html_class($invoice->get_template()); ?>">
             <div class="form-row">
-                <?php foreach ( $columns as $key => $label ) : ?>
-                    <div class="<?php echo 'name' == $key ? 'col-12 col-sm-6' : 'col-12 col-sm' ?> getpaid-invoice-line-item-col-<?php echo esc_attr( $key ); ?>">
-                        <?php echo sanitize_text_field( $label ); ?>
+                <?php foreach ($columns as $key => $label) : ?>
+                    <div class="<?php echo 'name' == $key ? 'col-12 col-sm-6' : 'col-12 col-sm' ?> getpaid-invoice-line-item-col-<?php echo esc_attr($key); ?>">
+                        <?php echo sanitize_text_field($label); ?>
                     </div>
                 <?php endforeach; ?>
             </div>
@@ -32,20 +32,20 @@ 
         <?php
 
             // Display the item totals.
-            foreach ( $invoice->get_items() as $item ) {
-                wpinv_get_template( 'invoice/line-item.php', compact( 'invoice', 'item', 'columns' ) );
+            foreach ($invoice->get_items() as $item) {
+                wpinv_get_template('invoice/line-item.php', compact('invoice', 'item', 'columns'));
             }
 
             // Display the fee totals.
-            foreach ( $invoice->get_fees() as $fee ) {
-                wpinv_get_template( 'invoice/fee-item.php', compact( 'invoice', 'fee', 'columns' ) );
+            foreach ($invoice->get_fees() as $fee) {
+                wpinv_get_template('invoice/fee-item.php', compact('invoice', 'fee', 'columns'));
             }
 
             // Display the cart totals.
-            wpinv_get_template( 'invoice/line-totals.php', compact( 'invoice' ) );
+            wpinv_get_template('invoice/line-totals.php', compact('invoice'));
 
         ?>
 
     </div>
 
-<?php do_action( 'getpaid_invoice_after_line_items', $invoice ); ?>
+<?php do_action('getpaid_invoice_after_line_items', $invoice); ?>

templates/payment-forms/variations/select.php

Spacing +7 added lines, -7 removed lines

@@ -7,17 +7,17 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Prepare the selectable items.
 $selectable = array();
-foreach ( $form->get_items() as $item ) {
-    if ( ! $item->is_required ) {
-        $selectable[$item->get_id()] = strip_tags( $item->get_name() . ' — ' . wpinv_price( $item->get_initial_price() ) );
+foreach ($form->get_items() as $item) {
+    if (!$item->is_required) {
+        $selectable[$item->get_id()] = strip_tags($item->get_name() . ' — ' . wpinv_price($item->get_initial_price()));
     }
 }
 
-if ( empty( $selectable ) ) {
+if (empty($selectable)) {
     return;
 }
 
@@ -27,9 +27,9 @@ 
 echo aui()->select(
     array(
         'name'       => 'getpaid-payment-form-selected-item',
-        'id'         => 'getpaid-payment-form-selected-item' . uniqid( '_' ),
+        'id'         => 'getpaid-payment-form-selected-item' . uniqid('_'),
         'required'   => true,
-        'label'      => __( 'Select Item', 'invoicing' ),
+        'label'      => __('Select Item', 'invoicing'),
         'label_type' => 'vertical',
         'inline'     => false,
         'options'    => $selectable,

templates/payment-forms/variations/checkbox.php

Spacing +7 added lines, -7 removed lines

@@ -7,29 +7,29 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Prepare the selectable items.
 $selectable = array();
-foreach ( $form->get_items() as $item ) {
-    if ( ! $item->is_required ) {
-        $selectable[$item->get_id()] = $item->get_name() . ' — ' . wpinv_price( $item->get_initial_price() );
+foreach ($form->get_items() as $item) {
+    if (!$item->is_required) {
+        $selectable[$item->get_id()] = $item->get_name() . ' — ' . wpinv_price($item->get_initial_price());
     }
 }
 
-if ( empty( $selectable ) ) {
+if (empty($selectable)) {
     return;
 }
 
 echo '<div class="getpaid-payment-form-items-checkbox form-group">';
 
-foreach ( $selectable as $item_id => $item_name ) {
+foreach ($selectable as $item_id => $item_name) {
 
     echo aui()->input(
         array(
             'type'       => 'checkbox',
             'name'       => 'getpaid-payment-form-selected-item',
-            'id'         => 'getpaid-payment-form-selected-item' . uniqid( '_' ) . $item_id,
+            'id'         => 'getpaid-payment-form-selected-item' . uniqid('_') . $item_id,
             'label'      => $item_name,
             'value'      => $item_id,
             'no_wrap'    => true,

templates/emails/invoice-totals.php

Spacing +23 added lines, -23 removed lines

@@ -8,22 +8,22 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Totals rows.
-$totals = getpaid_invoice_totals_rows( $invoice );
+$totals = getpaid_invoice_totals_rows($invoice);
 
-do_action( 'getpaid_before_email_line_totals', $invoice, $totals );
+do_action('getpaid_before_email_line_totals', $invoice, $totals);
 
 ?>
 
 
-<?php if ( has_action( 'wpinv_email_footer_buttons' ) ) : ?>
+<?php if (has_action('wpinv_email_footer_buttons')) : ?>
 
     <tr class="wpinv_cart_footer_row">
 
-        <td colspan="<?php echo ( (int) $column_count ); ?>">
-            <?php do_action( 'wpinv_email_footer_buttons' ); ?>
+        <td colspan="<?php echo ((int) $column_count); ?>">
+            <?php do_action('wpinv_email_footer_buttons'); ?>
         </td>
 
     </tr>
@@ -31,44 +31,44 @@ 
 <?php endif; ?>
 
 
-<?php foreach ( $totals as $key => $label ) : ?>
+<?php foreach ($totals as $key => $label) : ?>
 
-    <tr class="wpinv_cart_footer_row wpinv_cart_<?php echo sanitize_html_class( $key ); ?>_row">
+    <tr class="wpinv_cart_footer_row wpinv_cart_<?php echo sanitize_html_class($key); ?>_row">
 
-        <td colspan="<?php echo ( $column_count - 1 ); ?>" class="wpinv_cart_<?php echo sanitize_html_class( $key ); ?>_label text-right">
-            <strong><?php echo sanitize_text_field( $label ); ?>:</strong>
+        <td colspan="<?php echo ($column_count - 1); ?>" class="wpinv_cart_<?php echo sanitize_html_class($key); ?>_label text-right">
+            <strong><?php echo sanitize_text_field($label); ?>:</strong>
         </td>
 
-        <td class="wpinv_cart_<?php echo sanitize_html_class( $key ); ?> text-right">
+        <td class="wpinv_cart_<?php echo sanitize_html_class($key); ?> text-right">
 
             <?php
 
                 // Total tax.
-                if ( 'tax' == $key ) {
-                    echo wpinv_price( $invoice->get_total_tax(), $invoice->get_currency() );
+                if ('tax' == $key) {
+                    echo wpinv_price($invoice->get_total_tax(), $invoice->get_currency());
                 }
 
-                if ( 'fee' == $key ) {
-                    echo wpinv_price( $invoice->get_total_fees(), $invoice->get_currency() );
+                if ('fee' == $key) {
+                    echo wpinv_price($invoice->get_total_fees(), $invoice->get_currency());
                 }
 
                 // Total discount.
-                if ( 'discount' == $key ) {
-                    echo wpinv_price( $invoice->get_total_discount(), $invoice->get_currency() );
+                if ('discount' == $key) {
+                    echo wpinv_price($invoice->get_total_discount(), $invoice->get_currency());
                 }
 
                 // Sub total.
-                if ( 'subtotal' == $key ) {
-                    echo wpinv_price( $invoice->get_subtotal(), $invoice->get_currency() );
+                if ('subtotal' == $key) {
+                    echo wpinv_price($invoice->get_subtotal(), $invoice->get_currency());
                 }
 
                 // Total.
-                if ( 'total' == $key ) {
-                    echo wpinv_price( $invoice->get_total(), $invoice->get_currency() );
+                if ('total' == $key) {
+                    echo wpinv_price($invoice->get_total(), $invoice->get_currency());
                 }
 
                 // Fires when printing a cart total in an email.
-                do_action( "getpaid_email_cart_totals_$key", $invoice );
+                do_action("getpaid_email_cart_totals_$key", $invoice);
 
             ?>
 
@@ -80,4 +80,4 @@ 
 
 <?php
 
-    do_action( 'getpaid_after_email_line_totals', $invoice, $totals );
+    do_action('getpaid_after_email_line_totals', $invoice, $totals);

includes/gateways/class-getpaid-worldpay-gateway.php

Spacing +86 added lines, -86 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Worldpay Payment Gateway class.
@@ -45,14 +45,14 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'sandbox' );
+    protected $supports = array('sandbox');
     
     /**
 	 * Currencies this gateway is allowed for.
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR' );
+	public $currencies = array('AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR');
 
     /**
 	 * URL to view a transaction.
@@ -73,13 +73,13 @@ 
 	 */
 	public function __construct() {
 
-        $this->method_title         = __( 'Worldpay', 'invoicing' );
-        $this->title                = __( 'Worldpay - Credit Card / Debit Card', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed to Worldpay', 'invoicing' );
-        $this->notify_url           = wpinv_get_ipn_url( $this->id );
+        $this->method_title         = __('Worldpay', 'invoicing');
+        $this->title                = __('Worldpay - Credit Card / Debit Card', 'invoicing');
+        $this->checkout_button_text = __('Proceed to Worldpay', 'invoicing');
+        $this->notify_url           = wpinv_get_ipn_url($this->id);
 
-        add_filter( 'wpinv_gateway_description', array( $this, 'sandbox_notice' ), 10, 2 );
-        add_filter( 'getpaid_worldpay_args', array( $this, 'hash_args' ) );
+        add_filter('wpinv_gateway_description', array($this, 'sandbox_notice'), 10, 2);
+        add_filter('getpaid_worldpay_args', array($this, 'hash_args'));
 
         parent::__construct();
     }
@@ -93,24 +93,24 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Get redirect url.
-        $worldpay_redirect = esc_url( $this->get_request_url( $invoice ) );
+        $worldpay_redirect = esc_url($this->get_request_url($invoice));
 
         // Get submission args.
-        $worldpay_args     = $this->get_worldpay_args( $invoice );
+        $worldpay_args     = $this->get_worldpay_args($invoice);
 
         $form = "<form action='$worldpay_redirect' name='wpi_worldpay_form' method='POST'>";
 
-        foreach ( $worldpay_args as $key => $value ) {
+        foreach ($worldpay_args as $key => $value) {
 
-            if ( false === $value || '' === trim( $value ) ) {
+            if (false === $value || '' === trim($value)) {
                 continue;
             }
 
-            $value = esc_attr( $value );
-            $key   = wpinv_clean( $key );
+            $value = esc_attr($value);
+            $key   = wpinv_clean($key);
             $form .= "<input type='hidden' name='$key' value='$value'>";
         }
 
@@ -133,10 +133,10 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_request_url( $invoice ) {
+	public function get_request_url($invoice) {
 
         // Endpoint for this request
-		$this->endpoint = $this->is_sandbox( $invoice ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
+		$this->endpoint = $this->is_sandbox($invoice) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
 
         return $this->endpoint;
 
@@ -148,34 +148,34 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_worldpay_args( $invoice ) {
+	protected function get_worldpay_args($invoice) {
 
 		return apply_filters(
 			'getpaid_worldpay_args',
 			array(
-                'amount'         => wpinv_sanitize_amount( $invoice->get_total() ), // mandatory
-                'cartId'         => wpinv_clean( $invoice->get_number() ), // mandatory reference for the item purchased
-                'currency'       => wpinv_clean( $invoice->get_currency() ), // mandatory
-                'instId'         => wpinv_clean( $this->get_option( 'instId', '' ) ), // mandatory
-                'testMode'       => $this->is_sandbox( $invoice ) ? 100 : 0, // mandatory
-                'name'           => wpinv_clean( $invoice->get_full_name() ),
-                'address'        => wpinv_clean( $invoice->get_address() ),
-                'postcode'       => wpinv_clean( $invoice->get_zip() ),
-                'tel'            => wpinv_clean( $invoice->get_phone() ),
-                'email'          => sanitize_email( $invoice->get_email() ),
-                'country'        => wpinv_clean( $invoice->get_country() ),
-                'desc'           => sprintf( __( 'Payment for invoice %s.', 'invoicing' ), wpinv_clean( $invoice->get_number() ) ),
-                'MC_description' => sprintf( __( 'Payment for invoice %s.', 'invoicing' ), wpinv_clean( $invoice->get_number() ) ),
-                'MC_callback'    => esc_url_raw( $this->notify_url ),
-                'resultfile'     => esc_url_raw( $this->get_return_url( $invoice ) ),
-                'MC_key'         => wpinv_clean( $invoice->get_key() ),
+                'amount'         => wpinv_sanitize_amount($invoice->get_total()), // mandatory
+                'cartId'         => wpinv_clean($invoice->get_number()), // mandatory reference for the item purchased
+                'currency'       => wpinv_clean($invoice->get_currency()), // mandatory
+                'instId'         => wpinv_clean($this->get_option('instId', '')), // mandatory
+                'testMode'       => $this->is_sandbox($invoice) ? 100 : 0, // mandatory
+                'name'           => wpinv_clean($invoice->get_full_name()),
+                'address'        => wpinv_clean($invoice->get_address()),
+                'postcode'       => wpinv_clean($invoice->get_zip()),
+                'tel'            => wpinv_clean($invoice->get_phone()),
+                'email'          => sanitize_email($invoice->get_email()),
+                'country'        => wpinv_clean($invoice->get_country()),
+                'desc'           => sprintf(__('Payment for invoice %s.', 'invoicing'), wpinv_clean($invoice->get_number())),
+                'MC_description' => sprintf(__('Payment for invoice %s.', 'invoicing'), wpinv_clean($invoice->get_number())),
+                'MC_callback'    => esc_url_raw($this->notify_url),
+                'resultfile'     => esc_url_raw($this->get_return_url($invoice)),
+                'MC_key'         => wpinv_clean($invoice->get_key()),
                 'MC_invoice_id'  => $invoice->get_id(),
-                'address1'       => wpinv_clean( $invoice->get_address() ),
-                'town'           => wpinv_clean( $invoice->get_city() ),
-                'region'         => wpinv_clean( $invoice->get_state() ),
-                'amountString'   => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
-                'countryString'  => wpinv_clean( wpinv_country_name( $invoice->get_country() ) ),
-                'compName'       => wpinv_clean( $invoice->get_company() ),
+                'address1'       => wpinv_clean($invoice->get_address()),
+                'town'           => wpinv_clean($invoice->get_city()),
+                'region'         => wpinv_clean($invoice->get_state()),
+                'amountString'   => wpinv_price($invoice->get_total(), $invoice->get_currency()),
+                'countryString'  => wpinv_clean(wpinv_country_name($invoice->get_country())),
+                'compName'       => wpinv_clean($invoice->get_company()),
             ),
 			$invoice
 		);
@@ -188,17 +188,17 @@ 
 	 * @param  array $args Gateway args.
 	 * @return array
 	 */
-	public function hash_args( $args ) {
+	public function hash_args($args) {
 
-        $md5_secret = $this->get_option( 'md5_secret' );
+        $md5_secret = $this->get_option('md5_secret');
 
         // Abort if there is no secret.
-        if ( empty( $md5_secret ) ) {
+        if (empty($md5_secret)) {
             return $args;
         }
 
         // Hash the args.
-        $args['signature'] = md5( "$md5_secret:{$args['instId']}:{$args['amount']}:{$args['currency']}:{$args['cartId']}" );
+        $args['signature'] = md5("$md5_secret:{$args['instId']}:{$args['amount']}:{$args['currency']}:{$args['cartId']}");
 
         return $args;
     }
@@ -211,43 +211,43 @@ 
 	public function verify_ipn() {
 
         // Validate the IPN.
-        if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Worldpay IPN Request Failure', 'Worldpay IPN', array( 'response' => 500 ) );
+        if (empty($_POST) || !$this->validate_ipn()) {
+		    wp_die('Worldpay IPN Request Failure', 'Worldpay IPN', array('response' => 500));
 		}
 
         // Process the IPN.
-        $posted  = wp_unslash( $_POST );
-        $invoice = wpinv_get_invoice( $posted['MC_invoice_id'] );
+        $posted  = wp_unslash($_POST);
+        $invoice = wpinv_get_invoice($posted['MC_invoice_id']);
 
-        if ( $invoice && $this->id == $invoice->get_gateway() ) {
+        if ($invoice && $this->id == $invoice->get_gateway()) {
 
-            wpinv_error_log( 'Found invoice #' . $invoice->get_number() );
-            wpinv_error_log( 'Payment status:' . $posted['transStatus'] );
+            wpinv_error_log('Found invoice #' . $invoice->get_number());
+            wpinv_error_log('Payment status:' . $posted['transStatus']);
 
             // Update the transaction id.
-            if ( ! empty( $posted['transId'] ) ) {
-                $invoice->set_transaction_id( wpinv_clean( $posted['transId'] ) );
+            if (!empty($posted['transId'])) {
+                $invoice->set_transaction_id(wpinv_clean($posted['transId']));
             }
 
              // Update the ip address.
-             if ( ! empty( $posted['ipAddress'] ) ) {
-                $invoice->set_ip( wpinv_clean( $posted['ipAddress'] ) );
+             if (!empty($posted['ipAddress'])) {
+                $invoice->set_ip(wpinv_clean($posted['ipAddress']));
             }
 
-            if ( $posted['transStatus'] == 'Y' ) {
-                $invoice->set_completed_date( date( 'Y-m-d H:i:s', $posted['transTime'] ) );
+            if ($posted['transStatus'] == 'Y') {
+                $invoice->set_completed_date(date('Y-m-d H:i:s', $posted['transTime']));
                 $invoice->mark_paid();
                 return;
             }
 
-            if ( $posted['transStatus'] == 'C' ) {
-                $invoice->set_status( 'wpi-failed' );
-                $invoice->add_note( __( 'Payment transaction failed while processing Worldpay payment.', 'invoicing' ), false, false, true );
+            if ($posted['transStatus'] == 'C') {
+                $invoice->set_status('wpi-failed');
+                $invoice->add_note(__('Payment transaction failed while processing Worldpay payment.', 'invoicing'), false, false, true);
                 $invoice->save();
                 return;
             }
 
-            wpinv_error_log( 'Aborting, Invalid transaction status:' . $posted['transStatus'] );
+            wpinv_error_log('Aborting, Invalid transaction status:' . $posted['transStatus']);
             $invoice->save();
 
         }
@@ -261,27 +261,27 @@ 
 	 */
 	public function validate_ipn() {
 
-        wpinv_error_log( 'Validating Worldpay IPN response' );
+        wpinv_error_log('Validating Worldpay IPN response');
 
-        $data = wp_unslash( $_POST );
+        $data = wp_unslash($_POST);
 
         // Verify installation.
-        if ( empty( $data['instId'] ) || $data['instId'] != wpinv_clean( $this->get_option( 'instId', '' ) ) ) {
-            wpinv_error_log( 'Received invalid installation ID from Worldpay IPN' );
+        if (empty($data['instId']) || $data['instId'] != wpinv_clean($this->get_option('instId', ''))) {
+            wpinv_error_log('Received invalid installation ID from Worldpay IPN');
             return false;
         }
 
         // Verify invoice.
-        if ( empty( $data['cartId'] ) || !  wpinv_get_id_by_invoice_number( $data['cartId'] ) ) {
-            wpinv_error_log( 'Received invalid invoice number from Worldpay IPN' );
+        if (empty($data['cartId']) || !wpinv_get_id_by_invoice_number($data['cartId'])) {
+            wpinv_error_log('Received invalid invoice number from Worldpay IPN');
             return false;
         }
         
         // (maybe) verify password.
-        $password = $this->get_option( 'callback_password' );
+        $password = $this->get_option('callback_password');
 
-        if ( ! empty( $password ) && ( empty( $data['callbackPW'] ) || $password != $data['callbackPW'] ) ) {
-            wpinv_error_log( 'Received invalid invoice number from Worldpay IPN' );
+        if (!empty($password) && (empty($data['callbackPW']) || $password != $data['callbackPW'])) {
+            wpinv_error_log('Received invalid invoice number from Worldpay IPN');
             return false;
         }
 
@@ -292,10 +292,10 @@ 
     /**
      * Displays a notice on the checkout page if sandbox is enabled.
      */
-    public function sandbox_notice( $description, $gateway ) {
-        if ( 'worldpay' == $gateway && wpinv_is_test_mode( 'worldpay' ) ) {
+    public function sandbox_notice($description, $gateway) {
+        if ('worldpay' == $gateway && wpinv_is_test_mode('worldpay')) {
             $description .= '<br>' . sprintf(
-                __( 'SANDBOX ENABLED. See the %sWorldpay Sandbox Testing Guide%s for more details.', 'invoicing' ),
+                __('SANDBOX ENABLED. See the %sWorldpay Sandbox Testing Guide%s for more details.', 'invoicing'),
                 '<a href="https://developer.worldpay.com/docs/wpg/directintegration/abouttesting">',
                 '</a>'
             );
@@ -309,43 +309,43 @@ 
 	 * 
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
         $currencies = sprintf(
-            __( 'Supported Currencies: %s', 'invoicing' ),
-            implode( ', ', $this->currencies )
+            __('Supported Currencies: %s', 'invoicing'),
+            implode(', ', $this->currencies)
         );
 
         $admin_settings['worldpay_active']['desc'] = $admin_settings['worldpay_active']['desc'] . " ($currencies)";
-        $admin_settings['worldpay_desc']['std']    = __( 'Pay securely via Worldpay using your PayPal account, credit or debit card.', 'invoicing' );
+        $admin_settings['worldpay_desc']['std']    = __('Pay securely via Worldpay using your PayPal account, credit or debit card.', 'invoicing');
 
         $admin_settings['worldpay_instId'] = array(
             'type' => 'text',
             'id'   => 'worldpay_instId',
-            'name' => __( 'Installation Id', 'invoicing' ),
-            'desc' => __( 'Your installation id. Ex: 211616', 'invoicing' ),
+            'name' => __('Installation Id', 'invoicing'),
+            'desc' => __('Your installation id. Ex: 211616', 'invoicing'),
         );
 
         $admin_settings['worldpay_md5_secret'] = array(
             'type' => 'text',
             'id'   => 'worldpay_md5_secret',
-            'name' => __( 'MD5 secret', 'invoicing' ),
-            'desc' => __( 'Optionally enter your MD5 secret here. Next, open your installation settings and ensure that your SignatureFields parameter is set to ', 'invoicing' ) . '<code>instId:amount:currency:cartId</code>',
+            'name' => __('MD5 secret', 'invoicing'),
+            'desc' => __('Optionally enter your MD5 secret here. Next, open your installation settings and ensure that your SignatureFields parameter is set to ', 'invoicing') . '<code>instId:amount:currency:cartId</code>',
         );
 
         $admin_settings['worldpay_callbackPW'] = array(
             'type' => 'text',
             'id'   => 'worldpay_callbackPW',
-            'name' => __( 'Payment Response password', 'invoicing' ),
-            'desc' => __( 'Recommended. Enter your WorldPay response password to validate payment notifications.', 'invoicing' ),
+            'name' => __('Payment Response password', 'invoicing'),
+            'desc' => __('Recommended. Enter your WorldPay response password to validate payment notifications.', 'invoicing'),
         );
 
         $admin_settings['worldpay_ipn_url'] = array(
             'type'     => 'ipn_url',
             'id'       => 'worldpay_ipn_url',
-            'name'     => __( 'Payment Response URL', 'invoicing' ),
+            'name'     => __('Payment Response URL', 'invoicing'),
             'std'      => $this->notify_url,
-            'desc'     => __( 'Login to your Worldpay Merchant Interface then enable Payment Response & Shopper Response. Next, go to the Payment Response URL field and enter the above URL.', 'invoicing' ),
+            'desc'     => __('Login to your Worldpay Merchant Interface then enable Payment Response & Shopper Response. Next, go to the Payment Response URL field and enter the above URL.', 'invoicing'),
             'custom'   => 'worldpay',
             'readonly' => true
         );

templates/emails/invoice-items.php

Spacing +12 added lines, -12 removed lines

@@ -8,18 +8,18 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$column_count = count( $columns );
+$column_count = count($columns);
 ?>
 
-<?php do_action( 'wpinv_before_email_items', $invoice ); ?>
+<?php do_action('wpinv_before_email_items', $invoice); ?>
 
 
 <div id="wpinv-email-items">
 
     <h3 class="invoice-items-title">
-        <?php echo sprintf( esc_html__( '%s Items', 'invoicing' ), ucfirst( $invoice->get_invoice_quote_type() )); ?>
+        <?php echo sprintf(esc_html__('%s Items', 'invoicing'), ucfirst($invoice->get_invoice_quote_type())); ?>
     </h3>
 
     <table class="table table-bordered table-hover">
@@ -28,9 +28,9 @@ 
 
             <tr class="wpinv_cart_header_row">
 
-                <?php foreach ( $columns as $key => $label ) : ?>
-                    <th class="<?php echo 'name' == $key ? 'text-left' : 'text-right' ?> wpinv_cart_item_<?php echo sanitize_html_class( $key ); ?>">
-                        <?php echo sanitize_text_field( $label ); ?>
+                <?php foreach ($columns as $key => $label) : ?>
+                    <th class="<?php echo 'name' == $key ? 'text-left' : 'text-right' ?> wpinv_cart_item_<?php echo sanitize_html_class($key); ?>">
+                        <?php echo sanitize_text_field($label); ?>
                     </th>
                 <?php endforeach; ?>
 
@@ -43,13 +43,13 @@ 
             <?php
 
                 // Display the item totals.
-                foreach ( $invoice->get_items() as $item ) {
-                    wpinv_get_template( 'emails/invoice-item.php', compact( 'invoice', 'item', 'columns' ) );
+                foreach ($invoice->get_items() as $item) {
+                    wpinv_get_template('emails/invoice-item.php', compact('invoice', 'item', 'columns'));
                 }
 
                 // Display the fee totals.
-                foreach ( $invoice->get_fees() as $fee ) {
-                    wpinv_get_template( 'emails/fee-item.php', compact( 'invoice', 'fee', 'columns' ) );
+                foreach ($invoice->get_fees() as $fee) {
+                    wpinv_get_template('emails/fee-item.php', compact('invoice', 'fee', 'columns'));
                 }
 
             ?>
@@ -57,7 +57,7 @@ 
         </tbody>
 
         <tfoot>
-            <?php wpinv_get_template( 'emails/invoice-totals.php', compact( 'invoice', 'column_count' ) ); ?>
+            <?php wpinv_get_template('emails/invoice-totals.php', compact('invoice', 'column_count')); ?>
         </tfoot>
     
     </table>