AyeCode / invoicing

vendor/composer/installers/src/Composer/Installers/OxidInstaller.php

Indentation +41 added lines, -41 removed lines

@@ -5,7 +5,7 @@ 
 
 class OxidInstaller extends BaseInstaller
 {
-	const VENDOR_PATTERN = '/^modules\/(?P<vendor>.+)\/.+/';
+    const VENDOR_PATTERN = '/^modules\/(?P<vendor>.+)\/.+/';
 
     protected $locations = array(
         'module'    => 'modules/{$name}/',
@@ -13,47 +13,47 @@ 
         'out'    => 'out/{$name}/',
     );
 
-	/**
-	 * getInstallPath
-	 *
-	 * @param PackageInterface $package
-	 * @param string $frameworkType
-	 * @return string
-	 */
-	public function getInstallPath(PackageInterface $package, $frameworkType = '')
-	{
-		$installPath = parent::getInstallPath($package, $frameworkType);
-		$type = $this->package->getType();
-		if ($type === 'oxid-module') {
-			$this->prepareVendorDirectory($installPath);
-		}
-		return $installPath;
-	}
+    /**
+     * getInstallPath
+     *
+     * @param PackageInterface $package
+     * @param string $frameworkType
+     * @return string
+     */
+    public function getInstallPath(PackageInterface $package, $frameworkType = '')
+    {
+        $installPath = parent::getInstallPath($package, $frameworkType);
+        $type = $this->package->getType();
+        if ($type === 'oxid-module') {
+            $this->prepareVendorDirectory($installPath);
+        }
+        return $installPath;
+    }
 
-	/**
-	 * prepareVendorDirectory
-	 *
-	 * Makes sure there is a vendormetadata.php file inside
-	 * the vendor folder if there is a vendor folder.
-	 *
-	 * @param string $installPath
-	 * @return void
-	 */
-	protected function prepareVendorDirectory($installPath)
-	{
-		$matches = '';
-		$hasVendorDirectory = preg_match(self::VENDOR_PATTERN, $installPath, $matches);
-		if (!$hasVendorDirectory) {
-			return;
-		}
+    /**
+     * prepareVendorDirectory
+     *
+     * Makes sure there is a vendormetadata.php file inside
+     * the vendor folder if there is a vendor folder.
+     *
+     * @param string $installPath
+     * @return void
+     */
+    protected function prepareVendorDirectory($installPath)
+    {
+        $matches = '';
+        $hasVendorDirectory = preg_match(self::VENDOR_PATTERN, $installPath, $matches);
+        if (!$hasVendorDirectory) {
+            return;
+        }
 
-		$vendorDirectory = $matches['vendor'];
-		$vendorPath = getcwd() . '/modules/' . $vendorDirectory;
-		if (!file_exists($vendorPath)) {
-			mkdir($vendorPath, 0755, true);
-		}
+        $vendorDirectory = $matches['vendor'];
+        $vendorPath = getcwd() . '/modules/' . $vendorDirectory;
+        if (!file_exists($vendorPath)) {
+            mkdir($vendorPath, 0755, true);
+        }
 
-		$vendorMetaDataPath = $vendorPath . '/vendormetadata.php';
-		touch($vendorMetaDataPath);
-	}
+        $vendorMetaDataPath = $vendorPath . '/vendormetadata.php';
+        touch($vendorMetaDataPath);
+    }
 }

includes/user-functions.php

Indentation +15 added lines, -15 removed lines

@@ -34,11 +34,11 @@ 
  */
 function wpinv_get_capability( $capalibilty = 'manage_invoicing' ) {
 
-	if ( current_user_can( 'manage_options' ) ) {
-		return 'manage_options';
-	};
+    if ( current_user_can( 'manage_options' ) ) {
+        return 'manage_options';
+    };
 
-	return $capalibilty;
+    return $capalibilty;
 }
 
 /**
@@ -62,10 +62,10 @@ 
     // Prepare user values.
     $prefix = preg_replace( '/\s+/', '', $prefix );
     $prefix = empty( $prefix ) ? $email : $prefix;
-	$args   = array(
-		'user_login' => wpinv_generate_user_name( $prefix ),
-		'user_pass'  => wp_generate_password(),
-		'user_email' => $email,
+    $args   = array(
+        'user_login' => wpinv_generate_user_name( $prefix ),
+        'user_pass'  => wp_generate_password(),
+        'user_email' => $email,
         'role'       => 'subscriber',
     );
 
@@ -82,16 +82,16 @@ 
 function wpinv_generate_user_name( $prefix = '' ) {
 
     // If prefix is an email, retrieve the part before the email.
-	$prefix = strtok( $prefix, '@' );
+    $prefix = strtok( $prefix, '@' );
     $prefix = trim( $prefix, '.' );
 
-	// Sanitize the username.
-	$prefix = sanitize_user( $prefix, true );
+    // Sanitize the username.
+    $prefix = sanitize_user( $prefix, true );
 
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
-	if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
-		$prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
-	}
+    $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+    if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
+        $prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
+    }
 
     $username = $prefix;
     $postfix  = 2;

Spacing +117 added lines, -117 removed lines

@@ -6,7 +6,7 @@ 
  * @package GetPaid
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  *  Generates a users select dropdown.
@@ -16,13 +16,13 @@ 
  * @param array $args
  * @see wp_dropdown_users
  */
-function wpinv_dropdown_users( $args = '' ) {
+function wpinv_dropdown_users($args = '') {
 
-    if ( is_array( $args ) && ! empty( $args['show'] ) && 'display_name_with_email' == $args['show'] ) {
+    if (is_array($args) && !empty($args['show']) && 'display_name_with_email' == $args['show']) {
         $args['show'] = 'display_name_with_login';
     }
 
-    return wp_dropdown_users( $args );
+    return wp_dropdown_users($args);
 }
 
 /**
@@ -32,9 +32,9 @@ 
  * @return string capability to check against
  * @param string $capalibilty Optional. The alternative capability to check against.
  */
-function wpinv_get_capability( $capalibilty = 'manage_invoicing' ) {
+function wpinv_get_capability($capalibilty = 'manage_invoicing') {
 
-	if ( current_user_can( 'manage_options' ) ) {
+	if (current_user_can('manage_options')) {
 		return 'manage_options';
 	};
 
@@ -48,7 +48,7 @@ 
  * @return bool
  */
 function wpinv_current_user_can_manage_invoicing() {
-    return current_user_can( wpinv_get_capability() );
+    return current_user_can(wpinv_get_capability());
 }
 
 /**
@@ -57,19 +57,19 @@ 
  * @since 1.0.19
  * @return int|WP_Error
  */
-function wpinv_create_user( $email, $prefix = '' ) {
+function wpinv_create_user($email, $prefix = '') {
 
     // Prepare user values.
-    $prefix = preg_replace( '/\s+/', '', $prefix );
-    $prefix = empty( $prefix ) ? $email : $prefix;
-	$args   = array(
-		'user_login' => wpinv_generate_user_name( $prefix ),
+    $prefix = preg_replace('/\s+/', '', $prefix);
+    $prefix = empty($prefix) ? $email : $prefix;
+	$args = array(
+		'user_login' => wpinv_generate_user_name($prefix),
 		'user_pass'  => wp_generate_password(),
 		'user_email' => $email,
         'role'       => 'subscriber',
     );
 
-    return wp_insert_user( $args );
+    return wp_insert_user($args);
 
 }
 
@@ -79,26 +79,26 @@ 
  * @since 1.0.19
  * @return bool|WP_User
  */
-function wpinv_generate_user_name( $prefix = '' ) {
+function wpinv_generate_user_name($prefix = '') {
 
     // If prefix is an email, retrieve the part before the email.
-	$prefix = strtok( $prefix, '@' );
-    $prefix = trim( $prefix, '.' );
+	$prefix = strtok($prefix, '@');
+    $prefix = trim($prefix, '.');
 
 	// Sanitize the username.
-	$prefix = sanitize_user( $prefix, true );
+	$prefix = sanitize_user($prefix, true);
 
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
-	if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
-		$prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
+	if (empty($prefix) || in_array(strtolower($prefix), array_map('strtolower', $illegal_logins), true)) {
+		$prefix = 'gtp_' . zeroise(wp_rand(0, 9999), 4);
 	}
 
     $username = $prefix;
     $postfix  = 2;
 
-    while ( username_exists( $username ) ) {
+    while (username_exists($username)) {
         $username = $prefix + $postfix;
-        $postfix ++;
+        $postfix++;
     }
 
     return $username;
@@ -115,31 +115,31 @@ 
     $tabs = array(
 
         'gp-invoices'   => array(
-            'label'     => __( 'Invoices', 'invoicing' ), // Name of the tab.
+            'label'     => __('Invoices', 'invoicing'), // Name of the tab.
             'content'   => '[wpinv_history]', // Content of the tab. Or specify "callback" to provide a callback instead.
             'icon'      => 'fas fa-file-invoice', // Shown on some profile plugins.
         ),
 
         'gp-subscriptions' => array(
-            'label'        => __( 'Subscriptions', 'invoicing' ),
+            'label'        => __('Subscriptions', 'invoicing'),
             'content'      => '[wpinv_subscriptions]',
             'icon'         => 'fas fa-redo',
         ),
 
         'gp-edit-address'  => array(
-            'label'        => __( 'Billing Address', 'invoicing' ),
+            'label'        => __('Billing Address', 'invoicing'),
             'callback'     => 'getpaid_display_address_edit_tab',
             'icon'         => 'fas fa-credit-card',
         ),
 
     );
 
-    $tabs = apply_filters( 'getpaid_user_content_tabs', $tabs );
+    $tabs = apply_filters('getpaid_user_content_tabs', $tabs);
 
     // Make sure address editing is last on the list.
-    if ( isset( $tabs['gp-edit-address'] ) ) {
+    if (isset($tabs['gp-edit-address'])) {
         $address = $tabs['gp-edit-address'];
-        unset( $tabs['gp-edit-address'] );
+        unset($tabs['gp-edit-address']);
         $tabs['gp-edit-address'] = $address;
     }
 
@@ -153,19 +153,19 @@ 
  * @param array $tab
  * @return array
  */
-function getpaid_prepare_user_content_tab( $tab ) {
+function getpaid_prepare_user_content_tab($tab) {
 
-    if ( ! empty( $tab['callback'] ) ) {
-        return call_user_func( $tab['callback'] );
+    if (!empty($tab['callback'])) {
+        return call_user_func($tab['callback']);
     }
 
-    if ( ! empty( $tab['content'] ) ) {
-        return convert_smilies( capital_P_dangit( wp_filter_content_tags( do_shortcode( shortcode_unautop( wpautop( wptexturize( do_blocks( $tab['content'] ) ) ) ) ) ) ) );
+    if (!empty($tab['content'])) {
+        return convert_smilies(capital_P_dangit(wp_filter_content_tags(do_shortcode(shortcode_unautop(wpautop(wptexturize(do_blocks($tab['content']))))))));
     }
 
     $notice = aui()->alert(
         array(
-            'content'     => __( 'This tab has no content or content callback.', 'invoicing' ),
+            'content'     => __('This tab has no content or content callback.', 'invoicing'),
             'type'        => 'error',
         )
     );
@@ -181,14 +181,14 @@ 
  * @param string $default
  * @return array
  */
-function getpaid_get_tab_url( $tab, $default ) {
+function getpaid_get_tab_url($tab, $default) {
     global $getpaid_tab_url;
 
-    if ( empty( $getpaid_tab_url ) ) {
+    if (empty($getpaid_tab_url)) {
         return $default;
     }
 
-    return sprintf( $getpaid_tab_url, $tab );
+    return sprintf($getpaid_tab_url, $tab);
 
 }
 
@@ -200,11 +200,11 @@ 
  */
 function getpaid_display_address_edit_tab() {
 
-    if ( 0 === get_current_user_id() ) {
+    if (0 === get_current_user_id()) {
         return '<div class="bsui">' . aui()->alert(
             array(
                 'type'       => 'error',
-                'content'    => __( 'Your must be logged in to view this section', 'invoicing' ),
+                'content'    => __('Your must be logged in to view this section', 'invoicing'),
                 'dismissible'=> false,
             )
         ) . '</div>';
@@ -218,19 +218,19 @@ 
 
                 <?php
 
-                    foreach ( getpaid_user_address_fields() as $key => $label ) {
+                    foreach (getpaid_user_address_fields() as $key => $label) {
 
                         // Display the country.
-                        if ( 'country' == $key ) {
+                        if ('country' == $key) {
 
                             echo aui()->select(
                                 array(
                                     'options'     => wpinv_get_country_list(),
-                                    'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
-                                    'id'          => 'wpinv-' . sanitize_html_class( $key ),
-                                    'value'       => sanitize_text_field( getpaid_get_user_address_field( get_current_user_id(), $key ) ),
+                                    'name'        => 'getpaid_address[' . esc_attr($key) . ']',
+                                    'id'          => 'wpinv-' . sanitize_html_class($key),
+                                    'value'       => sanitize_text_field(getpaid_get_user_address_field(get_current_user_id(), $key)),
                                     'placeholder' => $label,
-                                    'label'       => wp_kses_post( $label ),
+                                    'label'       => wp_kses_post($label),
                                     'label_type'  => 'vertical',
                                     'class'       => 'getpaid-address-field',
                                 )
@@ -239,30 +239,30 @@ 
                         }
 
                         // Display the state.
-                        else if ( 'state' == $key ) {
+                        else if ('state' == $key) {
 
-                            echo getpaid_get_states_select_markup (
-                                getpaid_get_user_address_field( get_current_user_id(), 'country' ),
-                                getpaid_get_user_address_field( get_current_user_id(), 'state' ),
+                            echo getpaid_get_states_select_markup(
+                                getpaid_get_user_address_field(get_current_user_id(), 'country'),
+                                getpaid_get_user_address_field(get_current_user_id(), 'state'),
                                 $label,
                                 $label,
                                 '',
                                 false,
                                 '',
-                                'getpaid_address[' . esc_attr( $key ) . ']'
+                                'getpaid_address[' . esc_attr($key) . ']'
                             );
 
                         } else {
 
                             echo aui()->input(
                                 array(
-                                    'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
-                                    'id'          => 'wpinv-' . sanitize_html_class( $key ),
+                                    'name'        => 'getpaid_address[' . esc_attr($key) . ']',
+                                    'id'          => 'wpinv-' . sanitize_html_class($key),
                                     'placeholder' => $label,
-                                    'label'       => wp_kses_post( $label ),
+                                    'label'       => wp_kses_post($label),
                                     'label_type'  => 'vertical',
                                     'type'        => 'text',
-                                    'value'       => sanitize_text_field( getpaid_get_user_address_field( get_current_user_id(), $key ) ),
+                                    'value'       => sanitize_text_field(getpaid_get_user_address_field(get_current_user_id(), $key)),
                                     'class'       => 'getpaid-address-field',
                                 )
                             );
@@ -276,30 +276,30 @@ 
                             'name'        => 'getpaid_address[email_cc]',
                             'id'          => 'wpinv-email_cc',
                             'placeholder' => 'email1@example.com, email2@example.com',
-                            'label'       => __( 'Other email addresses', 'invoicing' ),
+                            'label'       => __('Other email addresses', 'invoicing'),
                             'label_type'  => 'vertical',
                             'type'        => 'text',
-                            'value'       => sanitize_text_field( get_user_meta( get_current_user_id(), '_wpinv_email_cc', true ) ),
+                            'value'       => sanitize_text_field(get_user_meta(get_current_user_id(), '_wpinv_email_cc', true)),
                             'class'       => 'getpaid-address-field',
-                            'help_text'   => __( 'Optionally provide other email addresses where we should send payment notifications', 'invoicing' ),
+                            'help_text'   => __('Optionally provide other email addresses where we should send payment notifications', 'invoicing'),
                         )
                     );
 
-                    do_action( 'getpaid_display_address_edit_tab' );
+                    do_action('getpaid_display_address_edit_tab');
 
                     echo aui()->input(
                         array(
                             'name'             => 'getpaid_profile_edit_submit_button',
                             'id'               => 'getpaid_profile_edit_submit_button',
-                            'value'            => __( 'Save Address', 'invoicing' ),
-                            'help_text'        => __( 'New invoices will use this address as the billing address.', 'invoicing' ),
+                            'value'            => __('Save Address', 'invoicing'),
+                            'help_text'        => __('New invoices will use this address as the billing address.', 'invoicing'),
                             'type'             => 'submit',
                             'class'            => 'btn btn-primary btn-block submit-button',
                         )
                     );
 
-                    wp_nonce_field( 'getpaid-nonce', 'getpaid-nonce' );
-                    getpaid_hidden_field( 'getpaid-action', 'edit_billing_details' );
+                    wp_nonce_field('getpaid-nonce', 'getpaid-nonce');
+                    getpaid_hidden_field('getpaid-action', 'edit_billing_details');
                 ?>
 
             </form>
@@ -309,7 +309,7 @@ 
 
     return ob_get_clean();
 }
-add_shortcode( 'getpaid_edit_address', 'getpaid_display_address_edit_tab' );
+add_shortcode('getpaid_edit_address', 'getpaid_display_address_edit_tab');
 
 /**
  * Saves the billing address edit tab.
@@ -317,31 +317,31 @@ 
  * @since 2.1.4
  * @param array $data
  */
-function getpaid_save_address_edit_tab( $data ) {
+function getpaid_save_address_edit_tab($data) {
 
-    if ( empty( $data['getpaid_address'] ) || ! is_array( $data['getpaid_address'] ) ) {
+    if (empty($data['getpaid_address']) || !is_array($data['getpaid_address'])) {
         return;
     }
 
     $data    = $data['getpaid_address'];
     $user_id = get_current_user_id();
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-        if ( isset( $data[ $field ] ) ) {
-            $value = sanitize_text_field( $data[ $field ] );
-            update_user_meta( $user_id, '_wpinv_' . $field, $value );
+        if (isset($data[$field])) {
+            $value = sanitize_text_field($data[$field]);
+            update_user_meta($user_id, '_wpinv_' . $field, $value);
         }
 
     }
 
-    if ( isset( $data['email_cc'] ) ) {
-        update_user_meta( $user_id, '_wpinv_email_cc', sanitize_text_field( $data['email_cc'] ) );
+    if (isset($data['email_cc'])) {
+        update_user_meta($user_id, '_wpinv_email_cc', sanitize_text_field($data['email_cc']));
     }
 
-    wpinv_set_error( 'address_updated', __( 'Your billing address has been updated', 'invoicing' ), 'success');
+    wpinv_set_error('address_updated', __('Your billing address has been updated', 'invoicing'), 'success');
 }
-add_action( 'getpaid_authenticated_action_edit_billing_details', 'getpaid_save_address_edit_tab' );
+add_action('getpaid_authenticated_action_edit_billing_details', 'getpaid_save_address_edit_tab');
 
 
 /*
@@ -359,27 +359,27 @@ 
  * @param  array $tabs
  * @return array
  */
-function getpaid_filter_userswp_account_tabs( $tabs ) {
+function getpaid_filter_userswp_account_tabs($tabs) {
 
     // Abort if the integration is inactive.
-    if ( ! getpaid_is_userswp_integration_active() ) {
+    if (!getpaid_is_userswp_integration_active()) {
         return $tabs;
     }
 
-    $new_tabs   = array();
+    $new_tabs = array();
 
-    foreach ( getpaid_get_user_content_tabs() as $slug => $tab ) {
+    foreach (getpaid_get_user_content_tabs() as $slug => $tab) {
 
-        $new_tabs[ $slug ] = array(
-            'title' => $tab[ 'label'],
-            'icon'  =>  $tab[ 'icon'],
+        $new_tabs[$slug] = array(
+            'title' => $tab['label'],
+            'icon'  =>  $tab['icon'],
         );
 
     }
 
-    return array_merge( $tabs, $new_tabs );
+    return array_merge($tabs, $new_tabs);
 }
-add_filter( 'uwp_account_available_tabs', 'getpaid_filter_userswp_account_tabs' );
+add_filter('uwp_account_available_tabs', 'getpaid_filter_userswp_account_tabs');
 
 /**
  * Display our UsersWP account tabs.
@@ -388,18 +388,18 @@ 
  * @param  array $tabs
  * @return array
  */
-function getpaid_display_userswp_account_tabs( $tab ) {
+function getpaid_display_userswp_account_tabs($tab) {
     global $getpaid_tab_url;
 
     $our_tabs = getpaid_get_user_content_tabs();
 
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        $getpaid_tab_url = add_query_arg( 'type', '%s', uwp_get_account_page_url() );
-        echo getpaid_prepare_user_content_tab( $our_tabs[ $tab ] );
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        $getpaid_tab_url = add_query_arg('type', '%s', uwp_get_account_page_url());
+        echo getpaid_prepare_user_content_tab($our_tabs[$tab]);
     }
 
 }
-add_action( 'uwp_account_form_display', 'getpaid_display_userswp_account_tabs' );
+add_action('uwp_account_form_display', 'getpaid_display_userswp_account_tabs');
 
 
 /**
@@ -410,17 +410,17 @@ 
  * @param  string $tab   Current tab.
  * @return string Title.
  */
-function getpaid_filter_userswp_account_title( $title, $tab ) {
+function getpaid_filter_userswp_account_title($title, $tab) {
 
-    $our_tabs   = getpaid_get_user_content_tabs();
+    $our_tabs = getpaid_get_user_content_tabs();
 
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        return $our_tabs[ $tab ]['label'];
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        return $our_tabs[$tab]['label'];
     }
 
     return $title;
 }
-add_filter( 'uwp_account_page_title', 'getpaid_filter_userswp_account_title', 10, 2 );
+add_filter('uwp_account_page_title', 'getpaid_filter_userswp_account_title', 10, 2);
 
 /**
  * Registers the UsersWP integration settings.
@@ -429,26 +429,26 @@ 
  * @param  array $settings An array of integration settings.
  * @return array
  */
-function getpaid_register_userswp_settings( $settings ) {
+function getpaid_register_userswp_settings($settings) {
 
-    if ( defined( 'USERSWP_PLUGIN_FILE' ) ) {
+    if (defined('USERSWP_PLUGIN_FILE')) {
 
         $settings[] = array(
 
             'id'       => 'userswp',
-            'label'    => __( 'UsersWP', 'invoicing' ),
+            'label'    => __('UsersWP', 'invoicing'),
             'settings' => array(
 
                 'userswp_settings' => array(
                     'id'   => 'userswp_settings',
-                    'name' => '<h3>' . __( 'UsersWP', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('UsersWP', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_userswp' => array(
                     'id'         => 'enable_userswp',
-                    'name'       => __( 'Enable Integration', 'invoicing' ),
-                    'desc'       => __( 'Display GetPaid items on UsersWP account page.', 'invoicing' ),
+                    'name'       => __('Enable Integration', 'invoicing'),
+                    'desc'       => __('Display GetPaid items on UsersWP account page.', 'invoicing'),
                     'type'       => 'checkbox',
                     'std'        => 1,
                 )
@@ -461,7 +461,7 @@ 
 
     return $settings;
 }
-add_filter( 'getpaid_integration_settings', 'getpaid_register_userswp_settings' );
+add_filter('getpaid_integration_settings', 'getpaid_register_userswp_settings');
 
 /**
  * Ovewrites the invoices history page to UsersWP.
@@ -469,18 +469,18 @@ 
  * @since  2.3.1
  * @return bool
  */
-function getpaid_userswp_overwrite_invoice_history_page( $url, $post_type ) {
+function getpaid_userswp_overwrite_invoice_history_page($url, $post_type) {
 
     $our_tabs = getpaid_get_user_content_tabs();
     $tab      = "gp-{$post_type}s";
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        return add_query_arg( 'type', $tab, uwp_get_account_page_url() );
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        return add_query_arg('type', $tab, uwp_get_account_page_url());
     }
 
     return $url;
 
 }
-add_filter( 'wpinv_get_history_page_uri', 'getpaid_userswp_overwrite_invoice_history_page', 10, 2 );
+add_filter('wpinv_get_history_page_uri', 'getpaid_userswp_overwrite_invoice_history_page', 10, 2);
 
 /**
  * Checks if the integration is enabled.
@@ -489,8 +489,8 @@ 
  * @return bool
  */
 function getpaid_is_userswp_integration_active() {
-    $enabled = wpinv_get_option( 'enable_userswp', 1 );
-    return defined( 'USERSWP_PLUGIN_FILE' ) && ! empty( $enabled );
+    $enabled = wpinv_get_option('enable_userswp', 1);
+    return defined('USERSWP_PLUGIN_FILE') && !empty($enabled);
 }
 
 /*
@@ -508,26 +508,26 @@ 
  * @param  array $settings An array of integration settings.
  * @return array
  */
-function getpaid_register_buddypress_settings( $settings ) {
+function getpaid_register_buddypress_settings($settings) {
 
-    if ( class_exists( 'BuddyPress' ) ) {
+    if (class_exists('BuddyPress')) {
 
         $settings[] = array(
 
             'id'       => 'buddypress',
-            'label'    => __( 'BuddyPress', 'invoicing' ),
+            'label'    => __('BuddyPress', 'invoicing'),
             'settings' => array(
 
                 'buddypress_settings' => array(
                     'id'   => 'buddypress_settings',
-                    'name' => '<h3>' . __( 'BuddyPress', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('BuddyPress', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_buddypress' => array(
                     'id'         => 'enable_buddypress',
-                    'name'       => __( 'Enable Integration', 'invoicing' ),
-                    'desc'       => __( 'Display GetPaid items on BuddyPress account pages.', 'invoicing' ),
+                    'name'       => __('Enable Integration', 'invoicing'),
+                    'desc'       => __('Display GetPaid items on BuddyPress account pages.', 'invoicing'),
                     'type'       => 'checkbox',
                     'std'        => 1,
                 )
@@ -540,7 +540,7 @@ 
 
     return $settings;
 }
-add_filter( 'getpaid_integration_settings', 'getpaid_register_buddypress_settings' );
+add_filter('getpaid_integration_settings', 'getpaid_register_buddypress_settings');
 
 /**
  * Checks if the integration is enabled.
@@ -549,8 +549,8 @@ 
  * @return bool
  */
 function getpaid_is_buddypress_integration_active() {
-    $enabled = wpinv_get_option( 'enable_buddypress', 1 );
-    return class_exists( 'BuddyPress' ) && ! empty( $enabled );
+    $enabled = wpinv_get_option('enable_buddypress', 1);
+    return class_exists('BuddyPress') && !empty($enabled);
 }
 
 /**
@@ -561,10 +561,10 @@ 
  */
 function getpaid_setup_buddypress_integration() {
 
-    if ( getpaid_is_buddypress_integration_active() ) {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-bp-getpaid-component.php' );
+    if (getpaid_is_buddypress_integration_active()) {
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-bp-getpaid-component.php');
         buddypress()->getpaid = new BP_GetPaid_Component();
     }
 
 }
-add_action( 'bp_setup_components', 'getpaid_setup_buddypress_integration' );
+add_action('bp_setup_components', 'getpaid_setup_buddypress_integration');

templates/frontend-head.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 

templates/frontend-footer.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -16,7 +16,7 @@ 
 		<div class="modal-dialog modal-dialog-centered modal-lg" role="checkout" style="max-width: 650px;">
 			<div class="modal-content">
 				<div class="modal-body">
-					<button type="button" class="close p-2 getpaid-payment-modal-close d-sm-none" data-dismiss="modal" aria-label="<?php esc_attr__( 'Close', 'invoicing' ); ?>">
+					<button type="button" class="close p-2 getpaid-payment-modal-close d-sm-none" data-dismiss="modal" aria-label="<?php esc_attr__('Close', 'invoicing'); ?>">
 						<i class="fa fa-times" aria-hidden="true"></i>
 					</button>
 					<div class="modal-body-wrapper"></div>

templates/payment-forms/elements/address.php

Indentation +25 added lines, -25 removed lines

@@ -10,7 +10,7 @@ 
 defined( 'ABSPATH' ) || exit;
 
 if ( empty( $fields ) ) {
-	return;
+    return;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
@@ -18,12 +18,12 @@ 
 
 // Prepare the user's country.
 if ( ! empty( $form->invoice ) ) {
-	$country = $form->invoice->get_country();
+    $country = $form->invoice->get_country();
 }
 
 if ( empty( $country ) ) {
-	$country = empty( $country ) ? getpaid_get_ip_country() : $country;
-	$country = empty( $country ) ? wpinv_get_default_country() : $country;
+    $country = empty( $country ) ? getpaid_get_ip_country() : $country;
+    $country = empty( $country ) ? wpinv_get_default_country() : $country;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
@@ -55,10 +55,10 @@ 
 	<!-- Start Billing Address -->
 	<div class="getpaid-billing-address-wrapper">
 		<?php
-			$field_type = 'billing';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_billing_fields', $form );
-		?>
+            $field_type = 'billing';
+            include plugin_dir_path( __FILE__ ) . 'address-fields.php';
+            do_action( 'getpaid_after_payment_form_billing_fields', $form );
+        ?>
 	</div>
 	<!-- End Billing Address -->
 
@@ -70,20 +70,20 @@ 
 
 	<?php
 
-		echo aui()->input(
-		    array(
-			    'type'       => 'checkbox',
-			    'name'       => 'same-shipping-address',
-			    'id'         => "shipping-toggle$uniqid",
-			    'required'   => false,
-			    'label'      => wp_kses_post( $shipping_address_toggle ),
-			    'value'      => 1,
-			    'checked'    => true,
-				'class'      => 'w-auto',
-		    )
-		);
+        echo aui()->input(
+            array(
+                'type'       => 'checkbox',
+                'name'       => 'same-shipping-address',
+                'id'         => "shipping-toggle$uniqid",
+                'required'   => false,
+                'label'      => wp_kses_post( $shipping_address_toggle ),
+                'value'      => 1,
+                'checked'    => true,
+                'class'      => 'w-auto',
+            )
+        );
 
-	?>
+    ?>
 
 
 	<!-- Start Shipping Address Title -->
@@ -102,10 +102,10 @@ 
 	<!-- Start Shipping Address -->
 	<div class="getpaid-shipping-address-wrapper">
 		<?php
-			$field_type = 'shipping';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_shipping_fields', $form );
-		?>
+            $field_type = 'shipping';
+            include plugin_dir_path( __FILE__ ) . 'address-fields.php';
+            do_action( 'getpaid_after_payment_form_shipping_fields', $form );
+        ?>
 	</div>
 	<!-- End Shipping Address -->
 

Spacing +21 added lines, -21 removed lines

@@ -7,57 +7,57 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-if ( empty( $fields ) ) {
+if (empty($fields)) {
 	return;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
-$uniqid = uniqid( '_' );
+$uniqid = uniqid('_');
 
 // Prepare the user's country.
-if ( ! empty( $form->invoice ) ) {
+if (!empty($form->invoice)) {
 	$country = $form->invoice->get_country();
 }
 
-if ( empty( $country ) ) {
-	$country = empty( $country ) ? getpaid_get_ip_country() : $country;
-	$country = empty( $country ) ? wpinv_get_default_country() : $country;
+if (empty($country)) {
+	$country = empty($country) ? getpaid_get_ip_country() : $country;
+	$country = empty($country) ? wpinv_get_default_country() : $country;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
-$uniqid = uniqid( '_' );
+$uniqid = uniqid('_');
 
-$address_type = empty( $address_type ) ? 'billing' : $address_type;
+$address_type = empty($address_type) ? 'billing' : $address_type;
 
 ?>
 
-<?php if ( 'both' === $address_type ) : ?>
+<?php if ('both' === $address_type) : ?>
 
 	<!-- Start Billing/Shipping Address Title -->
 	<h4 class="mb-3 getpaid-shipping-billing-address-title">
-		<?php _e( 'Billing / Shipping Address', 'invoicing' ); ?>
+		<?php _e('Billing / Shipping Address', 'invoicing'); ?>
 	</h4>
 	<!-- End Billing Address Title -->
 
 	<!-- Start Billing Address Title -->
 	<h4 class="mb-3 getpaid-billing-address-title">
-		<?php _e( 'Billing Address', 'invoicing' ); ?>
+		<?php _e('Billing Address', 'invoicing'); ?>
 	</h4>
 	<!-- End Billing Address Title -->
 
 <?php endif; ?>
 
 
-<?php if ( 'both' === $address_type || 'billing' === $address_type ) : ?>
+<?php if ('both' === $address_type || 'billing' === $address_type) : ?>
 
 	<!-- Start Billing Address -->
 	<div class="getpaid-billing-address-wrapper">
 		<?php
 			$field_type = 'billing';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_billing_fields', $form );
+			include plugin_dir_path(__FILE__) . 'address-fields.php';
+			do_action('getpaid_after_payment_form_billing_fields', $form);
 		?>
 	</div>
 	<!-- End Billing Address -->
@@ -65,7 +65,7 @@ 
 <?php endif; ?>
 
 
-<?php if ( 'both' === $address_type ) : ?>
+<?php if ('both' === $address_type) : ?>
 
 
 	<?php
@@ -76,7 +76,7 @@ 
 			    'name'       => 'same-shipping-address',
 			    'id'         => "shipping-toggle$uniqid",
 			    'required'   => false,
-			    'label'      => wp_kses_post( $shipping_address_toggle ),
+			    'label'      => wp_kses_post($shipping_address_toggle),
 			    'value'      => 1,
 			    'checked'    => true,
 				'class'      => 'w-auto',
@@ -88,7 +88,7 @@ 
 
 	<!-- Start Shipping Address Title -->
 	<h4 class="mb-3 getpaid-shipping-address-title">
-		<?php _e( 'Shipping Address', 'invoicing' ); ?>
+		<?php _e('Shipping Address', 'invoicing'); ?>
 	</h4>
 	<!-- End Shipping Address Title -->
 
@@ -97,14 +97,14 @@ 
 
 
 	
-<?php if ( 'both' === $address_type || 'shipping' === $address_type ) : ?>
+<?php if ('both' === $address_type || 'shipping' === $address_type) : ?>
 
 	<!-- Start Shipping Address -->
 	<div class="getpaid-shipping-address-wrapper">
 		<?php
 			$field_type = 'shipping';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_shipping_fields', $form );
+			include plugin_dir_path(__FILE__) . 'address-fields.php';
+			do_action('getpaid_after_payment_form_shipping_fields', $form);
 		?>
 	</div>
 	<!-- End Shipping Address -->

templates/payment-forms/variations/radio.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()] = $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;
 }
 
@@ -27,9 +27,9 @@ 
 echo aui()->radio(
     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',
         'class'      => 'w-auto',
         'inline'     => false,

includes/data-stores/class-getpaid-invoice-data-store.php

Spacing +138 added lines, -138 removed lines

@@ -4,7 +4,7 @@ 
  * GetPaid_Invoice_Data_Store class file.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -110,61 +110,61 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 */
-	public function create( &$invoice ) {
-		$invoice->set_version( WPINV_VERSION );
-		$invoice->set_date_created( current_time('mysql') );
+	public function create(&$invoice) {
+		$invoice->set_version(WPINV_VERSION);
+		$invoice->set_date_created(current_time('mysql'));
 
 		// Create a new post.
 		$id = wp_insert_post(
 			apply_filters(
 				'getpaid_new_invoice_data',
 				array(
-					'post_date'     => $invoice->get_date_created( 'edit' ),
-					'post_type'     => $invoice->get_post_type( 'edit' ),
-					'post_status'   => $this->get_post_status( $invoice ),
+					'post_date'     => $invoice->get_date_created('edit'),
+					'post_type'     => $invoice->get_post_type('edit'),
+					'post_status'   => $this->get_post_status($invoice),
 					'ping_status'   => 'closed',
-					'post_author'   => $invoice->get_user_id( 'edit' ),
-					'post_title'    => $invoice->get_title( 'edit' ),
-					'post_excerpt'  => $invoice->get_description( 'edit' ),
-					'post_parent'   => $invoice->get_parent_id( 'edit' ),
+					'post_author'   => $invoice->get_user_id('edit'),
+					'post_title'    => $invoice->get_title('edit'),
+					'post_excerpt'  => $invoice->get_description('edit'),
+					'post_parent'   => $invoice->get_parent_id('edit'),
 				)
 			),
 			true
 		);
 
-		if ( $id && ! is_wp_error( $id ) ) {
+		if ($id && !is_wp_error($id)) {
 
 			// Update the new id and regenerate a title.
-			$invoice->set_id( $id );
+			$invoice->set_id($id);
 
 			$invoice->maybe_set_number();
 
 			wp_update_post(
 				array(
 					'ID'         => $invoice->get_id(),
-					'post_title' => $invoice->get_number( 'edit' ),
-					'post_name'  => $invoice->get_path( 'edit' )
+					'post_title' => $invoice->get_number('edit'),
+					'post_name'  => $invoice->get_path('edit')
 				)
 			);
 
 			// Save special fields and items.
-			$this->save_special_fields( $invoice );
-			$this->save_items( $invoice );
+			$this->save_special_fields($invoice);
+			$this->save_items($invoice);
 
 			// Update meta data.
-			$this->update_post_meta( $invoice );
+			$this->update_post_meta($invoice);
 			$invoice->save_meta_data();
 
 			// Apply changes.
 			$invoice->apply_changes();
-			$this->clear_caches( $invoice );
+			$this->clear_caches($invoice);
 
 			// Fires after a new invoice is created.
-			do_action( 'getpaid_new_invoice', $invoice );
+			do_action('getpaid_new_invoice', $invoice);
 			return true;
 		}
 
-		if ( is_wp_error( $id ) ) {
+		if (is_wp_error($id)) {
 			$invoice->last_error = $id->get_error_message();
 		}
 
@@ -177,14 +177,14 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 *
 	 */
-	public function read( &$invoice ) {
+	public function read(&$invoice) {
 
 		$invoice->set_defaults();
-		$invoice_object = get_post( $invoice->get_id() );
+		$invoice_object = get_post($invoice->get_id());
 
-		if ( ! $invoice->get_id() || ! $invoice_object || ! getpaid_is_invoice_post_type( $invoice_object->post_type ) ) {
-			$invoice->last_error = __( 'Invalid invoice.', 'invoicing' );
-			$invoice->set_id( 0 );
+		if (!$invoice->get_id() || !$invoice_object || !getpaid_is_invoice_post_type($invoice_object->post_type)) {
+			$invoice->last_error = __('Invalid invoice.', 'invoicing');
+			$invoice->set_id(0);
 			return false;
 		}
 
@@ -202,14 +202,14 @@ 
 			)
 		);
 
-		$invoice->set_type( $invoice_object->post_type );
+		$invoice->set_type($invoice_object->post_type);
 
-		$this->read_object_data( $invoice, $invoice_object );
-		$this->add_special_fields( $invoice );
-		$this->add_items( $invoice );
+		$this->read_object_data($invoice, $invoice_object);
+		$this->add_special_fields($invoice);
+		$this->add_items($invoice);
 		$invoice->read_meta_data();
-		$invoice->set_object_read( true );
-		do_action( 'getpaid_read_invoice', $invoice );
+		$invoice->set_object_read(true);
+		do_action('getpaid_read_invoice', $invoice);
 
 	}
 
@@ -218,35 +218,35 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 */
-	public function update( &$invoice ) {
+	public function update(&$invoice) {
 		$invoice->save_meta_data();
-		$invoice->set_version( WPINV_VERSION );
+		$invoice->set_version(WPINV_VERSION);
 
-		if ( null === $invoice->get_date_created( 'edit' ) ) {
-			$invoice->set_date_created(  current_time('mysql') );
+		if (null === $invoice->get_date_created('edit')) {
+			$invoice->set_date_created(current_time('mysql'));
 		}
 
 		// Ensure both the key and number are set.
 		$invoice->get_path();
 
 		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $invoice->get_id() );
+		$previous_status = get_post_status($invoice->get_id());
 
 		$changes = $invoice->get_changes();
 
 		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author', 'description', 'parent_id', 'post_excerpt', 'path' ), array_keys( $changes ) ) ) {
+		if (array_intersect(array('date_created', 'date_modified', 'status', 'name', 'author', 'description', 'parent_id', 'post_excerpt', 'path'), array_keys($changes))) {
 			$post_data = array(
-				'post_date'         => $invoice->get_date_created( 'edit' ),
-				'post_date_gmt'     => $invoice->get_date_created_gmt( 'edit' ),
-				'post_status'       => $invoice->get_status( 'edit' ),
-				'post_title'        => $invoice->get_name( 'edit' ),
-				'post_author'       => $invoice->get_user_id( 'edit' ),
-				'post_modified'     => $invoice->get_date_modified( 'edit' ),
-				'post_excerpt'      => $invoice->get_description( 'edit' ),
-				'post_parent'       => $invoice->get_parent_id( 'edit' ),
-				'post_name'         => $invoice->get_path( 'edit' ),
-				'post_type'         => $invoice->get_post_type( 'edit' ),
+				'post_date'         => $invoice->get_date_created('edit'),
+				'post_date_gmt'     => $invoice->get_date_created_gmt('edit'),
+				'post_status'       => $invoice->get_status('edit'),
+				'post_title'        => $invoice->get_name('edit'),
+				'post_author'       => $invoice->get_user_id('edit'),
+				'post_modified'     => $invoice->get_date_modified('edit'),
+				'post_excerpt'      => $invoice->get_description('edit'),
+				'post_parent'       => $invoice->get_parent_id('edit'),
+				'post_name'         => $invoice->get_path('edit'),
+				'post_type'         => $invoice->get_post_type('edit'),
 			);
 
 			/**
@@ -257,35 +257,35 @@ 
 			 * This ensures hooks are fired by either WP itself (admin screen save),
 			 * or an update purely from CRUD.
 			 */
-			if ( doing_action( 'save_post' ) ) {
-				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $invoice->get_id() ) );
-				clean_post_cache( $invoice->get_id() );
+			if (doing_action('save_post')) {
+				$GLOBALS['wpdb']->update($GLOBALS['wpdb']->posts, $post_data, array('ID' => $invoice->get_id()));
+				clean_post_cache($invoice->get_id());
 			} else {
-				wp_update_post( array_merge( array( 'ID' => $invoice->get_id() ), $post_data ) );
+				wp_update_post(array_merge(array('ID' => $invoice->get_id()), $post_data));
 			}
-			$invoice->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+			$invoice->read_meta_data(true); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
 		}
 
 		// Update meta data.
-		$this->update_post_meta( $invoice );
+		$this->update_post_meta($invoice);
 
 		// Save special fields and items.
-		$this->save_special_fields( $invoice );
-		$this->save_items( $invoice );
+		$this->save_special_fields($invoice);
+		$this->save_items($invoice);
 
 		// Apply the changes.
 		$invoice->apply_changes();
 
 		// Clear caches.
-		$this->clear_caches( $invoice );
+		$this->clear_caches($invoice);
 
 		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $invoice->get_status( 'edit' );
+		$new_status = $invoice->get_status('edit');
 
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_invoice', $invoice );
+		if ($new_status !== $previous_status && in_array($previous_status, array('new', 'auto-draft', 'draft'), true)) {
+			do_action('getpaid_new_invoice', $invoice);
 		} else {
-			do_action( 'getpaid_update_invoice', $invoice );
+			do_action('getpaid_update_invoice', $invoice);
 		}
 
 	}
@@ -301,45 +301,45 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
      */
-    public function add_special_fields( &$invoice ) {
+    public function add_special_fields(&$invoice) {
 		global $wpdb;
 
 		// Maybe retrieve from the cache.
-		$data   = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_special_fields' );
+		$data = wp_cache_get($invoice->get_id(), 'getpaid_invoice_special_fields');
 
 		// If not found, retrieve from the db.
-		if ( false === $data ) {
-			$table =  $wpdb->prefix . 'getpaid_invoices';
+		if (false === $data) {
+			$table = $wpdb->prefix . 'getpaid_invoices';
 
 			$data  = $wpdb->get_row(
-				$wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d LIMIT 1", $invoice->get_id() ),
+				$wpdb->prepare("SELECT * FROM $table WHERE `post_id`=%d LIMIT 1", $invoice->get_id()),
 				ARRAY_A
 			);
 
 			// Update the cache with our data
-			wp_cache_set( $invoice->get_id(), $data, 'getpaid_invoice_special_fields' );
+			wp_cache_set($invoice->get_id(), $data, 'getpaid_invoice_special_fields');
 
 		}
 
 		// Abort if the data does not exist.
-		if ( empty( $data ) ) {
-			$invoice->set_object_read( true );
-			$invoice->set_props( wpinv_get_user_address( $invoice->get_user_id() ) );
+		if (empty($data)) {
+			$invoice->set_object_read(true);
+			$invoice->set_props(wpinv_get_user_address($invoice->get_user_id()));
 			return;
 		}
 
 		$props = array();
 
-		foreach ( $this->database_fields_to_props as $db_field => $prop ) {
+		foreach ($this->database_fields_to_props as $db_field => $prop) {
 			
-			if ( $db_field == 'post_id' ) {
+			if ($db_field == 'post_id') {
 				continue;
 			}
 
-			$props[ $prop ] = $data[ $db_field ];
+			$props[$prop] = $data[$db_field];
 		}
 
-		$invoice->set_props( $props );
+		$invoice->set_props($props);
 
 	}
 
@@ -350,14 +350,14 @@ 
 	 * @param  WPInv_Invoice $invoice       The Invoice object.
 	 * @return array                        A mapping of field keys => prop names, filtered by ones that should be updated.
 	 */
-	protected function get_special_fields_to_update( $invoice ) {
+	protected function get_special_fields_to_update($invoice) {
 		$fields_to_update = array();
-		$changed_props   = $invoice->get_changes();
+		$changed_props = $invoice->get_changes();
 
 		// Props should be updated if they are a part of the $changed array or don't exist yet.
-		foreach ( $this->database_fields_to_props as $database_field => $prop ) {
-			if ( array_key_exists( $prop, $changed_props ) ) {
-				$fields_to_update[ $database_field ] = $prop;
+		foreach ($this->database_fields_to_props as $database_field => $prop) {
+			if (array_key_exists($prop, $changed_props)) {
+				$fields_to_update[$database_field] = $prop;
 			}
 		}
 
@@ -370,25 +370,25 @@ 
 	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
 	 * @since 1.0.19
 	 */
-	protected function update_special_fields( &$invoice ) {
+	protected function update_special_fields(&$invoice) {
 		global $wpdb;
 
 		$updated_props    = array();
-		$fields_to_update = $this->get_special_fields_to_update( $invoice );
+		$fields_to_update = $this->get_special_fields_to_update($invoice);
 
-		foreach ( $fields_to_update as $database_field => $prop ) {
-			$value = $invoice->{"get_$prop"}( 'edit' );
-			$value = is_string( $value ) ? wp_slash( $value ) : $value;
-			$value = is_bool( $value ) ? ( int ) $value : $value;
-			$updated_props[ $database_field ] = maybe_serialize( $value );
+		foreach ($fields_to_update as $database_field => $prop) {
+			$value = $invoice->{"get_$prop"}('edit');
+			$value = is_string($value) ? wp_slash($value) : $value;
+			$value = is_bool($value) ? (int) $value : $value;
+			$updated_props[$database_field] = maybe_serialize($value);
 		}
 
-		if ( ! empty( $updated_props ) ) {
+		if (!empty($updated_props)) {
 
 			$table = $wpdb->prefix . 'getpaid_invoices';
-			$wpdb->update( $table, $updated_props, array( 'post_id' => $invoice->get_id() ) );
-			wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
-			do_action( "getpaid_invoice_update_database_fields", $invoice, $updated_props );
+			$wpdb->update($table, $updated_props, array('post_id' => $invoice->get_id()));
+			wp_cache_delete($invoice->get_id(), 'getpaid_invoice_special_fields');
+			do_action("getpaid_invoice_update_database_fields", $invoice, $updated_props);
 
 		}
 
@@ -400,22 +400,22 @@ 
 	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
 	 * @since 1.0.19
 	 */
-	protected function insert_special_fields( &$invoice ) {
+	protected function insert_special_fields(&$invoice) {
 		global $wpdb;
 
-		$updated_props   = array();
+		$updated_props = array();
 
-		foreach ( $this->database_fields_to_props as $database_field => $prop ) {
-			$value = $invoice->{"get_$prop"}( 'edit' );
-			$value = is_string( $value ) ? wp_slash( $value ) : $value;
-			$value = is_bool( $value ) ? ( int ) $value : $value;
-			$updated_props[ $database_field ] = maybe_serialize( $value );
+		foreach ($this->database_fields_to_props as $database_field => $prop) {
+			$value = $invoice->{"get_$prop"}('edit');
+			$value = is_string($value) ? wp_slash($value) : $value;
+			$value = is_bool($value) ? (int) $value : $value;
+			$updated_props[$database_field] = maybe_serialize($value);
 		}
 
 		$table = $wpdb->prefix . 'getpaid_invoices';
-		$wpdb->insert( $table, $updated_props );
-		wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
-		do_action( "getpaid_invoice_insert_database_fields", $invoice, $updated_props );
+		$wpdb->insert($table, $updated_props);
+		wp_cache_delete($invoice->get_id(), 'getpaid_invoice_special_fields');
+		do_action("getpaid_invoice_insert_database_fields", $invoice, $updated_props);
 
 	}
 
@@ -424,7 +424,7 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
      */
-    public function save_special_fields( & $invoice ) {
+    public function save_special_fields(& $invoice) {
 		global $wpdb;
 
 		// The invoices table.
@@ -432,13 +432,13 @@ 
 		$id    = (int) $invoice->get_id();
 		$invoice->maybe_set_key();
 
-		if ( $wpdb->get_var( "SELECT `post_id` FROM $table WHERE `post_id`= $id" ) ) {
+		if ($wpdb->get_var("SELECT `post_id` FROM $table WHERE `post_id`= $id")) {
 
-			$this->update_special_fields( $invoice );
+			$this->update_special_fields($invoice);
 
 		} else {
 
-			$this->insert_special_fields( $invoice );
+			$this->insert_special_fields($invoice);
 
 		}
 
@@ -449,46 +449,46 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
      */
-    public function add_items( &$invoice ) {
+    public function add_items(&$invoice) {
 		global $wpdb;
 
 		// Maybe retrieve from the cache.
-		$items = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_cart_details' );
+		$items = wp_cache_get($invoice->get_id(), 'getpaid_invoice_cart_details');
 
 		// If not found, retrieve from the db.
-		if ( false === $items ) {
-			$table =  $wpdb->prefix . 'getpaid_invoice_items';
+		if (false === $items) {
+			$table = $wpdb->prefix . 'getpaid_invoice_items';
 
 			$items = $wpdb->get_results(
-				$wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d", $invoice->get_id() )
+				$wpdb->prepare("SELECT * FROM $table WHERE `post_id`=%d", $invoice->get_id())
 			);
 
 			// Update the cache with our data
-			wp_cache_set( $invoice->get_id(), $items, 'getpaid_invoice_cart_details' );
+			wp_cache_set($invoice->get_id(), $items, 'getpaid_invoice_cart_details');
 
 		}
 
 		// Abort if no items found.
-        if ( empty( $items ) ) {
+        if (empty($items)) {
             return;
 		}
 
 		$_items = array();
-		foreach ( $items as $item_data ) {
-			$item = new GetPaid_Form_Item( $item_data->item_id );
+		foreach ($items as $item_data) {
+			$item = new GetPaid_Form_Item($item_data->item_id);
 
 			// Set item data.
-			$item->item_tax      = wpinv_sanitize_amount( $item_data->tax );
-			$item->item_discount = wpinv_sanitize_amount( $item_data->discount );
-			$item->set_name( $item_data->item_name );
-			$item->set_description( $item_data->item_description );
-			$item->set_price( $item_data->item_price );
-			$item->set_quantity( $item_data->quantity );
-			$item->set_item_meta( $item_data->meta );
+			$item->item_tax      = wpinv_sanitize_amount($item_data->tax);
+			$item->item_discount = wpinv_sanitize_amount($item_data->discount);
+			$item->set_name($item_data->item_name);
+			$item->set_description($item_data->item_description);
+			$item->set_price($item_data->item_price);
+			$item->set_quantity($item_data->quantity);
+			$item->set_item_meta($item_data->meta);
 			$_items[] = $item;
 		}
 
-		$invoice->set_items( $_items );
+		$invoice->set_items($_items);
 	}
 
 	/**
@@ -496,20 +496,20 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
      */
-    public function save_items( $invoice ) {
+    public function save_items($invoice) {
 
 		// Delete previously existing items.
-		$this->delete_items( $invoice );
+		$this->delete_items($invoice);
 
-		$table   =  $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
+		$table = $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
 
-		foreach ( $invoice->get_cart_details() as $item_data ) {
-			$item_data = array_map( 'maybe_serialize', $item_data );
-			$GLOBALS['wpdb']->insert( $table, $item_data );
+		foreach ($invoice->get_cart_details() as $item_data) {
+			$item_data = array_map('maybe_serialize', $item_data);
+			$GLOBALS['wpdb']->insert($table, $item_data);
 		}
 
-		wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_cart_details' );
-		do_action( "getpaid_invoice_save_items", $invoice );
+		wp_cache_delete($invoice->get_id(), 'getpaid_invoice_cart_details');
+		do_action("getpaid_invoice_save_items", $invoice);
 
 	}
 
@@ -518,9 +518,9 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
      */
-    public function delete_items( $invoice ) {
-		$table =  $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
-		return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
+    public function delete_items($invoice) {
+		$table = $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
+		return $GLOBALS['wpdb']->delete($table, array('post_id' => $invoice->get_id()));
 	}
 
 	/**
@@ -528,9 +528,9 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
      */
-    public function delete_special_fields( $invoice ) {
-		$table =  $GLOBALS['wpdb']->prefix . 'getpaid_invoices';
-		return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
+    public function delete_special_fields($invoice) {
+		$table = $GLOBALS['wpdb']->prefix . 'getpaid_invoices';
+		return $GLOBALS['wpdb']->delete($table, array('post_id' => $invoice->get_id()));
 	}
 	
 	/**
@@ -541,10 +541,10 @@ 
 	 * @param  WPInv_Invoice $object GetPaid_Data object.
 	 * @return string
 	 */
-	protected function get_post_status( $object ) {
-		$object_status = $object->get_status( 'edit' );
+	protected function get_post_status($object) {
+		$object_status = $object->get_status('edit');
 
-		if ( ! $object_status ) {
+		if (!$object_status) {
 			$object_status = $object->get_default_status();
 		}
 

Indentation +479 added lines, -479 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,544 +15,544 @@ 
  */
 class GetPaid_Invoice_Data_Store extends GetPaid_Data_Store_WP {
 
-	/**
-	 * Data stored in meta keys, but not considered "meta" for a discount.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $internal_meta_keys = array(
-		'_wpinv_subscr_profile_id',
-		'_wpinv_subscription_id',
-		'_wpinv_taxes',
-		'_wpinv_fees',
-		'_wpinv_discounts',
-		'_wpinv_submission_id',
-		'_wpinv_payment_form',
-		'_wpinv_is_viewed',
-		'_wpinv_phone',
-		'_wpinv_company_id',
-		'wpinv_shipping',
-		'wpinv_email_cc',
-		'wpinv_template',
-		'wpinv_created_via'
-	);
-
-	/**
-	 * A map of meta keys to data props.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $meta_key_to_props = array(
-		'_wpinv_subscr_profile_id' => 'remote_subscription_id',
-		'_wpinv_subscription_id'   => 'subscription_id',
-		'_wpinv_taxes'             => 'taxes',
-		'_wpinv_fees'              => 'fees',
-		'_wpinv_discounts'         => 'discounts',
-		'_wpinv_submission_id'     => 'submission_id',
-		'_wpinv_payment_form'      => 'payment_form',
-		'_wpinv_is_viewed'         => 'is_viewed',
-		'wpinv_email_cc'           => 'email_cc',
-		'wpinv_template'           => 'template',
-		'wpinv_created_via'        => 'created_via',
-		'_wpinv_phone'             => 'phone',
-		'_wpinv_company_id'        => 'company_id',
-		'wpinv_shipping'           => 'shipping',
-	);
-
-	/**
-	 * A map of database fields to data props.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $database_fields_to_props = array(
-		'post_id'            => 'id',
-		'number'             => 'number',
-		'currency'           => 'currency',
-		'key'                => 'key',
-		'type'               => 'type',
-		'mode'               => 'mode',
-		'user_ip'            => 'user_ip',
-		'first_name'         => 'first_name',
-		'last_name'          => 'last_name',
-		'address'            => 'address',
-		'city'               => 'city',
-		'state'              => 'state',
-		'country'            => 'country',
-		'zip'                => 'zip',
-		'zip'                => 'zip',
-		'adddress_confirmed' => 'address_confirmed',
-		'gateway'            => 'gateway',
-		'transaction_id'     => 'transaction_id',
-		'currency'           => 'currency',
-		'subtotal'           => 'subtotal',
-		'tax'                => 'total_tax',
-		'fees_total'         => 'total_fees',
-		'discount'           => 'total_discount',
-		'total'              => 'total',
-		'discount_code'      => 'discount_code',
-		'disable_taxes'      => 'disable_taxes',
-		'due_date'           => 'due_date',
-		'completed_date'     => 'completed_date',
-		'company'            => 'company',
-		'vat_number'         => 'vat_number',
-		'vat_rate'           => 'vat_rate',
-	);
-
-	/*
+    /**
+     * Data stored in meta keys, but not considered "meta" for a discount.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $internal_meta_keys = array(
+        '_wpinv_subscr_profile_id',
+        '_wpinv_subscription_id',
+        '_wpinv_taxes',
+        '_wpinv_fees',
+        '_wpinv_discounts',
+        '_wpinv_submission_id',
+        '_wpinv_payment_form',
+        '_wpinv_is_viewed',
+        '_wpinv_phone',
+        '_wpinv_company_id',
+        'wpinv_shipping',
+        'wpinv_email_cc',
+        'wpinv_template',
+        'wpinv_created_via'
+    );
+
+    /**
+     * A map of meta keys to data props.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $meta_key_to_props = array(
+        '_wpinv_subscr_profile_id' => 'remote_subscription_id',
+        '_wpinv_subscription_id'   => 'subscription_id',
+        '_wpinv_taxes'             => 'taxes',
+        '_wpinv_fees'              => 'fees',
+        '_wpinv_discounts'         => 'discounts',
+        '_wpinv_submission_id'     => 'submission_id',
+        '_wpinv_payment_form'      => 'payment_form',
+        '_wpinv_is_viewed'         => 'is_viewed',
+        'wpinv_email_cc'           => 'email_cc',
+        'wpinv_template'           => 'template',
+        'wpinv_created_via'        => 'created_via',
+        '_wpinv_phone'             => 'phone',
+        '_wpinv_company_id'        => 'company_id',
+        'wpinv_shipping'           => 'shipping',
+    );
+
+    /**
+     * A map of database fields to data props.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $database_fields_to_props = array(
+        'post_id'            => 'id',
+        'number'             => 'number',
+        'currency'           => 'currency',
+        'key'                => 'key',
+        'type'               => 'type',
+        'mode'               => 'mode',
+        'user_ip'            => 'user_ip',
+        'first_name'         => 'first_name',
+        'last_name'          => 'last_name',
+        'address'            => 'address',
+        'city'               => 'city',
+        'state'              => 'state',
+        'country'            => 'country',
+        'zip'                => 'zip',
+        'zip'                => 'zip',
+        'adddress_confirmed' => 'address_confirmed',
+        'gateway'            => 'gateway',
+        'transaction_id'     => 'transaction_id',
+        'currency'           => 'currency',
+        'subtotal'           => 'subtotal',
+        'tax'                => 'total_tax',
+        'fees_total'         => 'total_fees',
+        'discount'           => 'total_discount',
+        'total'              => 'total',
+        'discount_code'      => 'discount_code',
+        'disable_taxes'      => 'disable_taxes',
+        'due_date'           => 'due_date',
+        'completed_date'     => 'completed_date',
+        'company'            => 'company',
+        'vat_number'         => 'vat_number',
+        'vat_rate'           => 'vat_rate',
+    );
+
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Method to create a new invoice in the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 */
-	public function create( &$invoice ) {
-		$invoice->set_version( WPINV_VERSION );
-		$invoice->set_date_created( current_time('mysql') );
-
-		// Create a new post.
-		$id = wp_insert_post(
-			apply_filters(
-				'getpaid_new_invoice_data',
-				array(
-					'post_date'     => $invoice->get_date_created( 'edit' ),
-					'post_type'     => $invoice->get_post_type( 'edit' ),
-					'post_status'   => $this->get_post_status( $invoice ),
-					'ping_status'   => 'closed',
-					'post_author'   => $invoice->get_user_id( 'edit' ),
-					'post_title'    => $invoice->get_title( 'edit' ),
-					'post_excerpt'  => $invoice->get_description( 'edit' ),
-					'post_parent'   => $invoice->get_parent_id( 'edit' ),
-				)
-			),
-			true
-		);
-
-		if ( $id && ! is_wp_error( $id ) ) {
-
-			// Update the new id and regenerate a title.
-			$invoice->set_id( $id );
-
-			$invoice->maybe_set_number();
-
-			wp_update_post(
-				array(
-					'ID'         => $invoice->get_id(),
-					'post_title' => $invoice->get_number( 'edit' ),
-					'post_name'  => $invoice->get_path( 'edit' )
-				)
-			);
-
-			// Save special fields and items.
-			$this->save_special_fields( $invoice );
-			$this->save_items( $invoice );
-
-			// Update meta data.
-			$this->update_post_meta( $invoice );
-			$invoice->save_meta_data();
-
-			// Apply changes.
-			$invoice->apply_changes();
-			$this->clear_caches( $invoice );
-
-			// Fires after a new invoice is created.
-			do_action( 'getpaid_new_invoice', $invoice );
-			return true;
-		}
-
-		if ( is_wp_error( $id ) ) {
-			$invoice->last_error = $id->get_error_message();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Method to read an invoice from the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 *
-	 */
-	public function read( &$invoice ) {
-
-		$invoice->set_defaults();
-		$invoice_object = get_post( $invoice->get_id() );
-
-		if ( ! $invoice->get_id() || ! $invoice_object || ! getpaid_is_invoice_post_type( $invoice_object->post_type ) ) {
-			$invoice->last_error = __( 'Invalid invoice.', 'invoicing' );
-			$invoice->set_id( 0 );
-			return false;
-		}
-
-		$invoice->set_props(
-			array(
-				'date_created'  => 0 < $invoice_object->post_date ? $invoice_object->post_date : null,
-				'date_modified' => 0 < $invoice_object->post_modified ? $invoice_object->post_modified : null,
-				'status'        => $invoice_object->post_status,
-				'author'        => $invoice_object->post_author,
-				'description'   => $invoice_object->post_excerpt,
-				'parent_id'     => $invoice_object->post_parent,
-				'name'          => $invoice_object->post_title,
-				'path'          => $invoice_object->post_name,
-				'post_type'     => $invoice_object->post_type,
-			)
-		);
-
-		$invoice->set_type( $invoice_object->post_type );
-
-		$this->read_object_data( $invoice, $invoice_object );
-		$this->add_special_fields( $invoice );
-		$this->add_items( $invoice );
-		$invoice->read_meta_data();
-		$invoice->set_object_read( true );
-		do_action( 'getpaid_read_invoice', $invoice );
-
-	}
-
-	/**
-	 * Method to update an invoice in the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 */
-	public function update( &$invoice ) {
-		$invoice->save_meta_data();
-		$invoice->set_version( WPINV_VERSION );
-
-		if ( null === $invoice->get_date_created( 'edit' ) ) {
-			$invoice->set_date_created(  current_time('mysql') );
-		}
-
-		// Ensure both the key and number are set.
-		$invoice->get_path();
-
-		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $invoice->get_id() );
-
-		$changes = $invoice->get_changes();
-
-		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author', 'description', 'parent_id', 'post_excerpt', 'path' ), array_keys( $changes ) ) ) {
-			$post_data = array(
-				'post_date'         => $invoice->get_date_created( 'edit' ),
-				'post_date_gmt'     => $invoice->get_date_created_gmt( 'edit' ),
-				'post_status'       => $invoice->get_status( 'edit' ),
-				'post_title'        => $invoice->get_name( 'edit' ),
-				'post_author'       => $invoice->get_user_id( 'edit' ),
-				'post_modified'     => $invoice->get_date_modified( 'edit' ),
-				'post_excerpt'      => $invoice->get_description( 'edit' ),
-				'post_parent'       => $invoice->get_parent_id( 'edit' ),
-				'post_name'         => $invoice->get_path( 'edit' ),
-				'post_type'         => $invoice->get_post_type( 'edit' ),
-			);
-
-			/**
-			 * When updating this object, to prevent infinite loops, use $wpdb
-			 * to update data, since wp_update_post spawns more calls to the
-			 * save_post action.
-			 *
-			 * This ensures hooks are fired by either WP itself (admin screen save),
-			 * or an update purely from CRUD.
-			 */
-			if ( doing_action( 'save_post' ) ) {
-				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $invoice->get_id() ) );
-				clean_post_cache( $invoice->get_id() );
-			} else {
-				wp_update_post( array_merge( array( 'ID' => $invoice->get_id() ), $post_data ) );
-			}
-			$invoice->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
-		}
-
-		// Update meta data.
-		$this->update_post_meta( $invoice );
-
-		// Save special fields and items.
-		$this->save_special_fields( $invoice );
-		$this->save_items( $invoice );
-
-		// Apply the changes.
-		$invoice->apply_changes();
-
-		// Clear caches.
-		$this->clear_caches( $invoice );
-
-		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $invoice->get_status( 'edit' );
-
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_invoice', $invoice );
-		} else {
-			do_action( 'getpaid_update_invoice', $invoice );
-		}
-
-	}
-
-	/*
+    /**
+     * Method to create a new invoice in the database.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
+     */
+    public function create( &$invoice ) {
+        $invoice->set_version( WPINV_VERSION );
+        $invoice->set_date_created( current_time('mysql') );
+
+        // Create a new post.
+        $id = wp_insert_post(
+            apply_filters(
+                'getpaid_new_invoice_data',
+                array(
+                    'post_date'     => $invoice->get_date_created( 'edit' ),
+                    'post_type'     => $invoice->get_post_type( 'edit' ),
+                    'post_status'   => $this->get_post_status( $invoice ),
+                    'ping_status'   => 'closed',
+                    'post_author'   => $invoice->get_user_id( 'edit' ),
+                    'post_title'    => $invoice->get_title( 'edit' ),
+                    'post_excerpt'  => $invoice->get_description( 'edit' ),
+                    'post_parent'   => $invoice->get_parent_id( 'edit' ),
+                )
+            ),
+            true
+        );
+
+        if ( $id && ! is_wp_error( $id ) ) {
+
+            // Update the new id and regenerate a title.
+            $invoice->set_id( $id );
+
+            $invoice->maybe_set_number();
+
+            wp_update_post(
+                array(
+                    'ID'         => $invoice->get_id(),
+                    'post_title' => $invoice->get_number( 'edit' ),
+                    'post_name'  => $invoice->get_path( 'edit' )
+                )
+            );
+
+            // Save special fields and items.
+            $this->save_special_fields( $invoice );
+            $this->save_items( $invoice );
+
+            // Update meta data.
+            $this->update_post_meta( $invoice );
+            $invoice->save_meta_data();
+
+            // Apply changes.
+            $invoice->apply_changes();
+            $this->clear_caches( $invoice );
+
+            // Fires after a new invoice is created.
+            do_action( 'getpaid_new_invoice', $invoice );
+            return true;
+        }
+
+        if ( is_wp_error( $id ) ) {
+            $invoice->last_error = $id->get_error_message();
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to read an invoice from the database.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
+     *
+     */
+    public function read( &$invoice ) {
+
+        $invoice->set_defaults();
+        $invoice_object = get_post( $invoice->get_id() );
+
+        if ( ! $invoice->get_id() || ! $invoice_object || ! getpaid_is_invoice_post_type( $invoice_object->post_type ) ) {
+            $invoice->last_error = __( 'Invalid invoice.', 'invoicing' );
+            $invoice->set_id( 0 );
+            return false;
+        }
+
+        $invoice->set_props(
+            array(
+                'date_created'  => 0 < $invoice_object->post_date ? $invoice_object->post_date : null,
+                'date_modified' => 0 < $invoice_object->post_modified ? $invoice_object->post_modified : null,
+                'status'        => $invoice_object->post_status,
+                'author'        => $invoice_object->post_author,
+                'description'   => $invoice_object->post_excerpt,
+                'parent_id'     => $invoice_object->post_parent,
+                'name'          => $invoice_object->post_title,
+                'path'          => $invoice_object->post_name,
+                'post_type'     => $invoice_object->post_type,
+            )
+        );
+
+        $invoice->set_type( $invoice_object->post_type );
+
+        $this->read_object_data( $invoice, $invoice_object );
+        $this->add_special_fields( $invoice );
+        $this->add_items( $invoice );
+        $invoice->read_meta_data();
+        $invoice->set_object_read( true );
+        do_action( 'getpaid_read_invoice', $invoice );
+
+    }
+
+    /**
+     * Method to update an invoice in the database.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
+     */
+    public function update( &$invoice ) {
+        $invoice->save_meta_data();
+        $invoice->set_version( WPINV_VERSION );
+
+        if ( null === $invoice->get_date_created( 'edit' ) ) {
+            $invoice->set_date_created(  current_time('mysql') );
+        }
+
+        // Ensure both the key and number are set.
+        $invoice->get_path();
+
+        // Grab the current status so we can compare.
+        $previous_status = get_post_status( $invoice->get_id() );
+
+        $changes = $invoice->get_changes();
+
+        // Only update the post when the post data changes.
+        if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author', 'description', 'parent_id', 'post_excerpt', 'path' ), array_keys( $changes ) ) ) {
+            $post_data = array(
+                'post_date'         => $invoice->get_date_created( 'edit' ),
+                'post_date_gmt'     => $invoice->get_date_created_gmt( 'edit' ),
+                'post_status'       => $invoice->get_status( 'edit' ),
+                'post_title'        => $invoice->get_name( 'edit' ),
+                'post_author'       => $invoice->get_user_id( 'edit' ),
+                'post_modified'     => $invoice->get_date_modified( 'edit' ),
+                'post_excerpt'      => $invoice->get_description( 'edit' ),
+                'post_parent'       => $invoice->get_parent_id( 'edit' ),
+                'post_name'         => $invoice->get_path( 'edit' ),
+                'post_type'         => $invoice->get_post_type( 'edit' ),
+            );
+
+            /**
+             * When updating this object, to prevent infinite loops, use $wpdb
+             * to update data, since wp_update_post spawns more calls to the
+             * save_post action.
+             *
+             * This ensures hooks are fired by either WP itself (admin screen save),
+             * or an update purely from CRUD.
+             */
+            if ( doing_action( 'save_post' ) ) {
+                $GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $invoice->get_id() ) );
+                clean_post_cache( $invoice->get_id() );
+            } else {
+                wp_update_post( array_merge( array( 'ID' => $invoice->get_id() ), $post_data ) );
+            }
+            $invoice->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+        }
+
+        // Update meta data.
+        $this->update_post_meta( $invoice );
+
+        // Save special fields and items.
+        $this->save_special_fields( $invoice );
+        $this->save_items( $invoice );
+
+        // Apply the changes.
+        $invoice->apply_changes();
+
+        // Clear caches.
+        $this->clear_caches( $invoice );
+
+        // Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
+        $new_status = $invoice->get_status( 'edit' );
+
+        if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
+            do_action( 'getpaid_new_invoice', $invoice );
+        } else {
+            do_action( 'getpaid_update_invoice', $invoice );
+        }
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Additional Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
+    /**
      * Retrieves special fields and adds to the invoice.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function add_special_fields( &$invoice ) {
-		global $wpdb;
+        global $wpdb;
 
-		// Maybe retrieve from the cache.
-		$data   = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_special_fields' );
+        // Maybe retrieve from the cache.
+        $data   = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_special_fields' );
 
-		// If not found, retrieve from the db.
-		if ( false === $data ) {
-			$table =  $wpdb->prefix . 'getpaid_invoices';
+        // If not found, retrieve from the db.
+        if ( false === $data ) {
+            $table =  $wpdb->prefix . 'getpaid_invoices';
 
-			$data  = $wpdb->get_row(
-				$wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d LIMIT 1", $invoice->get_id() ),
-				ARRAY_A
-			);
+            $data  = $wpdb->get_row(
+                $wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d LIMIT 1", $invoice->get_id() ),
+                ARRAY_A
+            );
 
-			// Update the cache with our data
-			wp_cache_set( $invoice->get_id(), $data, 'getpaid_invoice_special_fields' );
+            // Update the cache with our data
+            wp_cache_set( $invoice->get_id(), $data, 'getpaid_invoice_special_fields' );
 
-		}
+        }
 
-		// Abort if the data does not exist.
-		if ( empty( $data ) ) {
-			$invoice->set_object_read( true );
-			$invoice->set_props( wpinv_get_user_address( $invoice->get_user_id() ) );
-			return;
-		}
+        // Abort if the data does not exist.
+        if ( empty( $data ) ) {
+            $invoice->set_object_read( true );
+            $invoice->set_props( wpinv_get_user_address( $invoice->get_user_id() ) );
+            return;
+        }
 
-		$props = array();
+        $props = array();
 
-		foreach ( $this->database_fields_to_props as $db_field => $prop ) {
+        foreach ( $this->database_fields_to_props as $db_field => $prop ) {
 			
-			if ( $db_field == 'post_id' ) {
-				continue;
-			}
-
-			$props[ $prop ] = $data[ $db_field ];
-		}
-
-		$invoice->set_props( $props );
-
-	}
-
-	/**
-	 * Gets a list of special fields that need updated based on change state
-	 * or if they are present in the database or not.
-	 *
-	 * @param  WPInv_Invoice $invoice       The Invoice object.
-	 * @return array                        A mapping of field keys => prop names, filtered by ones that should be updated.
-	 */
-	protected function get_special_fields_to_update( $invoice ) {
-		$fields_to_update = array();
-		$changed_props   = $invoice->get_changes();
-
-		// Props should be updated if they are a part of the $changed array or don't exist yet.
-		foreach ( $this->database_fields_to_props as $database_field => $prop ) {
-			if ( array_key_exists( $prop, $changed_props ) ) {
-				$fields_to_update[ $database_field ] = $prop;
-			}
-		}
-
-		return $fields_to_update;
-	}
-
-	/**
-	 * Helper method that updates all the database fields for an invoice based on it's settings in the WPInv_Invoice class.
-	 *
-	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
-	 * @since 1.0.19
-	 */
-	protected function update_special_fields( &$invoice ) {
-		global $wpdb;
-
-		$updated_props    = array();
-		$fields_to_update = $this->get_special_fields_to_update( $invoice );
-
-		foreach ( $fields_to_update as $database_field => $prop ) {
-			$value = $invoice->{"get_$prop"}( 'edit' );
-			$value = is_string( $value ) ? wp_slash( $value ) : $value;
-			$value = is_bool( $value ) ? ( int ) $value : $value;
-			$updated_props[ $database_field ] = maybe_serialize( $value );
-		}
-
-		if ( ! empty( $updated_props ) ) {
-
-			$table = $wpdb->prefix . 'getpaid_invoices';
-			$wpdb->update( $table, $updated_props, array( 'post_id' => $invoice->get_id() ) );
-			wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
-			do_action( "getpaid_invoice_update_database_fields", $invoice, $updated_props );
-
-		}
-
-	}
-
-	/**
-	 * Helper method that inserts special fields to the database.
-	 *
-	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
-	 * @since 1.0.19
-	 */
-	protected function insert_special_fields( &$invoice ) {
-		global $wpdb;
-
-		$updated_props   = array();
-
-		foreach ( $this->database_fields_to_props as $database_field => $prop ) {
-			$value = $invoice->{"get_$prop"}( 'edit' );
-			$value = is_string( $value ) ? wp_slash( $value ) : $value;
-			$value = is_bool( $value ) ? ( int ) $value : $value;
-			$updated_props[ $database_field ] = maybe_serialize( $value );
-		}
-
-		$table = $wpdb->prefix . 'getpaid_invoices';
-		$wpdb->insert( $table, $updated_props );
-		wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
-		do_action( "getpaid_invoice_insert_database_fields", $invoice, $updated_props );
-
-	}
-
-	/**
+            if ( $db_field == 'post_id' ) {
+                continue;
+            }
+
+            $props[ $prop ] = $data[ $db_field ];
+        }
+
+        $invoice->set_props( $props );
+
+    }
+
+    /**
+     * Gets a list of special fields that need updated based on change state
+     * or if they are present in the database or not.
+     *
+     * @param  WPInv_Invoice $invoice       The Invoice object.
+     * @return array                        A mapping of field keys => prop names, filtered by ones that should be updated.
+     */
+    protected function get_special_fields_to_update( $invoice ) {
+        $fields_to_update = array();
+        $changed_props   = $invoice->get_changes();
+
+        // Props should be updated if they are a part of the $changed array or don't exist yet.
+        foreach ( $this->database_fields_to_props as $database_field => $prop ) {
+            if ( array_key_exists( $prop, $changed_props ) ) {
+                $fields_to_update[ $database_field ] = $prop;
+            }
+        }
+
+        return $fields_to_update;
+    }
+
+    /**
+     * Helper method that updates all the database fields for an invoice based on it's settings in the WPInv_Invoice class.
+     *
+     * @param WPInv_Invoice $invoice WPInv_Invoice object.
+     * @since 1.0.19
+     */
+    protected function update_special_fields( &$invoice ) {
+        global $wpdb;
+
+        $updated_props    = array();
+        $fields_to_update = $this->get_special_fields_to_update( $invoice );
+
+        foreach ( $fields_to_update as $database_field => $prop ) {
+            $value = $invoice->{"get_$prop"}( 'edit' );
+            $value = is_string( $value ) ? wp_slash( $value ) : $value;
+            $value = is_bool( $value ) ? ( int ) $value : $value;
+            $updated_props[ $database_field ] = maybe_serialize( $value );
+        }
+
+        if ( ! empty( $updated_props ) ) {
+
+            $table = $wpdb->prefix . 'getpaid_invoices';
+            $wpdb->update( $table, $updated_props, array( 'post_id' => $invoice->get_id() ) );
+            wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
+            do_action( "getpaid_invoice_update_database_fields", $invoice, $updated_props );
+
+        }
+
+    }
+
+    /**
+     * Helper method that inserts special fields to the database.
+     *
+     * @param WPInv_Invoice $invoice WPInv_Invoice object.
+     * @since 1.0.19
+     */
+    protected function insert_special_fields( &$invoice ) {
+        global $wpdb;
+
+        $updated_props   = array();
+
+        foreach ( $this->database_fields_to_props as $database_field => $prop ) {
+            $value = $invoice->{"get_$prop"}( 'edit' );
+            $value = is_string( $value ) ? wp_slash( $value ) : $value;
+            $value = is_bool( $value ) ? ( int ) $value : $value;
+            $updated_props[ $database_field ] = maybe_serialize( $value );
+        }
+
+        $table = $wpdb->prefix . 'getpaid_invoices';
+        $wpdb->insert( $table, $updated_props );
+        wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
+        do_action( "getpaid_invoice_insert_database_fields", $invoice, $updated_props );
+
+    }
+
+    /**
      * Saves all special fields.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function save_special_fields( & $invoice ) {
-		global $wpdb;
+        global $wpdb;
 
-		// The invoices table.
-		$table = $wpdb->prefix . 'getpaid_invoices';
-		$id    = (int) $invoice->get_id();
-		$invoice->maybe_set_key();
+        // The invoices table.
+        $table = $wpdb->prefix . 'getpaid_invoices';
+        $id    = (int) $invoice->get_id();
+        $invoice->maybe_set_key();
 
-		if ( $wpdb->get_var( "SELECT `post_id` FROM $table WHERE `post_id`= $id" ) ) {
+        if ( $wpdb->get_var( "SELECT `post_id` FROM $table WHERE `post_id`= $id" ) ) {
 
-			$this->update_special_fields( $invoice );
+            $this->update_special_fields( $invoice );
 
-		} else {
+        } else {
 
-			$this->insert_special_fields( $invoice );
+            $this->insert_special_fields( $invoice );
 
-		}
+        }
 
-	}
+    }
 
-	/**
+    /**
      * Set's up cart details.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function add_items( &$invoice ) {
-		global $wpdb;
+        global $wpdb;
 
-		// Maybe retrieve from the cache.
-		$items = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_cart_details' );
+        // Maybe retrieve from the cache.
+        $items = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_cart_details' );
 
-		// If not found, retrieve from the db.
-		if ( false === $items ) {
-			$table =  $wpdb->prefix . 'getpaid_invoice_items';
+        // If not found, retrieve from the db.
+        if ( false === $items ) {
+            $table =  $wpdb->prefix . 'getpaid_invoice_items';
 
-			$items = $wpdb->get_results(
-				$wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d", $invoice->get_id() )
-			);
+            $items = $wpdb->get_results(
+                $wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d", $invoice->get_id() )
+            );
 
-			// Update the cache with our data
-			wp_cache_set( $invoice->get_id(), $items, 'getpaid_invoice_cart_details' );
+            // Update the cache with our data
+            wp_cache_set( $invoice->get_id(), $items, 'getpaid_invoice_cart_details' );
 
-		}
+        }
 
-		// Abort if no items found.
+        // Abort if no items found.
         if ( empty( $items ) ) {
             return;
-		}
-
-		$_items = array();
-		foreach ( $items as $item_data ) {
-			$item = new GetPaid_Form_Item( $item_data->item_id );
-
-			// Set item data.
-			$item->item_tax      = wpinv_sanitize_amount( $item_data->tax );
-			$item->item_discount = wpinv_sanitize_amount( $item_data->discount );
-			$item->set_name( $item_data->item_name );
-			$item->set_description( $item_data->item_description );
-			$item->set_price( $item_data->item_price );
-			$item->set_quantity( $item_data->quantity );
-			$item->set_item_meta( $item_data->meta );
-			$_items[] = $item;
-		}
-
-		$invoice->set_items( $_items );
-	}
-
-	/**
+        }
+
+        $_items = array();
+        foreach ( $items as $item_data ) {
+            $item = new GetPaid_Form_Item( $item_data->item_id );
+
+            // Set item data.
+            $item->item_tax      = wpinv_sanitize_amount( $item_data->tax );
+            $item->item_discount = wpinv_sanitize_amount( $item_data->discount );
+            $item->set_name( $item_data->item_name );
+            $item->set_description( $item_data->item_description );
+            $item->set_price( $item_data->item_price );
+            $item->set_quantity( $item_data->quantity );
+            $item->set_item_meta( $item_data->meta );
+            $_items[] = $item;
+        }
+
+        $invoice->set_items( $_items );
+    }
+
+    /**
      * Saves cart details.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function save_items( $invoice ) {
 
-		// Delete previously existing items.
-		$this->delete_items( $invoice );
+        // Delete previously existing items.
+        $this->delete_items( $invoice );
 
-		$table   =  $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
+        $table   =  $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
 
-		foreach ( $invoice->get_cart_details() as $item_data ) {
-			$item_data = array_map( 'maybe_serialize', $item_data );
-			$GLOBALS['wpdb']->insert( $table, $item_data );
-		}
+        foreach ( $invoice->get_cart_details() as $item_data ) {
+            $item_data = array_map( 'maybe_serialize', $item_data );
+            $GLOBALS['wpdb']->insert( $table, $item_data );
+        }
 
-		wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_cart_details' );
-		do_action( "getpaid_invoice_save_items", $invoice );
+        wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_cart_details' );
+        do_action( "getpaid_invoice_save_items", $invoice );
 
-	}
+    }
 
-	/**
+    /**
      * Deletes an invoice's cart details from the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function delete_items( $invoice ) {
-		$table =  $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
-		return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
-	}
+        $table =  $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
+        return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
+    }
 
-	/**
+    /**
      * Deletes an invoice's special fields from the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function delete_special_fields( $invoice ) {
-		$table =  $GLOBALS['wpdb']->prefix . 'getpaid_invoices';
-		return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
-	}
+        $table =  $GLOBALS['wpdb']->prefix . 'getpaid_invoices';
+        return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
+    }
 	
-	/**
-	 * Get the status to save to the post object.
-	 *
-	 *
-	 * @since 1.0.19
-	 * @param  WPInv_Invoice $object GetPaid_Data object.
-	 * @return string
-	 */
-	protected function get_post_status( $object ) {
-		$object_status = $object->get_status( 'edit' );
-
-		if ( ! $object_status ) {
-			$object_status = $object->get_default_status();
-		}
-
-		return $object_status;
-	}
+    /**
+     * Get the status to save to the post object.
+     *
+     *
+     * @since 1.0.19
+     * @param  WPInv_Invoice $object GetPaid_Data object.
+     * @return string
+     */
+    protected function get_post_status( $object ) {
+        $object_status = $object->get_status( 'edit' );
+
+        if ( ! $object_status ) {
+            $object_status = $object->get_default_status();
+        }
+
+        return $object_status;
+    }
 
 }

includes/class-getpaid-template.php

Indentation +152 added lines, -152 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -20,29 +20,29 @@ 
     public $templates_url;
 
     /**
-	 * Class constructor.
-	 *
-	 * @since 1.0.19
-	 */
-	public function __construct() {
+     * Class constructor.
+     *
+     * @since 1.0.19
+     */
+    public function __construct() {
 
         $this->templates_dir = apply_filters( 'getpaid_default_templates_dir', WPINV_PLUGIN_DIR . 'templates' );
         $this->templates_url = apply_filters( 'getpaid_default_templates_url', WPINV_PLUGIN_URL . 'templates' );
 
         // Oxygen plugin
-		if ( defined( 'CT_VERSION' ) ) {
-			add_filter( 'wpinv_locate_template', array( $this, 'oxygen_override_template' ), 11, 4 );
-		}
+        if ( defined( 'CT_VERSION' ) ) {
+            add_filter( 'wpinv_locate_template', array( $this, 'oxygen_override_template' ), 11, 4 );
+        }
 
     }
 
     /**
-	 * Checks if this is a preview page
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_preview() {
+     * Checks if this is a preview page
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_preview() {
         return 
             $this->is_divi_preview() ||
             $this->is_elementor_preview() ||
@@ -54,73 +54,73 @@ 
     }
 
     /**
-	 * Checks if this is an elementor preview page
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_elementor_preview() {
-		return isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' );
-	}
-
-	/**
-	 * Checks if this is a DIVI preview page
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_divi_preview() {
-		return isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'et_pb' );
-	}
-
-	/**
-	 * Checks if this is a beaver builder preview page
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_beaver_preview() {
-		return isset( $_REQUEST['fl_builder'] );
-	}
-
-	/**
-	 * Checks if this is a siteorigin builder preview page
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_siteorigin_preview() {
-		return ! empty( $_REQUEST['siteorigin_panels_live_editor'] );
-	}
-
-	/**
-	 * Checks if this is a cornerstone builder preview page
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_cornerstone_preview() {
-		return ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint';
-	}
-
-	/**
-	 * Checks if this is a fusion builder preview page
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_fusion_preview() {
-		return ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] );
-	}
-
-	/**
-	 * Checks if this is an oxygen builder preview page
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_oxygen_preview() {
-		return ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) );
+     * Checks if this is an elementor preview page
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_elementor_preview() {
+        return isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' );
+    }
+
+    /**
+     * Checks if this is a DIVI preview page
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_divi_preview() {
+        return isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'et_pb' );
+    }
+
+    /**
+     * Checks if this is a beaver builder preview page
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_beaver_preview() {
+        return isset( $_REQUEST['fl_builder'] );
+    }
+
+    /**
+     * Checks if this is a siteorigin builder preview page
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_siteorigin_preview() {
+        return ! empty( $_REQUEST['siteorigin_panels_live_editor'] );
+    }
+
+    /**
+     * Checks if this is a cornerstone builder preview page
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_cornerstone_preview() {
+        return ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint';
+    }
+
+    /**
+     * Checks if this is a fusion builder preview page
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_fusion_preview() {
+        return ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] );
+    }
+
+    /**
+     * Checks if this is an oxygen builder preview page
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_oxygen_preview() {
+        return ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) );
     }
 
     /**
@@ -130,7 +130,7 @@ 
      * @param string $template_path The template path relative to the theme's root dir. Defaults to 'invoicing'.
      * @param string $default_path The root path to the default template. Defaults to invoicing/templates
      */
-	public function locate_template( $template_name, $template_path = '', $default_path = '' ) {
+    public function locate_template( $template_name, $template_path = '', $default_path = '' ) {
 
         // Load the defaults for the template path and default path.
         $template_path = empty( $template_path ) ? 'invoicing' : $template_path;
@@ -151,22 +151,22 @@ 
     }
     
     /**
-	 * Loads a template
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	protected function load_template( $template_name, $template_path, $args ) {
+     * Loads a template
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    protected function load_template( $template_name, $template_path, $args ) {
 
         if ( is_array( $args ) ){
             extract( $args );
         }
 
         // Fires before loading a template.
-	    do_action( 'wpinv_before_template_part', $template_name, $template_path, $args );
+        do_action( 'wpinv_before_template_part', $template_name, $template_path, $args );
 
         // Load the template.
-	    include( $template_path );
+        include( $template_path );
 
         // Fires after loading a template.
         do_action( 'wpinv_after_template_part', $template_name, $template_path, $args );
@@ -183,7 +183,7 @@ 
      * @param string $template_path The templates directory relative to the theme's root dir. Defaults to 'invoicing'.
      * @param string $default_path The root path to the default template. Defaults to invoicing/templates
      */
-	public function display_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+    public function display_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
 
         // Locate the template.
         $located = $this->locate_template( $template_name, $template_path, $default_path );
@@ -208,74 +208,74 @@ 
      * @param string $template_path The templates directory relative to the theme's root dir. Defaults to 'invoicing'.
      * @param string $default_path The root path to the default template. Defaults to invoicing/templates
      */
-	public function get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+    public function get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
         ob_start();
         $this->display_template( $template_name, $args, $template_path, $default_path );
         return ob_get_clean();
     }
 
     /**
-	 * Get the geodirectory templates theme path.
-	 *
-	 *
-	 * @return string Template path.
-	 */
-	public static function get_theme_template_path() {
-		$template   = get_template();
-		$theme_root = get_theme_root( $template );
-
-		return $theme_root . '/' . $template . '/' . untrailingslashit( wpinv_get_theme_template_dir_name() );
-
-	}
-
-	/**
-	 * Oxygen locate theme template.
-	 *
-	 * @param string $template The template.
-	 * @return string The theme template.
-	 */
-	public static function oxygen_locate_template( $template ) {
-
-		if ( empty( $template ) ) {
-			return '';
-		}
-
-		$has_filter = has_filter( 'template', 'ct_oxygen_template_name' );
-
-		// Remove template filter
-		if ( $has_filter ) {
-			remove_filter( 'template', 'ct_oxygen_template_name' );
-		}
-
-		$template = self::get_theme_template_path() . '/' . $template;
-
-		if ( ! file_exists( $template ) ) {
-			$template = '';
-		}
-
-		// Add template filter
-		if ( $has_filter ) {
-			add_filter( 'template', 'ct_oxygen_template_name' );
-		}
-
-		return $template;
-	}
-
-	/**
-	 * Oxygen override theme template.
-	 *
-	 * @param string $located Located template.
-	 * @param string $template_name Template name.
-	 * @return string Located template.
-	 */
-	public function oxygen_override_template( $located, $template_name ) {
+     * Get the geodirectory templates theme path.
+     *
+     *
+     * @return string Template path.
+     */
+    public static function get_theme_template_path() {
+        $template   = get_template();
+        $theme_root = get_theme_root( $template );
+
+        return $theme_root . '/' . $template . '/' . untrailingslashit( wpinv_get_theme_template_dir_name() );
+
+    }
+
+    /**
+     * Oxygen locate theme template.
+     *
+     * @param string $template The template.
+     * @return string The theme template.
+     */
+    public static function oxygen_locate_template( $template ) {
+
+        if ( empty( $template ) ) {
+            return '';
+        }
+
+        $has_filter = has_filter( 'template', 'ct_oxygen_template_name' );
+
+        // Remove template filter
+        if ( $has_filter ) {
+            remove_filter( 'template', 'ct_oxygen_template_name' );
+        }
+
+        $template = self::get_theme_template_path() . '/' . $template;
+
+        if ( ! file_exists( $template ) ) {
+            $template = '';
+        }
+
+        // Add template filter
+        if ( $has_filter ) {
+            add_filter( 'template', 'ct_oxygen_template_name' );
+        }
+
+        return $template;
+    }
+
+    /**
+     * Oxygen override theme template.
+     *
+     * @param string $located Located template.
+     * @param string $template_name Template name.
+     * @return string Located template.
+     */
+    public function oxygen_override_template( $located, $template_name ) {
 
         $oxygen_overide = self::oxygen_locate_template( $template_name );
-		if ( ! empty( $oxygen_overide ) ) {
-			return $oxygen_overide;
-		}
+        if ( ! empty( $oxygen_overide ) ) {
+            return $oxygen_overide;
+        }
 
-		return $located;
-	}
+        return $located;
+    }
 
 }

Spacing +46 added lines, -46 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,12 +26,12 @@ 
 	 */
 	public function __construct() {
 
-        $this->templates_dir = apply_filters( 'getpaid_default_templates_dir', WPINV_PLUGIN_DIR . 'templates' );
-        $this->templates_url = apply_filters( 'getpaid_default_templates_url', WPINV_PLUGIN_URL . 'templates' );
+        $this->templates_dir = apply_filters('getpaid_default_templates_dir', WPINV_PLUGIN_DIR . 'templates');
+        $this->templates_url = apply_filters('getpaid_default_templates_url', WPINV_PLUGIN_URL . 'templates');
 
         // Oxygen plugin
-		if ( defined( 'CT_VERSION' ) ) {
-			add_filter( 'wpinv_locate_template', array( $this, 'oxygen_override_template' ), 11, 4 );
+		if (defined('CT_VERSION')) {
+			add_filter('wpinv_locate_template', array($this, 'oxygen_override_template'), 11, 4);
 		}
 
     }
@@ -60,7 +60,7 @@ 
 	 * @return bool
 	 */
 	public function is_elementor_preview() {
-		return isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' );
+		return isset($_REQUEST['elementor-preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor') || (isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor_ajax');
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 * @return bool
 	 */
 	public function is_divi_preview() {
-		return isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'et_pb' );
+		return isset($_REQUEST['et_fb']) || isset($_REQUEST['et_pb_preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'et_pb');
 	}
 
 	/**
@@ -80,7 +80,7 @@ 
 	 * @return bool
 	 */
 	public function is_beaver_preview() {
-		return isset( $_REQUEST['fl_builder'] );
+		return isset($_REQUEST['fl_builder']);
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 * @return bool
 	 */
 	public function is_siteorigin_preview() {
-		return ! empty( $_REQUEST['siteorigin_panels_live_editor'] );
+		return !empty($_REQUEST['siteorigin_panels_live_editor']);
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	 * @return bool
 	 */
 	public function is_cornerstone_preview() {
-		return ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint';
+		return !empty($_REQUEST['cornerstone_preview']) || basename($_SERVER['REQUEST_URI']) == 'cornerstone-endpoint';
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 * @return bool
 	 */
 	public function is_fusion_preview() {
-		return ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] );
+		return !empty($_REQUEST['fb-edit']) || !empty($_REQUEST['fusion_load_nonce']);
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 * @return bool
 	 */
 	public function is_oxygen_preview() {
-		return ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) );
+		return !empty($_REQUEST['ct_builder']) || (!empty($_REQUEST['action']) && (substr($_REQUEST['action'], 0, 11) === "oxy_render_" || substr($_REQUEST['action'], 0, 10) === "ct_render_"));
     }
 
     /**
@@ -130,24 +130,24 @@ 
      * @param string $template_path The template path relative to the theme's root dir. Defaults to 'invoicing'.
      * @param string $default_path The root path to the default template. Defaults to invoicing/templates
      */
-	public function locate_template( $template_name, $template_path = '', $default_path = '' ) {
+	public function locate_template($template_name, $template_path = '', $default_path = '') {
 
         // Load the defaults for the template path and default path.
-        $template_path = empty( $template_path ) ? 'invoicing' : $template_path;
-        $default_path  = empty( $default_path ) ? $this->templates_dir : $default_path;
-        $default_path  = apply_filters( 'getpaid_template_default_template_path', $default_path, $template_name );
+        $template_path = empty($template_path) ? 'invoicing' : $template_path;
+        $default_path  = empty($default_path) ? $this->templates_dir : $default_path;
+        $default_path  = apply_filters('getpaid_template_default_template_path', $default_path, $template_name);
 
         // Is it overidden?
         $template = locate_template(
-            array( trailingslashit( $template_path ) . $template_name, 'wpinv-' . $template_name )
+            array(trailingslashit($template_path) . $template_name, 'wpinv-' . $template_name)
         );
 
         // If not, load the default template.
-        if ( empty( $template ) ) {
-            $template = trailingslashit( $default_path ) . $template_name;
+        if (empty($template)) {
+            $template = trailingslashit($default_path) . $template_name;
         }
 
-        return apply_filters( 'wpinv_locate_template', $template, $template_name, $template_path, $default_path );
+        return apply_filters('wpinv_locate_template', $template, $template_name, $template_path, $default_path);
     }
     
     /**
@@ -156,20 +156,20 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	protected function load_template( $template_name, $template_path, $args ) {
+	protected function load_template($template_name, $template_path, $args) {
 
-        if ( is_array( $args ) ){
-            extract( $args );
+        if (is_array($args)) {
+            extract($args);
         }
 
         // Fires before loading a template.
-	    do_action( 'wpinv_before_template_part', $template_name, $template_path, $args );
+	    do_action('wpinv_before_template_part', $template_name, $template_path, $args);
 
         // Load the template.
-	    include( $template_path );
+	    include($template_path);
 
         // Fires after loading a template.
-        do_action( 'wpinv_after_template_part', $template_name, $template_path, $args );
+        do_action('wpinv_after_template_part', $template_name, $template_path, $args);
 
     }
 
@@ -183,18 +183,18 @@ 
      * @param string $template_path The templates directory relative to the theme's root dir. Defaults to 'invoicing'.
      * @param string $default_path The root path to the default template. Defaults to invoicing/templates
      */
-	public function display_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+	public function display_template($template_name, $args = array(), $template_path = '', $default_path = '') {
 
         // Locate the template.
-        $located = $this->locate_template( $template_name, $template_path, $default_path );
+        $located = $this->locate_template($template_name, $template_path, $default_path);
 
         // Abort if the file does not exist.
-        if ( ! file_exists( $located ) ) {
-            getpaid_doing_it_wrong( __METHOD__, sprintf( '<code>%s</code> does not exist.', $located ), '2.0.0' );
+        if (!file_exists($located)) {
+            getpaid_doing_it_wrong(__METHOD__, sprintf('<code>%s</code> does not exist.', $located), '2.0.0');
             return;
         }
 
-        $this->load_template( $template_name, $located, $args );
+        $this->load_template($template_name, $located, $args);
 
     }
     
@@ -208,9 +208,9 @@ 
      * @param string $template_path The templates directory relative to the theme's root dir. Defaults to 'invoicing'.
      * @param string $default_path The root path to the default template. Defaults to invoicing/templates
      */
-	public function get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+	public function get_template($template_name, $args = array(), $template_path = '', $default_path = '') {
         ob_start();
-        $this->display_template( $template_name, $args, $template_path, $default_path );
+        $this->display_template($template_name, $args, $template_path, $default_path);
         return ob_get_clean();
     }
 
@@ -222,9 +222,9 @@ 
 	 */
 	public static function get_theme_template_path() {
 		$template   = get_template();
-		$theme_root = get_theme_root( $template );
+		$theme_root = get_theme_root($template);
 
-		return $theme_root . '/' . $template . '/' . untrailingslashit( wpinv_get_theme_template_dir_name() );
+		return $theme_root . '/' . $template . '/' . untrailingslashit(wpinv_get_theme_template_dir_name());
 
 	}
 
@@ -234,28 +234,28 @@ 
 	 * @param string $template The template.
 	 * @return string The theme template.
 	 */
-	public static function oxygen_locate_template( $template ) {
+	public static function oxygen_locate_template($template) {
 
-		if ( empty( $template ) ) {
+		if (empty($template)) {
 			return '';
 		}
 
-		$has_filter = has_filter( 'template', 'ct_oxygen_template_name' );
+		$has_filter = has_filter('template', 'ct_oxygen_template_name');
 
 		// Remove template filter
-		if ( $has_filter ) {
-			remove_filter( 'template', 'ct_oxygen_template_name' );
+		if ($has_filter) {
+			remove_filter('template', 'ct_oxygen_template_name');
 		}
 
 		$template = self::get_theme_template_path() . '/' . $template;
 
-		if ( ! file_exists( $template ) ) {
+		if (!file_exists($template)) {
 			$template = '';
 		}
 
 		// Add template filter
-		if ( $has_filter ) {
-			add_filter( 'template', 'ct_oxygen_template_name' );
+		if ($has_filter) {
+			add_filter('template', 'ct_oxygen_template_name');
 		}
 
 		return $template;
@@ -268,10 +268,10 @@ 
 	 * @param string $template_name Template name.
 	 * @return string Located template.
 	 */
-	public function oxygen_override_template( $located, $template_name ) {
+	public function oxygen_override_template($located, $template_name) {
 
-        $oxygen_overide = self::oxygen_locate_template( $template_name );
-		if ( ! empty( $oxygen_overide ) ) {
+        $oxygen_overide = self::oxygen_locate_template($template_name);
+		if (!empty($oxygen_overide)) {
 			return $oxygen_overide;
 		}
 

templates/invoice/invoice-logo.php

Spacing +9 added lines, -9 removed lines

@@ -7,24 +7,24 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$logo_width  = wpinv_get_option( 'logo_width' );
-$logo_height = wpinv_get_option( 'logo_height' );
+$logo_width  = wpinv_get_option('logo_width');
+$logo_height = wpinv_get_option('logo_height');
 
 ?>
-<a target="_blank" class="logo-link text-dark" href="<?php echo esc_url( wpinv_get_business_website() ); ?>">
+<a target="_blank" class="logo-link text-dark" href="<?php echo esc_url(wpinv_get_business_website()); ?>">
 
-    <?php if ( $logo = wpinv_get_business_logo() ) : ?>
+    <?php if ($logo = wpinv_get_business_logo()) : ?>
 
-        <?php if ( ! empty( $logo_width ) && ! empty( $logo_height ) ) : ?>
-            <img class="logo" style="max-width:100%; width:<?php echo absint( $logo_width ); ?>px; height:<?php echo absint( $logo_height ); ?>px;" src="<?php echo esc_url( $logo ); ?>">
+        <?php if (!empty($logo_width) && !empty($logo_height)) : ?>
+            <img class="logo" style="max-width:100%; width:<?php echo absint($logo_width); ?>px; height:<?php echo absint($logo_height); ?>px;" src="<?php echo esc_url($logo); ?>">
         <?php else: ?>
-            <img class="logo" style="max-width:100%;" src="<?php echo esc_url( $logo ); ?>">
+            <img class="logo" style="max-width:100%;" src="<?php echo esc_url($logo); ?>">
         <?php endif; ?>
 
     <?php else: ?>
-        <h1 class="h3"><?php echo esc_html( wpinv_get_business_name() ); ?></h1>
+        <h1 class="h3"><?php echo esc_html(wpinv_get_business_name()); ?></h1>
     <?php endif; ?>
 
 </a>

Braces +10 added lines, -4 removed lines

@@ -19,12 +19,18 @@
 
         <?php if ( ! empty( $logo_width ) && ! empty( $logo_height ) ) : ?>
             <img class="logo" style="max-width:100%; width:<?php echo absint( $logo_width ); ?>px; height:<?php echo absint( $logo_height ); ?>px;" src="<?php echo esc_url( $logo ); ?>">
-        <?php else: ?>
-            <img class="logo" style="max-width:100%;" src="<?php echo esc_url( $logo ); ?>">
+        <?php else {
+    : ?>
+            <img class="logo" style="max-width:100%;" src="<?php echo esc_url( $logo );
+}
+?>">
         <?php endif; ?>
 
-    <?php else: ?>
-        <h1 class="h3"><?php echo esc_html( wpinv_get_business_name() ); ?></h1>
+    <?php else {
+    : ?>
+        <h1 class="h3"><?php echo esc_html( wpinv_get_business_name() );
+}
+?></h1>
     <?php endif; ?>
 
 </a>